Merge pull request #101 from gematik/feat/maintenance

Feat/maintenance
gematik · Dec 19, 2023 · 2c7b0e4 · 2c7b0e4
2 parents f2c7dcd + 8bf7809
commit 2c7b0e4
Show file tree

Hide file tree

Showing 9 changed files with 689 additions and 472 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,9 +6,7 @@ name: CI (FHIR Validation)
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -29,7 +27,7 @@ jobs:
       # Java and .NET are already installed on ubuntu-latest
 
       - name: Firely.Terminal (GitHub Actions)
-        uses: FirelyTeam/firely-terminal-pipeline@v0.3.5
+        uses: FirelyTeam/firely-terminal-pipeline@v0.4.0
         with:
           PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/
           #PATH_TO_EXAMPLES: Examples
@@ -42,7 +40,7 @@ jobs:
           SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
           SUSHI_ENABLED: true
           SUSHI_OPTIONS: Resources/
-          SUSHI_VERSION: 2.10.2
+          SUSHI_VERSION: 3.5.0
           EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA
 
       - name: Add & Commit

diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament2.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament2.json
@@ -8,15 +8,6 @@
   },
   "ingredient": [
     {
-      "extension": [
-        {
-          "valueCoding": {
-            "system": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/CodeSystem/wirkstofftyp",
-            "code": "IN"
-          },
-          "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/StructureDefinition/wirkstofftyp"
-        }
-      ],
       "strength": {
         "numerator": {
           "system": "http://unitsofmeasure.org",
@@ -31,6 +22,15 @@
           "code": "mL"
         }
       },
+      "extension": [
+        {
+          "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/StructureDefinition/wirkstofftyp",
+          "valueCoding": {
+            "system": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/CodeSystem/wirkstofftyp",
+            "code": "IN"
+          }
+        }
+      ],
       "itemCodeableConcept": {
         "coding": [
           {

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json
@@ -335,8 +335,23 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept",
-        "path": "Medication.ingredient.itemCodeableConcept",
+        "id": "Medication.ingredient.item[x]",
+        "path": "Medication.ingredient.item[x]",
+        "slicing": {
+          "discriminator": [
+            {
+              "type": "type",
+              "path": "$this"
+            }
+          ],
+          "ordered": false,
+          "rules": "open"
+        }
+      },
+      {
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept",
+        "path": "Medication.ingredient.item[x]",
+        "sliceName": "itemCodeableConcept",
         "short": "Bestandteil in codierter Form oder ggf. als Freitext",
         "min": 0,
         "max": "1",
@@ -348,8 +363,8 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding",
-        "path": "Medication.ingredient.itemCodeableConcept.coding",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding",
+        "path": "Medication.ingredient.item[x].coding",
         "slicing": {
           "discriminator": [
             {
@@ -362,8 +377,8 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:ASK",
-        "path": "Medication.ingredient.itemCodeableConcept.coding",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ASK",
+        "path": "Medication.ingredient.item[x].coding",
         "sliceName": "ASK",
         "min": 0,
         "max": "1",
@@ -373,25 +388,25 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:ASK.system",
-        "path": "Medication.ingredient.itemCodeableConcept.coding.system",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ASK.system",
+        "path": "Medication.ingredient.item[x].coding.system",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:ASK.code",
-        "path": "Medication.ingredient.itemCodeableConcept.coding.code",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ASK.code",
+        "path": "Medication.ingredient.item[x].coding.code",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:ASK.display",
-        "path": "Medication.ingredient.itemCodeableConcept.coding.display",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ASK.display",
+        "path": "Medication.ingredient.item[x].coding.display",
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:ATC-DE",
-        "path": "Medication.ingredient.itemCodeableConcept.coding",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ATC-DE",
+        "path": "Medication.ingredient.item[x].coding",
         "sliceName": "ATC-DE",
         "min": 0,
         "max": "1",
@@ -401,25 +416,25 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:ATC-DE.system",
-        "path": "Medication.ingredient.itemCodeableConcept.coding.system",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ATC-DE.system",
+        "path": "Medication.ingredient.item[x].coding.system",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:ATC-DE.code",
-        "path": "Medication.ingredient.itemCodeableConcept.coding.code",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ATC-DE.code",
+        "path": "Medication.ingredient.item[x].coding.code",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:ATC-DE.display",
-        "path": "Medication.ingredient.itemCodeableConcept.coding.display",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ATC-DE.display",
+        "path": "Medication.ingredient.item[x].coding.display",
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:PZN",
-        "path": "Medication.ingredient.itemCodeableConcept.coding",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:PZN",
+        "path": "Medication.ingredient.item[x].coding",
         "sliceName": "PZN",
         "min": 0,
         "max": "1",
@@ -429,25 +444,25 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:PZN.system",
-        "path": "Medication.ingredient.itemCodeableConcept.coding.system",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:PZN.system",
+        "path": "Medication.ingredient.item[x].coding.system",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:PZN.code",
-        "path": "Medication.ingredient.itemCodeableConcept.coding.code",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:PZN.code",
+        "path": "Medication.ingredient.item[x].coding.code",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:PZN.display",
-        "path": "Medication.ingredient.itemCodeableConcept.coding.display",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:PZN.display",
+        "path": "Medication.ingredient.item[x].coding.display",
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:WG14",
-        "path": "Medication.ingredient.itemCodeableConcept.coding",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:WG14",
+        "path": "Medication.ingredient.item[x].coding",
         "sliceName": "WG14",
         "min": 0,
         "max": "1",
@@ -457,30 +472,31 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:WG14.system",
-        "path": "Medication.ingredient.itemCodeableConcept.coding.system",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:WG14.system",
+        "path": "Medication.ingredient.item[x].coding.system",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:WG14.code",
-        "path": "Medication.ingredient.itemCodeableConcept.coding.code",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:WG14.code",
+        "path": "Medication.ingredient.item[x].coding.code",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.coding:WG14.display",
-        "path": "Medication.ingredient.itemCodeableConcept.coding.display",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:WG14.display",
+        "path": "Medication.ingredient.item[x].coding.display",
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemCodeableConcept.text",
-        "path": "Medication.ingredient.itemCodeableConcept.text",
+        "id": "Medication.ingredient.item[x]:itemCodeableConcept.text",
+        "path": "Medication.ingredient.item[x].text",
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemReference",
-        "path": "Medication.ingredient.itemReference",
+        "id": "Medication.ingredient.item[x]:itemReference",
+        "path": "Medication.ingredient.item[x]",
+        "sliceName": "itemReference",
         "short": "Bestandteil (Referenz auf ein anderes Medikament)",
         "min": 0,
         "max": "1",
@@ -496,8 +512,8 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.itemReference.reference",
-        "path": "Medication.ingredient.itemReference.reference",
+        "id": "Medication.ingredient.item[x]:itemReference.reference",
+        "path": "Medication.ingredient.item[x].reference",
         "min": 1,
         "mustSupport": true
       },