From 9598012f6093bb8a03ad67397c5b45dc1d802b7f Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Thu, 25 Jan 2024 08:19:48 +0100 Subject: [PATCH 1/6] changed named indexing for various profiles --- ...-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json | 30 +++--- ...-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json | 50 ++++----- ...-8ca3c379-ac86-470f-bc12-178c9008f5c9.json | 100 +++++++++--------- .../fsh/profiles/GEM_ERP_PR_BfArMApproval.fsh | 2 +- .../input/fsh/profiles/GEM_ERP_PR_Bundle.fsh | 16 +-- .../GEM_ERP_PR_Communication_InfoReq.fsh | 36 +++---- .../GEM_ERP_PR_Communication_Reply.fsh | 20 ++-- .../fsh/profiles/GEM_ERP_PR_Composition.fsh | 6 +- 8 files changed, 130 insertions(+), 130 deletions(-) diff --git a/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json b/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json index b0b4e7d9..30ed89b0 100644 --- a/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json +++ b/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json @@ -16,6 +16,20 @@ "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId", "value": "160.000.033.491.280.78" }, + "signature": { + "type": [ + { + "system": "urn:iso-astm:E1762-95:2013", + "code": "1.2.840.10065.1.12.1.1" + } + ], + "when": "2022-03-18T15:28:00+00:00", + "who": { + "reference": "https://erp.zentral.erp.splitdns.ti-dienste.de/Device/1" + }, + "sigFormat": "application/pkcs7-mime", + "data": "dGhpcyBibG9iIGlzIHNuaXBwZWQ=" + }, "timestamp": "2022-03-18T15:28:00+00:00", "entry": [ { @@ -118,19 +132,5 @@ "data": "tJg8c5ZtdhzEEhJ0ZpAsUVFx5dKuYgQFs5oKgthi17M=" } } - ], - "signature": { - "type": [ - { - "system": "urn:iso-astm:E1762-95:2013", - "code": "1.2.840.10065.1.12.1.1" - } - ], - "when": "2022-03-18T15:28:00+00:00", - "who": { - "reference": "https://erp.zentral.erp.splitdns.ti-dienste.de/Device/1" - }, - "sigFormat": "application/pkcs7-mime", - "data": "dGhpcyBibG9iIGlzIHNuaXBwZWQ=" - } + ] } diff --git a/Resources/fsh-generated/resources/Communication-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json b/Resources/fsh-generated/resources/Communication-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json index 06c8d0fc..5b09888a 100644 --- a/Resources/fsh-generated/resources/Communication-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json +++ b/Resources/fsh-generated/resources/Communication-7977a4ab-97a9-4d95-afb3-6c4c1e2ac596.json @@ -12,26 +12,6 @@ ] }, "status": "unknown", - "basedOn": [ - { - "reference": "Task/160.000.033.491.280.78" - } - ], - "sender": { - "identifier": { - "system": "https://gematik.de/fhir/sid/telematik-id", - "value": "3-SMC-B-Testkarte-883110000123465" - } - }, - "recipient": [ - { - "identifier": { - "system": "http://fhir.de/sid/gkv/kvid-10", - "value": "X234567890" - } - } - ], - "sent": "2020-04-29T13:46:30.128+02:00", "payload": [ { "extension": [ @@ -45,6 +25,10 @@ { "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_SupplyOptionsType", "extension": [ + { + "url": "delivery", + "valueBoolean": true + }, { "url": "onPremise", "valueBoolean": true @@ -52,15 +36,31 @@ { "url": "shipment", "valueBoolean": false - }, - { - "url": "delivery", - "valueBoolean": true } ] } ], "contentString": "Eisern" } - ] + ], + "basedOn": [ + { + "reference": "Task/160.000.033.491.280.78" + } + ], + "sender": { + "identifier": { + "system": "https://gematik.de/fhir/sid/telematik-id", + "value": "3-SMC-B-Testkarte-883110000123465" + } + }, + "recipient": [ + { + "identifier": { + "system": "http://fhir.de/sid/gkv/kvid-10", + "value": "X234567890" + } + } + ], + "sent": "2020-04-29T13:46:30.128+02:00" } diff --git a/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json b/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json index f0afbaff..3c704fce 100644 --- a/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json +++ b/Resources/fsh-generated/resources/Communication-8ca3c379-ac86-470f-bc12-178c9008f5c9.json @@ -20,6 +20,55 @@ } } ], + "payload": [ + { + "extension": [ + { + "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_InsuranceProvider", + "valueIdentifier": { + "system": "http://fhir.de/sid/arge-ik/iknr", + "value": "109500969" + } + }, + { + "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_SubstitutionAllowedType", + "valueBoolean": false + }, + { + "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType", + "valueCoding": { + "system": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_FlowType", + "code": "160" + } + }, + { + "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PackageQuantity", + "valueQuantity": { + "system": "http://unitsofmeasure.org", + "value": 1 + } + }, + { + "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_SupplyOptionsType", + "extension": [ + { + "url": "delivery", + "valueBoolean": true + }, + { + "url": "onPremise", + "valueBoolean": true + }, + { + "url": "shipment", + "valueBoolean": false + } + ] + } + ], + "contentString": "U.N.V.E.U." + } + ], "contained": [ { "resourceType": "Medication", @@ -108,54 +157,5 @@ "value": "X234567890" } }, - "sent": "2020-04-29T13:43:30.128+02:00", - "payload": [ - { - "extension": [ - { - "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_InsuranceProvider", - "valueIdentifier": { - "system": "http://fhir.de/sid/arge-ik/iknr", - "value": "109500969" - } - }, - { - "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_SubstitutionAllowedType", - "valueBoolean": false - }, - { - "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType", - "valueCoding": { - "system": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_FlowType", - "code": "160" - } - }, - { - "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PackageQuantity", - "valueQuantity": { - "system": "http://unitsofmeasure.org", - "value": 1 - } - }, - { - "url": "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_SupplyOptionsType", - "extension": [ - { - "url": "onPremise", - "valueBoolean": true - }, - { - "url": "shipment", - "valueBoolean": false - }, - { - "url": "delivery", - "valueBoolean": true - } - ] - } - ], - "contentString": "U.N.V.E.U." - } - ] + "sent": "2020-04-29T13:43:30.128+02:00" } diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_BfArMApproval.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_BfArMApproval.fsh index 9d5cf7e1..545ebff7 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_BfArMApproval.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_BfArMApproval.fsh @@ -80,7 +80,7 @@ InstanceOf: GEM_ERP_PR_BfArMApproval Usage: #example * id = "64d5081e-8d65-11ec-b909-0242ac120002" * meta.profile = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_BfArMApproval|1.3" -* target[+].reference = "Task/160.100.000.000.024.67" +* target[TaskReference].reference = "Task/160.100.000.000.024.67" * recorded = "2022-02-14T08:39:24+01:00" * entity.what.identifier.system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" * entity.what.identifier.value = "165.100.000.000.024.67" diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Bundle.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Bundle.fsh index e4dc31ed..92768105 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_Bundle.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Bundle.fsh @@ -71,14 +71,14 @@ Usage: #example * identifier[=].value = "160.000.033.491.280.78" * type = #document * timestamp = "2022-03-18T15:28:00+00:00" -* entry[+].fullUrl = "urn:uuid:c624cf47-e235-4624-af71-0a09dc9254dc" -* entry[=].resource = ReceiptBundleComposition -* entry[+].fullUrl = "https://erp.zentral.erp.splitdns.ti-dienste.de/Device/1" -* entry[=].resource = ReceiptBundleDevice -* entry[+].fullUrl = "https://erp.zentral.erp.splitdns.ti-dienste.de/Task/160.000.080.761.527.39/PrescriptionDigest-160.123.456.789.123.58" -* entry[=].resource = ReceiptBundleBinary -* signature.type[+].system = "urn:iso-astm:E1762-95:2013" -* signature.type[=].code = #1.2.840.10065.1.12.1.1 +* entry[DocumentInformation].fullUrl = "urn:uuid:c624cf47-e235-4624-af71-0a09dc9254dc" +* entry[DocumentInformation].resource = ReceiptBundleComposition +* entry[SigningDevice].fullUrl = "https://erp.zentral.erp.splitdns.ti-dienste.de/Device/1" +* entry[SigningDevice].resource = ReceiptBundleDevice +* entry[PrescriptionDigest].fullUrl = "https://erp.zentral.erp.splitdns.ti-dienste.de/Task/160.000.080.761.527.39/PrescriptionDigest-160.123.456.789.123.58" +* entry[PrescriptionDigest].resource = ReceiptBundleBinary +* signature.type[AuthorsSignature].system = "urn:iso-astm:E1762-95:2013" +* signature.type[AuthorsSignature].code = #1.2.840.10065.1.12.1.1 * signature.when = "2022-03-18T15:28:00+00:00" * signature.who.reference = "https://erp.zentral.erp.splitdns.ti-dienste.de/Device/1" * signature.sigFormat = #application/pkcs7-mime diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_InfoReq.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_InfoReq.fsh index 1ddb60e1..892ef9f4 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_InfoReq.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_InfoReq.fsh @@ -63,22 +63,22 @@ Usage: #example * sender.identifier.system = "http://fhir.de/sid/gkv/kvid-10" * sender.identifier.value = "X234567890" * sent = "2020-04-29T13:43:30.128+02:00" -* payload.extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_InsuranceProvider" -* payload.extension[=].valueIdentifier.system = "http://fhir.de/sid/arge-ik/iknr" -* payload.extension[=].valueIdentifier.value = "109500969" -* payload.extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_SubstitutionAllowedType" -* payload.extension[=].valueBoolean = false -* payload.extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType" -* payload.extension[=].valueCoding.system = "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_FlowType" -* payload.extension[=].valueCoding.code = #160 -* payload.extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PackageQuantity" -* payload.extension[=].valueQuantity.system = "http://unitsofmeasure.org" -* payload.extension[=].valueQuantity.value = 1 -* payload.extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_SupplyOptionsType" -* payload.extension[=].extension[+].url = "onPremise" -* payload.extension[=].extension[=].valueBoolean = true -* payload.extension[=].extension[+].url = "shipment" -* payload.extension[=].extension[=].valueBoolean = false -* payload.extension[=].extension[+].url = "delivery" -* payload.extension[=].extension[=].valueBoolean = true +* payload.extension[InsuranceProvider].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_InsuranceProvider" +* payload.extension[InsuranceProvider].valueIdentifier.system = "http://fhir.de/sid/arge-ik/iknr" +* payload.extension[InsuranceProvider].valueIdentifier.value = "109500969" +* payload.extension[SubstitutionAllowed].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_SubstitutionAllowedType" +* payload.extension[SubstitutionAllowed].valueBoolean = false +* payload.extension[PrescriptionType].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType" +* payload.extension[PrescriptionType].valueCoding.system = "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_FlowType" +* payload.extension[PrescriptionType].valueCoding.code = #160 +* payload.extension[PackageQuantity].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PackageQuantity" +* payload.extension[PackageQuantity].valueQuantity.system = "http://unitsofmeasure.org" +* payload.extension[PackageQuantity].valueQuantity.value = 1 +* payload.extension[PreferredSupplyOptions].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_SupplyOptionsType" +* payload.extension[PreferredSupplyOptions].extension[onPremise].url = "onPremise" +* payload.extension[PreferredSupplyOptions].extension[onPremise].valueBoolean = true +* payload.extension[PreferredSupplyOptions].extension[shipment].url = "shipment" +* payload.extension[PreferredSupplyOptions].extension[shipment].valueBoolean = false +* payload.extension[PreferredSupplyOptions].extension[delivery].url = "delivery" +* payload.extension[PreferredSupplyOptions].extension[delivery].valueBoolean = true * payload.contentString = "U.N.V.E.U." diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Reply.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Reply.fsh index d461bc09..59b60b31 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Reply.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Communication_Reply.fsh @@ -58,14 +58,14 @@ Usage: #example * recipient[+].identifier.system = "http://fhir.de/sid/gkv/kvid-10" * recipient[=].identifier.value = "X234567890" * sent = "2020-04-29T13:46:30.128+02:00" -* payload.extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_AvailabilityState" -* payload.extension[=].valueCoding.system = "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_AvailabilityStatus" -* payload.extension[=].valueCoding.code = #20 -* payload.extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_SupplyOptionsType" -* payload.extension[=].extension[+].url = "onPremise" -* payload.extension[=].extension[=].valueBoolean = true -* payload.extension[=].extension[+].url = "shipment" -* payload.extension[=].extension[=].valueBoolean = false -* payload.extension[=].extension[+].url = "delivery" -* payload.extension[=].extension[=].valueBoolean = true +* payload.extension[AvailabilityStatus].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_AvailabilityState" +* payload.extension[AvailabilityStatus].valueCoding.system = "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_AvailabilityStatus" +* payload.extension[AvailabilityStatus].valueCoding.code = #20 +* payload.extension[OfferedSupplyOptions].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_SupplyOptionsType" +* payload.extension[OfferedSupplyOptions].extension[onPremise].url = "onPremise" +* payload.extension[OfferedSupplyOptions].extension[onPremise].valueBoolean = true +* payload.extension[OfferedSupplyOptions].extension[shipment].url = "shipment" +* payload.extension[OfferedSupplyOptions].extension[shipment].valueBoolean = false +* payload.extension[OfferedSupplyOptions].extension[delivery].url = "delivery" +* payload.extension[OfferedSupplyOptions].extension[delivery].valueBoolean = true * payload.contentString = "Eisern" \ No newline at end of file diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Composition.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Composition.fsh index 275d2731..ddce68af 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_Composition.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Composition.fsh @@ -55,9 +55,9 @@ Title: "Composition for Receipt Bundle 'Quittung'" Usage: #inline * id = "c624cf47-e235-4624-af71-0a09dc9254dc" * meta.profile[+] = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Composition|1.3" -* extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_Beneficiary" -* extension[=].valueIdentifier.system = "https://gematik.de/fhir/sid/telematik-id" -* extension[=].valueIdentifier.value = "3-SMC-B-Testkarte-883110000129070" +* extension[Beneficiary].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_Beneficiary" +* extension[Beneficiary].valueIdentifier.system = "https://gematik.de/fhir/sid/telematik-id" +* extension[Beneficiary].valueIdentifier.value = "3-SMC-B-Testkarte-883110000129070" * status = #final * type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#3 "Receipt" * date = "2022-03-18T15:29:00+00:00" From d418085aaffbbd3101e5f94da7e3e8c310e5df0c Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Thu, 25 Jan 2024 08:30:13 +0100 Subject: [PATCH 2/6] remove unnecessary information for fshOnly --- Resources/sushi-config.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index bab7b3c1..a3dc4b90 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -1,17 +1,9 @@ -id: fhir-profiles-erp canonical: https://gematik.de/fhir/erp -name: Die E-Rezept-Spezifikation -title: ePrescription workflow -description: German fhir profiles on ePrescription workflow fhirVersion: 4.0.1 FSHOnly: true applyExtensionMetadataToRoot: false version: "1.3.0" -publisher: - name: Gematik GmbH - url: https://www.gematik.de/ - email: info@gematik.de dependencies: de.basisprofil.r4: 1.3.2 hl7.fhir.r4.core: 4.0.1 From cf00a064802fc9ea0fa2ce63ea538216f33a6cb8 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Thu, 25 Jan 2024 08:30:36 +0100 Subject: [PATCH 3/6] set task to namedReference and not numeric index --- ...-09330307-16ce-4cdc-810a-ca24ef80dde3.json | 42 ++++---- ...-607255ed-ce41-47fc-aad3-cfce1c39963f.json | 42 ++++---- ...-d70932d1-9e1c-483c-b2d4-b7dced09b35e.json | 42 ++++---- .../input/fsh/profiles/GEM_ERP_PR_Task.fsh | 96 +++++++++---------- 4 files changed, 111 insertions(+), 111 deletions(-) diff --git a/Resources/fsh-generated/resources/Task-09330307-16ce-4cdc-810a-ca24ef80dde3.json b/Resources/fsh-generated/resources/Task-09330307-16ce-4cdc-810a-ca24ef80dde3.json index d509a7f9..ceaa7584 100644 --- a/Resources/fsh-generated/resources/Task-09330307-16ce-4cdc-810a-ca24ef80dde3.json +++ b/Resources/fsh-generated/resources/Task-09330307-16ce-4cdc-810a-ca24ef80dde3.json @@ -40,26 +40,6 @@ "value": "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" } ], - "status": "completed", - "authoredOn": "2022-03-18T15:26:00+00:00", - "performerType": [ - { - "coding": [ - { - "code": "urn:oid:1.2.276.0.76.4.54", - "system": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_OrganizationType", - "display": "Öffentliche Apotheke" - } - ] - } - ], - "for": { - "identifier": { - "system": "http://fhir.de/sid/gkv/kvid-10", - "value": "X123456789" - } - }, - "lastModified": "2022-03-18T15:29:00+00:00", "input": [ { "type": { @@ -105,5 +85,25 @@ "reference": "dffbfd6a-5712-4798-bdc8-07201eb77ab8" } } - ] + ], + "status": "completed", + "authoredOn": "2022-03-18T15:26:00+00:00", + "performerType": [ + { + "coding": [ + { + "code": "urn:oid:1.2.276.0.76.4.54", + "system": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_OrganizationType", + "display": "Öffentliche Apotheke" + } + ] + } + ], + "for": { + "identifier": { + "system": "http://fhir.de/sid/gkv/kvid-10", + "value": "X123456789" + } + }, + "lastModified": "2022-03-18T15:29:00+00:00" } diff --git a/Resources/fsh-generated/resources/Task-607255ed-ce41-47fc-aad3-cfce1c39963f.json b/Resources/fsh-generated/resources/Task-607255ed-ce41-47fc-aad3-cfce1c39963f.json index d0c4525f..a8f916d8 100644 --- a/Resources/fsh-generated/resources/Task-607255ed-ce41-47fc-aad3-cfce1c39963f.json +++ b/Resources/fsh-generated/resources/Task-607255ed-ce41-47fc-aad3-cfce1c39963f.json @@ -40,26 +40,6 @@ "value": "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" } ], - "status": "ready", - "authoredOn": "2022-03-18T15:26:00+00:00", - "performerType": [ - { - "coding": [ - { - "code": "urn:oid:1.2.276.0.76.4.54", - "system": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_OrganizationType", - "display": "Öffentliche Apotheke" - } - ] - } - ], - "for": { - "identifier": { - "system": "http://fhir.de/sid/gkv/kvid-10", - "value": "X123456789" - } - }, - "lastModified": "2022-03-18T15:27:00+00:00", "input": [ { "type": { @@ -89,5 +69,25 @@ "reference": "f8c2298f-7c00-4a68-af29-8a2862d55d43" } } - ] + ], + "status": "ready", + "authoredOn": "2022-03-18T15:26:00+00:00", + "performerType": [ + { + "coding": [ + { + "code": "urn:oid:1.2.276.0.76.4.54", + "system": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_OrganizationType", + "display": "Öffentliche Apotheke" + } + ] + } + ], + "for": { + "identifier": { + "system": "http://fhir.de/sid/gkv/kvid-10", + "value": "X123456789" + } + }, + "lastModified": "2022-03-18T15:27:00+00:00" } diff --git a/Resources/fsh-generated/resources/Task-d70932d1-9e1c-483c-b2d4-b7dced09b35e.json b/Resources/fsh-generated/resources/Task-d70932d1-9e1c-483c-b2d4-b7dced09b35e.json index cf782c01..ff8e370e 100644 --- a/Resources/fsh-generated/resources/Task-d70932d1-9e1c-483c-b2d4-b7dced09b35e.json +++ b/Resources/fsh-generated/resources/Task-d70932d1-9e1c-483c-b2d4-b7dced09b35e.json @@ -40,26 +40,6 @@ "value": "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" } ], - "status": "in-progress", - "authoredOn": "2022-03-18T15:26:00+00:00", - "performerType": [ - { - "coding": [ - { - "code": "urn:oid:1.2.276.0.76.4.54", - "system": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_OrganizationType", - "display": "Öffentliche Apotheke" - } - ] - } - ], - "for": { - "identifier": { - "system": "http://fhir.de/sid/gkv/kvid-10", - "value": "X123456789" - } - }, - "lastModified": "2022-03-18T15:28:00+00:00", "input": [ { "type": { @@ -89,5 +69,25 @@ "reference": "f8c2298f-7c00-4a68-af29-8a2862d55d43" } } - ] + ], + "status": "in-progress", + "authoredOn": "2022-03-18T15:26:00+00:00", + "performerType": [ + { + "coding": [ + { + "code": "urn:oid:1.2.276.0.76.4.54", + "system": "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_OrganizationType", + "display": "Öffentliche Apotheke" + } + ] + } + ], + "for": { + "identifier": { + "system": "http://fhir.de/sid/gkv/kvid-10", + "value": "X123456789" + } + }, + "lastModified": "2022-03-18T15:28:00+00:00" } diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Task.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Task.fsh index b7e0cf99..1cf2a06d 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_Task.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Task.fsh @@ -108,10 +108,10 @@ Usage: #example * extension[acceptDate].valueDate = "2022-04-02" * extension[expiryDate].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_ExpiryDate" * extension[expiryDate].valueDate = "2022-06-02" -* identifier[+].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" -* identifier[=].value = "160.000.033.491.280.78" -* identifier[+].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_AccessCode" -* identifier[=].value = "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" +* identifier[PrescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" +* identifier[PrescriptionID].value = "160.000.033.491.280.78" +* identifier[AccessCode].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_AccessCode" +* identifier[AccessCode].value = "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" * status = #draft * intent = #order * authoredOn = "2022-03-18T15:26:00+00:00" @@ -125,16 +125,16 @@ Usage: #example * id = "607255ed-ce41-47fc-aad3-cfce1c39963f" * meta.profile[+] = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Task|1.3" * meta.tag.display = "Task in READY state activated by (Z)PVS/KIS via $activate operation" -* extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType" -* extension[=].valueCoding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_FlowType#160 "Muster 16 (Apothekenpflichtige Arzneimittel)" -* extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_AcceptDate" -* extension[=].valueDate = "2022-04-02" -* extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_ExpiryDate" -* extension[=].valueDate = "2022-06-02" -* identifier[+].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" -* identifier[=].value = "160.000.033.491.280.78" -* identifier[+].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_AccessCode" -* identifier[=].value = "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" +* extension[flowType].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType" +* extension[flowType].valueCoding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_FlowType#160 "Muster 16 (Apothekenpflichtige Arzneimittel)" +* extension[acceptDate].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_AcceptDate" +* extension[acceptDate].valueDate = "2022-04-02" +* extension[expiryDate].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_ExpiryDate" +* extension[expiryDate].valueDate = "2022-06-02" +* identifier[PrescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" +* identifier[PrescriptionID].value = "160.000.033.491.280.78" +* identifier[AccessCode].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_AccessCode" +* identifier[AccessCode].value = "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" * status = #ready * intent = #order * authoredOn = "2022-03-18T15:26:00+00:00" @@ -142,10 +142,10 @@ Usage: #example * for.identifier.system = "http://fhir.de/sid/gkv/kvid-10" * for.identifier.value = "X123456789" * lastModified = "2022-03-18T15:27:00+00:00" -* input[+].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#1 "Health Care Provider Prescription" -* input[=].valueReference.reference = "281a985c-f25b-4aae-91a6-41ad744080b0" -* input[+].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#2 "Patient Confirmation" -* input[=].valueReference.reference = "f8c2298f-7c00-4a68-af29-8a2862d55d43" +* input[ePrescription].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#1 "Health Care Provider Prescription" +* input[ePrescription].valueReference.reference = "281a985c-f25b-4aae-91a6-41ad744080b0" +* input[patientReceipt].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#2 "Patient Confirmation" +* input[patientReceipt].valueReference.reference = "f8c2298f-7c00-4a68-af29-8a2862d55d43" Instance: TaskInIn-ProgressState InstanceOf: GEM_ERP_PR_Task @@ -154,16 +154,16 @@ Usage: #example * id = "d70932d1-9e1c-483c-b2d4-b7dced09b35e" * meta.profile[+] = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Task|1.3" * meta.tag.display = "Task in IN-PROGRESS state claimed by pharmacy via $accept operation" -* extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType" -* extension[=].valueCoding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_FlowType#160 "Muster 16 (Apothekenpflichtige Arzneimittel)" -* extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_AcceptDate" -* extension[=].valueDate = "2022-04-02" -* extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_ExpiryDate" -* extension[=].valueDate = "2022-06-02" -* identifier[+].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" -* identifier[=].value = "160.000.033.491.280.78" -* identifier[+].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_AccessCode" -* identifier[=].value = "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" +* extension[flowType].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType" +* extension[flowType].valueCoding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_FlowType#160 "Muster 16 (Apothekenpflichtige Arzneimittel)" +* extension[acceptDate].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_AcceptDate" +* extension[acceptDate].valueDate = "2022-04-02" +* extension[expiryDate].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_ExpiryDate" +* extension[expiryDate].valueDate = "2022-06-02" +* identifier[PrescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" +* identifier[PrescriptionID].value = "160.000.033.491.280.78" +* identifier[AccessCode].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_AccessCode" +* identifier[AccessCode].value = "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" * status = #in-progress * intent = #order * authoredOn = "2022-03-18T15:26:00+00:00" @@ -171,10 +171,10 @@ Usage: #example * for.identifier.system = "http://fhir.de/sid/gkv/kvid-10" * for.identifier.value = "X123456789" * lastModified = "2022-03-18T15:28:00+00:00" -* input[+].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#1 "Health Care Provider Prescription" -* input[=].valueReference.reference = "281a985c-f25b-4aae-91a6-41ad744080b0" -* input[+].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#2 "Patient Confirmation" -* input[=].valueReference.reference = "f8c2298f-7c00-4a68-af29-8a2862d55d43" +* input[ePrescription].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#1 "Health Care Provider Prescription" +* input[ePrescription].valueReference.reference = "281a985c-f25b-4aae-91a6-41ad744080b0" +* input[patientReceipt].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#2 "Patient Confirmation" +* input[patientReceipt].valueReference.reference = "f8c2298f-7c00-4a68-af29-8a2862d55d43" Instance: TaskInIn-ProgressState-Dispensed InstanceOf: GEM_ERP_PR_Task @@ -216,16 +216,16 @@ Usage: #example * id = "09330307-16ce-4cdc-810a-ca24ef80dde3" * meta.profile[+] = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Task|1.3" * meta.tag.display = "Task in COMPLETED state dispensed by pharmacy via $closed operation" -* extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType" -* extension[=].valueCoding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_FlowType#160 "Muster 16 (Apothekenpflichtige Arzneimittel)" -* extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_AcceptDate" -* extension[=].valueDate = "2022-04-02" -* extension[+].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_ExpiryDate" -* extension[=].valueDate = "2022-06-02" -* identifier[+].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" -* identifier[=].value = "160.000.033.491.280.78" -* identifier[+].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_AccessCode" -* identifier[=].value = "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" +* extension[flowType].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_PrescriptionType" +* extension[flowType].valueCoding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_FlowType#160 "Muster 16 (Apothekenpflichtige Arzneimittel)" +* extension[acceptDate].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_AcceptDate" +* extension[acceptDate].valueDate = "2022-04-02" +* extension[expiryDate].url = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_EX_ExpiryDate" +* extension[expiryDate].valueDate = "2022-06-02" +* identifier[PrescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" +* identifier[PrescriptionID].value = "160.000.033.491.280.78" +* identifier[AccessCode].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_AccessCode" +* identifier[AccessCode].value = "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea" * status = #completed * intent = #order * authoredOn = "2022-03-18T15:26:00+00:00" @@ -233,9 +233,9 @@ Usage: #example * for.identifier.system = "http://fhir.de/sid/gkv/kvid-10" * for.identifier.value = "X123456789" * lastModified = "2022-03-18T15:29:00+00:00" -* input[+].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#1 "Health Care Provider Prescription" -* input[=].valueReference.reference = "281a985c-f25b-4aae-91a6-41ad744080b0" -* input[+].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#2 "Patient Confirmation" -* input[=].valueReference.reference = "f8c2298f-7c00-4a68-af29-8a2862d55d43" -* output[+].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#3 "Receipt" -* output[=].valueReference.reference = "dffbfd6a-5712-4798-bdc8-07201eb77ab8" \ No newline at end of file +* input[ePrescription].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#1 "Health Care Provider Prescription" +* input[ePrescription].valueReference.reference = "281a985c-f25b-4aae-91a6-41ad744080b0" +* input[patientReceipt].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#2 "Patient Confirmation" +* input[patientReceipt].valueReference.reference = "f8c2298f-7c00-4a68-af29-8a2862d55d43" +* output[receipt].type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#3 "Receipt" +* output[receipt].valueReference.reference = "dffbfd6a-5712-4798-bdc8-07201eb77ab8" \ No newline at end of file From d101c03b71e3c9a5159c366dfa1706ae39a3d3c4 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Thu, 25 Jan 2024 12:10:10 +0100 Subject: [PATCH 4/6] Fix reference in receipt bundle --- .../resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json | 2 +- Resources/input/fsh/profiles/GEM_ERP_PR_Composition.fsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json b/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json index 30ed89b0..1aae397e 100644 --- a/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json +++ b/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json @@ -80,7 +80,7 @@ { "entry": [ { - "reference": "Binary/PrescriptionDigest-160.123.456.789.123.58" + "reference": "https://erp.zentral.erp.splitdns.ti-dienste.de/Task/160.000.080.761.527.39/PrescriptionDigest-160.123.456.789.123.58" } ] } diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Composition.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Composition.fsh index ddce68af..9cd8a072 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_Composition.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Composition.fsh @@ -65,4 +65,4 @@ Usage: #inline * title = "Quittung" * event.period.start = "2022-03-18T15:28:00+00:00" * event.period.end = "2022-03-18T15:29:00+00:00" -* section[+].entry.reference = "Binary/PrescriptionDigest-160.123.456.789.123.58" \ No newline at end of file +* section[+].entry.reference = "https://erp.zentral.erp.splitdns.ti-dienste.de/Task/160.000.080.761.527.39/PrescriptionDigest-160.123.456.789.123.58" \ No newline at end of file From 7876981ad9bcc7f1590cc3f54c639f20062e467f Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Thu, 25 Jan 2024 12:10:20 +0100 Subject: [PATCH 5/6] Fix string statement in auditevent --- .../AuditEvent-9361863d-fec0-4ba9-8776-7905cf1b0cfa.json | 2 +- Resources/input/fsh/profiles/GEM_ERP_PR_AuditEvent.fsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/fsh-generated/resources/AuditEvent-9361863d-fec0-4ba9-8776-7905cf1b0cfa.json b/Resources/fsh-generated/resources/AuditEvent-9361863d-fec0-4ba9-8776-7905cf1b0cfa.json index 833d19f3..2f9964d6 100644 --- a/Resources/fsh-generated/resources/AuditEvent-9361863d-fec0-4ba9-8776-7905cf1b0cfa.json +++ b/Resources/fsh-generated/resources/AuditEvent-9361863d-fec0-4ba9-8776-7905cf1b0cfa.json @@ -23,7 +23,7 @@ }, "text": { "status": "generated", - "div": "
Praxis Dr. Müller, Bahnhofstr. 78 hat ein E-Rezept 160.123.456.789.123.58 eingestellt
" + "div": "
Praxis Dr. Müller, Bahnhofstr. 78 hat ein E-Rezept 160.123.456.789.123.58 eingestellt
" }, "subtype": [ { diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_AuditEvent.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_AuditEvent.fsh index b5fa2a86..2b997511 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_AuditEvent.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_AuditEvent.fsh @@ -45,7 +45,7 @@ Usage: #example * meta.profile[+] = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_AuditEvent|1.3" * meta.tag.display = "AuditEvent entry generated by E-Rezept-Backend-Service on access to any patient data by any person" * text.status = #generated -* text.div = "
Praxis Dr. Müller, Bahnhofstr. 78 hat ein E-Rezept 160.123.456.789.123.58 eingestellt
" +* text.div = "
Praxis Dr. Müller, Bahnhofstr. 78 hat ein E-Rezept 160.123.456.789.123.58 eingestellt
" * type.system = "http://terminology.hl7.org/CodeSystem/audit-event-type" * type.code = #rest * subtype[+].system = "http://hl7.org/fhir/restful-interaction" From 0c7325c87646d81e060da44b2a30b2c9bd51d20d Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Mon, 5 Feb 2024 06:42:33 +0100 Subject: [PATCH 6/6] Update references to use UUIDs instead of URLs In order to match the current design of how references are done in a quittungsbundle the references were adapted accordingly --- .../Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json | 12 ++++++------ Resources/input/fsh/profiles/GEM_ERP_PR_Bundle.fsh | 8 ++++---- .../input/fsh/profiles/GEM_ERP_PR_Composition.fsh | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json b/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json index 1aae397e..9a6dfd0d 100644 --- a/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json +++ b/Resources/fsh-generated/resources/Bundle-dffbfd6a-5712-4798-bdc8-07201eb77ab8.json @@ -25,7 +25,7 @@ ], "when": "2022-03-18T15:28:00+00:00", "who": { - "reference": "https://erp.zentral.erp.splitdns.ti-dienste.de/Device/1" + "reference": "urn:uuid:1413b38d-81a6-432a-a801-98d7307a422b" }, "sigFormat": "application/pkcs7-mime", "data": "dGhpcyBibG9iIGlzIHNuaXBwZWQ=" @@ -65,7 +65,7 @@ "date": "2022-03-18T15:29:00+00:00", "author": [ { - "reference": "https://erp.zentral.erp.splitdns.ti-dienste.de/Device/1" + "reference": "urn:uuid:1413b38d-81a6-432a-a801-98d7307a422b" } ], "event": [ @@ -80,7 +80,7 @@ { "entry": [ { - "reference": "https://erp.zentral.erp.splitdns.ti-dienste.de/Task/160.000.080.761.527.39/PrescriptionDigest-160.123.456.789.123.58" + "reference": "urn:uuid:b939a82a-9c23-4b6d-a139-f468d1b9d652" } ] } @@ -88,7 +88,7 @@ } }, { - "fullUrl": "https://erp.zentral.erp.splitdns.ti-dienste.de/Device/1", + "fullUrl": "urn:uuid:1413b38d-81a6-432a-a801-98d7307a422b", "resource": { "resourceType": "Device", "id": "1", @@ -119,10 +119,10 @@ } }, { - "fullUrl": "https://erp.zentral.erp.splitdns.ti-dienste.de/Task/160.000.080.761.527.39/PrescriptionDigest-160.123.456.789.123.58", + "fullUrl": "urn:uuid:b939a82a-9c23-4b6d-a139-f468d1b9d652", "resource": { "resourceType": "Binary", - "id": "PrescriptionDigest-160.123.456.789.123.58", + "id": "b939a82a-9c23-4b6d-a139-f468d1b9d652", "meta": { "profile": [ "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Digest|1.3" diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Bundle.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Bundle.fsh index 92768105..2634df3a 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_Bundle.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Bundle.fsh @@ -55,7 +55,7 @@ Description: "A document style representation of the receipt (complete, self-con Instance: ReceiptBundleBinary InstanceOf: Binary Usage: #inline -* id = "PrescriptionDigest-160.123.456.789.123.58" +* id = "b939a82a-9c23-4b6d-a139-f468d1b9d652" * meta.profile = "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Digest|1.3" * contentType = #application/octet-stream * data = "tJg8c5ZtdhzEEhJ0ZpAsUVFx5dKuYgQFs5oKgthi17M=" @@ -73,13 +73,13 @@ Usage: #example * timestamp = "2022-03-18T15:28:00+00:00" * entry[DocumentInformation].fullUrl = "urn:uuid:c624cf47-e235-4624-af71-0a09dc9254dc" * entry[DocumentInformation].resource = ReceiptBundleComposition -* entry[SigningDevice].fullUrl = "https://erp.zentral.erp.splitdns.ti-dienste.de/Device/1" +* entry[SigningDevice].fullUrl = "urn:uuid:1413b38d-81a6-432a-a801-98d7307a422b" * entry[SigningDevice].resource = ReceiptBundleDevice -* entry[PrescriptionDigest].fullUrl = "https://erp.zentral.erp.splitdns.ti-dienste.de/Task/160.000.080.761.527.39/PrescriptionDigest-160.123.456.789.123.58" +* entry[PrescriptionDigest].fullUrl = "urn:uuid:b939a82a-9c23-4b6d-a139-f468d1b9d652" * entry[PrescriptionDigest].resource = ReceiptBundleBinary * signature.type[AuthorsSignature].system = "urn:iso-astm:E1762-95:2013" * signature.type[AuthorsSignature].code = #1.2.840.10065.1.12.1.1 * signature.when = "2022-03-18T15:28:00+00:00" -* signature.who.reference = "https://erp.zentral.erp.splitdns.ti-dienste.de/Device/1" +* signature.who.reference = "urn:uuid:1413b38d-81a6-432a-a801-98d7307a422b" * signature.sigFormat = #application/pkcs7-mime * signature.data = "dGhpcyBibG9iIGlzIHNuaXBwZWQ=" \ No newline at end of file diff --git a/Resources/input/fsh/profiles/GEM_ERP_PR_Composition.fsh b/Resources/input/fsh/profiles/GEM_ERP_PR_Composition.fsh index 9cd8a072..c6e44c37 100644 --- a/Resources/input/fsh/profiles/GEM_ERP_PR_Composition.fsh +++ b/Resources/input/fsh/profiles/GEM_ERP_PR_Composition.fsh @@ -61,8 +61,8 @@ Usage: #inline * status = #final * type.coding = https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType#3 "Receipt" * date = "2022-03-18T15:29:00+00:00" -* author.reference = "https://erp.zentral.erp.splitdns.ti-dienste.de/Device/1" +* author.reference = "urn:uuid:1413b38d-81a6-432a-a801-98d7307a422b" * title = "Quittung" * event.period.start = "2022-03-18T15:28:00+00:00" * event.period.end = "2022-03-18T15:29:00+00:00" -* section[+].entry.reference = "https://erp.zentral.erp.splitdns.ti-dienste.de/Task/160.000.080.761.527.39/PrescriptionDigest-160.123.456.789.123.58" \ No newline at end of file +* section[+].entry.reference = "urn:uuid:b939a82a-9c23-4b6d-a139-f468d1b9d652" \ No newline at end of file