Merge pull request #56 from gematik/develop

Fix Prescription IDs for Examples
gematik · Aug 29, 2024 · 07584b2 · 07584b2
2 parents 39401bd + 66cf00d
commit 07584b2
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 45 deletions.
diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json
@@ -188,8 +188,8 @@
     "fshName": "Example-MedicationDispense-2",
     "fshType": "Instance",
     "fshFile": "examples/Example_MedicationDispense.fsh",
-    "startLine": 17,
-    "endLine": 30
+    "startLine": 16,
+    "endLine": 28
   },
   {
     "outputFile": "MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json",
@@ -220,24 +220,24 @@
     "fshName": "Example-MedicationDispense-Kombipackung",
     "fshType": "Instance",
     "fshFile": "examples/Example_MedicationDispense.fsh",
-    "startLine": 32,
-    "endLine": 45
+    "startLine": 30,
+    "endLine": 42
   },
   {
     "outputFile": "MedicationDispense-Example-MedicationDispense-Rezeptur.json",
     "fshName": "Example-MedicationDispense-Rezeptur",
     "fshType": "Instance",
     "fshFile": "examples/Example_MedicationDispense.fsh",
-    "startLine": 47,
-    "endLine": 60
+    "startLine": 44,
+    "endLine": 56
   },
   {
     "outputFile": "MedicationDispense-Example-MedicationDispense.json",
     "fshName": "Example-MedicationDispense",
     "fshType": "Instance",
     "fshFile": "examples/Example_MedicationDispense.fsh",
     "startLine": 2,
-    "endLine": 15
+    "endLine": 14
   },
   {
     "outputFile": "OperationDefinition-AbortOperation.json",

diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt
@@ -22,13 +22,13 @@ Medication-MedicationHydrocortison-FD.json
 Medication-MedicationHydrocortison.json                                          MedicationHydrocortison                                          Instance    examples/Example_Medication_Rezeptur.fsh                43 - 51
 Medication-NasenSpray.json                                                       NasenSpray                                                       Instance    examples/Example_Medication_Kombipackung.fsh            39 - 57
 Medication-SumatripanMedication.json                                             SumatripanMedication                                             Instance    examples/Example_Medication.fsh                         2 - 23
-MedicationDispense-Example-MedicationDispense-2.json                             Example-MedicationDispense-2                                     Instance    examples/Example_MedicationDispense.fsh                 17 - 30
+MedicationDispense-Example-MedicationDispense-2.json                             Example-MedicationDispense-2                                     Instance    examples/Example_MedicationDispense.fsh                 16 - 28
 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                 32 - 45
-MedicationDispense-Example-MedicationDispense-Rezeptur.json                      Example-MedicationDispense-Rezeptur                              Instance    examples/Example_MedicationDispense.fsh                 47 - 60
-MedicationDispense-Example-MedicationDispense.json                               Example-MedicationDispense                                       Instance    examples/Example_MedicationDispense.fsh                 2 - 15
+MedicationDispense-Example-MedicationDispense-Kombipackung.json                  Example-MedicationDispense-Kombipackung                          Instance    examples/Example_MedicationDispense.fsh                 30 - 42
+MedicationDispense-Example-MedicationDispense-Rezeptur.json                      Example-MedicationDispense-Rezeptur                              Instance    examples/Example_MedicationDispense.fsh                 44 - 56
+MedicationDispense-Example-MedicationDispense.json                               Example-MedicationDispense                                       Instance    examples/Example_MedicationDispense.fsh                 2 - 14
 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/MedicationDispense-Example-MedicationDispense-2.json b/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-2.json
@@ -9,7 +9,7 @@
   "identifier": [
     {
       "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
-      "value": "160.153.303.257.459"
+      "value": "160.000.033.491.280.78"
     }
   ],
   "status": "completed",
@@ -30,7 +30,6 @@
     }
   ],
   "whenHandedOver": "2024-04-03",
-  "whenPrepared": "2024-04-03",
   "medicationReference": {
     "reference": "Medication/Medication-Without-Strength-Code"
   }

diff --git a/...s/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-Kombipackung.json b/...s/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-Kombipackung.json
@@ -9,7 +9,7 @@
   "identifier": [
     {
       "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
-      "value": "160.153.303.257.459"
+      "value": "160.000.033.491.280.78"
     }
   ],
   "status": "completed",
@@ -30,7 +30,6 @@
     }
   ],
   "whenHandedOver": "2024-04-03",
-  "whenPrepared": "2024-04-03",
   "medicationReference": {
     "reference": "Medication/Medication-Kombipackung"
   }

diff --git a/...urces/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-Rezeptur.json b/...urces/fsh-generated/resources/MedicationDispense-Example-MedicationDispense-Rezeptur.json
@@ -9,7 +9,7 @@
   "identifier": [
     {
       "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
-      "value": "160.153.303.257.459"
+      "value": "160.000.033.491.280.78"
     }
   ],
   "status": "completed",
@@ -30,7 +30,6 @@
     }
   ],
   "whenHandedOver": "2024-04-03",
-  "whenPrepared": "2024-04-03",
   "medicationReference": {
     "reference": "Medication/Medication-Rezeptur"
   }

diff --git a/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense.json b/Resources/fsh-generated/resources/MedicationDispense-Example-MedicationDispense.json
@@ -30,7 +30,6 @@
     }
   ],
   "whenHandedOver": "2024-04-03",
-  "whenPrepared": "2024-04-03",
   "medicationReference": {
     "reference": "Medication/SumatripanMedication"
   }

diff --git a/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParameters.json b/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParameters.json
@@ -44,7 +44,6 @@
               }
             ],
             "whenHandedOver": "2024-04-03",
-            "whenPrepared": "2024-04-03",
             "medicationReference": {
               "reference": "Medication/SumatripanMedication"
             }

diff --git a/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParametersKombipackung.json b/Resources/fsh-generated/resources/Parameters-ExampleDispenseInputParametersKombipackung.json
@@ -23,7 +23,7 @@
             "identifier": [
               {
                 "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
-                "value": "160.153.303.257.459"
+                "value": "160.000.033.491.280.78"
               }
             ],
             "status": "completed",
@@ -44,7 +44,6 @@
               }
             ],
             "whenHandedOver": "2024-04-03",
-            "whenPrepared": "2024-04-03",
             "medicationReference": {
               "reference": "Medication/Medication-Kombipackung"
             }

diff --git a/...rated/resources/Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json b/...rated/resources/Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json
@@ -44,7 +44,6 @@
               }
             ],
             "whenHandedOver": "2024-04-03",
-            "whenPrepared": "2024-04-03",
             "medicationReference": {
               "reference": "Medication/SumatripanMedication"
             }
@@ -129,7 +128,7 @@
             "identifier": [
               {
                 "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
-                "value": "160.153.303.257.459"
+                "value": "160.000.033.491.280.78"
               }
             ],
             "status": "completed",
@@ -150,7 +149,6 @@
               }
             ],
             "whenHandedOver": "2024-04-03",
-            "whenPrepared": "2024-04-03",
             "medicationReference": {
               "reference": "Medication/Medication-Without-Strength-Code"
             }

diff --git a/Resources/fsh-generated/resources/Parameters-ExampleDispenseOutputParametersSuccess.json b/Resources/fsh-generated/resources/Parameters-ExampleDispenseOutputParametersSuccess.json
@@ -44,7 +44,6 @@
               }
             ],
             "whenHandedOver": "2024-04-03",
-            "whenPrepared": "2024-04-03",
             "medicationReference": {
               "reference": "Medication/SumatripanMedication"
             }

diff --git a/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParameters.json b/Resources/fsh-generated/resources/Parameters-ExampleOperationCloseInputParameters.json
@@ -44,7 +44,6 @@
               }
             ],
             "whenHandedOver": "2024-04-03",
-            "whenPrepared": "2024-04-03",
             "medicationReference": {
               "reference": "Medication/SumatripanMedication"
             }

diff --git a/.../fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersKombipackung.json b/.../fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersKombipackung.json
@@ -23,7 +23,7 @@
             "identifier": [
               {
                 "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
-                "value": "160.153.303.257.459"
+                "value": "160.000.033.491.280.78"
               }
             ],
             "status": "completed",
@@ -44,7 +44,6 @@
               }
             ],
             "whenHandedOver": "2024-04-03",
-            "whenPrepared": "2024-04-03",
             "medicationReference": {
               "reference": "Medication/Medication-Kombipackung"
             }

diff --git a/...resources/Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json b/...resources/Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json
@@ -44,7 +44,6 @@
               }
             ],
             "whenHandedOver": "2024-04-03",
-            "whenPrepared": "2024-04-03",
             "medicationReference": {
               "reference": "Medication/SumatripanMedication"
             }
@@ -129,7 +128,7 @@
             "identifier": [
               {
                 "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
-                "value": "160.153.303.257.459"
+                "value": "160.000.033.491.280.78"
               }
             ],
             "status": "completed",
@@ -150,7 +149,6 @@
               }
             ],
             "whenHandedOver": "2024-04-03",
-            "whenPrepared": "2024-04-03",
             "medicationReference": {
               "reference": "Medication/Medication-Without-Strength-Code"
             }

diff --git a/...rces/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersRezeptur.json b/...rces/fsh-generated/resources/Parameters-ExampleOperationCloseInputParametersRezeptur.json
@@ -23,7 +23,7 @@
             "identifier": [
               {
                 "system": "https://gematik.de/fhir/erp/NamingSystem/GEM_ERP_NS_PrescriptionId",
-                "value": "160.153.303.257.459"
+                "value": "160.000.033.491.280.78"
               }
             ],
             "status": "completed",
@@ -44,7 +44,6 @@
               }
             ],
             "whenHandedOver": "2024-04-03",
-            "whenPrepared": "2024-04-03",
             "medicationReference": {
               "reference": "Medication/Medication-Rezeptur"
             }

diff --git a/...generated/resources/Parameters-ExampleOperationCloseInputParametersWithoutMedication.json b/...generated/resources/Parameters-ExampleOperationCloseInputParametersWithoutMedication.json
@@ -44,7 +44,6 @@
               }
             ],
             "whenHandedOver": "2024-04-03",
-            "whenPrepared": "2024-04-03",
             "medicationReference": {
               "reference": "Medication/SumatripanMedication"
             }

diff --git a/Resources/input/fsh/examples/Example_MedicationDispense.fsh b/Resources/input/fsh/examples/Example_MedicationDispense.fsh
@@ -11,7 +11,6 @@ Description: "Example of a Medication Dispense."
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
 * whenHandedOver = "2024-04-03"
-* whenPrepared = "2024-04-03"
 * medicationReference = Reference(SumatripanMedication)
 
 Instance: Example-MedicationDispense-2
@@ -20,13 +19,12 @@ 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.153.303.257.459"
+* 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"
-* whenPrepared = "2024-04-03"
 * medicationReference = Reference(Medication-Without-Strength-Code)
 
 Instance: Example-MedicationDispense-Kombipackung
@@ -35,13 +33,12 @@ 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.153.303.257.459"
+* 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"
-* whenPrepared = "2024-04-03"
 * medicationReference = Reference(Medication-Kombipackung)
 
 Instance: Example-MedicationDispense-Rezeptur
@@ -50,13 +47,12 @@ 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.153.303.257.459"
+* 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"
-* whenPrepared = "2024-04-03"
 * medicationReference = Reference(Medication-Rezeptur)
 
 /*
@@ -73,7 +69,6 @@ Description: "Example of a Medication Dispense."
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
 * whenHandedOver = "2024"
-* whenPrepared = "2024"
 * contained[+] = SumatripanMedication
 * medicationReference = Reference(SumatripanMedication)
 
@@ -89,7 +84,6 @@ Description: "Example of a Medication Dispense."
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
 * whenHandedOver = "2024-04"
-* whenPrepared = "2024-04"
 * contained[+] = SumatripanMedication
 * medicationReference = Reference(SumatripanMedication)
 
@@ -105,7 +99,6 @@ Description: "Example of a Medication Dispense."
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "1-SMC-B-Testkarte-883110000095957"
 * whenHandedOver = "2024-04-03T15:28:00+00:00"
-* whenPrepared = "2024-04-03T15:28:00+00:00"
 * contained[+] = SumatripanMedication
 * medicationReference = Reference(SumatripanMedication)
 
@@ -121,7 +114,6 @@ Description: "Example of a Medication Dispense."
 * performer.actor.identifier.system = $identifier-telematik-id
 * performer.actor.identifier.value = "3-SMC-B-Testkarte-883110000095957"
 * whenHandedOver = "2024-04-03T00:00:00.000Z"
-* whenPrepared = "2024-04-03T00:00:00.000Z"
 * contained[+] = SumatripanMedication
 * medicationReference = Reference(SumatripanMedication)