Update Parameters Dispense Example

gematik · Sep 12, 2024 · ca09a4f · ca09a4f
1 parent e50a0eb
commit ca09a4f
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 26 deletions.
diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json
@@ -124,16 +124,16 @@
  "fshName": "Medication-Without-Strength-Code",
  "fshType": "Instance",
  "fshFile": "examples/Example_Medication.fsh",
- "startLine": 33,
- "endLine": 50
+ "startLine": 58,
+ "endLine": 75
  },
  {
  "outputFile": "Medication-Medication-Without-Strength-Numerator.json",
  "fshName": "Medication-Without-Strength-Numerator",
  "fshType": "Instance",
  "fshFile": "examples/Example_Medication.fsh",
- "startLine": 52,
- "endLine": 70
+ "startLine": 77,
+ "endLine": 95
  },
  {
  "outputFile": "Medication-MedicationDexpanthenol-FD.json",
@@ -180,8 +180,8 @@
  "fshName": "SimpleMedication",
  "fshType": "Instance",
  "fshFile": "examples/Example_Medication.fsh",
- "startLine": 25,
- "endLine": 30
+ "startLine": 50,
+ "endLine": 55
  },
  {
  "outputFile": "Medication-SumatripanMedication.json",
@@ -196,8 +196,8 @@
  "fshName": "Example-MedicationDispense-2",
  "fshType": "Instance",
  "fshFile": "examples/Example_MedicationDispense.fsh",
- "startLine": 29,
- "endLine": 41
+ "startLine": 44,
+ "endLine": 56
  },
  {
  "outputFile": "MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json",
@@ -228,24 +228,24 @@
  "fshName": "Example-MedicationDispense-Kombipackung",
  "fshType": "Instance",
  "fshFile": "examples/Example_MedicationDispense.fsh",
- "startLine": 43,
- "endLine": 55
+ "startLine": 58,
+ "endLine": 70
  },
  {
  "outputFile": "MedicationDispense-Example-MedicationDispense-Rezeptur.json",
  "fshName": "Example-MedicationDispense-Rezeptur",
  "fshType": "Instance",
  "fshFile": "examples/Example_MedicationDispense.fsh",
- "startLine": 57,
- "endLine": 69
+ "startLine": 72,
+ "endLine": 84
  },
  {
  "outputFile": "MedicationDispense-Example-MedicationDispense-Without-Medication.json",
  "fshName": "Example-MedicationDispense-Without-Medication",
  "fshType": "Instance",
  "fshFile": "examples/Example_MedicationDispense.fsh",
- "startLine": 15,
- "endLine": 27
+ "startLine": 30,
+ "endLine": 42
  },
  {
  "outputFile": "MedicationDispense-Example-MedicationDispense.json",

diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt
@@ -14,22 +14,22 @@ 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 33 - 50
-Medication-Medication-Without-Strength-Numerator.json Medication-Without-Strength-Numerator Instance examples/Example_Medication.fsh 52 - 70
+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-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 25 - 30
+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 29 - 41
+MedicationDispense-Example-MedicationDispense-2.json Example-MedicationDispense-2 Instance examples/Example_MedicationDispense.fsh 44 - 56
 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 43 - 55
-MedicationDispense-Example-MedicationDispense-Rezeptur.json Example-MedicationDispense-Rezeptur Instance examples/Example_MedicationDispense.fsh 57 - 69
-MedicationDispense-Example-MedicationDispense-Without-Medication.json Example-MedicationDispense-Without-Medication Instance examples/Example_MedicationDispense.fsh 15 - 27
+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
 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

diff --git a/Resources/fsh-generated/resources/Parameters-ExampleDispenseOutputParametersSuccess.json b/Resources/fsh-generated/resources/Parameters-ExampleDispenseOutputParametersSuccess.json
@@ -14,7 +14,7 @@
  "name": "medicationDispense",
  "resource": {
  "resourceType": "MedicationDispense",
- "id": "Example-MedicationDispense",
+ "id": "160.000.033.491.280.78",
  "meta": {
  "profile": [
  "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_MedicationDispense|1.4"
@@ -45,15 +45,15 @@
  ],
  "whenHandedOver": "2024-04-03",
  "medicationReference": {
- "reference": "Medication/SumatripanMedication"
+ "reference": "Medication/30e0e53f-275c-46f5-9e59-04d55735dabb"
  }
  }
  },
  {
  "name": "medication",
  "resource": {
  "resourceType": "Medication",
- "id": "SumatripanMedication",
+ "id": "30e0e53f-275c-46f5-9e59-04d55735dabb",
  "meta": {
  "profile": [
  "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Medication|1.4"

diff --git a/Resources/input/fsh/examples/Example_Medication.fsh b/Resources/input/fsh/examples/Example_Medication.fsh
@@ -22,6 +22,31 @@ Usage: #example
 * amount.numerator.extension[totalQuantity].valueString = "20"
 * amount.denominator.value = 1
 
+// Single Medication
+Instance: SumatripanMedicationWithID
+InstanceOf: GEM_ERP_PR_Medication
+Title: "Sample Medication Sumatripan"
+Usage: #inline
+* id = "30e0e53f-275c-46f5-9e59-04d55735dabb"
+// Arzneimittelkategorie
+* extension[drugCategory].valueCoding = EPADrugCategoryCS#00
+
+// Impfstoff
+* extension[isVaccine].valueBoolean = false
+
+// normgroesse
+* extension[normSizeCode].url = "http://fhir.de/StructureDefinition/normgroesse"
+* extension[normSizeCode].valueCode = #N1
+* code.coding[pzn].system = "http://fhir.de/CodeSystem/ifa/pzn"
+* code.coding[pzn].code = #06313728
+* code.text = "Sumatriptan-1a Pharma 100 mg Tabletten"
+* form.coding[kbvDarreichungsform].system = "https://fhir.kbv.de/CodeSystem/KBV_CS_SFHIR_KBV_DARREICHUNGSFORM"
+* form.coding[kbvDarreichungsform].code = #TAB
+* amount.numerator.value = 20
+* amount.numerator.unit = "St"
+* amount.numerator.extension[totalQuantity].valueString = "20"
+* amount.denominator.value = 1
+
 Instance: SimpleMedication
 InstanceOf: GEM_ERP_PR_Medication
 Title: "Sample Simple Medication"

diff --git a/Resources/input/fsh/examples/Example_MedicationDispense.fsh b/Resources/input/fsh/examples/Example_MedicationDispense.fsh
@@ -12,6 +12,21 @@ Description: "Example of a Medication Dispense."
 * whenHandedOver = "2024-04-03"
 * medicationReference = Reference(SumatripanMedication)
 
+Instance: Example-MedicationDispense-ToID
+InstanceOf: GEM_ERP_PR_MedicationDispense
+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"
+* performer.actor.identifier.system = $identifier-telematik-id
+* performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
+* whenHandedOver = "2024-04-03"
+* medicationReference = Reference(30e0e53f-275c-46f5-9e59-04d55735dabb)
+
 Instance: Example-MedicationDispense-Without-Medication
 InstanceOf: GEM_ERP_PR_MedicationDispense
 Usage: #example

diff --git a/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Dispense.fsh b/Resources/input/fsh/examples/parameters_examples/Example_Parameters_Dispense.fsh
@@ -53,10 +53,10 @@ Title: "Example Dispense Parameters Response on Success"
  * name = "rxDispensation"
  * part[medicationDispense]
  * name = "medicationDispense"
- * resource = Example-MedicationDispense
+ * resource = Example-MedicationDispense-ToID
  * part[medication]
  * name = "medication"
- * resource = SumatripanMedication
+ * resource = SumatripanMedicationWithID
 
 Instance: ExampleDispenseOutputParametersError
 InstanceOf: GEM_ERP_PR_PAR_DispenseOperation_Output