Merge pull request #170 from IHE/moehrke-provideBundle-identifier

Moehrke provide bundle identifier
IHE · Oct 3, 2022 · c044e73 · c044e73
2 parents 3cfb616 + f1be28a
commit c044e73
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 33 deletions.
diff --git a/input/fsh/SimplifiedPublish.fsh b/input/fsh/SimplifiedPublish.fsh
@@ -23,7 +23,7 @@ Simplified Publish
 """
 * modifierExtension 0..0
 * masterIdentifier 1..1
-* identifier 0..* MS
+* identifier 0..0
 * status 1..1
 * status = http://hl7.org/fhir/document-reference-status#current
 * docStatus 0..0
@@ -70,8 +70,6 @@ Usage: #example
 * meta.security = http://terminology.hl7.org/CodeSystem/v3-ActReason#HTEST
 * masterIdentifier.system = "urn:ietf:rfc:3986"
 * masterIdentifier.value = "urn:oid:1.2.840.113556.1.8000.2554.53432.348.12973.17740.34205.4355.60220.62012"
-* identifier.system = "urn:ietf:rfc:3986"
-* identifier.value = "urn:uuid:7d5bb8ac-68ee-4926-65e7-b8aac8e1f09d"
 * status = #current
 * content.attachment.contentType = #text/plain
 * content.attachment.data = "SGVsbG8gV29ybGQ="

diff --git a/input/fsh/documentReference.fsh b/input/fsh/documentReference.fsh
@@ -19,6 +19,12 @@ Description:    "A profile on the DocumentReference resource for MHD with minima
 * modifierExtension 0..0
 * masterIdentifier 1..1
 * identifier 0..* MS
+* identifier ^slicing.discriminator.type = #value
+* identifier ^slicing.discriminator.path = "use"
+* identifier ^slicing.rules = #open
+* identifier contains entryUUID 0..*
+* identifier[entryUUID] ^short = "entryUUID"
+* identifier[entryUUID].use = #official
 * status 1..1
 * status from DocumentReferenceStats (required)
 * docStatus 0..0

diff --git a/input/fsh/ex-DocumentReference.fsh b/input/fsh/ex-DocumentReference.fsh
@@ -6,8 +6,9 @@ Usage: #example
 * meta.security = http://terminology.hl7.org/CodeSystem/v3-ActReason#HTEST
 * masterIdentifier.system = "urn:ietf:rfc:3986"
 * masterIdentifier.value = "urn:oid:1.2.840.113556.1.8000.2554.53432.348.12973.17740.34205.4355.50220.62012"
-* identifier.system = "urn:ietf:rfc:3986"
-* identifier.value = "urn:uuid:7d5bb8ac-68ee-4926-85e7-b8aac8e1f09d"
+* identifier[entryUUID].system = "urn:ietf:rfc:3986"
+* identifier[entryUUID].value = "urn:uuid:7d5bb8ac-68ee-4926-85e7-b8aac8e1f09d"
+* identifier[entryUUID].use = #official
 * status = #current
 * content.attachment.contentType = #text/plain
 * content.attachment.url = "http://example.com/nowhere.txt"
@@ -20,8 +21,9 @@ Usage: #example
 * meta.security = http://terminology.hl7.org/CodeSystem/v3-ActReason#HTEST
 * masterIdentifier.system = "urn:ietf:rfc:3986"
 * masterIdentifier.value = "urn:oid:1.2.840.113556.1.8000.2554.53432.348.12973.17740.34205.4355.50220.62012"
-* identifier.system = "urn:ietf:rfc:3986"
-* identifier.value = "urn:uuid:7d5bb8ac-68ee-4926-85e7-b8aac8e1f09d"
+* identifier[entryUUID].system = "urn:ietf:rfc:3986"
+* identifier[entryUUID].value = "urn:uuid:7d5bb8ac-68ee-4926-85e7-b8aac8e1f09d"
+* identifier[entryUUID].use = #official
 * status = #current
 * content.attachment.contentType = #text/plain
 * content.attachment.url = "http://example.com/nowhere.txt"
@@ -36,8 +38,9 @@ Usage: #example
 * meta.security = http://terminology.hl7.org/CodeSystem/v3-ActReason#HTEST
 * masterIdentifier.system = "urn:ietf:rfc:3986"
 * masterIdentifier.value = "urn:oid:1.2.840.113556.1.8000.2554.58783.21864.3474.19410.44358.58254.41281.46340"
-* identifier.system = "urn:ietf:rfc:3986"
-* identifier.value = "urn:uuid:0c287d32-01e3-4d87-9953-9fcc9404eb21"
+* identifier[entryUUID].system = "urn:ietf:rfc:3986"
+* identifier[entryUUID].value = "urn:uuid:0c287d32-01e3-4d87-9953-9fcc9404eb21"
+* identifier[entryUUID].use = #official
 * status = #current
 * content.attachment.contentType = #text/plain
 * content.attachment.url = "http://example.com/nowhere.txt"
@@ -62,8 +65,9 @@ Usage: #example
 * meta.security = http://terminology.hl7.org/CodeSystem/v3-ActReason#HTEST
 * masterIdentifier.system = "urn:ietf:rfc:3986"
 * masterIdentifier.value = "urn:oid:1.2.840.113556.1.8000.2554.58783.21864.3474.19410.44358.58254.41281.46340"
-* identifier.system = "urn:ietf:rfc:3986"
-* identifier.value = "urn:uuid:0c287d32-01e3-4d87-9953-9fcc9404eb21"
+* identifier[entryUUID].system = "urn:ietf:rfc:3986"
+* identifier[entryUUID].value = "urn:uuid:0c287d32-01e3-4d87-9953-9fcc9404eb21"
+* identifier[entryUUID].use = #official
 * status = #current
 * content.attachment.contentType = #text/plain
 * content.attachment.url = "http://example.com/nowhere.txt"
@@ -104,8 +108,9 @@ Usage: #example
 * meta.security = http://terminology.hl7.org/CodeSystem/v3-ActReason#HTEST
 * masterIdentifier.system = "urn:ietf:rfc:3986"
 * masterIdentifier.value = "urn:oid:1.2.840.113556.1.8000.2554.58783.21864.3474.19410.44358.58254.41281.46340"
-* identifier.system = "urn:ietf:rfc:3986"
-* identifier.value = "urn:uuid:0c287d32-01e3-4d87-9953-9fcc9404eb21"
+* identifier[entryUUID].system = "urn:ietf:rfc:3986"
+* identifier[entryUUID].value = "urn:uuid:0c287d32-01e3-4d87-9953-9fcc9404eb21"
+* identifier[entryUUID].use = #official
 * status = #current
 * content.attachment.contentType = #text/plain
 * content.attachment.url = "http://example.com/nowhere.txt"
@@ -154,8 +159,9 @@ Usage: #example
 * meta.security = http://terminology.hl7.org/CodeSystem/v3-ActReason#HTEST
 * masterIdentifier.system = "urn:ietf:rfc:3986"
 * masterIdentifier.value = "urn:oid:1.2.840.113556.1.8000.2554.58783.21864.3474.19410.44358.58254.41281.47340"
-* identifier.system = "urn:ietf:rfc:3986"
-* identifier.value = "urn:uuid:0c287d32-01e3-4d87-9953-9fcc9407eb21"
+* identifier[entryUUID].system = "urn:ietf:rfc:3986"
+* identifier[entryUUID].value = "urn:uuid:0c287d32-01e3-4d87-9953-9fcc9407eb21"
+* identifier[entryUUID].use = #official
 * status = #current
 * content.attachment.contentType = #text/plain
 // This URL would be used to retrieve the content, and in this case that is when the content would be created
@@ -204,8 +210,9 @@ Usage: #example
 * meta.security = http://terminology.hl7.org/CodeSystem/v3-ActReason#HTEST
 * masterIdentifier.system = "urn:ietf:rfc:3986"
 * masterIdentifier.value = "urn:oid:1.2.840.113556.1.8000.2554.58783.21864.3474.19410.44358.58254.41281.57340"
-* identifier.system = "urn:ietf:rfc:3986"
-* identifier.value = "urn:uuid:0c287d32-01e3-4d87-9953-9fc59407eb21"
+* identifier[entryUUID].system = "urn:ietf:rfc:3986"
+* identifier[entryUUID].value = "urn:uuid:0c287d32-01e3-4d87-9953-9fc59407eb21"
+* identifier[entryUUID].use = #official
 * status = #current
 * content.attachment.contentType = #text/plain
 // This URL would be used to retrieve the content, and in this case that is when the content would be created
@@ -236,8 +243,9 @@ Usage: #example
 * meta.security = http://terminology.hl7.org/CodeSystem/v3-ActReason#HTEST
 * masterIdentifier.system = "urn:ietf:rfc:3986"
 * masterIdentifier.value = "urn:oid:1.2.840.113556.1.8000.2554.58783.21864.3474.19410.44358.58254.41381.57340"
-* identifier.system = "urn:ietf:rfc:3986"
-* identifier.value = "urn:uuid:0c287d32-01e3-4d87-9953-91c59407eb21"
+* identifier[entryUUID].system = "urn:ietf:rfc:3986"
+* identifier[entryUUID].value = "urn:uuid:0c287d32-01e3-4d87-9953-91c59407eb21"
+* identifier[entryUUID].use = #official
 * status = #current
 * content.attachment.contentType = #text/plain
 * type = http://loinc.org#60591-5
@@ -308,8 +316,9 @@ Usage: #inline
 * meta.security = http://terminology.hl7.org/CodeSystem/v3-ActReason#HTEST
 * masterIdentifier.system = "urn:ietf:rfc:3986"
 * masterIdentifier.value = "urn:oid:1.2.840.113556.1.8000.2554.53432.348.12973.17740.34205.4355.50220.62012"
-* identifier.system = "urn:ietf:rfc:3986"
-* identifier.value = "urn:uuid:7d5bb8ac-68ee-4926-85e7-b8aac8e1f09d"
+* identifier[entryUUID].system = "urn:ietf:rfc:3986"
+* identifier[entryUUID].value = "urn:uuid:7d5bb8ac-68ee-4926-85e7-b8aac8e1f09d"
+* identifier[entryUUID].use = #official
 * status = #current
 * content.attachment.contentType = #text/plain
 * content.attachment.url = "http://example.com/nowhere.txt"
diff --git a/input/fsh/ex-ProvideBundles3.fsh b/input/fsh/ex-ProvideBundles3.fsh
@@ -171,12 +171,9 @@ Usage: #inline
 * text.status = #extensions
 * text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">SubmissionSet with Patient</div>"
 * meta.security = http://terminology.hl7.org/CodeSystem/v3-ActReason#HTEST
-* identifier[+].system = "urn:ietf:rfc:3986"
-* identifier[=].value = "urn:oid:1.2.129.6.58.92.88337.1"
-* identifier[=].use = #official
-* identifier[+].system = "http://example.org/documents"
-* identifier[=].value = "23425234-23470-1"
-* identifier[=].use = #usual
+* identifier[uniqueId].system = "http://example.org/documents"
+* identifier[uniqueId].value = "23425234-23470-1"
+* identifier[uniqueId].use = #usual
 * status = #current
 * mode = #working
 * code = MHDlistTypes#submissionset
@@ -226,8 +223,6 @@ Usage: #inline
 * meta.security = http://terminology.hl7.org/CodeSystem/v3-ActReason#HTEST
 * masterIdentifier.system = "urn:ietf:rfc:3986"
 * masterIdentifier.value = "urn:oid:1.2.840.113556.1.8000.2554.53432.348.12973.17740.34205.4355.50220.62012"
-* identifier.system = "urn:ietf:rfc:3986"
-* identifier.value = "urn:uuid:7d5bb8ac-68ee-4926-85e7-b8aac8e1f09d"
 * status = #current
 * contained[+] = aaaaaaaa-bbbb-cccc-dddd-e00333300004
 * context.sourcePatientInfo = Reference(aaaaaaaa-bbbb-cccc-dddd-e00333300004)

diff --git a/input/fsh/ex-ProvideBundles7.fsh b/input/fsh/ex-ProvideBundles7.fsh
@@ -20,8 +20,8 @@ Usage: #example
 * entry[SubmissionSet].resource = aaaaaaaa-bbbb-cccc-dddd-e00777700001
 * entry[SubmissionSet].request.url = "List"
 * entry[SubmissionSet].request.method = #POST
-* entry[Folders].fullUrl = "List/e00777700005"
-* entry[Folders].resource = e00777700005
+* entry[Folders].fullUrl = "urn:uuid:aaaaaaaa-bbbb-cccc-dddd-e00777700005"
+* entry[Folders].resource = aaaaaaaa-bbbb-cccc-dddd-e00777700005
 * entry[Folders].request.url = "List"
 * entry[Folders].request.method = #PUT
 * entry[DocumentRefs].fullUrl = "urn:uuid:aaaaaaaa-bbbb-cccc-dddd-e00777700002"
@@ -62,7 +62,7 @@ Usage: #inline
 * code = MHDlistTypes#submissionset
 * date = 2004-10-25T23:50:50-05:00
 * entry[+].item = Reference(urn:uuid:aaaaaaaa-bbbb-cccc-dddd-e00777700002)
-* entry[+].item = Reference(List/e00777700005)
+* entry[+].item = Reference(urn:uuid:aaaaaaaa-bbbb-cccc-dddd-e00777700005)
 * extension[sourceId].valueIdentifier.value = "urn:oid:1.2.3.4"
 * subject = Reference(Patient/ex-patient)
 * extension[designationType].valueCodeableConcept = http://snomed.info/sct#225728007
@@ -112,7 +112,7 @@ Usage: #inline
 * data = "SGVsbG8gV29ybGQ="
 
 // the instance is simulating an existing
-Instance:   e00777700005
+Instance:   aaaaaaaa-bbbb-cccc-dddd-e00777700005
 InstanceOf: IHE.MHD.Comprehensive.Folder
 Title: "Example complete Comprehensive Folder"
 Description:      "Folder in List resource conforming Comprehensive metadata fully populated"