Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: backport dependency #479

Merged
merged 6 commits into from
Nov 7, 2024
Merged

fix: backport dependency #479

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de474c8
fix: backport dependency
patrick-werner Nov 6, 2024
929e5c2
auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation)
patrick-werner Nov 6, 2024
2150cd3
releasenotes
patrick-werner Nov 6, 2024
46e4b6d
removes redundant extension slicing
patrick-werner Nov 7, 2024
d92c727
auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation)
patrick-werner Nov 7, 2024
7ece1e1
fix: overwrite fhir version of patient-merge subscription profile
patrick-werner Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ImplementationGuide/markdown/ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 14 additions & 14 deletions Resources/fsh-generated/fsh-index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
"fshName": "SubscriptionNotificationBundleExample",
"fshType": "Instance",
"fshFile": "IsiKPatientMerge.fsh",
"startLine": 100,
"endLine": 113
"startLine": 152,
"endLine": 165
},
{
"outputFile": "Bundle-Szenario1.json",
Expand Down Expand Up @@ -380,16 +380,16 @@
"fshName": "DorisQuelle",
"fshType": "Instance",
"fshFile": "IsiKPatientMerge.fsh",
"startLine": 49,
"endLine": 61
"startLine": 101,
"endLine": 113
},
{
"outputFile": "Patient-DorisZiel.json",
"fshName": "DorisZiel",
"fshType": "Instance",
"fshFile": "IsiKPatientMerge.fsh",
"startLine": 63,
"endLine": 75
"startLine": 115,
"endLine": 127
},
{
"outputFile": "Patient-PatientinMusterfrau.json",
Expand Down Expand Up @@ -748,16 +748,16 @@
"fshName": "PatientMergeSubscription",
"fshType": "Profile",
"fshFile": "IsiKPatientMerge.fsh",
"startLine": 2,
"endLine": 18
"startLine": 3,
"endLine": 58
},
{
"outputFile": "Subscription-PatientMergeSubscriptionExample.json",
"fshName": "PatientMergeSubscriptionExample",
"fshType": "Instance",
"fshFile": "IsiKPatientMerge.fsh",
"startLine": 20,
"endLine": 31
"startLine": 72,
"endLine": 83
},
{
"outputFile": "ValueSet-DiagnosesSCT.json",
Expand All @@ -772,8 +772,8 @@
"fshName": "FhirMimeTypeVS",
"fshType": "ValueSet",
"fshFile": "IsiKPatientMerge.fsh",
"startLine": 41,
"endLine": 47
"startLine": 93,
"endLine": 99
},
{
"outputFile": "ValueSet-ISiKAccountType.json",
Expand Down Expand Up @@ -852,8 +852,8 @@
"fshName": "RestAndWSSubscriptionChannelType",
"fshType": "ValueSet",
"fshFile": "IsiKPatientMerge.fsh",
"startLine": 33,
"endLine": 39
"startLine": 85,
"endLine": 91
},
{
"outputFile": "ValueSet-SchwangerschaftEtMethodeVS.json",
Expand Down
14 changes: 7 additions & 7 deletions Resources/fsh-generated/fsh-index.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Binary-Binary-JPEG-Example.json Binary-
Binary-Binary-PDF-Example-short.json Binary-PDF-Example-short Instance ISiKBinary.fsh 36 - 41
Binary-Binary-PDF-Example.json Binary-PDF-Example Instance ISiKBinary.fsh 49 - 54
Bundle-ISiKBundle-Example.json ISiKBundle-Example Instance ISiKBerichtBundle.fsh 24 - 38
Bundle-SubscriptionNotificationBundleExample.json SubscriptionNotificationBundleExample Instance IsiKPatientMerge.fsh 100 - 113
Bundle-SubscriptionNotificationBundleExample.json SubscriptionNotificationBundleExample Instance IsiKPatientMerge.fsh 152 - 165
Bundle-Szenario1.json Szenario1 Instance Beispiel-Szenario-1.fsh 164 - 174
Bundle-Szenario2.json Szenario2 Instance Beispiel-Szenario-2.fsh 99 - 107
CapabilityStatement-ISiKCapabilityStatementBasisServer.json ISiKCapabilityStatementBasisServer Instance ISiKCapabilityStatementBasisServer.fsh 1 - 1469
Expand Down Expand Up @@ -46,8 +46,8 @@ Observation-ISiKSchwangerschaftsstatusBeispiel.json ISiKSch
Observation-ISiKStillstatusBeispiel.json ISiKStillstatusBeispiel Instance ISiKLebenszustandOberservations.fsh 204 - 217
Organization-AbteilungAllgemeinchirurgieOrganisationBeispiel.json AbteilungAllgemeinchirurgieOrganisationBeispiel Instance ISiKOrganisation.fsh 260 - 270
Organization-KrankenhausOrganisationBeispiel.json KrankenhausOrganisationBeispiel Instance ISiKOrganisation.fsh 251 - 257
Patient-DorisQuelle.json DorisQuelle Instance IsiKPatientMerge.fsh 49 - 61
Patient-DorisZiel.json DorisZiel Instance IsiKPatientMerge.fsh 63 - 75
Patient-DorisQuelle.json DorisQuelle Instance IsiKPatientMerge.fsh 101 - 113
Patient-DorisZiel.json DorisZiel Instance IsiKPatientMerge.fsh 115 - 127
Patient-PatientinMusterfrau.json PatientinMusterfrau Instance ISiKPatient.fsh 347 - 397
Patient-PatientinMusterfrauMinimal.json PatientinMusterfrauMinimal Instance ISiKBerichtBundle.fsh 41 - 53
Patient-SZ1Patient.json SZ1Patient Instance Beispiel-Szenario-1.fsh 11 - 27
Expand Down Expand Up @@ -92,10 +92,10 @@ StructureDefinition-ISiKStillstatus.json ISiKSti
StructureDefinition-ISiKValueSet.json ISiKValueSet Profile ISiKValueSet.fsh 1 - 75
StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json ISiKVersicherungsverhaeltnisGesetzlich Profile ISiKVersicherungsverhaeltnisGesetzlich.fsh 1 - 108
StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json ISiKVersicherungsverhaeltnisSelbstzahler Profile ISiKVersicherungsverhaeltnisSelbstzahler.fsh 1 - 72
StructureDefinition-patient-merge-subscription.json PatientMergeSubscription Profile IsiKPatientMerge.fsh 2 - 18
Subscription-PatientMergeSubscriptionExample.json PatientMergeSubscriptionExample Instance IsiKPatientMerge.fsh 20 - 31
StructureDefinition-patient-merge-subscription.json PatientMergeSubscription Profile IsiKPatientMerge.fsh 3 - 58
Subscription-PatientMergeSubscriptionExample.json PatientMergeSubscriptionExample Instance IsiKPatientMerge.fsh 72 - 83
ValueSet-DiagnosesSCT.json DiagnosesSCT ValueSet valueSets.fsh 1 - 10
ValueSet-FhirMimeTypeVS.json FhirMimeTypeVS ValueSet IsiKPatientMerge.fsh 41 - 47
ValueSet-FhirMimeTypeVS.json FhirMimeTypeVS ValueSet IsiKPatientMerge.fsh 93 - 99
ValueSet-ISiKAccountType.json ISiKAccountType ValueSet valueSets.fsh 36 - 41
ValueSet-ISiKBehandlungsergebnisReha.json ISiKBehandlungsergebnisReha ValueSet valueSets.fsh 79 - 83
ValueSet-ISiKBesondereBehandlungsformReha.json ISiKBesondereBehandlungsformReha ValueSet valueSets.fsh 73 - 77
Expand All @@ -105,7 +105,7 @@ ValueSet-ISiKUnterbrechnungReha.json ISiKUnt
ValueSet-ISiKValueSetExample.json ISiKValueSetExample Instance ISiKValueSet.fsh 77 - 90
ValueSet-ProzedurenCodesSCT.json ProzedurenCodesSCT ValueSet valueSets.fsh 12 - 16
ValueSet-ProzedurenKategorieSCT.json ProzedurenKategorieSCT ValueSet valueSets.fsh 18 - 27
ValueSet-RestAndWSSubscriptionChannelType.json RestAndWSSubscriptionChannelType ValueSet IsiKPatientMerge.fsh 33 - 39
ValueSet-RestAndWSSubscriptionChannelType.json RestAndWSSubscriptionChannelType ValueSet IsiKPatientMerge.fsh 85 - 91
ValueSet-SchwangerschaftEtMethodeVS.json SchwangerschaftEtMethodeVS ValueSet valueSets.fsh 51 - 62
ValueSet-SchwangerschaftsstatusVS.json SchwangerschaftsstatusVS ValueSet valueSets.fsh 43 - 49
ValueSet-StillstatusVS.json StillstatusVS ValueSet valueSets.fsh 64 - 71
Expand Down
2 changes: 1 addition & 1 deletion Resources/fsh-generated/resources/StructureDefinition-patient-merge-subscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: wir haben sonst immer 4.0.1 - ist das hier gewollt mit 4.0.0?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wurde aus den backport subscriptions so geerbt, habe es in unserem abgeleiteten Profil auf 4.0.1 hochgesetzt.

"kind": "resource",
"abstract": false,
"type": "Subscription",
Expand Down
4 changes: 2 additions & 2 deletions Resources/input/fsh/ISiKAbrechnungsfall.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion Resources/sushi-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}