diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ad0d843..079cc0c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: # Java and .NET are already installed on ubuntu-latest - name: Firely.Terminal (GitHub Actions) - uses: FirelyTeam/firely-terminal-pipeline@v0.4.1 + uses: FirelyTeam/firely-terminal-pipeline@v0.4.3 with: PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/ #PATH_TO_EXAMPLES: Examples @@ -42,7 +42,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 index 90b4d1f..8002c80 100644 --- a/ImplementationGuide/markdown/Einfuehrung.md +++ b/ImplementationGuide/markdown/Einfuehrung.md @@ -1,9 +1,9 @@ gematik logo ---- -Version: 2.0.3 +Version: 2.0.4 -Datum: 03.07.2024 +Datum: 13.11.2024 Status: Aktiv diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index 8c35617..43c637b 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -4,6 +4,12 @@ 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: 2.0.4 + +Datum: 13.11.2024 + +- Update Basismodul Dependency -> 2.0.9 ---- Version: 2.0.3 diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json index 5d93124..6224229 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json @@ -4,11 +4,11 @@ "url": "https://gematik.de/fhir/isik/v2/Medikation/CapabilityStatement/medikation-server/information", "status": "active", "experimental": false, - "version": "2.0.3", + "version": "2.0.4", "publisher": "gematik GmbH", - "date": "2024-07-03", + "date": "2024-11-13", "implementationGuide": [ - "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.3" + "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.4" ], "name": "ISiKCapabilityStatementMedikationInformation", "title": "ISiK CapabilityStatement Medikation Server - Medikationsinformation", diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json index 7afa986..ba503d8 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json @@ -4,11 +4,11 @@ "url": "https://gematik.de/fhir/isik/v2/Medikation/CapabilityStatement/medikation-server/verabreichung", "status": "active", "experimental": false, - "version": "2.0.3", + "version": "2.0.4", "publisher": "gematik GmbH", - "date": "2024-07-03", + "date": "2024-11-13", "implementationGuide": [ - "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.3" + "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.4" ], "name": "ISiKCapabilityStatementMedikationVerabreichung", "title": "ISiK CapabilityStatement Medikation Server - Medikationsverabreichung", diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json index 27049ea..2264fb9 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json @@ -4,11 +4,11 @@ "url": "https://gematik.de/fhir/isik/v2/Medikation/CapabilityStatement/medikation-server/verordnung", "status": "active", "experimental": false, - "version": "2.0.3", + "version": "2.0.4", "publisher": "gematik GmbH", - "date": "2024-07-03", + "date": "2024-11-13", "implementationGuide": [ - "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.3" + "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.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 index fa9540a..941a167 100644 --- 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/v2/Medikation/StructureDefinition/ISiKMedikament", - "version": "2.0.3", + "version": "2.0.4", "name": "ISiKMedikament", "status": "active", "experimental": false, - "date": "2024-07-03", + "date": "2024-11-13", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Abbildung von patientenunabhängigen Informationen zu Medikamenten in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransaction.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransaction.json index c275d0b..6bf2720 100644 --- 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/v2/Medikation/StructureDefinition/ISiKMedikationTransaction", - "version": "2.0.3", + "version": "2.0.4", "name": "ISiKMedikationTransaction", "status": "active", "experimental": false, - "date": "2024-07-03", + "date": "2024-11-13", "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 index 468b096..a7316df 100644 --- 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/v2/Medikation/StructureDefinition/ISiKMedikationTransactionResponse", - "version": "2.0.3", + "version": "2.0.4", "name": "ISiKMedikationTransactionResponse", "status": "active", "experimental": false, - "date": "2024-07-03", + "date": "2024-11-13", "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 index 51fc59f..fb6a8c6 100644 --- 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/v2/Medikation/StructureDefinition/ISiKMedikationsInformation", - "version": "2.0.3", + "version": "2.0.4", "name": "ISiKMedikationsInformation", "status": "active", "experimental": false, - "date": "2024-07-03", + "date": "2024-11-13", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Abbildung von Informationen zur Medikation eines Patienten in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsListe.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsListe.json index d65bdaa..62140af 100644 --- 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/v2/Medikation/StructureDefinition/ISiKMedikationsListe", - "version": "2.0.3", + "version": "2.0.4", "name": "ISiKMedikationsListe", "status": "active", "experimental": false, - "date": "2024-07-03", + "date": "2024-11-13", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Zusammenführung einzelner MedikationsInformationen eines Patienten in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json index b786d96..bf4e77e 100644 --- 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/v2/Medikation/StructureDefinition/ISiKMedikationsVerabreichung", - "version": "2.0.3", + "version": "2.0.4", "name": "ISiKMedikationsVerabreichung", "status": "active", "experimental": false, - "date": "2024-07-03", + "date": "2024-11-13", "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", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json index fa8d329..acd2b6d 100644 --- 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/v2/Medikation/StructureDefinition/ISiKMedikationsVerordnung", - "version": "2.0.3", + "version": "2.0.4", "name": "ISiKMedikationsVerordnung", "status": "active", "experimental": false, - "date": "2024-07-03", + "date": "2024-11-13", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Abbildung von Medikationsverordnungen eines Patienten in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json b/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json index db09630..96a8898 100644 --- 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": "2.0.4", "url": "https://gematik.de/fhir/isik/v2/Medikation/ValueSet/SctRouteOfAdministration", "experimental": false, "publisher": "gematik GmbH", - "version": "2.0.3", - "date": "2024-07-03", + "date": "2024-11-13", "compose": { "include": [ { diff --git a/Resources/input/fsh/ruleset.fsh b/Resources/input/fsh/ruleset.fsh index 0900b3b..96d54fe 100644 --- 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 = "2.0.3" -* ^date = "2024-07-03" +* ^version = "2.0.4" +* ^date = "2024-11-13" RuleSet: Meta-CapabilityStatementInformation * status = #active * experimental = false -* version = "2.0.3" +* version = "2.0.4" * publisher = "gematik GmbH" -* date = "2024-07-03" -* implementationGuide = "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.3" +* date = "2024-11-13" +* implementationGuide = "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.4" * url = "https://gematik.de/fhir/isik/v2/Medikation/CapabilityStatement/medikation-server/information" RuleSet: Meta-CapabilityStatementVerordnung * status = #active * experimental = false -* version = "2.0.3" +* version = "2.0.4" * publisher = "gematik GmbH" -* date = "2024-07-03" -* implementationGuide = "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.3" +* date = "2024-11-13" +* implementationGuide = "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.4" * url = "https://gematik.de/fhir/isik/v2/Medikation/CapabilityStatement/medikation-server/verordnung" RuleSet: Meta-CapabilityStatementVerabreichung * status = #active * experimental = false -* version = "2.0.3" +* version = "2.0.4" * publisher = "gematik GmbH" -* date = "2024-07-03" -* implementationGuide = "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.3" +* date = "2024-11-13" +* implementationGuide = "https://gematik.de/fhir/isik/v2/Medikation/ImplementationGuide|2.0.4" * url = "https://gematik.de/fhir/isik/v2/Medikation/CapabilityStatement/medikation-server/verabreichung" \ No newline at end of file diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index 611c1db..8d200a7 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -3,7 +3,7 @@ fhirVersion: 4.0.1 FSHOnly: true applyExtensionMetadataToRoot: false status: active -version: 2.0.3 +version: 2.0.4 dependencies: de.medizininformatikinitiative.kerndatensatz.medikation: 1.0.10 hl7.fhir.r4.core: 4.0.1 diff --git a/package.json b/package.json index 9a387f5..841829e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "de.gematik.isik-medikation", - "version": "2.0.3", + "version": "2.0.4", "fhirVersions": [ "4.0.1" ],