diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index 8e23d76c..1e7f2dee 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -61,7 +61,7 @@ "fshType": "Instance", "fshFile": "IsiKPatientMerge.fsh", "startLine": 100, - "endLine": 109 + "endLine": 113 }, { "outputFile": "CapabilityStatement-ISiKCapabilityStatementBasisServer.json", @@ -188,8 +188,8 @@ "fshName": "Fachabteilungskontakt", "fshType": "Instance", "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh", - "startLine": 169, - "endLine": 207 + "startLine": 155, + "endLine": 193 }, { "outputFile": "Encounter-FachabteilungskontaktMinimal.json", @@ -332,24 +332,24 @@ "fshName": "Encounter-date-start", "fshType": "Instance", "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh", - "startLine": 250, - "endLine": 268 + "startLine": 236, + "endLine": 254 }, { "outputFile": "SearchParameter-Encounter-end-date.json", "fshName": "Encounter-end-date", "fshType": "Instance", "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh", - "startLine": 270, - "endLine": 288 + "startLine": 256, + "endLine": 274 }, { "outputFile": "StructureDefinition-ExtensionISiKRehaEntlassung.json", "fshName": "ExtensionISiKRehaEntlassung", "fshType": "Extension", "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh", - "startLine": 146, - "endLine": 167 + "startLine": 132, + "endLine": 153 }, { "outputFile": "StructureDefinition-ISiKASKCoding.json", @@ -615,22 +615,6 @@ "startLine": 1, "endLine": 16 }, - { - "outputFile": "StructureDefinition-PlannedEndDate.json", - "fshName": "PlannedEndDate", - "fshType": "Extension", - "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh", - "startLine": 140, - "endLine": 144 - }, - { - "outputFile": "StructureDefinition-PlannedStartDate.json", - "fshName": "PlannedStartDate", - "fshType": "Extension", - "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh", - "startLine": 133, - "endLine": 137 - }, { "outputFile": "StructureDefinition-patient-merge-subscription.json", "fshName": "PatientMergeSubscription", diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index 05870e85..45b1effa 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -6,7 +6,7 @@ Binary-Binary-JPEG-Example.json Binary- Binary-Binary-PDF-Example-short.json Binary-PDF-Example-short Instance ISiKBinary.fsh 23 - 28 Binary-Binary-PDF-Example.json Binary-PDF-Example Instance ISiKBinary.fsh 36 - 41 Bundle-ISiKBundle-Example.json ISiKBundle-Example Instance ISiKBerichtBundle.fsh 24 - 38 -Bundle-SubscriptionNotificationBundleExample.json SubscriptionNotificationBundleExample Instance IsiKPatientMerge.fsh 100 - 109 +Bundle-SubscriptionNotificationBundleExample.json SubscriptionNotificationBundleExample Instance IsiKPatientMerge.fsh 100 - 113 CapabilityStatement-ISiKCapabilityStatementBasisServer.json ISiKCapabilityStatementBasisServer Instance ISiKCapabilityStatementBasisServer.fsh 1 - 1456 CodeSystem-CodeSystemExample.json CodeSystemExample Instance ISiKCodeSystem.fsh 16 - 26 CodeSystem-ISiKBehandlungsergebnisRehaCS.json ISiKBehandlungsergebnisReha CodeSystem CodeSystems.fsh 11 - 18 @@ -22,7 +22,7 @@ Condition-Example-condition-kreuz-stern-sekundaer.json Example Condition-MittelgradigeIntelligenzminderung.json MittelgradigeIntelligenzminderung Instance ISiKDiagnose.fsh 122 - 131 Coverage-CoverageGesetzlich.json CoverageGesetzlich Instance ISiKVersicherungsverhaeltnisGesetzlich.fsh 45 - 54 Coverage-CoveragePrivat.json CoveragePrivat Instance ISiKVersicherungsverhaeltnisSelbstzahler.fsh 18 - 24 -Encounter-Fachabteilungskontakt.json Fachabteilungskontakt Instance ISiKKontaktGesundheitseinrichtung.fsh 169 - 207 +Encounter-Fachabteilungskontakt.json Fachabteilungskontakt Instance ISiKKontaktGesundheitseinrichtung.fsh 155 - 193 Encounter-FachabteilungskontaktMinimal.json FachabteilungskontaktMinimal Instance ISiKBerichtBundle.fsh 55 - 68 Location-BettenstellplatzStandortBeispiel.json BettenstellplatzStandortBeispiel Instance ISiKStandort.fsh 61 - 65 Location-RaumStandortBeispiel.json RaumStandortBeispiel Instance ISiKStandort.fsh 55 - 59 @@ -40,9 +40,9 @@ Patient-PatientinMusterfrauMinimal.json Patient Practitioner-PractitionerWalterArzt.json PractitionerWalterArzt Instance ISiKPersonImGesundheitsberuf.fsh 92 - 127 Procedure-Appendektomie.json Appendektomie Instance ISiKProzedur.fsh 47 - 60 RelatedPerson-ISiKAngehoerigerMustermann.json ISiKAngehoerigerMustermann Instance ISiKAngehoeriger.fsh 49 - 60 -SearchParameter-Encounter-date-start.json Encounter-date-start Instance ISiKKontaktGesundheitseinrichtung.fsh 250 - 268 -SearchParameter-Encounter-end-date.json Encounter-end-date Instance ISiKKontaktGesundheitseinrichtung.fsh 270 - 288 -StructureDefinition-ExtensionISiKRehaEntlassung.json ExtensionISiKRehaEntlassung Extension ISiKKontaktGesundheitseinrichtung.fsh 146 - 167 +SearchParameter-Encounter-date-start.json Encounter-date-start Instance ISiKKontaktGesundheitseinrichtung.fsh 236 - 254 +SearchParameter-Encounter-end-date.json Encounter-end-date Instance ISiKKontaktGesundheitseinrichtung.fsh 256 - 274 +StructureDefinition-ExtensionISiKRehaEntlassung.json ExtensionISiKRehaEntlassung Extension ISiKKontaktGesundheitseinrichtung.fsh 132 - 153 StructureDefinition-ISiKASKCoding.json ISiKASKCoding Profile ISiKDataTypeProfiles.fsh 44 - 52 StructureDefinition-ISiKATCCoding.json ISiKATCCoding Profile ISiKDataTypeProfiles.fsh 54 - 62 StructureDefinition-ISiKAbrechnungsfall.json ISiKAbrechnungsfall Profile ISiKAbrechnungsfall.fsh 1 - 32 @@ -76,8 +76,6 @@ StructureDefinition-ISiKStillstatus.json ISiKSti StructureDefinition-ISiKValueSet.json ISiKValueSet Profile ISiKValueSet.fsh 1 - 21 StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json ISiKVersicherungsverhaeltnisGesetzlich Profile ISiKVersicherungsverhaeltnisGesetzlich.fsh 1 - 43 StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json ISiKVersicherungsverhaeltnisSelbstzahler Profile ISiKVersicherungsverhaeltnisSelbstzahler.fsh 1 - 16 -StructureDefinition-PlannedEndDate.json PlannedEndDate Extension ISiKKontaktGesundheitseinrichtung.fsh 140 - 144 -StructureDefinition-PlannedStartDate.json PlannedStartDate Extension ISiKKontaktGesundheitseinrichtung.fsh 133 - 137 StructureDefinition-patient-merge-subscription.json PatientMergeSubscription Profile IsiKPatientMerge.fsh 2 - 18 Subscription-PatientMergeSubscriptionExample.json PatientMergeSubscriptionExample Instance IsiKPatientMerge.fsh 20 - 31 ValueSet-DiagnosesSCT.json DiagnosesSCT ValueSet valueSets.fsh 1 - 10 diff --git a/Resources/fsh-generated/resources/Bundle-SubscriptionNotificationBundleExample.json b/Resources/fsh-generated/resources/Bundle-SubscriptionNotificationBundleExample.json index c567eddf..73571020 100644 --- a/Resources/fsh-generated/resources/Bundle-SubscriptionNotificationBundleExample.json +++ b/Resources/fsh-generated/resources/Bundle-SubscriptionNotificationBundleExample.json @@ -45,7 +45,7 @@ }, { "name": "timestamp", - "valueDate": "2024-02-22" + "valueInstant": "2024-02-22T18:30:05+01:00" }, { "name": "focus", @@ -56,10 +56,17 @@ ] } ] + }, + "request": { + "method": "GET", + "url": "https://gematik.de/fhir/isik/SubscriptionTopic/patient-merge/$status" + }, + "response": { + "status": "200" } }, { - "fullUrl": "http://example.com/fhir/Patient/DorisQuelle/_history/2", + "fullUrl": "http://example.org/fhir/Patient/DorisQuelle", "resource": { "resourceType": "Patient", "id": "DorisQuelle", @@ -109,7 +116,10 @@ }, "request": { "method": "PUT", - "url": "Patient/DorisQuelle" + "url": "Patient" + }, + "response": { + "status": "201" } } ] diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json index 3d7d0bde..3b9c54cd 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json @@ -2537,13 +2537,13 @@ ], "name": "near", "definition": "http://hl7.org/fhir/SearchParameter/Location-near", - "type": "token", + "type": "special", "documentation": "**Beispiel zur Suche nach Standort nahe (100m) Koordinaten:** \n `GET [base]/Location?contains=52.525851|13.37774|100|m` \n **Anwendungshinweis:** \n Weitere Details siehe [FHIR-Kernspezifikation](https://hl7.org/fhir/R4/search.html#special). " } ] }, { - "type": "Organisation", + "type": "Organization", "extension": [ { "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", @@ -2919,9 +2919,12 @@ }, { "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", + "valueCode": "MAY" + }, { "url": "http://hl7.org/fhir/uv/subscriptions-backport/StructureDefinition/capabilitystatement-subscriptiontopic-canonical", - "valueCode": "MAY", "valueCanonical": "https://gematik.de/fhir/isik/SubscriptionTopic/patient-merge" } ], diff --git a/Resources/fsh-generated/resources/CodeSystem-ISiKBehandlungsergebnisRehaCS.json b/Resources/fsh-generated/resources/CodeSystem-ISiKBehandlungsergebnisRehaCS.json index c94a6e41..40757cd4 100644 --- a/Resources/fsh-generated/resources/CodeSystem-ISiKBehandlungsergebnisRehaCS.json +++ b/Resources/fsh-generated/resources/CodeSystem-ISiKBehandlungsergebnisRehaCS.json @@ -5,6 +5,7 @@ "name": "ISiKBehandlungsergebnisReha", "id": "ISiKBehandlungsergebnisRehaCS", "description": "Behandlungsergebnis Reha gemäß §301(4 UND 4A) SGB V. Diagnosenbezogene Bewertung des Behandlungsergebnisses für einen Versicherten/Berechtigten bei Entlassung aus der Reha-Maßnahme bzw. Stellung eines Antrags auf Verlängerung. Vgl. Schlüsseltabelle 2.71 Diagnose - Behandlungsergebnis.", + "version": "4.0.1", "url": "https://gematik.de/fhir/isik/CodeSystem/ISiKBehandlungsergebnisRehaCS", "concept": [ { @@ -24,7 +25,6 @@ "display": "verschlechtert" } ], - "version": "4.0.1", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/CodeSystem-ISiKBesondereBehandlungsformRehaCS.json b/Resources/fsh-generated/resources/CodeSystem-ISiKBesondereBehandlungsformRehaCS.json index 1a3f63b6..b8cb9583 100644 --- a/Resources/fsh-generated/resources/CodeSystem-ISiKBesondereBehandlungsformRehaCS.json +++ b/Resources/fsh-generated/resources/CodeSystem-ISiKBesondereBehandlungsformRehaCS.json @@ -5,6 +5,7 @@ "name": "ISiKBesondereBehandlungsformReha", "id": "ISiKBesondereBehandlungsformRehaCS", "description": "Besondere Behandlungsform der Reha gemäß §301(4 UND 4A) SGB V. Vgl. Schlüsseltabelle 2.51 Besondere Behandlungsformen.", + "version": "4.0.1", "url": "https://gematik.de/fhir/isik/CodeSystem/ISiKBesondereBehandlungsformRehaCS", "concept": [ { @@ -31,7 +32,6 @@ "display": "sonstige" } ], - "version": "4.0.1", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/CodeSystem-ISiKEntlassformRehaCS.json b/Resources/fsh-generated/resources/CodeSystem-ISiKEntlassformRehaCS.json index 6d1067bd..25441816 100644 --- a/Resources/fsh-generated/resources/CodeSystem-ISiKEntlassformRehaCS.json +++ b/Resources/fsh-generated/resources/CodeSystem-ISiKEntlassformRehaCS.json @@ -5,6 +5,7 @@ "name": "ISiKEntlassformReha", "id": "ISiKEntlassformRehaCS", "description": "ISiK Entlassform Reha. Beschreibt Form und ggf. Weiterbehandlung der Entlassung eines Versicherten/Berechtigten aus verwaltungs- und medizinischer Sicht. Vgl. Schlüsseltabelle 2.107 Entlassungsform.", + "version": "4.0.1", "url": "https://gematik.de/fhir/isik/CodeSystem/ISiKEntlassformRehaCS", "concept": [ { @@ -76,7 +77,6 @@ "display": "Entlassung vor Wiederaufnahme (für CIFolgetherapie)" } ], - "version": "4.0.1", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/CodeSystem-ISiKUnterbrechnungRehaCS.json b/Resources/fsh-generated/resources/CodeSystem-ISiKUnterbrechnungRehaCS.json index 2ef831b4..4c08b81d 100644 --- a/Resources/fsh-generated/resources/CodeSystem-ISiKUnterbrechnungRehaCS.json +++ b/Resources/fsh-generated/resources/CodeSystem-ISiKUnterbrechnungRehaCS.json @@ -5,6 +5,7 @@ "name": "ISiKUnterbrechnungReha", "id": "ISiKUnterbrechnungRehaCS", "description": "ISiK Unterbrechung Reha. Dokumentiert die relevanten Gründe einer Unterbrechung einer Rehabilitationsmaßnahme im Einzelfall. Vgl. Schlüsseltabelle 2.111 Erläuterung zur Unterbrechung.", + "version": "4.0.1", "url": "https://gematik.de/fhir/isik/CodeSystem/ISiKUnterbrechnungRehaCS", "concept": [ { @@ -36,7 +37,6 @@ "display": "Sonstiger Grund, der zur Unterbrechung der Pflegekosten führt" } ], - "version": "4.0.1", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAlkoholAbusus.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAlkoholAbusus.json index 6ee98a23..424eb37d 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAlkoholAbusus.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAlkoholAbusus.json @@ -24,7 +24,7 @@ "coding": [ { "code": "social-history", - "system": "http://hl7.org/fhir/secondary-finding" + "system": "http://terminology.hl7.org/CodeSystem/observation-category" } ] } diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAllergieUnvertraeglichkeit.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAllergieUnvertraeglichkeit.json index 445421f6..6bdb9af5 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAllergieUnvertraeglichkeit.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAllergieUnvertraeglichkeit.json @@ -265,7 +265,7 @@ { "id": "AllergyIntolerance.recordedDate", "path": "AllergyIntolerance.recordedDate", - "short": "", + "short": "Datum an dem die Allergie/Unverträglichkeit aufgezeichnet wurde", "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKOrganisation.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKOrganisation.json index 9a8d3af2..3833437c 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKOrganisation.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKOrganisation.json @@ -154,7 +154,7 @@ "mustSupport": true, "binding": { "strength": "required", - "valueSet": "http://terminology.hl7.org/CodeSystem/organization-type" + "valueSet": "http://hl7.org/fhir/ValueSet/organization-type" } }, { @@ -201,7 +201,7 @@ "mustSupport": true, "binding": { "strength": "required", - "valueSet": "http://fhir.de/CodeSystem/dkgev/Fachabteilungsschluessel-erweitert" + "valueSet": "http://fhir.de/ValueSet/dkgev/Fachabteilungsschluessel-erweitert" } }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKOrganisationFachabteilung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKOrganisationFachabteilung.json index e8c365fa..a93fb212 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKOrganisationFachabteilung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKOrganisationFachabteilung.json @@ -173,7 +173,7 @@ "mustSupport": true, "binding": { "strength": "required", - "valueSet": "http://fhir.de/CodeSystem/dkgev/Fachabteilungsschluessel-erweitert" + "valueSet": "http://fhir.de/ValueSet/dkgev/Fachabteilungsschluessel-erweitert" } }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKRaucherStatus.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKRaucherStatus.json index 48177ba8..92f21f23 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKRaucherStatus.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKRaucherStatus.json @@ -24,7 +24,7 @@ "coding": [ { "code": "social-history", - "system": "http://hl7.org/fhir/secondary-finding" + "system": "http://terminology.hl7.org/CodeSystem/observation-category" } ] } diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKStandort.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKStandort.json index 6f8036f3..5d6600d4 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKStandort.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKStandort.json @@ -59,14 +59,7 @@ { "id": "Location.mode", "path": "Location.mode", - "patternCodeableConcept": { - "coding": [ - { - "code": "instance", - "system": "http://hl7.org/fhir/location-mode" - } - ] - }, + "patternCode": "instance", "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKStandortBettenstellplatz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKStandortBettenstellplatz.json index 21681d89..019636b0 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKStandortBettenstellplatz.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKStandortBettenstellplatz.json @@ -24,7 +24,7 @@ "mustSupport": true, "binding": { "strength": "required", - "valueSet": "http://terminology.hl7.org/CodeSystem/v2-0116" + "valueSet": "http://terminology.hl7.org/ValueSet/v2-0116" } }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKStandortRaum.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKStandortRaum.json index 92726ab8..608f7592 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKStandortRaum.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKStandortRaum.json @@ -24,7 +24,7 @@ "mustSupport": true, "binding": { "strength": "required", - "valueSet": "http://terminology.hl7.org/CodeSystem/v2-0116" + "valueSet": "http://terminology.hl7.org/ValueSet/v2-0116" } }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json b/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json deleted file mode 100644 index 6e88f4b6..00000000 --- a/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "resourceType": "StructureDefinition", - "id": "PlannedEndDate", - "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedEndDate", - "version": "4.0.1", - "name": "PlannedEndDate", - "status": "active", - "experimental": false, - "date": "2024-09-27", - "publisher": "gematik GmbH", - "fhirVersion": "4.0.1", - "kind": "complex-type", - "abstract": false, - "context": [ - { - "type": "element", - "expression": "Element" - } - ], - "type": "Extension", - "baseDefinition": "http://hl7.org/fhir/StructureDefinition/Extension", - "derivation": "constraint", - "differential": { - "element": [ - { - "id": "Extension.extension", - "path": "Extension.extension", - "max": "0" - }, - { - "id": "Extension.url", - "path": "Extension.url", - "fixedUri": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedEndDate" - }, - { - "id": "Extension.value[x]", - "path": "Extension.value[x]", - "type": [ - { - "code": "dateTime" - } - ] - } - ] - } -} diff --git a/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json b/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json deleted file mode 100644 index f7abb79e..00000000 --- a/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "resourceType": "StructureDefinition", - "id": "PlannedStartDate", - "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedStartDate", - "version": "4.0.1", - "name": "PlannedStartDate", - "status": "active", - "experimental": false, - "date": "2024-09-27", - "publisher": "gematik GmbH", - "fhirVersion": "4.0.1", - "kind": "complex-type", - "abstract": false, - "context": [ - { - "type": "element", - "expression": "Element" - } - ], - "type": "Extension", - "baseDefinition": "http://hl7.org/fhir/StructureDefinition/Extension", - "derivation": "constraint", - "differential": { - "element": [ - { - "id": "Extension.extension", - "path": "Extension.extension", - "max": "0" - }, - { - "id": "Extension.url", - "path": "Extension.url", - "fixedUri": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedStartDate" - }, - { - "id": "Extension.value[x]", - "path": "Extension.value[x]", - "type": [ - { - "code": "dateTime" - } - ] - } - ] - } -} diff --git a/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json b/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json index fa94beb5..12443b79 100644 --- a/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json @@ -4,8 +4,8 @@ "name": "DiagnosesSCT", "id": "DiagnosesSCT", "description": "Enthaelt alle SNOMED Clinical finding, Event und Situation with explicit context codes", - "url": "https://gematik.de/fhir/isik/ValueSet/DiagnosesSCT", "version": "4.0.1", + "url": "https://gematik.de/fhir/isik/ValueSet/DiagnosesSCT", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/ValueSet-FhirMimeTypeVS.json b/Resources/fsh-generated/resources/ValueSet-FhirMimeTypeVS.json index a4f1609b..b9b55285 100644 --- a/Resources/fsh-generated/resources/ValueSet-FhirMimeTypeVS.json +++ b/Resources/fsh-generated/resources/ValueSet-FhirMimeTypeVS.json @@ -5,8 +5,8 @@ "id": "FhirMimeTypeVS", "title": "FhirMimeTypeVS", "description": "FHIR Mime Types", - "url": "https://gematik.de/fhir/isik/ValueSet/FhirMimeTypeVS", "version": "4.0.1", + "url": "https://gematik.de/fhir/isik/ValueSet/FhirMimeTypeVS", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json b/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json index 34013020..9e9ac828 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json @@ -4,8 +4,8 @@ "name": "ISiKAccountType", "id": "ISiKAccountType", "title": "ISiKAccountType", - "url": "https://gematik.de/fhir/isik/ValueSet/ISiKAccountType", "version": "4.0.1", + "url": "https://gematik.de/fhir/isik/ValueSet/ISiKAccountType", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKBehandlungsergebnisReha.json b/Resources/fsh-generated/resources/ValueSet-ISiKBehandlungsergebnisReha.json index 7cf21a8f..a00bd215 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKBehandlungsergebnisReha.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKBehandlungsergebnisReha.json @@ -4,8 +4,8 @@ "name": "ISiKBehandlungsergebnisReha", "id": "ISiKBehandlungsergebnisReha", "description": "Behandlungsergebnis Reha gemäß §301(4 UND 4A) SGB V. Diagnosenbezogene Bewertung des Behandlungsergebnisses für einen Versicherten/Berechtigten bei Entlassung aus der Reha-Maßnahme bzw. Stellung eines Antrags auf Verlängerung. Vgl. Schlüsseltabelle 2.71 Diagnose - Behandlungsergebnis.", - "url": "https://gematik.de/fhir/isik/ValueSet/ISiKBehandlungsergebnisReha", "version": "4.0.1", + "url": "https://gematik.de/fhir/isik/ValueSet/ISiKBehandlungsergebnisReha", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKBesondereBehandlungsformReha.json b/Resources/fsh-generated/resources/ValueSet-ISiKBesondereBehandlungsformReha.json index c8fa76f2..9e50a84c 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKBesondereBehandlungsformReha.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKBesondereBehandlungsformReha.json @@ -4,8 +4,8 @@ "name": "ISiKBesondereBehandlungsformReha", "id": "ISiKBesondereBehandlungsformReha", "description": "Besondere Behandlungsform der Reha gemäß §301(4 UND 4A) SGB V. Vgl. Schlüsseltabelle 2.51 Besondere Behandlungsformen.", - "url": "https://gematik.de/fhir/isik/ValueSet/ISiKBesondereBehandlungsformReha", "version": "4.0.1", + "url": "https://gematik.de/fhir/isik/ValueSet/ISiKBesondereBehandlungsformReha", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKEntlassformReha.json b/Resources/fsh-generated/resources/ValueSet-ISiKEntlassformReha.json index 35e27a2c..fc058e54 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKEntlassformReha.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKEntlassformReha.json @@ -4,8 +4,8 @@ "name": "ISiKEntlassformReha", "id": "ISiKEntlassformReha", "description": "ISiK Entlassform Reha. Beschreibt Form und ggf. Weiterbehandlung der Entlassung eines Versicherten/Berechtigten aus verwaltungs- und medizinischer Sicht. Vgl. Schlüsseltabelle 2.107 Entlassungsform.", - "url": "https://gematik.de/fhir/isik/ValueSet/ISiKEntlassformReha", "version": "4.0.1", + "url": "https://gematik.de/fhir/isik/ValueSet/ISiKEntlassformReha", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json b/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json index 78c51279..ad2ba035 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json @@ -3,8 +3,8 @@ "status": "active", "name": "ISiKLocationPhysicalType", "id": "ISiKLocationPhysicalType", - "url": "https://gematik.de/fhir/isik/ValueSet/ISiKLocationPhysicalType", "version": "4.0.1", + "url": "https://gematik.de/fhir/isik/ValueSet/ISiKLocationPhysicalType", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKUnterbrechnungReha.json b/Resources/fsh-generated/resources/ValueSet-ISiKUnterbrechnungReha.json index 20bb8c4a..3c484655 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKUnterbrechnungReha.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKUnterbrechnungReha.json @@ -4,8 +4,8 @@ "name": "ISiKUnterbrechnungReha", "id": "ISiKUnterbrechnungReha", "description": "ISiK Unterbrechung Reha. Dokumentiert die relevanten Gründe einer Unterbrechung einer Rehabilitationsmaßnahme im Einzelfall. Vgl. Schlüsseltabelle 2.111 Erläuterung zur Unterbrechung.", - "url": "https://gematik.de/fhir/isik/ValueSet/ISiKUnterbrechnungReha", "version": "4.0.1", + "url": "https://gematik.de/fhir/isik/ValueSet/ISiKUnterbrechnungReha", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json b/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json index 719c6a6e..8f42401d 100644 --- a/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json @@ -4,8 +4,8 @@ "name": "ProzedurenCodesSCT", "id": "ProzedurenCodesSCT", "description": "Enthaelt alle SNOMED Procedure Codes", - "url": "https://gematik.de/fhir/isik/ValueSet/ProzedurenCodesSCT", "version": "4.0.1", + "url": "https://gematik.de/fhir/isik/ValueSet/ProzedurenCodesSCT", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json b/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json index 30cfae55..6ad637f8 100644 --- a/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json @@ -4,8 +4,8 @@ "name": "ProzedurenKategorieSCT", "id": "ProzedurenKategorieSCT", "description": "Enthaelt alle SNOMED Codes für ein Mapping der OPS Klassentitel", - "url": "https://gematik.de/fhir/isik/ValueSet/ProzedurenKategorieSCT", "version": "4.0.1", + "url": "https://gematik.de/fhir/isik/ValueSet/ProzedurenKategorieSCT", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/ValueSet-RestAndWSSubscriptionChannelType.json b/Resources/fsh-generated/resources/ValueSet-RestAndWSSubscriptionChannelType.json index 26d6b7b2..d95809db 100644 --- a/Resources/fsh-generated/resources/ValueSet-RestAndWSSubscriptionChannelType.json +++ b/Resources/fsh-generated/resources/ValueSet-RestAndWSSubscriptionChannelType.json @@ -5,8 +5,8 @@ "id": "RestAndWSSubscriptionChannelType", "title": "RestAndWSSubscriptionChannelType", "description": "Subscription Channel Type for ISiK", - "url": "https://gematik.de/fhir/isik/ValueSet/RestAndWSSubscriptionChannelType", "version": "4.0.1", + "url": "https://gematik.de/fhir/isik/ValueSet/RestAndWSSubscriptionChannelType", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/ValueSet-SchwangerschaftEtMethodeVS.json b/Resources/fsh-generated/resources/ValueSet-SchwangerschaftEtMethodeVS.json index a3717272..bbb2c7a0 100644 --- a/Resources/fsh-generated/resources/ValueSet-SchwangerschaftEtMethodeVS.json +++ b/Resources/fsh-generated/resources/ValueSet-SchwangerschaftEtMethodeVS.json @@ -4,8 +4,8 @@ "name": "SchwangerschaftEtMethodeVS", "id": "SchwangerschaftEtMethodeVS", "title": "Schwangerschaft Erwarteter Entbindungstermin Methode", - "url": "https://gematik.de/fhir/isik/ValueSet/SchwangerschaftEtMethodeVS", "version": "4.0.1", + "url": "https://gematik.de/fhir/isik/ValueSet/SchwangerschaftEtMethodeVS", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/ValueSet-SchwangerschaftsstatusVS.json b/Resources/fsh-generated/resources/ValueSet-SchwangerschaftsstatusVS.json index eac8e753..8118cd62 100644 --- a/Resources/fsh-generated/resources/ValueSet-SchwangerschaftsstatusVS.json +++ b/Resources/fsh-generated/resources/ValueSet-SchwangerschaftsstatusVS.json @@ -4,8 +4,8 @@ "name": "SchwangerschaftsstatusVS", "id": "SchwangerschaftsstatusVS", "title": "Schwangerschaftsstatus Valueset", - "url": "https://gematik.de/fhir/isik/ValueSet/SchwangerschaftsstatusVS", "version": "4.0.1", + "url": "https://gematik.de/fhir/isik/ValueSet/SchwangerschaftsstatusVS", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/ValueSet-StillstatusVS.json b/Resources/fsh-generated/resources/ValueSet-StillstatusVS.json index 7adac1c2..0fcc6d56 100644 --- a/Resources/fsh-generated/resources/ValueSet-StillstatusVS.json +++ b/Resources/fsh-generated/resources/ValueSet-StillstatusVS.json @@ -5,8 +5,8 @@ "id": "StillstatusVS", "title": "Stillstatus LOINC Antwortoptionen", "description": "Dieses Valueset enthält die Codes zur Beschreibung von Stillstatus LOINC.", - "url": "https://gematik.de/fhir/isik/ValueSet/StillstatusVS", "version": "4.0.1", + "url": "https://gematik.de/fhir/isik/ValueSet/StillstatusVS", "experimental": false, "publisher": "gematik GmbH", "date": "2024-09-27", diff --git a/Resources/fsh-generated/resources/ValueSet-current-smoking-status-uv-ips.json b/Resources/fsh-generated/resources/ValueSet-current-smoking-status-uv-ips.json index db837153..c92e5140 100644 --- a/Resources/fsh-generated/resources/ValueSet-current-smoking-status-uv-ips.json +++ b/Resources/fsh-generated/resources/ValueSet-current-smoking-status-uv-ips.json @@ -5,6 +5,7 @@ "id": "current-smoking-status-uv-ips", "title": "Current Smoking Status - IPS", "description": "HL7 LOINC value set for smoking status. Based on the HL7 Vocab and Structured Doc WG (formerly TC) consensus - per US CDC submission 7/12/2012 for smoking status terms.", + "version": "1.1.0", "url": "https://gematik.de/fhir/isik/ValueSet/current-smoking-status-uv-ips", "meta": { "profile": [ @@ -48,7 +49,6 @@ "value": "2.16.840.1.113883.11.22.59" } ], - "version": "1.1.0", "experimental": false, "publisher": "HL7 International / Patient Care", "contact": [ diff --git a/Resources/input/fsh/ISiKAllergieUnvertraeglichkeit.fsh b/Resources/input/fsh/ISiKAllergieUnvertraeglichkeit.fsh index 19df8bbe..1916cc90 100644 --- a/Resources/input/fsh/ISiKAllergieUnvertraeglichkeit.fsh +++ b/Resources/input/fsh/ISiKAllergieUnvertraeglichkeit.fsh @@ -53,7 +53,7 @@ Description: "Diese Profil ermöglicht die Dokumentation von Allergien und Unver * onsetAge MS * onsetString MS * recordedDate MS - * ^short = "" + * ^short = "Datum an dem die Allergie/Unverträglichkeit aufgezeichnet wurde" * recorder MS * ^short = "Person/Rolle, die die Information dokumentiert" * reference MS diff --git a/Resources/input/fsh/ISiKCapabilityStatementBasisServer.fsh b/Resources/input/fsh/ISiKCapabilityStatementBasisServer.fsh index 7c37f130..ae7e2db8 100644 --- a/Resources/input/fsh/ISiKCapabilityStatementBasisServer.fsh +++ b/Resources/input/fsh/ISiKCapabilityStatementBasisServer.fsh @@ -1190,7 +1190,7 @@ Die Verwendung der CapabilityStatement-Expectation-Extension ist im CapabilitySt * insert Expectation(#MAY) * name = "near" * definition = "http://hl7.org/fhir/SearchParameter/Location-near" - * type = #token + * type = #special * documentation = "**Beispiel zur Suche nach Standort nahe (100m) Koordinaten:** `GET [base]/Location?contains=52.525851|13.37774|100|m` @@ -1202,7 +1202,7 @@ Die Verwendung der CapabilityStatement-Expectation-Extension ist im CapabilitySt //Organisation * resource[+] - * type = #Organisation + * type = #Organization * insert Expectation(#MAY) * supportedProfile[+] = Canonical(ISiKOrganisation) * insert Expectation(#MAY) @@ -1441,7 +1441,7 @@ Die Verwendung der CapabilityStatement-Expectation-Extension ist im CapabilitySt * insert Expectation(#MAY) * code = #delete - * extension + * extension[+] * url = Canonical(CapabilityStatementSubscriptionTopic) * valueCanonical = $patient-merge-topic * operation[+] diff --git a/Resources/input/fsh/ISiKKontaktGesundheitseinrichtung.fsh b/Resources/input/fsh/ISiKKontaktGesundheitseinrichtung.fsh index 52680592..836a8321 100644 --- a/Resources/input/fsh/ISiKKontaktGesundheitseinrichtung.fsh +++ b/Resources/input/fsh/ISiKKontaktGesundheitseinrichtung.fsh @@ -129,20 +129,6 @@ Description: "Dieses Profil ermöglicht die Herstellung eines Fallbezuges welche * identifier 1.. MS * display 1.. MS -// This extension can be safely removed as soon as a package for R5 backport extensions is published and referenced by this project -Extension: PlannedStartDate -Id: PlannedStartDate -* insert Meta -* ^url = "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedStartDate" -* value[x] only dateTime - -// This extension can be safely removed as soon as a package for R5 backport extensions is published and referenced by this project -Extension: PlannedEndDate -Id: PlannedEndDate -* insert Meta -* ^url = "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedEndDate" -* value[x] only dateTime - Extension: ExtensionISiKRehaEntlassung Id: ExtensionISiKRehaEntlassung Description: "Extension zur Dokumentation von Informationen nach §301 (4 und 4a) SGB V, entsprechend dem ärztliche Reha-Entlassungsbericht" diff --git a/Resources/input/fsh/ISiKLebenszustandOberservations.fsh b/Resources/input/fsh/ISiKLebenszustandOberservations.fsh index 37ed9a4d..f422c350 100644 --- a/Resources/input/fsh/ISiKLebenszustandOberservations.fsh +++ b/Resources/input/fsh/ISiKLebenszustandOberservations.fsh @@ -83,7 +83,7 @@ Parent: ISiKLebensZustand Id: ISiKAlkoholAbusus Title: "ISiK Alkohol Abusus" * insert Meta -* category = ObservationCategoryCodes#social-history +* category = $observation-category#social-history * code.coding[snomed-ct] = $sct#15167005 * code.coding[loinc] = $loinc#74043-1 * value[x] only CodeableConcept @@ -109,7 +109,7 @@ Parent: ISiKLebensZustand Id: ISiKRaucherStatus Title: "ISiK Raucherstatus" * insert Meta -* category = ObservationCategoryCodes#social-history +* category = $observation-category#social-history * code.coding[snomed-ct] = $sct#77176002 * code.coding[loinc] = $loinc#72166-2 * value[x] only CodeableConcept diff --git a/Resources/input/fsh/ISiKOrganisation.fsh b/Resources/input/fsh/ISiKOrganisation.fsh index 42f07cc1..986e926f 100644 --- a/Resources/input/fsh/ISiKOrganisation.fsh +++ b/Resources/input/fsh/ISiKOrganisation.fsh @@ -56,7 +56,7 @@ Description: "Dieses Profil beschreibt die Organisationseinheit Fachabteilung in Fachbereich 0..1 MS * type[organisationstyp] = $organization_type#dept * ^comment = "Motivation: Eine Fachabteilung muss als solche hinsichtlich des Typs kodiert werden." -* type[ErweiterterFachabteilungsschluessel] from $FachabteilungsschluesselErweitertCS (required) +* type[ErweiterterFachabteilungsschluessel] from $FachabteilungsschluesselErweitertVS * ^comment = "Motivation: Das ValueSet muss bindend sein, damit Systemübergreifend der Fachabteilungstyp einheitlich kodiert werden kann. Dieses ValueSet KANN über ein Mapping (siehe Abschnitt https://wiki.hl7.de/index.php?title=IG:Value_Sets_f%C3%BCr_XDS#DocumentEntry.practiceSettingCode) mit dem ValueSet der Fachrichtung verknüpft werden und darüber ggf. die Integration von Systemen erleichtern." @@ -170,10 +170,10 @@ Description: "Dieses Profil beschreibt die Nutzung von Organisationseinheiten in organisationstyp 0..1 MS and EinrichtungsArt 0..1 and ErweiterterFachabteilungsschluessel 0..1 MS -* type[organisationstyp] from $organization_type (required) +* type[organisationstyp] from $organization_typeVS (required) * type[organisationstyp].coding.system 1.. MS * type[organisationstyp].coding.code 1.. MS -* type[ErweiterterFachabteilungsschluessel] from $FachabteilungsschluesselErweitertCS (required) +* type[ErweiterterFachabteilungsschluessel] from $FachabteilungsschluesselErweitertVS (required) * type[ErweiterterFachabteilungsschluessel].coding.system 1.. MS * type[ErweiterterFachabteilungsschluessel].coding.code 1.. MS * type[EinrichtungsArt] from $IHEXDSFacilityType (required) diff --git a/Resources/input/fsh/ISiKStandort.fsh b/Resources/input/fsh/ISiKStandort.fsh index c058b34e..46508967 100644 --- a/Resources/input/fsh/ISiKStandort.fsh +++ b/Resources/input/fsh/ISiKStandort.fsh @@ -14,7 +14,7 @@ Description: "Dieses Profil dient der strukturierten Erfassung von Standortangab * ^comment = "Motivation : Entsprechend der Festlegung der DKG laut Basisprofile-DE 1.5.0 (https://simplifier.net/packages/de.basisprofil.r4/) " * name MS //Motivation: Kein Name zwingend notwendig (z.B. für ein Zimmer), wenn über .identifier identifizierbar; weicht daher ab von https://simplifier.net/medizininformatikinitiative-modulstrukturdaten/sd_mii_struktur_location * mode MS //Motivation: entspricht https://simplifier.net/medizininformatikinitiative-modulstrukturdaten/sd_mii_struktur_location - * ^patternCodeableConcept.coding = $LocationMode#instance +* mode = #instance * type MS * ^comment = "Motivation: Ein System muss den Typ eines Standorts zum Abruf bereitstellen, sofern diese Information verfügbar ist." * address MS @@ -38,7 +38,7 @@ Description: "Dieses Profil dient der strukturierten Erfassung von Räumen (als * insert Meta * physicalType = $LocationPhysicalType#ro "Room" * operationalStatus MS -* operationalStatus from http://terminology.hl7.org/CodeSystem/v2-0116 (required) +* operationalStatus from $v2-0116-BedStatus * ^comment = "Motivation: Entsprechend der Bedarfsmeldung im Rahmen der AG zur Ausbaustufe 4 muss ein System den Belegungsstatus eines Raums zum Abruf bereitstellen, sofern diese Information verfügbar ist. Dies dient z.B. der Markierung als 'Isoliert'." Profile: ISiKStandortBettenstellplatz @@ -48,7 +48,7 @@ Description: "Dieses Profil dient der strukturierten Erfassung von Bettenstellpl * insert Meta * physicalType = $LocationPhysicalType#bd "Bed" // Dies entspreicht der Definition des VS "This is not the physical bed/trolley that may be moved about, but the space it may occupy." * operationalStatus MS -* operationalStatus from http://terminology.hl7.org/CodeSystem/v2-0116 (required) +* operationalStatus from $v2-0116-BedStatus * ^comment = "Motivation: Entsprechend der Bedarfsmeldung im Rahmen der AG zur Ausbaustufe 4 muss ein System den Belegungsstatus eines Bettenstellplatz zum Abruf bereitstellen, sofern diese Information verfügbar ist. Dies dient z.B. der Markierung als 'Isoliert'. Im Sinne der Interoperabilität ist das ValueSet verpflichtend." diff --git a/Resources/input/fsh/IsiKPatientMerge.fsh b/Resources/input/fsh/IsiKPatientMerge.fsh index 8c6538bd..b1bb30fb 100644 --- a/Resources/input/fsh/IsiKPatientMerge.fsh +++ b/Resources/input/fsh/IsiKPatientMerge.fsh @@ -103,10 +103,14 @@ Usage: #example * type = #history * entry[+].fullUrl = "urn:uuid:9bb6fcbd-8391-4e35-bd4c-620a2db47af0" * entry[=].resource = SubscriptionNotification -* entry[+].fullUrl = "http://example.com/fhir/Patient/DorisQuelle/_history/2" +* entry[=].request.method = #GET +* entry[=].request.url = "https://gematik.de/fhir/isik/SubscriptionTopic/patient-merge/$status" +* entry[=].response.status = "200" +* entry[+].fullUrl = "http://example.org/fhir/Patient/DorisQuelle" * entry[=].resource = DorisQuelle * entry[=].request.method = #PUT -* entry[=].request.url = "Patient/DorisQuelle" +* entry[=].request.url = "Patient" +* entry[=].response.status = "201" Instance: SubscriptionNotification InstanceOf: Parameters @@ -126,7 +130,7 @@ Usage: #inline * parameter[=].part[0].name = "event-number" * parameter[=].part[=].valueString = "1" * parameter[=].part[+].name = "timestamp" -* parameter[=].part[=].valueDate = "2024-02-22" +* parameter[=].part[=].valueInstant = "2024-02-22T18:30:05+01:00" * parameter[=].part[+].name = "focus" * parameter[=].part[=].valueReference = Reference(DorisQuelle) diff --git a/Resources/input/fsh/aliases.fsh b/Resources/input/fsh/aliases.fsh index b214c962..84cba642 100644 --- a/Resources/input/fsh/aliases.fsh +++ b/Resources/input/fsh/aliases.fsh @@ -3,7 +3,9 @@ Alias: $sct = http://snomed.info/sct Alias: $atc = http://fhir.de/CodeSystem/bfarm/atc Alias: $ask = http://fhir.de/CodeSystem/ask Alias: $condition-clinical = http://terminology.hl7.org/CodeSystem/condition-clinical +Alias: $observation-category = http://terminology.hl7.org/CodeSystem/observation-category Alias: $v2-0203 = http://terminology.hl7.org/CodeSystem/v2-0203 +Alias: $v2-0116-BedStatus = http://terminology.hl7.org/ValueSet/v2-0116 Alias: $diagnosis-role = http://terminology.hl7.org/CodeSystem/diagnosis-role Alias: $v3-ActCode = http://terminology.hl7.org/CodeSystem/v3-ActCode Alias: $DiagnosisRole = http://terminology.hl7.org/CodeSystem/diagnosis-role @@ -56,5 +58,6 @@ Alias: $identifier-bsnr-system = https://fhir.kbv.de/NamingSystem/KBV_NS_Base_BS Alias: $identifer-TelematikID = http://fhir.de/StructureDefinition/identifier-telematik-id Alias: $identifer-TelematikID-system = https://gematik.de/fhir/sid/telematik-id Alias: $organization_type = http://terminology.hl7.org/CodeSystem/organization-type +Alias: $organization_typeVS = http://hl7.org/fhir/ValueSet/organization-type Alias: $identifier-standortnummer-dkg = http://fhir.de/StructureDefinition/identifier-standortnummer Alias: $identifier-standortnummer-dkg-system = http://fhir.de/sid/dkgev/standortnummer \ No newline at end of file diff --git a/Resources/input/fsh/ruleset.fsh b/Resources/input/fsh/ruleset.fsh index fe32cf9a..9ea53be6 100644 --- a/Resources/input/fsh/ruleset.fsh +++ b/Resources/input/fsh/ruleset.fsh @@ -18,8 +18,9 @@ RuleSet: Meta-CapabilityStatement * url = "https://gematik.de/fhir/isik/CapabilityStatement/ISiKCapabilityStatementBasisServer" RuleSet: Expectation (expectation) -* extension.url = $capabilitystatement-expectation -* extension.valueCode = {expectation} +* extension[+] + * url = $capabilitystatement-expectation + * valueCode = {expectation} RuleSet: CommonSearchParameters * searchParam[+]