Merge pull request #60 from gematik/release/wf-1.4.2

Updates for Package 1.4.2
gematik · Sep 10, 2024 · 094d61f · 094d61f
2 parents 07584b2 + 172dc45
commit 094d61f
Show file tree

Hide file tree

Showing 49 changed files with 632 additions and 484 deletions.
diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json
@@ -92,7 +92,7 @@
     "fshName": "Augentropfen",
     "fshType": "Instance",
     "fshFile": "examples/Example_Medication_Kombipackung.fsh",
-    "startLine": 19,
+    "startLine": 20,
     "endLine": 37
   },
   {
@@ -101,7 +101,7 @@
     "fshType": "Instance",
     "fshFile": "examples/Example_Medication_Kombipackung.fsh",
     "startLine": 2,
-    "endLine": 17
+    "endLine": 18
   },
   {
     "outputFile": "Medication-Medication-Rezeptur-FD.json",
@@ -124,16 +124,16 @@
     "fshName": "Medication-Without-Strength-Code",
     "fshType": "Instance",
     "fshFile": "examples/Example_Medication.fsh",
-    "startLine": 26,
-    "endLine": 43
+    "startLine": 33,
+    "endLine": 50
   },
   {
     "outputFile": "Medication-Medication-Without-Strength-Numerator.json",
     "fshName": "Medication-Without-Strength-Numerator",
     "fshType": "Instance",
     "fshFile": "examples/Example_Medication.fsh",
-    "startLine": 45,
-    "endLine": 63
+    "startLine": 52,
+    "endLine": 70
   },
   {
     "outputFile": "Medication-MedicationDexpanthenol-FD.json",
@@ -173,7 +173,15 @@
     "fshType": "Instance",
     "fshFile": "examples/Example_Medication_Kombipackung.fsh",
     "startLine": 39,
-    "endLine": 57
+    "endLine": 56
+  },
+  {
+    "outputFile": "Medication-SimpleMedication.json",
+    "fshName": "SimpleMedication",
+    "fshType": "Instance",
+    "fshFile": "examples/Example_Medication.fsh",
+    "startLine": 25,
+    "endLine": 30
   },
   {
     "outputFile": "Medication-SumatripanMedication.json",
@@ -188,8 +196,8 @@
     "fshName": "Example-MedicationDispense-2",
     "fshType": "Instance",
     "fshFile": "examples/Example_MedicationDispense.fsh",
-    "startLine": 16,
-    "endLine": 28
+    "startLine": 29,
+    "endLine": 41
   },
   {
     "outputFile": "MedicationDispense-Example-MedicationDispense-DiGA-DeepLink.json",
@@ -220,24 +228,32 @@
     "fshName": "Example-MedicationDispense-Kombipackung",
     "fshType": "Instance",
     "fshFile": "examples/Example_MedicationDispense.fsh",
-    "startLine": 30,
-    "endLine": 42
+    "startLine": 43,
+    "endLine": 55
   },
   {
     "outputFile": "MedicationDispense-Example-MedicationDispense-Rezeptur.json",
     "fshName": "Example-MedicationDispense-Rezeptur",
     "fshType": "Instance",
     "fshFile": "examples/Example_MedicationDispense.fsh",
-    "startLine": 44,
-    "endLine": 56
+    "startLine": 57,
+    "endLine": 69
+  },
+  {
+    "outputFile": "MedicationDispense-Example-MedicationDispense-Without-Medication.json",
+    "fshName": "Example-MedicationDispense-Without-Medication",
+    "fshType": "Instance",
+    "fshFile": "examples/Example_MedicationDispense.fsh",
+    "startLine": 15,
+    "endLine": 27
   },
   {
     "outputFile": "MedicationDispense-Example-MedicationDispense.json",
     "fshName": "Example-MedicationDispense",
     "fshType": "Instance",
     "fshFile": "examples/Example_MedicationDispense.fsh",
-    "startLine": 2,
-    "endLine": 14
+    "startLine": 1,
+    "endLine": 13
   },
   {
     "outputFile": "OperationDefinition-AbortOperation.json",
@@ -332,8 +348,8 @@
     "fshName": "ExampleOperationCloseError",
     "fshType": "Instance",
     "fshFile": "examples/Example_Operation_Close.fsh",
-    "startLine": 81,
-    "endLine": 89
+    "startLine": 1,
+    "endLine": 9
   },
   {
     "outputFile": "OperationOutcome-ExampleOperationCreateError.json",
@@ -351,43 +367,83 @@
     "startLine": 1,
     "endLine": 8
   },
+  {
+    "outputFile": "Parameters-ExampleCloseInputParameters.json",
+    "fshName": "ExampleCloseInputParameters",
+    "fshType": "Instance",
+    "fshFile": "examples/parameters_examples/Example_Parameters_Close.fsh",
+    "startLine": 1,
+    "endLine": 12
+  },
+  {
+    "outputFile": "Parameters-ExampleCloseInputParametersDiGA.json",
+    "fshName": "ExampleCloseInputParametersDiGA",
+    "fshType": "Instance",
+    "fshFile": "examples/parameters_examples/Example_Parameters_Close.fsh",
+    "startLine": 61,
+    "endLine": 69
+  },
+  {
+    "outputFile": "Parameters-ExampleCloseInputParametersKombipackung.json",
+    "fshName": "ExampleCloseInputParametersKombipackung",
+    "fshType": "Instance",
+    "fshFile": "examples/parameters_examples/Example_Parameters_Close.fsh",
+    "startLine": 35,
+    "endLine": 46
+  },
+  {
+    "outputFile": "Parameters-ExampleCloseInputParametersMultipleMedicationDispenses.json",
+    "fshName": "ExampleCloseInputParametersMultipleMedicationDispenses",
+    "fshType": "Instance",
+    "fshFile": "examples/parameters_examples/Example_Parameters_Close.fsh",
+    "startLine": 14,
+    "endLine": 33
+  },
+  {
+    "outputFile": "Parameters-ExampleCloseInputParametersRezeptur.json",
+    "fshName": "ExampleCloseInputParametersRezeptur",
+    "fshType": "Instance",
+    "fshFile": "examples/parameters_examples/Example_Parameters_Close.fsh",
+    "startLine": 48,
+    "endLine": 59
+  },
   {
     "outputFile": "Parameters-ExampleDispenseInputParameters.json",
     "fshName": "ExampleDispenseInputParameters",
     "fshType": "Instance",
-    "fshFile": "examples/Example_Operation_Dispense.fsh",
+    "fshFile": "examples/parameters_examples/Example_Parameters_Dispense.fsh",
     "startLine": 1,
     "endLine": 12
   },
   {
     "outputFile": "Parameters-ExampleDispenseInputParametersKombipackung.json",
     "fshName": "ExampleDispenseInputParametersKombipackung",
     "fshType": "Instance",
-    "fshFile": "examples/Example_Operation_Dispense.fsh",
+    "fshFile": "examples/parameters_examples/Example_Parameters_Dispense.fsh",
     "startLine": 35,
     "endLine": 46
   },
   {
     "outputFile": "Parameters-ExampleDispenseInputParametersMultipleMedicationDispenses.json",
     "fshName": "ExampleDispenseInputParametersMultipleMedicationDispenses",
     "fshType": "Instance",
-    "fshFile": "examples/Example_Operation_Dispense.fsh",
+    "fshFile": "examples/parameters_examples/Example_Parameters_Dispense.fsh",
     "startLine": 14,
     "endLine": 33
   },
   {
     "outputFile": "Parameters-ExampleDispenseOutputParametersError.json",
     "fshName": "ExampleDispenseOutputParametersError",
     "fshType": "Instance",
-    "fshFile": "examples/Example_Operation_Dispense.fsh",
+    "fshFile": "examples/parameters_examples/Example_Parameters_Dispense.fsh",
     "startLine": 61,
     "endLine": 69
   },
   {
     "outputFile": "Parameters-ExampleDispenseOutputParametersSuccess.json",
     "fshName": "ExampleDispenseOutputParametersSuccess",
     "fshType": "Instance",
-    "fshFile": "examples/Example_Operation_Dispense.fsh",
+    "fshFile": "examples/parameters_examples/Example_Parameters_Dispense.fsh",
     "startLine": 48,
     "endLine": 59
   },
@@ -399,54 +455,6 @@
     "startLine": 1,
     "endLine": 6
   },
-  {
-    "outputFile": "Parameters-ExampleOperationCloseInputParameters.json",
-    "fshName": "ExampleOperationCloseInputParameters",
-    "fshType": "Instance",
-    "fshFile": "examples/Example_Operation_Close.fsh",
-    "startLine": 1,
-    "endLine": 12
-  },
-  {
-    "outputFile": "Parameters-ExampleOperationCloseInputParametersDiGA.json",
-    "fshName": "ExampleOperationCloseInputParametersDiGA",
-    "fshType": "Instance",
-    "fshFile": "examples/Example_Operation_Close.fsh",
-    "startLine": 71,
-    "endLine": 79
-  },
-  {
-    "outputFile": "Parameters-ExampleOperationCloseInputParametersKombipackung.json",
-    "fshName": "ExampleOperationCloseInputParametersKombipackung",
-    "fshType": "Instance",
-    "fshFile": "examples/Example_Operation_Close.fsh",
-    "startLine": 45,
-    "endLine": 56
-  },
-  {
-    "outputFile": "Parameters-ExampleOperationCloseInputParametersMultipleMedicationDispenses.json",
-    "fshName": "ExampleOperationCloseInputParametersMultipleMedicationDispenses",
-    "fshType": "Instance",
-    "fshFile": "examples/Example_Operation_Close.fsh",
-    "startLine": 24,
-    "endLine": 43
-  },
-  {
-    "outputFile": "Parameters-ExampleOperationCloseInputParametersRezeptur.json",
-    "fshName": "ExampleOperationCloseInputParametersRezeptur",
-    "fshType": "Instance",
-    "fshFile": "examples/Example_Operation_Close.fsh",
-    "startLine": 58,
-    "endLine": 69
-  },
-  {
-    "outputFile": "Parameters-ExampleOperationCloseInputParametersWithoutMedication.json",
-    "fshName": "ExampleOperationCloseInputParametersWithoutMedication",
-    "fshType": "Instance",
-    "fshFile": "examples/Example_Operation_Close.fsh",
-    "startLine": 14,
-    "endLine": 22
-  },
   {
     "outputFile": "Parameters-OperationCreateParametersInputExample.json",
     "fshName": "OperationCreateParametersInputExample",
@@ -717,7 +725,7 @@
     "fshType": "Profile",
     "fshFile": "parameters/GEM_ERP_PR_PAR_CloseOperation_Input.fsh",
     "startLine": 1,
-    "endLine": 41
+    "endLine": 43
   },
   {
     "outputFile": "StructureDefinition-GEM-ERP-PR-PAR-Close-Operation-Output.json",
@@ -749,7 +757,7 @@
     "fshType": "Profile",
     "fshFile": "parameters/GEM_ERP_PR_PAR_DispenseOperation_Input.fsh",
     "startLine": 1,
-    "endLine": 41
+    "endLine": 42
   },
   {
     "outputFile": "StructureDefinition-GEM-ERP-PR-PAR-Dispense-Operation-Output.json",