From 087f6ba1381cc8ab910e44dab7d61290b958e2c2 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Thu, 7 Nov 2024 07:56:38 +0100 Subject: [PATCH] add batch information to dispense and close --- Resources/fsh-generated/fsh-index.json | 32 ++++---- Resources/fsh-generated/fsh-index.txt | 18 ++--- .../Medication-SimpleMedication.json | 3 + .../Medication-SumatripanMedication.json | 3 + ...Dispense-Example-MedicationDispense-2.json | 2 +- ...arameters-ExampleCloseInputParameters.json | 3 + ...ParametersMultipleMedicationDispenses.json | 74 +++---------------- ...meters-ExampleDispenseInputParameters.json | 3 + ...ParametersMultipleMedicationDispenses.json | 74 +++---------------- ...xampleDispenseOutputParametersSuccess.json | 3 + .../Example_Communication_InfoReq.fsh | 2 +- .../input/fsh/examples/Example_Medication.fsh | 10 +++ .../examples/Example_MedicationDispense.fsh | 12 +-- .../Example_Parameters_Close.fsh | 2 +- .../Example_Parameters_Dispense.fsh | 2 +- 15 files changed, 75 insertions(+), 168 deletions(-) diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index a931b5b..5833d68 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -156,16 +156,16 @@ "fshName": "Medication-Without-Strength-Code", "fshType": "Instance", "fshFile": "examples/Example_Medication.fsh", - "startLine": 58, - "endLine": 75 + "startLine": 68, + "endLine": 85 }, { "outputFile": "Medication-Medication-Without-Strength-Numerator.json", "fshName": "Medication-Without-Strength-Numerator", "fshType": "Instance", "fshFile": "examples/Example_Medication.fsh", - "startLine": 77, - "endLine": 95 + "startLine": 87, + "endLine": 105 }, { "outputFile": "Medication-MedicationDexpanthenol-FD.json", @@ -212,8 +212,8 @@ "fshName": "SimpleMedication", "fshType": "Instance", "fshFile": "examples/Example_Medication.fsh", - "startLine": 50, - "endLine": 55 + "startLine": 56, + "endLine": 65 }, { "outputFile": "Medication-SumatripanMedication.json", @@ -221,15 +221,15 @@ "fshType": "Instance", "fshFile": "examples/Example_Medication.fsh", "startLine": 2, - "endLine": 23 + "endLine": 26 }, { "outputFile": "MedicationDispense-Example-MedicationDispense-2.json", "fshName": "Example-MedicationDispense-2", "fshType": "Instance", "fshFile": "examples/Example_MedicationDispense.fsh", - "startLine": 44, - "endLine": 56 + "startLine": 41, + "endLine": 52 }, { "outputFile": "MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json", @@ -260,24 +260,24 @@ "fshName": "Example-MedicationDispense-Kombipackung", "fshType": "Instance", "fshFile": "examples/Example_MedicationDispense.fsh", - "startLine": 58, - "endLine": 70 + "startLine": 54, + "endLine": 65 }, { "outputFile": "MedicationDispense-Example-MedicationDispense-Rezeptur.json", "fshName": "Example-MedicationDispense-Rezeptur", "fshType": "Instance", "fshFile": "examples/Example_MedicationDispense.fsh", - "startLine": 72, - "endLine": 84 + "startLine": 67, + "endLine": 78 }, { "outputFile": "MedicationDispense-Example-MedicationDispense-Without-Medication.json", "fshName": "Example-MedicationDispense-Without-Medication", "fshType": "Instance", "fshFile": "examples/Example_MedicationDispense.fsh", - "startLine": 30, - "endLine": 42 + "startLine": 28, + "endLine": 39 }, { "outputFile": "MedicationDispense-Example-MedicationDispense.json", @@ -285,7 +285,7 @@ "fshType": "Instance", "fshFile": "examples/Example_MedicationDispense.fsh", "startLine": 1, - "endLine": 13 + "endLine": 12 }, { "outputFile": "OperationDefinition-AbortOperation.json", diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index 7530409..7a473d5 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -18,23 +18,23 @@ Medication-Augentropfen.json Augen Medication-Medication-Kombipackung.json Medication-Kombipackung Instance examples/Example_Medication_Kombipackung.fsh 2 - 18 Medication-Medication-Rezeptur-FD.json Medication-Rezeptur-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 2 - 45 Medication-Medication-Rezeptur.json Medication-Rezeptur Instance examples/Example_Medication_Rezeptur.fsh 2 - 41 -Medication-Medication-Without-Strength-Code.json Medication-Without-Strength-Code Instance examples/Example_Medication.fsh 58 - 75 -Medication-Medication-Without-Strength-Numerator.json Medication-Without-Strength-Numerator Instance examples/Example_Medication.fsh 77 - 95 +Medication-Medication-Without-Strength-Code.json Medication-Without-Strength-Code Instance examples/Example_Medication.fsh 68 - 85 +Medication-Medication-Without-Strength-Numerator.json Medication-Without-Strength-Numerator Instance examples/Example_Medication.fsh 87 - 105 Medication-MedicationDexpanthenol-FD.json MedicationDexpanthenol-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 57 - 65 Medication-MedicationDexpanthenol.json MedicationDexpanthenol Instance examples/Example_Medication_Rezeptur.fsh 53 - 61 Medication-MedicationHydrocortison-FD.json MedicationHydrocortison-FD Instance examples/Example_Medication_Rezeptur_FD.fsh 47 - 55 Medication-MedicationHydrocortison.json MedicationHydrocortison Instance examples/Example_Medication_Rezeptur.fsh 43 - 51 Medication-NasenSpray.json NasenSpray Instance examples/Example_Medication_Kombipackung.fsh 39 - 56 -Medication-SimpleMedication.json SimpleMedication Instance examples/Example_Medication.fsh 50 - 55 -Medication-SumatripanMedication.json SumatripanMedication Instance examples/Example_Medication.fsh 2 - 23 -MedicationDispense-Example-MedicationDispense-2.json Example-MedicationDispense-2 Instance examples/Example_MedicationDispense.fsh 44 - 56 +Medication-SimpleMedication.json SimpleMedication Instance examples/Example_Medication.fsh 56 - 65 +Medication-SumatripanMedication.json SumatripanMedication Instance examples/Example_Medication.fsh 2 - 26 +MedicationDispense-Example-MedicationDispense-2.json Example-MedicationDispense-2 Instance examples/Example_MedicationDispense.fsh 41 - 52 MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json Example-MedicationDispense-DiGA-DeepLink Instance examples/Example_MedicationDispense_DiGA.fsh 18 - 34 MedicationDispense-Example-MedicationDispense-DiGA-Name-And-PZN.json Example-MedicationDispense-DiGA-Name-And-PZN Instance examples/Example_MedicationDispense_DiGA.fsh 1 - 16 MedicationDispense-Example-MedicationDispense-DiGA-NoRedeemCode.json Example-MedicationDispense-DiGA-NoRedeemCode Instance examples/Example_MedicationDispense_DiGA.fsh 36 - 49 -MedicationDispense-Example-MedicationDispense-Kombipackung.json Example-MedicationDispense-Kombipackung Instance examples/Example_MedicationDispense.fsh 58 - 70 -MedicationDispense-Example-MedicationDispense-Rezeptur.json Example-MedicationDispense-Rezeptur Instance examples/Example_MedicationDispense.fsh 72 - 84 -MedicationDispense-Example-MedicationDispense-Without-Medication.json Example-MedicationDispense-Without-Medication Instance examples/Example_MedicationDispense.fsh 30 - 42 -MedicationDispense-Example-MedicationDispense.json Example-MedicationDispense Instance examples/Example_MedicationDispense.fsh 1 - 13 +MedicationDispense-Example-MedicationDispense-Kombipackung.json Example-MedicationDispense-Kombipackung Instance examples/Example_MedicationDispense.fsh 54 - 65 +MedicationDispense-Example-MedicationDispense-Rezeptur.json Example-MedicationDispense-Rezeptur Instance examples/Example_MedicationDispense.fsh 67 - 78 +MedicationDispense-Example-MedicationDispense-Without-Medication.json Example-MedicationDispense-Without-Medication Instance examples/Example_MedicationDispense.fsh 28 - 39 +MedicationDispense-Example-MedicationDispense.json Example-MedicationDispense Instance examples/Example_MedicationDispense.fsh 1 - 12 OperationDefinition-AbortOperation.json AbortOperation Instance operationdefinitions/GEM_ERP_OP_Abort.fsh 1 - 23 OperationDefinition-AcceptOperation.json AcceptOperation Instance operationdefinitions/GEM_ERP_OP_Accept.fsh 1 - 25 OperationDefinition-ActivateOperation.json ActivateOperation Instance operationdefinitions/GEM_ERP_OP_Activate.fsh 1 - 26 diff --git a/Resources/fsh-generated/resources/Medication-SimpleMedication.json b/Resources/fsh-generated/resources/Medication-SimpleMedication.json index f2b3cf3..e26c03d 100644 --- a/Resources/fsh-generated/resources/Medication-SimpleMedication.json +++ b/Resources/fsh-generated/resources/Medication-SimpleMedication.json @@ -13,5 +13,8 @@ "code": "06313728" } ] + }, + "batch": { + "lotNumber": "1234567890" } } diff --git a/Resources/fsh-generated/resources/Medication-SumatripanMedication.json b/Resources/fsh-generated/resources/Medication-SumatripanMedication.json index 982e17f..c1bc030 100644 --- a/Resources/fsh-generated/resources/Medication-SumatripanMedication.json +++ b/Resources/fsh-generated/resources/Medication-SumatripanMedication.json @@ -54,5 +54,8 @@ "denominator": { "value": 1 } + }, + "batch": { + "lotNumber": "1234567890" } } diff --git a/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-2.json b/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-2.json index d0519aa..b3712f2 100644 --- a/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-2.json +++ b/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-2.json @@ -31,6 +31,6 @@ ], "whenHandedOver": "2024-04-03", "medicationReference": { - "reference": "Medication/Medication-Without-Strength-Code" + "reference": "Medication/SimpleMedication" } } diff --git a/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParameters.json b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParameters.json index bff14fb..87b2d1a 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParameters.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParameters.json @@ -107,6 +107,9 @@ "denominator": { "value": 1 } + }, + "batch": { + "lotNumber": "1234567890" } } } diff --git a/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json index 753dc77..7c902cd 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json @@ -107,6 +107,9 @@ "denominator": { "value": 1 } + }, + "batch": { + "lotNumber": "1234567890" } } } @@ -150,7 +153,7 @@ ], "whenHandedOver": "2024-04-03", "medicationReference": { - "reference": "Medication/Medication-Without-Strength-Code" + "reference": "Medication/SimpleMedication" } } }, @@ -158,79 +161,22 @@ "name": "medication", "resource": { "resourceType": "Medication", - "id": "Medication-Without-Strength-Code", + "id": "SimpleMedication", "meta": { "profile": [ "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Medication|1.4" ] }, - "ingredient": [ - { - "strength": { - "numerator": { - "value": 85, - "unit": "mg", - "_system": { - "extension": [ - { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" - } - ] - }, - "_code": { - "extension": [ - { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" - } - ] - } - }, - "denominator": { - "value": 250, - "unit": "Milliliter", - "_system": { - "extension": [ - { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" - } - ] - }, - "_code": { - "extension": [ - { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" - } - ] - } - } - }, - "itemCodeableConcept": { - "coding": [ - { - "code": "L01DB01", - "system": "http://fhir.de/CodeSystem/bfarm/atc", - "display": "Doxorubicin" - } - ] - }, - "isActive": true - } - ], "code": { - "text": "Infusion bestehend aus 85mg Doxorubicin aufgeloest zur Verabreichung in 250ml 5-%iger (50 mg/ml) Glucose-Infusionsloesung" - }, - "form": { "coding": [ { - "code": "11210000", - "system": "http://standardterms.edqm.eu", - "display": "Solution for infusion" + "system": "http://fhir.de/CodeSystem/ifa/pzn", + "code": "06313728" } ] + }, + "batch": { + "lotNumber": "1234567890" } } } diff --git a/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParameters.json b/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParameters.json index 8debb69..f8566bb 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParameters.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParameters.json @@ -107,6 +107,9 @@ "denominator": { "value": 1 } + }, + "batch": { + "lotNumber": "1234567890" } } } diff --git a/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json b/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json index 261e438..f9c0f73 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json @@ -107,6 +107,9 @@ "denominator": { "value": 1 } + }, + "batch": { + "lotNumber": "1234567890" } } } @@ -150,7 +153,7 @@ ], "whenHandedOver": "2024-04-03", "medicationReference": { - "reference": "Medication/Medication-Without-Strength-Code" + "reference": "Medication/SimpleMedication" } } }, @@ -158,79 +161,22 @@ "name": "medication", "resource": { "resourceType": "Medication", - "id": "Medication-Without-Strength-Code", + "id": "SimpleMedication", "meta": { "profile": [ "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Medication|1.4" ] }, - "ingredient": [ - { - "strength": { - "numerator": { - "value": 85, - "unit": "mg", - "_system": { - "extension": [ - { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" - } - ] - }, - "_code": { - "extension": [ - { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" - } - ] - } - }, - "denominator": { - "value": 250, - "unit": "Milliliter", - "_system": { - "extension": [ - { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" - } - ] - }, - "_code": { - "extension": [ - { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" - } - ] - } - } - }, - "itemCodeableConcept": { - "coding": [ - { - "code": "L01DB01", - "system": "http://fhir.de/CodeSystem/bfarm/atc", - "display": "Doxorubicin" - } - ] - }, - "isActive": true - } - ], "code": { - "text": "Infusion bestehend aus 85mg Doxorubicin aufgeloest zur Verabreichung in 250ml 5-%iger (50 mg/ml) Glucose-Infusionsloesung" - }, - "form": { "coding": [ { - "code": "11210000", - "system": "http://standardterms.edqm.eu", - "display": "Solution for infusion" + "system": "http://fhir.de/CodeSystem/ifa/pzn", + "code": "06313728" } ] + }, + "batch": { + "lotNumber": "1234567890" } } } diff --git a/Resources/fsh-generated/resources/Parameters-ExampleDispenseOutputParametersSuccess.json b/Resources/fsh-generated/resources/Parameters-ExampleDispenseOutputParametersSuccess.json index 52e0c3b..5ed36d5 100644 --- a/Resources/fsh-generated/resources/Parameters-ExampleDispenseOutputParametersSuccess.json +++ b/Resources/fsh-generated/resources/Parameters-ExampleDispenseOutputParametersSuccess.json @@ -107,6 +107,9 @@ "denominator": { "value": 1 } + }, + "batch": { + "lotNumber": "1234567890" } } } diff --git a/Resources/input/fsh/examples/Example_Communication_InfoReq.fsh b/Resources/input/fsh/examples/Example_Communication_InfoReq.fsh index a04c79e..a15d1ac 100644 --- a/Resources/input/fsh/examples/Example_Communication_InfoReq.fsh +++ b/Resources/input/fsh/examples/Example_Communication_InfoReq.fsh @@ -9,7 +9,7 @@ Usage: #example * contained[+] = SumatripanMedication * basedOn.reference = "Task/160.000.033.491.280.78" * status = #unknown -* about = Reference(SumatripanMedication) +* about = Reference(SumatripanMedication) //ACHTUNG: wenn das wieder aktiviert wird muss eine Medication ohne ChargenNUmmer verwendet werden * recipient[+].identifier.system = $identifier-telematik-id * recipient[=].identifier.value = "3-SMC-B-Testkarte-883110000123465" * sender.identifier.system = $identifier-kvid-10 diff --git a/Resources/input/fsh/examples/Example_Medication.fsh b/Resources/input/fsh/examples/Example_Medication.fsh index 56d2b9e..73bca5b 100644 --- a/Resources/input/fsh/examples/Example_Medication.fsh +++ b/Resources/input/fsh/examples/Example_Medication.fsh @@ -9,6 +9,9 @@ Usage: #example // Impfstoff * extension[isVaccine].valueBoolean = false +// ChargenInformation +* batch.lotNumber = "1234567890" + // normgroesse * extension[normSizeCode].url = "http://fhir.de/StructureDefinition/normgroesse" * extension[normSizeCode].valueCode = #N1 @@ -34,6 +37,9 @@ Usage: #inline // Impfstoff * extension[isVaccine].valueBoolean = false +// ChargenInformation +* batch.lotNumber = "1234567890" + // normgroesse * extension[normSizeCode].url = "http://fhir.de/StructureDefinition/normgroesse" * extension[normSizeCode].valueCode = #N1 @@ -51,6 +57,10 @@ Instance: SimpleMedication InstanceOf: GEM_ERP_PR_Medication Title: "Sample Simple Medication" Usage: #example + +// ChargenInformation +* batch.lotNumber = "1234567890" + * code.coding[pzn].system = "http://fhir.de/CodeSystem/ifa/pzn" * code.coding[pzn].code = #06313728 diff --git a/Resources/input/fsh/examples/Example_MedicationDispense.fsh b/Resources/input/fsh/examples/Example_MedicationDispense.fsh index 11d3802..e655b21 100644 --- a/Resources/input/fsh/examples/Example_MedicationDispense.fsh +++ b/Resources/input/fsh/examples/Example_MedicationDispense.fsh @@ -3,7 +3,6 @@ InstanceOf: GEM_ERP_PR_MedicationDispense Usage: #example Title: "Example Medication Dispense" Description: "Example of a Medication Dispense." -* identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" * identifier[prescriptionID].value = "160.000.033.491.280.78" * subject.identifier.system = $identifier-kvid-10 * subject.identifier.value = "X123456789" @@ -18,7 +17,6 @@ Usage: #inline Title: "Example Medication Dispense" Description: "Example of a Medication Dispense." * id = "160.000.033.491.280.78" -* identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" * identifier[prescriptionID].value = "160.000.033.491.280.78" * subject.identifier.system = $identifier-kvid-10 * subject.identifier.value = "X123456789" @@ -32,7 +30,6 @@ InstanceOf: GEM_ERP_PR_MedicationDispense Usage: #example Title: "Example Medication Dispense" Description: "Example of a Medication Dispense." -* identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" * identifier[prescriptionID].value = "160.000.033.491.280.78" * subject.identifier.system = $identifier-kvid-10 * subject.identifier.value = "X123456789" @@ -46,21 +43,19 @@ InstanceOf: GEM_ERP_PR_MedicationDispense Usage: #example Title: "Example another Medication Dispense" Description: "Example of another Medication Dispense." -* identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" * identifier[prescriptionID].value = "160.000.033.491.280.78" * subject.identifier.system = $identifier-kvid-10 * subject.identifier.value = "X123456789" * performer.actor.identifier.system = $identifier-telematik-id * performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957" * whenHandedOver = "2024-04-03" -* medicationReference = Reference(Medication-Without-Strength-Code) +* medicationReference = Reference(SimpleMedication) Instance: Example-MedicationDispense-Kombipackung InstanceOf: GEM_ERP_PR_MedicationDispense Usage: #example Title: "Example Kombipackung Medication Dispense" Description: "Example of a Kombipackung Medication Dispense." -* identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" * identifier[prescriptionID].value = "160.000.033.491.280.78" * subject.identifier.system = $identifier-kvid-10 * subject.identifier.value = "X123456789" @@ -74,7 +69,6 @@ InstanceOf: GEM_ERP_PR_MedicationDispense Usage: #example Title: "Example Rezeptur Medication Dispense" Description: "Example of a Rezeptur Medication Dispense." -* identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" * identifier[prescriptionID].value = "160.000.033.491.280.78" * subject.identifier.system = $identifier-kvid-10 * subject.identifier.value = "X123456789" @@ -90,7 +84,6 @@ InstanceOf: GEM_ERP_PR_MedicationDispense Usage: #example Title: "Example-Medication Dispense" Description: "Example of a Medication Dispense." -* identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" * identifier[prescriptionID].value = "160.000.033.491.280.78" * subject.identifier.system = $identifier-kvid-10 * subject.identifier.value = "X123456789" @@ -105,7 +98,6 @@ InstanceOf: GEM_ERP_PR_MedicationDispense Usage: #example Title: "Example-Medication Dispense" Description: "Example of a Medication Dispense." -* identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" * identifier[prescriptionID].value = "160.000.033.491.280.78" * subject.identifier.system = $identifier-kvid-10 * subject.identifier.value = "X123456789" @@ -120,7 +112,6 @@ InstanceOf: GEM_ERP_PR_MedicationDispense Usage: #example Title: "Example-Medication Dispense" Description: "Example of a Medication Dispense." -* identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" * identifier[prescriptionID].value = "160.000.033.491.280.78" * subject.identifier.system = $identifier-kvid-10 * subject.identifier.value = "X123456789" @@ -135,7 +126,6 @@ InstanceOf: GEM_ERP_PR_MedicationDispense Usage: #example Title: "Example-Medication Dispense" Description: "Example of a Medication Dispense." -* identifier[prescriptionID].system = "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId" * identifier[prescriptionID].value = "160.000.033.491.280.78" * subject.identifier.system = $identifier-kvid-10 * subject.identifier.value = "X123456789" diff --git a/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Close.fsh b/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Close.fsh index 793fa8c..fcc6ead 100644 --- a/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Close.fsh +++ b/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Close.fsh @@ -30,7 +30,7 @@ Title: "Example Close Parameters" * resource = Example-MedicationDispense-2 * part[medication] * name = "medication" - * resource = Medication-Without-Strength-Code + * resource = SimpleMedication Instance: ExampleCloseInputParametersKombipackung InstanceOf: GEM_ERP_PR_PAR_CloseOperation_Input diff --git a/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Dispense.fsh b/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Dispense.fsh index c901f63..c4753c2 100644 --- a/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Dispense.fsh +++ b/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Dispense.fsh @@ -30,7 +30,7 @@ Title: "Example Dispense Parameters" * resource = Example-MedicationDispense-2 * part[medication] * name = "medication" - * resource = Medication-Without-Strength-Code + * resource = SimpleMedication Instance: ExampleDispenseInputParametersKombipackung InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Input