From de474c850c5b2f4b5e45edbbf3dbe1c97d18eb02 Mon Sep 17 00:00:00 2001 From: Patrick Werner Date: Wed, 6 Nov 2024 15:24:35 +0100 Subject: [PATCH 1/3] fix: backport dependency --- .../resources/StructureDefinition-ISiKPatient.json | 14 -------------- ...ureDefinition-ISiKPersonImGesundheitsberuf.json | 14 -------------- ...ctureDefinition-patient-merge-subscription.json | 2 +- Resources/input/fsh/ISiKAbrechnungsfall.fsh | 4 ++-- Resources/sushi-config.yaml | 2 +- package.json | 2 +- 6 files changed, 5 insertions(+), 33 deletions(-) diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json index 544ff9b6..e6ce36a6 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json @@ -468,20 +468,6 @@ "min": 1, "mustSupport": true }, - { - "id": "Patient.gender.extension", - "path": "Patient.gender.extension", - "slicing": { - "discriminator": [ - { - "type": "value", - "path": "url" - } - ], - "ordered": false, - "rules": "open" - } - }, { "id": "Patient.gender.extension:Geschlecht-Administrativ", "path": "Patient.gender.extension", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json index 0397b4b7..74a87ac2 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json @@ -428,20 +428,6 @@ "short": "Ist das Geschlecht des Arztes bekannt, MUSS es bereitgestellt werden.", "mustSupport": true }, - { - "id": "Practitioner.gender.extension", - "path": "Practitioner.gender.extension", - "slicing": { - "discriminator": [ - { - "type": "value", - "path": "url" - } - ], - "ordered": false, - "rules": "open" - } - }, { "id": "Practitioner.gender.extension:Geschlecht-Administrativ", "path": "Practitioner.gender.extension", diff --git a/Resources/fsh-generated/resources/StructureDefinition-patient-merge-subscription.json b/Resources/fsh-generated/resources/StructureDefinition-patient-merge-subscription.json index adfbcee2..ac639102 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-patient-merge-subscription.json +++ b/Resources/fsh-generated/resources/StructureDefinition-patient-merge-subscription.json @@ -10,7 +10,7 @@ "date": "2024-11-06", "publisher": "gematik GmbH", "description": "Patient Merge Subscription \n### Motivation\n\nSubscription ist eine FHIR Ressource, um als Client-System Benachrichtigungen über Events auf dem FHIR Server anzufragen. Der Subscription Mechanismus in FHIR R4 ist nicht geeignet, um alle relevanten Events (hier im Speziellen das Mergen von Patienten) zu unterstützen. Daher basiert das ISiK Subscription-Profil auf dem [Subscriptions R5 Backport Profil von HL7](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/StructureDefinition-backport-subscription.html).\n\nSiehe auch: {{pagelink:Patient-merge, text:Use Case Patient-merge}}\n\nUm als Subsystem über ein Patienten-Merge-Event informiert zu werden, KANN der FHIR Subscription Mechanismus gemäß des [Subscriptions R5 Backport IGs von HL7](https://hl7.org/fhir/uv/subscriptions-backport/STU1.1/index.html) genutzt werden.\n\n### Kompatibilität\n\nDas Profil PatientMergeSubscription basiert auf dem [Backport-Subscription Profil](https://hl7.org/fhir/uv/subscriptions-backport/StructureDefinition-backport-subscription.html). \nDer [SubscriptionStatus](https://hl7.org/fhir/uv/subscriptions-backport/StructureDefinition-backport-subscription-status-r4.html), sowie das [Subscription Notification Bundle](https://hl7.org/fhir/uv/subscriptions-backport/StructureDefinition-backport-subscription-notification-r4.html) werden unverändert direkt aus dem [Subscriptions R5 Backport IG](https://hl7.org/fhir/uv/subscriptions-backport/index.html) genutzt. \n\nHinweise zu Inkompatibilitäten können über die [Portalseite](https://service.gematik.de/servicedesk/customer/portal/16) gemeldet werden.", - "fhirVersion": "4.3.0", + "fhirVersion": "4.0.0", "kind": "resource", "abstract": false, "type": "Subscription", diff --git a/Resources/input/fsh/ISiKAbrechnungsfall.fsh b/Resources/input/fsh/ISiKAbrechnungsfall.fsh index 21807988..b471ac66 100644 --- a/Resources/input/fsh/ISiKAbrechnungsfall.fsh +++ b/Resources/input/fsh/ISiKAbrechnungsfall.fsh @@ -122,6 +122,6 @@ Usage: #example * type = $v3-ActCode#IMP * subject = Reference(PatientinMusterfrau) * coverage - * extension.url = "http://fhir.de/StructureDefinition/ExtensionAbrechnungsart" - * extension.valueCoding = $Abrechnungsart#DRG "Diagnosebezogene Fallgruppen" + * extension[Abrechnungsart] + * valueCoding = $Abrechnungsart#DRG "Diagnosebezogene Fallgruppen" * coverage = Reference(CoverageGesetzlich) diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index 7b51216c..766e3631 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -6,4 +6,4 @@ dependencies: de.basisprofil.r4: 1.5.0 hl7.fhir.r4.core: 4.0.1 hl7.fhir.extensions.r5: 4.0.1 - hl7.fhir.uv.subscriptions-backport: 1.1.0 + hl7.fhir.uv.subscriptions-backport.r4: 1.1.0 diff --git a/package.json b/package.json index 990681e8..83ea7b31 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,6 @@ ], "dependencies": { "de.basisprofil.r4": "1.5.0", - "hl7.fhir.uv.subscriptions-backport": "1.1.0" + "hl7.fhir.uv.subscriptions-backport.r4": "1.1.0" } } \ No newline at end of file From 929e5c21db0e7a462ba2b23ad0cb1fd851028719 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Wed, 6 Nov 2024 15:08:17 +0000 Subject: [PATCH 2/3] auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) --- .../resources/StructureDefinition-ISiKPatient.json | 14 ++++++++++++++ ...ureDefinition-ISiKPersonImGesundheitsberuf.json | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json index e6ce36a6..544ff9b6 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json @@ -468,6 +468,20 @@ "min": 1, "mustSupport": true }, + { + "id": "Patient.gender.extension", + "path": "Patient.gender.extension", + "slicing": { + "discriminator": [ + { + "type": "value", + "path": "url" + } + ], + "ordered": false, + "rules": "open" + } + }, { "id": "Patient.gender.extension:Geschlecht-Administrativ", "path": "Patient.gender.extension", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json index 74a87ac2..0397b4b7 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json @@ -428,6 +428,20 @@ "short": "Ist das Geschlecht des Arztes bekannt, MUSS es bereitgestellt werden.", "mustSupport": true }, + { + "id": "Practitioner.gender.extension", + "path": "Practitioner.gender.extension", + "slicing": { + "discriminator": [ + { + "type": "value", + "path": "url" + } + ], + "ordered": false, + "rules": "open" + } + }, { "id": "Practitioner.gender.extension:Geschlecht-Administrativ", "path": "Practitioner.gender.extension", From 2150cd3e75f47317fb9c12dc6edd35554389576a Mon Sep 17 00:00:00 2001 From: Patrick Werner Date: Wed, 6 Nov 2024 16:08:30 +0100 Subject: [PATCH 3/3] releasenotes --- ImplementationGuide/markdown/ReleaseNotes.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index 0f53e15f..64574c68 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -5,11 +5,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: 4.0.1 -* Fixed CapabilityStatement *near* SearchParameter type & ResourceType Organization spelling, removed custom backport Extension - switched to the official backport mechanism, fixed Bindings to CodeSystems https://github.com/gematik/spec-ISiK-Basismodul/commit/ ae706142832e2059046ce978c4b0dc472c2375e6 -* Hinweis zur Handhabung von leeren Elementen und einem :not-Modifier hinzugefügt https://github.com/gematik/spec-ISiK-Basismodul/pull/473 Datum: tbd +* Fixed CapabilityStatement *near* SearchParameter type & ResourceType Organization spelling, removed custom backport Extension - switched to the official backport mechanism, fixed Bindings to CodeSystems https://github.com/gematik/spec-ISiK-Basismodul/commit/ ae706142832e2059046ce978c4b0dc472c2375e6 +* Hinweis zur Handhabung von leeren Elementen und einem :not-Modifier hinzugefügt https://github.com/gematik/spec-ISiK-Basismodul/pull/473 +* Dependency zum R5 backporting IG auf das R4 only package angepasst https://github.com/gematik/spec-ISiK-Basismodul/pull/479 + ---- Version: 4.0.0