Merge pull request #146 from gematik/TC_3.0.4

Tc 3.0.4
gematik · Nov 20, 2024 · 88b4efa · 88b4efa
2 parents 2b6e878 + ec023ab
commit 88b4efa
Show file tree

Hide file tree

Showing 22 changed files with 50 additions and 82 deletions.
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].1
+        uses: FirelyTeam/[email protected].3
         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.9.0
+          SUSHI_VERSION: 3.12.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.3
+Version: 3.0.4
 
-Datum: 03.07.2024
+Datum: 20.11.2024
 
 Status: Aktiv
 

diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md
@@ -4,6 +4,14 @@ 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.4
+
+Datum: 20.11.2024
+
+* #Entfernen der MS-Flag für .id, da irreführend (Analog in Stufe 4.0.0) https://github.com/gematik/spec-ISiK-Medikation/pull/137
+* Update ISiK Basismodul Dependency
+
+----
 
 Version: 3.0.3
 

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.3",
+  "version": "3.0.4",
   "publisher": "gematik GmbH",
-  "date": "2024-07-03",
+  "date": "2024-11-20",
   "implementationGuide": [
-    "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.3"
+    "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.4"
   ],
   "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.3",
+  "version": "3.0.4",
   "publisher": "gematik GmbH",
-  "date": "2024-07-03",
+  "date": "2024-11-20",
   "implementationGuide": [
-    "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.3"
+    "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.4"
   ],
   "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.3",
+  "version": "3.0.4",
   "publisher": "gematik GmbH",
-  "date": "2024-07-03",
+  "date": "2024-11-20",
   "implementationGuide": [
-    "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.3"
+    "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.4"
   ],
   "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,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikament",
   "url": "https://gematik.de/fhir/isik/v3/Medikation/StructureDefinition/ISiKMedikament",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKMedikament",
   "status": "active",
   "experimental": false,
-  "date": "2024-07-03",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Abbildung von patientenunabhängigen Informationen zu Medikamenten in ISiK Szenarien.",
   "fhirVersion": "4.0.1",
@@ -30,12 +30,6 @@
           }
         ]
       },
-      {
-        "id": "Medication.id",
-        "path": "Medication.id",
-        "short": "eindeutige ID der Ressource auf dem Server",
-        "mustSupport": true
-      },
       {
         "id": "Medication.code",
         "path": "Medication.code",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransaction.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransaction.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikationTransaction",
   "url": "https://gematik.de/fhir/isik/v3/Medikation/StructureDefinition/ISiKMedikationTransaction",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKMedikationTransaction",
   "status": "active",
   "experimental": false,
-  "date": "2024-07-03",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil definiert die Transaktions-Bundles im Rahmen von ISiK-Medikations-Szenarien.",
   "fhirVersion": "4.0.1",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransactionResponse.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransactionResponse.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikationTransactionResponse",
   "url": "https://gematik.de/fhir/isik/v3/Medikation/StructureDefinition/ISiKMedikationTransactionResponse",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKMedikationTransactionResponse",
   "status": "active",
   "experimental": false,
-  "date": "2024-07-03",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil definiert die Server-Antwort auf Transaktions-Bundles im Rahmen von ISiK-Medikations-Szenarien.",
   "fhirVersion": "4.0.1",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikationsInformation",
   "url": "https://gematik.de/fhir/isik/v3/Medikation/StructureDefinition/ISiKMedikationsInformation",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKMedikationsInformation",
   "status": "active",
   "experimental": false,
-  "date": "2024-07-03",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Abbildung von Informationen zur Medikation eines Patienten in ISiK Szenarien.",
   "fhirVersion": "4.0.1",
@@ -17,12 +17,6 @@
   "derivation": "constraint",
   "differential": {
     "element": [
-      {
-        "id": "MedicationStatement.id",
-        "path": "MedicationStatement.id",
-        "short": "eindeutige ID der Ressource auf dem Server",
-        "mustSupport": true
-      },
       {
         "id": "MedicationStatement.status",
         "path": "MedicationStatement.status",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsListe.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsListe.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikationsListe",
   "url": "https://gematik.de/fhir/isik/v3/Medikation/StructureDefinition/ISiKMedikationsListe",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKMedikationsListe",
   "status": "active",
   "experimental": false,
-  "date": "2024-07-03",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Zusammenführung einzelner MedikationsInformationen eines Patienten in ISiK Szenarien.",
   "fhirVersion": "4.0.1",
@@ -17,12 +17,6 @@
   "derivation": "constraint",
   "differential": {
     "element": [
-      {
-        "id": "List.id",
-        "path": "List.id",
-        "short": "eindeutige ID der Ressource auf dem Server",
-        "mustSupport": true
-      },
       {
         "id": "List.status",
         "path": "List.status",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikationsVerabreichung",
   "url": "https://gematik.de/fhir/isik/v3/Medikation/StructureDefinition/ISiKMedikationsVerabreichung",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKMedikationsVerabreichung",
   "status": "active",
   "experimental": false,
-  "date": "2024-07-03",
+  "date": "2024-11-20",
   "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",
@@ -17,12 +17,6 @@
   "derivation": "constraint",
   "differential": {
     "element": [
-      {
-        "id": "MedicationAdministration.id",
-        "path": "MedicationAdministration.id",
-        "short": "eindeutige ID der Ressource auf dem Server",
-        "mustSupport": true
-      },
       {
         "id": "MedicationAdministration.status",
         "path": "MedicationAdministration.status",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikationsVerordnung",
   "url": "https://gematik.de/fhir/isik/v3/Medikation/StructureDefinition/ISiKMedikationsVerordnung",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKMedikationsVerordnung",
   "status": "active",
   "experimental": false,
-  "date": "2024-07-03",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Abbildung von Medikationsverordnungen eines Patienten in ISiK Szenarien.",
   "fhirVersion": "4.0.1",
@@ -17,12 +17,6 @@
   "derivation": "constraint",
   "differential": {
     "element": [
-      {
-        "id": "MedicationRequest.id",
-        "path": "MedicationRequest.id",
-        "short": "eindeutige ID der Ressource auf dem Server",
-        "mustSupport": true
-      },
       {
         "id": "MedicationRequest.status",
         "path": "MedicationRequest.status",

diff --git a/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json b/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json
@@ -4,11 +4,11 @@
   "name": "SctRouteOfAdministration",
   "id": "SctRouteOfAdministration",
   "description": "Enthaelt alle SNOMED CT Administrationsarten",
+  "version": "3.0.4",
   "url": "https://gematik.de/fhir/isik/v3/Medikation/ValueSet/SctRouteOfAdministration",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "version": "3.0.3",
-  "date": "2024-07-03",
+  "date": "2024-11-20",
   "compose": {
     "include": [
       {

diff --git a/Resources/input/fsh/ISiKMedikament.fsh b/Resources/input/fsh/ISiKMedikament.fsh
@@ -4,8 +4,6 @@ Id: ISiKMedikament
 Description: "Dieses Profil ermöglicht die Abbildung von patientenunabhängigen Informationen zu Medikamenten in ISiK Szenarien."
 * insert Meta
 * obeys isik-med-1
-* id MS
-  * ^short = "eindeutige ID der Ressource auf dem Server"
 * code MS
   * ^short = "Medikament in codierter Form oder ggf. als Freitext"
   * coding MS

diff --git a/Resources/input/fsh/ISiKMedikationsInformation.fsh b/Resources/input/fsh/ISiKMedikationsInformation.fsh
@@ -3,8 +3,6 @@ Parent: MedicationStatement
 Id: ISiKMedikationsInformation
 Description: "Dieses Profil ermöglicht die Abbildung von Informationen zur Medikation eines Patienten in ISiK Szenarien."
 * insert Meta
-* id MS
-  * ^short = "eindeutige ID der Ressource auf dem Server"
 * status MS
   * ^short = "Status der Medikationsinformation"
 * medication[x] MS

diff --git a/Resources/input/fsh/ISiKMedikationsListe.fsh b/Resources/input/fsh/ISiKMedikationsListe.fsh
@@ -3,8 +3,6 @@ Parent: List
 Id: ISiKMedikationsListe
 Description: "Dieses Profil ermöglicht die Zusammenführung einzelner MedikationsInformationen eines Patienten in ISiK Szenarien."
 * insert Meta
-* id MS
-  * ^short = "eindeutige ID der Ressource auf dem Server"
 * status MS
   * ^short = "(Aktualitäts-)Status der Liste"
 * mode MS

diff --git a/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh b/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh
@@ -3,8 +3,6 @@ Parent: MedicationAdministration
 Id: ISiKMedikationsVerabreichung
 Description: "Dieses Profil ermöglicht die Abbildung der Verabreichung von Medikamenten für einen Patienten in ISiK Szenarien."
 * insert Meta
-* id MS
-  * ^short = "eindeutige ID der Ressource auf dem Server"
 * status MS
   * ^short = "Status der Verabreichungsinformation"
 * medicationCodeableConcept MS

diff --git a/Resources/input/fsh/ISiKMedikationsVerordnung.fsh b/Resources/input/fsh/ISiKMedikationsVerordnung.fsh
@@ -3,8 +3,6 @@ Parent: MedicationRequest
 Id: ISiKMedikationsVerordnung
 Description: "Dieses Profil ermöglicht die Abbildung von Medikationsverordnungen eines Patienten in ISiK Szenarien."
 * insert Meta
-* id MS
-  * ^short = "eindeutige ID der Ressource auf dem Server"
 * status MS
   * ^short = "Status der Verordnungsinformation"
 * intent MS

diff --git a/Resources/input/fsh/ruleset.fsh b/Resources/input/fsh/ruleset.fsh
@@ -2,32 +2,32 @@ RuleSet: Meta
 * ^status = #active
 * ^experimental = false
 * ^publisher = "gematik GmbH"
-* ^version = "3.0.3"
-* ^date = "2024-07-03"
+* ^version = "3.0.4"
+* ^date = "2024-11-20"
 
 RuleSet: Meta-CapabilityStatementInformation
 * status = #active
 * experimental = false
-* version = "3.0.3"
+* version = "3.0.4"
 * publisher = "gematik GmbH"
-* date = "2024-07-03"
-* implementationGuide = "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.3"
+* date = "2024-11-20"
+* implementationGuide = "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.4"
 * url = "https://gematik.de/fhir/isik/v3/Medikation/CapabilityStatement/medikation-server/information"
 
 RuleSet: Meta-CapabilityStatementVerordnung
 * status = #active
 * experimental = false
-* version = "3.0.3"
+* version = "3.0.4"
 * publisher = "gematik GmbH"
-* date = "2024-07-03"
-* implementationGuide = "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.3"
+* date = "2024-11-20"
+* implementationGuide = "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.4"
 * url = "https://gematik.de/fhir/isik/v3/Medikation/CapabilityStatement/medikation-server/verordnung"
 
 RuleSet: Meta-CapabilityStatementVerabreichung
 * status = #active
 * experimental = false
-* version = "3.0.3"
+* version = "3.0.4"
 * publisher = "gematik GmbH"
-* date = "2024-07-03"
-* implementationGuide = "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.3"
+* date = "2024-11-20"
+* implementationGuide = "https://gematik.de/fhir/isik/v3/Medikation/ImplementationGuide|3.0.4"
 * url = "https://gematik.de/fhir/isik/v3/Medikation/CapabilityStatement/medikation-server/verabreichung"
diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml
@@ -2,7 +2,7 @@ canonical: https://gematik.de/fhir/isik/v3/Medikation
 fhirVersion: 4.0.1
 FSHOnly: true
 applyExtensionMetadataToRoot: false
-version: 3.0.3
+version: 3.0.4
 dependencies:
   de.medizininformatikinitiative.kerndatensatz.medikation: 1.0.11
   hl7.fhir.r4.core: 4.0.1

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "de.gematik.isik-medikation",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "fhirVersions": [
     "4.0.1"
   ],