diff --git a/API-Examples/2025-01-15/erp_eml-epa-notes/06_RezepturVerordnung_PZN_Mapped.json b/API-Examples/2025-01-15/erp_eml-epa-notes/06_RezepturVerordnung_PZN_Mapped.json index bb2dd43d9..59caf0595 100644 --- a/API-Examples/2025-01-15/erp_eml-epa-notes/06_RezepturVerordnung_PZN_Mapped.json +++ b/API-Examples/2025-01-15/erp_eml-epa-notes/06_RezepturVerordnung_PZN_Mapped.json @@ -3,7 +3,7 @@ "id": "erp-eml-epa-notes-06-RezepturVerordnung-PZN-Mapped", "meta": { "profile": [ - "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Medication|1.4" + "https://gematik.de/fhir/epa-medication/StructureDefinition/epa-medication" ] }, "extension": [ @@ -43,34 +43,34 @@ }, "ingredient": [ { + "itemReference": { + "reference": "#MedicationSalicylsaeure" + }, "strength": { + "numerator": { + "value": 5, + "code": "g", + "system": "http://unitsofmeasure.org" + }, "denominator": { "value": 1, "_system": { "extension": [ { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" } ] }, "_code": { "extension": [ { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" } ] } - }, - "numerator": { - "value": 5, - "code": "g", - "system": "http://unitsofmeasure.org" } - }, - "itemReference": { - "reference": "#MedicationSalicylsaeure" } }, { @@ -82,23 +82,23 @@ } ], "numerator": { - "_system": { + "_value": { "extension": [ { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" } ] }, - "_code": { + "_system": { "extension": [ { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" } ] }, - "_value": { + "_code": { "extension": [ { "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", @@ -108,23 +108,23 @@ } }, "denominator": { - "_system": { + "_value": { "extension": [ { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" } ] }, - "_code": { + "_system": { "extension": [ { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" } ] }, - "_value": { + "_code": { "extension": [ { "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", diff --git a/API-Examples/2025-01-15/erp_eml-epa-notes/08_verordnung_wirkstoff_Mapped.xml b/API-Examples/2025-01-15/erp_eml-epa-notes/08_verordnung_wirkstoff_Mapped.xml index 5c3ccc02a..e49a4fa4c 100644 --- a/API-Examples/2025-01-15/erp_eml-epa-notes/08_verordnung_wirkstoff_Mapped.xml +++ b/API-Examples/2025-01-15/erp_eml-epa-notes/08_verordnung_wirkstoff_Mapped.xml @@ -1,7 +1,7 @@ - + diff --git a/API-Examples/2025-01-15/erp_eml-epa-notes/10_verordnung_freitext_Mapped.xml b/API-Examples/2025-01-15/erp_eml-epa-notes/10_verordnung_freitext_Mapped.xml index 82fcd8820..9de341faa 100644 --- a/API-Examples/2025-01-15/erp_eml-epa-notes/10_verordnung_freitext_Mapped.xml +++ b/API-Examples/2025-01-15/erp_eml-epa-notes/10_verordnung_freitext_Mapped.xml @@ -1,7 +1,7 @@ - + diff --git a/API-Examples/2025-01-15/erp_eml-epa-notes/12_ibm_medication_compounding_Mapped.json b/API-Examples/2025-01-15/erp_eml-epa-notes/12_ibm_medication_compounding_Mapped.json index 6f113b922..50fe127bb 100644 --- a/API-Examples/2025-01-15/erp_eml-epa-notes/12_ibm_medication_compounding_Mapped.json +++ b/API-Examples/2025-01-15/erp_eml-epa-notes/12_ibm_medication_compounding_Mapped.json @@ -3,7 +3,7 @@ "id": "erp-eml-epa-notes-12-ibm-medication-compounding-Mapped", "meta": { "profile": [ - "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Medication|1.4" + "https://gematik.de/fhir/epa-medication/StructureDefinition/epa-medication" ] }, "extension": [ @@ -43,72 +43,6 @@ "value": 1 } }, - "ingredient": [ - { - "strength": { - "denominator": { - "value": 1, - "_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" - } - ] - } - }, - "numerator": { - "value": 1, - "code": "{tbl}", - "system": "http://unitsofmeasure.org", - "unit": "TAB" - } - }, - "itemReference": { - "reference": "#FirstIngredient" - } - }, - { - "strength": { - "denominator": { - "value": 1, - "_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" - } - ] - } - }, - "numerator": { - "value": 2, - "code": "{tbl}", - "system": "http://unitsofmeasure.org", - "unit": "TAB" - } - }, - "itemReference": { - "reference": "#SecondIngredient" - } - } - ], "contained": [ { "resourceType": "Medication", @@ -174,5 +108,71 @@ }, "code": { "text": "Sumatriptan-1a Pharma 100 mg Tabletten" - } + }, + "ingredient": [ + { + "itemReference": { + "reference": "#FirstIngredient" + }, + "strength": { + "numerator": { + "value": 1, + "code": "{tbl}", + "system": "http://unitsofmeasure.org", + "unit": "TAB" + }, + "denominator": { + "value": 1, + "_system": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" + } + ] + }, + "_code": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" + } + ] + } + } + } + }, + { + "itemReference": { + "reference": "#SecondIngredient" + }, + "strength": { + "numerator": { + "value": 2, + "code": "{tbl}", + "system": "http://unitsofmeasure.org", + "unit": "TAB" + }, + "denominator": { + "value": 1, + "_system": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" + } + ] + }, + "_code": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" + } + ] + } + } + } + } + ] } diff --git a/API-Examples/2025-01-15/erp_eml-epa-notes/14_ibm_medication_compounding_amount_Mapped.json b/API-Examples/2025-01-15/erp_eml-epa-notes/14_ibm_medication_compounding_amount_Mapped.json index 9a3623d80..f358f88dc 100644 --- a/API-Examples/2025-01-15/erp_eml-epa-notes/14_ibm_medication_compounding_amount_Mapped.json +++ b/API-Examples/2025-01-15/erp_eml-epa-notes/14_ibm_medication_compounding_amount_Mapped.json @@ -3,7 +3,7 @@ "id": "erp-eml-epa-notes-14-ibm-medication-compounding-amount-Mapped", "meta": { "profile": [ - "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Medication|1.4" + "https://gematik.de/fhir/epa-medication/StructureDefinition/epa-medication" ] }, "extension": [ @@ -53,23 +53,23 @@ } ], "numerator": { - "_system": { + "_value": { "extension": [ { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" } ] }, - "_code": { + "_system": { "extension": [ { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" } ] }, - "_value": { + "_code": { "extension": [ { "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", @@ -79,23 +79,23 @@ } }, "denominator": { - "_system": { + "_value": { "extension": [ { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" } ] }, - "_code": { + "_system": { "extension": [ { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" } ] }, - "_value": { + "_code": { "extension": [ { "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", @@ -118,23 +118,23 @@ } ], "numerator": { - "_system": { + "_value": { "extension": [ { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" } ] }, - "_code": { + "_system": { "extension": [ { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" } ] }, - "_value": { + "_code": { "extension": [ { "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", @@ -144,23 +144,23 @@ } }, "denominator": { - "_system": { + "_value": { "extension": [ { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" } ] }, - "_code": { + "_system": { "extension": [ { - "valueCode": "unknown", - "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason" + "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", + "valueCode": "unknown" } ] }, - "_value": { + "_code": { "extension": [ { "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason", diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/06_RezepturVerordnung_PZN_Mapped.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/06_RezepturVerordnung_PZN_Mapped.fsh index 87a2908e5..e24f491c8 100644 --- a/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/06_RezepturVerordnung_PZN_Mapped.fsh +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/06_RezepturVerordnung_PZN_Mapped.fsh @@ -1,5 +1,5 @@ Instance: erp-eml-epa-notes-06-RezepturVerordnung-PZN-Mapped -InstanceOf: GEM_ERP_PR_Medication +InstanceOf: EPAMedication Usage: #example * contained[0] = MedicationPropanol * contained[+] = MedicationSalicylsaeure @@ -15,21 +15,27 @@ Usage: #example * itemReference = Reference(MedicationSalicylsaeure) * strength.numerator = 5 'g' * strength.denominator.value = 1 - * strength.denominator.system.extension[dataAbsentReason].valueCode = #unknown - * strength.denominator.code.extension[dataAbsentReason].valueCode = #unknown + * strength.denominator.system.extension[+].url = $data-absent-reason + * strength.denominator.system.extension[=].valueCode = #unknown + * strength.denominator.code.extension[+].url = $data-absent-reason + * strength.denominator.code.extension[=].valueCode = #unknown * ingredient[+] * itemReference = Reference(MedicationPropanol) * strength.extension[amountText].valueString = "Ad 100 g" * strength.numerator * value.extension[+].url = $data-absent-reason * value.extension[=].valueCode = #unknown - * system.extension[dataAbsentReason].valueCode = #unknown - * code.extension[dataAbsentReason].valueCode = #unknown + * system.extension[+].url = $data-absent-reason + * system.extension[=].valueCode = #unknown + * code.extension[+].url = $data-absent-reason + * code.extension[=].valueCode = #unknown * strength.denominator * value.extension[+].url = $data-absent-reason * value.extension[=].valueCode = #unknown - * system.extension[dataAbsentReason].valueCode = #unknown - * code.extension[dataAbsentReason].valueCode = #unknown + * system.extension[+].url = $data-absent-reason + * system.extension[=].valueCode = #unknown + * code.extension[+].url = $data-absent-reason + * code.extension[=].valueCode = #unknown Instance: MedicationSalicylsaeure InstanceOf: EPAMedicationPZNIngredient diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/08_Verordnung_Wirkstoff_Mapped.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/08_Verordnung_Wirkstoff_Mapped.fsh index 395900d33..440690cd8 100644 --- a/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/08_Verordnung_Wirkstoff_Mapped.fsh +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/08_Verordnung_Wirkstoff_Mapped.fsh @@ -1,5 +1,5 @@ Instance: erp-eml-epa-notes-08-verordnung-wirkstoff-Mapped -InstanceOf: GEM_ERP_PR_Medication +InstanceOf: EPAMedication Usage: #example * extension[drugCategory].valueCoding = $epa-drug-category-cs#00 * extension[type].valueCoding = $sct#781405001 "Medicinal product package (product)" @@ -11,9 +11,13 @@ Usage: #example * strength.numerator * value = 12 * unit = "mg" - * system.extension[dataAbsentReason].valueCode = #unknown - * code.extension[dataAbsentReason].valueCode = #unknown + * system.extension[+].url = $data-absent-reason + * system.extension[=].valueCode = #unknown + * code.extension[+].url = $data-absent-reason + * code.extension[=].valueCode = #unknown * strength.denominator * value = 1 - * system.extension[dataAbsentReason].valueCode = #unknown - * code.extension[dataAbsentReason].valueCode = #unknown + * system.extension[+].url = $data-absent-reason + * system.extension[=].valueCode = #unknown + * code.extension[+].url = $data-absent-reason + * code.extension[=].valueCode = #unknown diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/10_Verordnung_Freitext_Mapped.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/10_Verordnung_Freitext_Mapped.fsh index 8ce6b69dc..a557c14e8 100644 --- a/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/10_Verordnung_Freitext_Mapped.fsh +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/10_Verordnung_Freitext_Mapped.fsh @@ -1,5 +1,5 @@ Instance: erp-eml-epa-notes-10-verordnung-freitext-Mapped -InstanceOf: GEM_ERP_PR_Medication +InstanceOf: EPAMedication Usage: #example * extension[drugCategory].valueCoding = $epa-drug-category-cs#00 * extension[type].valueCoding = $sct#781405001 "Medicinal product package (product)" diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/12_ibm_medication_compounding_mapped.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/12_ibm_medication_compounding_mapped.fsh index 80f1e3c12..5416d3705 100644 --- a/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/12_ibm_medication_compounding_mapped.fsh +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/12_ibm_medication_compounding_mapped.fsh @@ -1,5 +1,5 @@ Instance: erp-eml-epa-notes-12-ibm-medication-compounding-Mapped -InstanceOf: GEM_ERP_PR_Medication +InstanceOf: EPAMedication Usage: #example * contained[0] = FirstIngredient * contained[+] = SecondIngredient @@ -17,16 +17,20 @@ Usage: #example * itemReference = Reference(FirstIngredient) * strength.numerator = 1 '{tbl}' "TAB" * strength.denominator.value = 1 - * strength.denominator.system.extension[dataAbsentReason].valueCode = #unknown - * strength.denominator.code.extension[dataAbsentReason].valueCode = #unknown + * strength.denominator.system.extension[+].url = $data-absent-reason + * strength.denominator.system.extension[=].valueCode = #unknown + * strength.denominator.code.extension[+].url = $data-absent-reason + * strength.denominator.code.extension[=].valueCode = #unknown * ingredient[+] * itemReference = Reference(SecondIngredient) * strength.numerator = 2 '{tbl}' "TAB" * strength.denominator * value = 1 - * system.extension[dataAbsentReason].valueCode = #unknown - * code.extension[dataAbsentReason].valueCode = #unknown + * system.extension[+].url = $data-absent-reason + * system.extension[=].valueCode = #unknown + * code.extension[+].url = $data-absent-reason + * code.extension[=].valueCode = #unknown Instance: FirstIngredient InstanceOf: EPAMedicationPZNIngredient diff --git a/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/14_ibm_medication_compounding_amount_mapped.fsh b/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/14_ibm_medication_compounding_amount_mapped.fsh index 1ba933506..42359b04e 100644 --- a/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/14_ibm_medication_compounding_amount_mapped.fsh +++ b/API-Examples/FSH-Files/input/fsh/examples/erp_eml_epa_notes/14_ibm_medication_compounding_amount_mapped.fsh @@ -1,5 +1,5 @@ Instance: erp-eml-epa-notes-14-ibm-medication-compounding-amount-Mapped -InstanceOf: GEM_ERP_PR_Medication +InstanceOf: EPAMedication Usage: #example * contained[0] = FirstIngredientAmount * contained[+] = SecondIngredientAmount @@ -20,13 +20,17 @@ Usage: #example * strength.numerator * value.extension[+].url = $data-absent-reason * value.extension[=].valueCode = #unknown - * system.extension[dataAbsentReason].valueCode = #unknown - * code.extension[dataAbsentReason].valueCode = #unknown + * system.extension[+].url = $data-absent-reason + * system.extension[=].valueCode = #unknown + * code.extension[+].url = $data-absent-reason + * code.extension[=].valueCode = #unknown * strength.denominator * value.extension[+].url = $data-absent-reason * value.extension[=].valueCode = #unknown - * system.extension[dataAbsentReason].valueCode = #unknown - * code.extension[dataAbsentReason].valueCode = #unknown + * system.extension[+].url = $data-absent-reason + * system.extension[=].valueCode = #unknown + * code.extension[+].url = $data-absent-reason + * code.extension[=].valueCode = #unknown * ingredient[+] * itemReference = Reference(SecondIngredientAmount) @@ -35,13 +39,17 @@ Usage: #example * strength.numerator * value.extension[+].url = $data-absent-reason * value.extension[=].valueCode = #unknown - * system.extension[dataAbsentReason].valueCode = #unknown - * code.extension[dataAbsentReason].valueCode = #unknown + * system.extension[+].url = $data-absent-reason + * system.extension[=].valueCode = #unknown + * code.extension[+].url = $data-absent-reason + * code.extension[=].valueCode = #unknown * strength.denominator * value.extension[+].url = $data-absent-reason * value.extension[=].valueCode = #unknown - * system.extension[dataAbsentReason].valueCode = #unknown - * code.extension[dataAbsentReason].valueCode = #unknown + * system.extension[+].url = $data-absent-reason + * system.extension[=].valueCode = #unknown + * code.extension[+].url = $data-absent-reason + * code.extension[=].valueCode = #unknown Instance: FirstIngredientAmount