diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8f73919..781808e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,7 +46,7 @@ jobs: SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true SUSHI_OPTIONS: Resources/ - SUSHI_VERSION: 3.8.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 4c88871..7774fa6 100644 --- a/ImplementationGuide/markdown/Einfuehrung.md +++ b/ImplementationGuide/markdown/Einfuehrung.md @@ -3,7 +3,7 @@ ---- Version: 4.0.0 -Datum: 09.09.2024 +Datum: 15.10.2024 Status: Active diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index 3638422..5583c45 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -8,7 +8,15 @@ Die erste Ziffer X bezeichnet ein Major-Release und regelt die Gültigkeit von R Version: 4.0.0 -Datum: 09.09.2024 +Datum: 15.10.2024 + +* Aktive Version ohne weitere Änderungen + +---- + +Version: 4.0.0-rc2 + +Datum: 26.06.2024 - Entfernen von MS von .id der Ressourcen https://github.com/gematik/spec-ISiK-Medikation/pull/122 - Klärung Dosis-Rate Quantity und Ratio (Beispiele, Must-Support) https://github.com/gematik/spec-ISiK-Medikation/pull/124/files diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementAMTS.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementAMTS.json index 7f64a0f..0a764e8 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementAMTS.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementAMTS.json @@ -6,7 +6,7 @@ "experimental": false, "version": "4.0.0", "publisher": "gematik GmbH", - "date": "2024-09-09", + "date": "2024-10-15", "implementationGuide": [ "https://gematik.de/fhir/Medikation/ImplementationGuide/ISiK-Medikation" ], diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json index 8fd31a1..2de085f 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json @@ -6,7 +6,7 @@ "experimental": false, "version": "4.0.0", "publisher": "gematik GmbH", - "date": "2024-09-09", + "date": "2024-10-15", "implementationGuide": [ "https://gematik.de/fhir/Medikation/ImplementationGuide/ISiK-Medikation" ], diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json index 75db672..1186d6c 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json @@ -6,7 +6,7 @@ "experimental": false, "version": "4.0.0", "publisher": "gematik GmbH", - "date": "2024-09-09", + "date": "2024-10-15", "implementationGuide": [ "https://gematik.de/fhir/ISiK/ImplementationGuide/ISiK-Medikation" ], diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json index 7bf7804..df7c213 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json @@ -6,7 +6,7 @@ "experimental": false, "version": "4.0.0", "publisher": "gematik GmbH", - "date": "2024-09-09", + "date": "2024-10-15", "implementationGuide": [ "https://gematik.de/fhir/ISiK/ImplementationGuide/ISiK-Medikation" ], diff --git a/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json b/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json index 1645de6..b851e74 100644 --- a/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json +++ b/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json @@ -6,6 +6,7 @@ "id": "ISiKMedikationsartCS", "title": "ISiK Medikationsart", "description": "ISiK Therapiearten für Medikation", + "version": "4.0.0", "url": "https://gematik.de/fhir/isik/CodeSystem/ISiKMedikationsartCS", "concept": [ { @@ -19,7 +20,6 @@ ], "experimental": false, "publisher": "gematik GmbH", - "version": "4.0.0", - "date": "2024-09-09", + "date": "2024-10-15", "count": 2 } diff --git a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKAcceptedRisk.json b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKAcceptedRisk.json index ef1462f..80210d8 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKAcceptedRisk.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKAcceptedRisk.json @@ -7,7 +7,7 @@ "title": "ISiK Accepted Risk", "status": "active", "experimental": false, - "date": "2024-09-09", + "date": "2024-10-15", "publisher": "gematik GmbH", "description": "Extension zur Dokumentation eines im Rahmen der AMTS bewusst eingegangenen Risikos. In diesem Freitext kann die Begründung und ggf. zu treffende besondere Maßnahmen dokumentiert werden.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKBehandlungsziel.json b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKBehandlungsziel.json index eda2430..0acb8ec 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKBehandlungsziel.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKBehandlungsziel.json @@ -7,7 +7,7 @@ "title": "ISiK Behandlungsziel", "status": "active", "experimental": false, - "date": "2024-09-09", + "date": "2024-10-15", "publisher": "gematik GmbH", "description": "Extension zur freitextlichen Angabe des Behandlungsziels.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationRequestReplaces.json b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationRequestReplaces.json index cb19a21..98c0d28 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationRequestReplaces.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationRequestReplaces.json @@ -7,7 +7,7 @@ "title": "ISiK MedicationRequestReplaces", "status": "active", "experimental": false, - "date": "2024-09-09", + "date": "2024-10-15", "publisher": "gematik GmbH", "description": "Extension zur Verlinkung der Medikationsverordnung die ersetzt wurde", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationStatementReplaces.json b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationStatementReplaces.json index 711bf67..d2d48dd 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationStatementReplaces.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationStatementReplaces.json @@ -7,7 +7,7 @@ "title": "ISiK MedicationStatementReplaces", "status": "active", "experimental": false, - "date": "2024-09-09", + "date": "2024-10-15", "publisher": "gematik GmbH", "description": "Extension zur Verlinkung der Medikationsinformation die ersetzt wurde", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedikationsart.json b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedikationsart.json index f360803..4e86aa3 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedikationsart.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedikationsart.json @@ -7,7 +7,7 @@ "title": "ISiK Medikationsart", "status": "active", "experimental": false, - "date": "2024-09-09", + "date": "2024-10-15", "publisher": "gematik GmbH", "description": "Extension zur Dokumentation der Therapieart einer Medikation (Akut- oder Dauermedikation).", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKSelbstmedikation.json b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKSelbstmedikation.json index 0c415ba..f5d54ce 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKSelbstmedikation.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKSelbstmedikation.json @@ -7,7 +7,7 @@ "title": "ISiK Selbstmedikation", "status": "active", "experimental": false, - "date": "2024-09-09", + "date": "2024-10-15", "publisher": "gematik GmbH", "description": "Extension zur Angabe, ob es sich bei der Medikation um eine Selbstmedikation handelt.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAMTSBewertung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAMTSBewertung.json index 27cc4bb..2638f9e 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAMTSBewertung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAMTSBewertung.json @@ -7,7 +7,7 @@ "title": "ISiK AMTS-Bewertung", "status": "active", "experimental": false, - "date": "2024-09-09", + "date": "2024-10-15", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Abbildung von Informationen zur Risikobeurteilung im Rahmen der Arzneimitteltherapiesicherheit (AMTS).", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json index bf8027b..e884cd4 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json @@ -6,7 +6,7 @@ "name": "ISiKMedikament", "status": "active", "experimental": false, - "date": "2024-09-09", + "date": "2024-10-15", "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 16f7733..6d24744 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransaction.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransaction.json @@ -7,7 +7,7 @@ "title": "ISiK Medikation Transactionbundle", "status": "active", "experimental": false, - "date": "2024-09-09", + "date": "2024-10-15", "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 8349429..4651cfb 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransactionResponse.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransactionResponse.json @@ -7,7 +7,7 @@ "title": "ISiK Medikation TransactionBundle-Response", "status": "active", "experimental": false, - "date": "2024-09-09", + "date": "2024-10-15", "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 a18f64a..dd20cf0 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json @@ -6,7 +6,7 @@ "name": "ISiKMedikationsInformation", "status": "active", "experimental": false, - "date": "2024-09-09", + "date": "2024-10-15", "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 6ba8ae4..b6671b3 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsListe.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsListe.json @@ -7,7 +7,7 @@ "title": "ISiK Medikationsliste", "status": "active", "experimental": false, - "date": "2024-09-09", + "date": "2024-10-15", "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 08d3f6b..0d75c30 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json @@ -6,7 +6,7 @@ "name": "ISiKMedikationsVerabreichung", "status": "active", "experimental": false, - "date": "2024-09-09", + "date": "2024-10-15", "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 e368658..4cdcec9 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json @@ -6,7 +6,7 @@ "name": "ISiKMedikationsVerordnung", "status": "active", "experimental": false, - "date": "2024-09-09", + "date": "2024-10-15", "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/StructureDefinition-MedicationQuantity.json b/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json index 21dbbb4..4290c63 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json +++ b/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json @@ -2,6 +2,7 @@ "resourceType": "StructureDefinition", "id": "MedicationQuantity", "url": "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity", + "version": "4.0.0", "name": "MedicationQuantity", "title": "Medication Quantity", "status": "draft", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json b/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json index 7419169..41d209b 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json @@ -4,11 +4,11 @@ "name": "ISiKMedikationsartVS", "id": "ISiKMedikationsartVS", "description": "ISiK Therapiearten für Medikation", + "version": "4.0.0", "url": "https://gematik.de/fhir/isik/ValueSet/ISiKMedikationsartVS", "experimental": false, "publisher": "gematik GmbH", - "version": "4.0.0", - "date": "2024-09-09", + "date": "2024-10-15", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-MedikationsListeListModeVS.json b/Resources/fsh-generated/resources/ValueSet-MedikationsListeListModeVS.json index 6e8db29..56dc6ff 100644 --- a/Resources/fsh-generated/resources/ValueSet-MedikationsListeListModeVS.json +++ b/Resources/fsh-generated/resources/ValueSet-MedikationsListeListModeVS.json @@ -5,11 +5,11 @@ "id": "MedikationsListeListModeVS", "title": "Medikationslisten-Modes", "description": "Erlaubte ListModes der ISiK MedikationsListe", + "version": "4.0.0", "url": "https://gematik.de/fhir/isik/ValueSet/MedikationsListeListModeVS", "experimental": false, "publisher": "gematik GmbH", - "version": "4.0.0", - "date": "2024-09-09", + "date": "2024-10-15", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json b/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json index db938b5..86a8986 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": "4.0.0", "url": "https://gematik.de/fhir/isik/ValueSet/SctRouteOfAdministration", "experimental": false, "publisher": "gematik GmbH", - "version": "4.0.0", - "date": "2024-09-09", + "date": "2024-10-15", "compose": { "include": [ { diff --git a/Resources/input/fsh/ruleset.fsh b/Resources/input/fsh/ruleset.fsh index 09a09a1..e360b88 100644 --- a/Resources/input/fsh/ruleset.fsh +++ b/Resources/input/fsh/ruleset.fsh @@ -3,14 +3,14 @@ RuleSet: Meta * ^experimental = false * ^publisher = "gematik GmbH" * ^version = "4.0.0" -* ^date = "2024-09-09" +* ^date = "2024-10-15" RuleSet: Meta-CapabilityStatementInformation * status = #active * experimental = false * version = "4.0.0" * publisher = "gematik GmbH" -* date = "2024-09-09" +* date = "2024-10-15" * implementationGuide = "https://gematik.de/fhir/Medikation/ImplementationGuide/ISiK-Medikation" * url = "https://gematik.de/fhir/isik/CapabilityStatement/ISiKCapabilityStatementMedikationInformation" @@ -19,7 +19,7 @@ RuleSet: Meta-CapabilityStatementAMTS * experimental = false * version = "4.0.0" * publisher = "gematik GmbH" -* date = "2024-09-09" +* date = "2024-10-15" * implementationGuide = "https://gematik.de/fhir/Medikation/ImplementationGuide/ISiK-Medikation" * url = "https://gematik.de/fhir/isik/CapabilityStatement/ISiKCapabilityStatementMedikationAMTS" @@ -28,7 +28,7 @@ RuleSet: Meta-CapabilityStatementVerordnung * experimental = false * version = "4.0.0" * publisher = "gematik GmbH" -* date = "2024-09-09" +* date = "2024-10-15" * implementationGuide = "https://gematik.de/fhir/ISiK/ImplementationGuide/ISiK-Medikation" * url = "https://gematik.de/fhir/isik/CapabilityStatement/ISiKCapabilityStatementMedikationVerordnung" @@ -37,6 +37,6 @@ RuleSet: Meta-CapabilityStatementVerabreichung * experimental = false * version = "4.0.0" * publisher = "gematik GmbH" -* date = "2024-09-09" +* date = "2024-10-15" * implementationGuide = "https://gematik.de/fhir/ISiK/ImplementationGuide/ISiK-Medikation" * url = "https://gematik.de/fhir/isik/CapabilityStatement/ISiKCapabilityStatementMedikationVerabreichung"