Merge pull request #120 from gematik/TC_3.0.2

Tc 3.0.2
gematik · May 8, 2024 · e7fed8c · e7fed8c
2 parents c19221a + 0726aa7
commit e7fed8c
Show file tree

Hide file tree

Showing 19 changed files with 99 additions and 198 deletions.
diff --git a/.github/workflows/TC-version-update.yml b/.github/workflows/TC-version-update.yml
@@ -0,0 +1,39 @@
+name: TC version update
+
+# Controls when the action will run. 
+on:
+  push:
+    branches:
+      - 'TC-*'
+      - 'TC_*'
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:        
+
+# setup python and run script 
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        steps:
+          - name: checkout repo content
+            uses: actions/checkout@v2 # checkout the repository content
+
+          - name: setup python
+            uses: actions/setup-python@v4
+            with:
+              python-version: '3.10' # install the python version needed
+
+          - name: install python packages
+            run: |
+              python -m pip install --upgrade pip
+              pip install pyyaml
+    
+          - name: execute py script # run main.py
+            run: python ./scripts/release_publish.py -b
+
+          - name: Add & Commit
+            uses: EndBug/add-and-commit@v9
+            with:
+              committer_name: GitHub Actions Bot
+              committer_email: [email protected]
+              message: auto-generated file update of TC version by GitHub Actions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,7 +33,7 @@ jobs:
       # Java and .NET are already installed on ubuntu-latest
 
       - name: Firely.Terminal (GitHub Actions)
-        uses: FirelyTeam/[email protected].0
+        uses: FirelyTeam/[email protected].1
         with:
           PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/
           #PATH_TO_EXAMPLES: Examples
@@ -46,7 +46,7 @@ jobs:
           SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
           SUSHI_ENABLED: true
           SUSHI_OPTIONS: Resources/
-          SUSHI_VERSION: 3.5.0
+          SUSHI_VERSION: 3.9.0
           EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA
 
       - name: Add & Commit

diff --git a/ImplementationGuide/markdown/Einfuehrung.md b/ImplementationGuide/markdown/Einfuehrung.md
@@ -1,9 +1,9 @@
 <img src="https://raw.githubusercontent.com/gematik/spec-ISiK-Medikation/main-stufe-3/Material/images/Gematik_Logo_Flag.svg" alt="gematik logo" width="400"/>
 
 ----
-Version: 3.0.1
+Version: 3.0.2
 
-Datum: 12.01.2024
+Datum: 08.05.2024
 
 Status: Aktiv
 

diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md
@@ -4,6 +4,13 @@ Im Rahmen der ISiK-Veröffentlichungen wird das [Semantic Versioning](https://se
 
 Die erste Ziffer X bezeichnet ein Major-Release und regelt die Gültigkeit von Releases. Die dritte Ziffer Y (Release x.0.y) bezeichnet eine technische Korrektur und versioniert kleinere Änderungen (Packages) während eines Jahres, z. B. 1.0.1.
 
+Version: 3.0.2
+
+Datum: 8.5.2024
+
+* Update ISIK Basismodul Dependency to Wildcard
+
+----
 Version: 3.0.1
 
 Datum: 08.01.2024

diff --git a/...generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json b/...generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json
@@ -4,11 +4,11 @@
   "url": "https://gematik.de/fhir/isik/v3/Medikation/CapabilityStatement/medikation-server/information",
   "status": "active",
   "experimental": false,
-  "version": "3.0.1",
+  "version": "3.0.2",
   "publisher": "gematik GmbH",
-  "date": "2024-01-12",
+  "date": "2024-05-08",
   "implementationGuide": [
-    "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.1"
+    "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.2"
   ],
   "name": "ISiKCapabilityStatementMedikationInformation",
   "title": "ISiK CapabilityStatement Medikation Server - Medikationsinformation",

diff --git a/...nerated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json b/...nerated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json
@@ -4,11 +4,11 @@
   "url": "https://gematik.de/fhir/isik/v3/Medikation/CapabilityStatement/medikation-server/verabreichung",
   "status": "active",
   "experimental": false,
-  "version": "3.0.1",
+  "version": "3.0.2",
   "publisher": "gematik GmbH",
-  "date": "2024-01-12",
+  "date": "2024-05-08",
   "implementationGuide": [
-    "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.1"
+    "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.2"
   ],
   "name": "ISiKCapabilityStatementMedikationVerabreichung",
   "title": "ISiK CapabilityStatement Medikation Server - Medikationsverabreichung",

diff --git a/...-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json b/...-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json
@@ -4,11 +4,11 @@
   "url": "https://gematik.de/fhir/isik/v3/Medikation/CapabilityStatement/medikation-server/verordnung",
   "status": "active",
   "experimental": false,
-  "version": "3.0.1",
+  "version": "3.0.2",
   "publisher": "gematik GmbH",
-  "date": "2024-01-12",
+  "date": "2024-05-08",
   "implementationGuide": [
-    "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.1"
+    "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.2"
   ],
   "name": "ISiKCapabilityStatementMedikationVerordnung",
   "title": "ISiK CapabilityStatement Medikation Server - Medikationsverordnung",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json
@@ -2,36 +2,14 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikament",
   "url": "https://gematik.de/fhir/isik/v3/Medikation/StructureDefinition/ISiKMedikament",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "name": "ISiKMedikament",
   "status": "active",
   "experimental": false,
-  "date": "2024-01-12",
+  "date": "2024-05-08",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Abbildung von patientenunabhängigen Informationen zu Medikamenten in ISiK Szenarien.",
   "fhirVersion": "4.0.1",
-  "mapping": [
-    {
-      "identity": "script10.6",
-      "uri": "http://ncpdp.org/SCRIPT10_6",
-      "name": "Mapping to NCPDP SCRIPT 10.6"
-    },
-    {
-      "identity": "rim",
-      "uri": "http://hl7.org/v3",
-      "name": "RIM Mapping"
-    },
-    {
-      "identity": "w5",
-      "uri": "http://hl7.org/fhir/fivews",
-      "name": "FiveWs Pattern Mapping"
-    },
-    {
-      "identity": "v2",
-      "uri": "http://hl7.org/v2",
-      "name": "HL7 v2 Mapping"
-    }
-  ],
   "kind": "resource",
   "abstract": false,
   "type": "Medication",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransaction.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransaction.json
@@ -2,36 +2,14 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikationTransaction",
   "url": "https://gematik.de/fhir/isik/v3/Medikation/StructureDefinition/ISiKMedikationTransaction",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "name": "ISiKMedikationTransaction",
   "status": "active",
   "experimental": false,
-  "date": "2024-01-12",
+  "date": "2024-05-08",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil definiert die Transaktions-Bundles im Rahmen von ISiK-Medikations-Szenarien.",
   "fhirVersion": "4.0.1",
-  "mapping": [
-    {
-      "identity": "v2",
-      "uri": "http://hl7.org/v2",
-      "name": "HL7 v2 Mapping"
-    },
-    {
-      "identity": "rim",
-      "uri": "http://hl7.org/v3",
-      "name": "RIM Mapping"
-    },
-    {
-      "identity": "cda",
-      "uri": "http://hl7.org/v3/cda",
-      "name": "CDA (R2)"
-    },
-    {
-      "identity": "w5",
-      "uri": "http://hl7.org/fhir/fivews",
-      "name": "FiveWs Pattern Mapping"
-    }
-  ],
   "kind": "resource",
   "abstract": false,
   "type": "Bundle",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransactionResponse.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransactionResponse.json
@@ -2,36 +2,14 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikationTransactionResponse",
   "url": "https://gematik.de/fhir/isik/v3/Medikation/StructureDefinition/ISiKMedikationTransactionResponse",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "name": "ISiKMedikationTransactionResponse",
   "status": "active",
   "experimental": false,
-  "date": "2024-01-12",
+  "date": "2024-05-08",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil definiert die Server-Antwort auf Transaktions-Bundles im Rahmen von ISiK-Medikations-Szenarien.",
   "fhirVersion": "4.0.1",
-  "mapping": [
-    {
-      "identity": "v2",
-      "uri": "http://hl7.org/v2",
-      "name": "HL7 v2 Mapping"
-    },
-    {
-      "identity": "rim",
-      "uri": "http://hl7.org/v3",
-      "name": "RIM Mapping"
-    },
-    {
-      "identity": "cda",
-      "uri": "http://hl7.org/v3/cda",
-      "name": "CDA (R2)"
-    },
-    {
-      "identity": "w5",
-      "uri": "http://hl7.org/fhir/fivews",
-      "name": "FiveWs Pattern Mapping"
-    }
-  ],
   "kind": "resource",
   "abstract": false,
   "type": "Bundle",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json
@@ -2,36 +2,14 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikationsInformation",
   "url": "https://gematik.de/fhir/isik/v3/Medikation/StructureDefinition/ISiKMedikationsInformation",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "name": "ISiKMedikationsInformation",
   "status": "active",
   "experimental": false,
-  "date": "2024-01-12",
+  "date": "2024-05-08",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Abbildung von Informationen zur Medikation eines Patienten in ISiK Szenarien.",
   "fhirVersion": "4.0.1",
-  "mapping": [
-    {
-      "identity": "workflow",
-      "uri": "http://hl7.org/fhir/workflow",
-      "name": "Workflow Pattern"
-    },
-    {
-      "identity": "rim",
-      "uri": "http://hl7.org/v3",
-      "name": "RIM Mapping"
-    },
-    {
-      "identity": "w5",
-      "uri": "http://hl7.org/fhir/fivews",
-      "name": "FiveWs Pattern Mapping"
-    },
-    {
-      "identity": "v2",
-      "uri": "http://hl7.org/v2",
-      "name": "HL7 v2 Mapping"
-    }
-  ],
   "kind": "resource",
   "abstract": false,
   "type": "MedicationStatement",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsListe.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsListe.json
@@ -2,26 +2,14 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikationsListe",
   "url": "https://gematik.de/fhir/isik/v3/Medikation/StructureDefinition/ISiKMedikationsListe",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "name": "ISiKMedikationsListe",
   "status": "active",
   "experimental": false,
-  "date": "2024-01-12",
+  "date": "2024-05-08",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Zusammenführung einzelner MedikationsInformationen eines Patienten in ISiK Szenarien.",
   "fhirVersion": "4.0.1",
-  "mapping": [
-    {
-      "identity": "rim",
-      "uri": "http://hl7.org/v3",
-      "name": "RIM Mapping"
-    },
-    {
-      "identity": "w5",
-      "uri": "http://hl7.org/fhir/fivews",
-      "name": "FiveWs Pattern Mapping"
-    }
-  ],
   "kind": "resource",
   "abstract": false,
   "type": "List",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json
@@ -2,41 +2,14 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikationsVerabreichung",
   "url": "https://gematik.de/fhir/isik/v3/Medikation/StructureDefinition/ISiKMedikationsVerabreichung",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "name": "ISiKMedikationsVerabreichung",
   "status": "active",
   "experimental": false,
-  "date": "2024-01-12",
+  "date": "2024-05-08",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Abbildung der Verabreichung von Medikamenten für einen Patienten in ISiK Szenarien.",
   "fhirVersion": "4.0.1",
-  "mapping": [
-    {
-      "identity": "workflow",
-      "uri": "http://hl7.org/fhir/workflow",
-      "name": "Workflow Pattern"
-    },
-    {
-      "identity": "rim",
-      "uri": "http://hl7.org/v3",
-      "name": "RIM Mapping"
-    },
-    {
-      "identity": "w5",
-      "uri": "http://hl7.org/fhir/fivews",
-      "name": "FiveWs Pattern Mapping"
-    },
-    {
-      "identity": "v2",
-      "uri": "http://hl7.org/v2",
-      "name": "HL7 v2 Mapping"
-    },
-    {
-      "identity": "w3c.prov",
-      "uri": "http://www.w3.org/ns/prov",
-      "name": "W3C PROV"
-    }
-  ],
   "kind": "resource",
   "abstract": false,
   "type": "MedicationAdministration",