diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d51dbdee..57bf663f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,6 +42,7 @@ jobs: SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true SUSHI_OPTIONS: Resources/ + SUSHI_VERSION: 2.10.2 EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA - name: Add & Commit diff --git a/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json b/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json index 15a0fae6..5e23ce09 100644 --- a/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json +++ b/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json @@ -1,7 +1,7 @@ { "resourceType": "ImplementationGuide", "url": "https://gematik.de/fhir/ISiK/v2/Basismodul/ImplementationGuide/ISiK-basismodul", - "version": "2.0.5", + "version": "2.0.6", "name": "Implementierungsleitfaden ISiK-Basismodul Stufe 2", "status": "active", "fhirVersion": [ diff --git a/ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Profil.md b/ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Profil.md index 86131dff..417bfb0b 100644 --- a/ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Profil.md +++ b/ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Profil.md @@ -7,5 +7,21 @@ from StructureDefinition where url = 'https://gematik.de/fhir/isik/v2/Basismodul {{tree:https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKAbrechnungsfall, hybrid}} Weitere Hinweise zu den Abgrenzungen der Begrifflichkeiten Fall und Kontakt finden sie unter [Deutsche Basisprofile - Abschnitt Ambulanter/stationärer Fall / Kontakt (Encounter)](https://ig.fhir.de/basisprofile-de/1.2.0/Ressourcen-AmbulanterStationaererFall.html). +--- + +**Terminology Bindings** +@``` +from StructureDefinition +where url in ('https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKAbrechnungsfall' ) +for differential.element +select +Path: path, +join binding.where(valueSet.exists()) +{ + Name: valueSet.substring((9 + valueSet.indexOf('ValueSet/'))), + Strength: strength, + URL: valueSet +} +``` --- \ No newline at end of file diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json index 4097480c..f56a31a1 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json @@ -1,18 +1,8 @@ { "resourceType": "StructureDefinition", "id": "ISiKAbrechnungsfall", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Financial.General" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "patient" - } - ], "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKAbrechnungsfall", - "version": "2.0.5", + "version": "2.0.6", "name": "ISiKAbrechnungsfall", "status": "active", "experimental": false, diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json index 59b79734..74966dd2 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json @@ -1,18 +1,8 @@ { "resourceType": "StructureDefinition", "id": "ISiKAngehoeriger", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Base.Individuals" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "patient" - } - ], "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKAngehoeriger", - "version": "2.0.5", + "version": "2.0.6", "name": "ISiKAngehoeriger", "status": "active", "experimental": false, diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json index ba2d6477..2b5dfc39 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json @@ -1,18 +1,8 @@ { "resourceType": "StructureDefinition", "id": "ISiKBerichtBundle", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Foundation.Other" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "not-classified" - } - ], "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKBerichtBundle", - "version": "2.0.5", + "version": "2.0.6", "name": "ISiKBerichtBundle", "title": "ISiKBerichtBundle", "status": "active", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json index 5f075fc3..984f3dff 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json @@ -1,18 +1,8 @@ { "resourceType": "StructureDefinition", "id": "ISiKBerichtSubSysteme", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Foundation.Documents" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "not-classified" - } - ], "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKBerichtSubSysteme", - "version": "2.0.5", + "version": "2.0.6", "name": "ISiKBerichtSubSysteme", "status": "active", "experimental": false, diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json index f040ab38..18c0f043 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json @@ -1,18 +1,8 @@ { "resourceType": "StructureDefinition", "id": "ISiKBinary", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Foundation.Other" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "not-classified" - } - ], "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKBinary", - "version": "2.0.5", + "version": "2.0.6", "name": "ISiKBinary", "title": "ISiKBinary", "status": "active", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json index ac136695..2ffac15b 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json @@ -1,18 +1,8 @@ { "resourceType": "StructureDefinition", "id": "ISiKCodeSystem", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Foundation.Terminology" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "anonymous" - } - ], "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKCodeSystem", - "version": "2.0.5", + "version": "2.0.6", "name": "ISiKCodeSystem", "status": "active", "experimental": false, diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json index 65765cfa..fac21b3a 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json @@ -1,18 +1,8 @@ { "resourceType": "StructureDefinition", "id": "ISiKDiagnose", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Clinical.Summary" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "patient" - } - ], "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKDiagnose", - "version": "2.0.5", + "version": "2.0.6", "name": "ISiKDiagnose", "status": "active", "experimental": false, diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json index 6a1b6e3e..21cb08b6 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json @@ -1,18 +1,8 @@ { "resourceType": "StructureDefinition", "id": "ISiKKontaktGesundheitseinrichtung", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Base.Management" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "patient" - } - ], "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKKontaktGesundheitseinrichtung", - "version": "2.0.5", + "version": "2.0.6", "name": "ISiKKontaktGesundheitseinrichtung", "status": "active", "experimental": false, diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json index 2d45f853..3bc0e4f0 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json @@ -1,18 +1,8 @@ { "resourceType": "StructureDefinition", "id": "ISiKPatient", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Base.Individuals" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "patient" - } - ], "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKPatient", - "version": "2.0.5", + "version": "2.0.6", "name": "ISiKPatient", "status": "active", "experimental": false, diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json index 28926932..50b6e74e 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json @@ -1,18 +1,8 @@ { "resourceType": "StructureDefinition", "id": "ISiKPersonImGesundheitsberuf", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Base.Individuals" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "individual" - } - ], "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKPersonImGesundheitsberuf", - "version": "2.0.5", + "version": "2.0.6", "name": "ISiKPersonImGesundheitsberuf", "status": "active", "experimental": false, diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json index a8a8fc09..3723dfa1 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json @@ -1,18 +1,8 @@ { "resourceType": "StructureDefinition", "id": "ISiKProzedur", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Clinical.Summary" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "patient" - } - ], "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKProzedur", - "version": "2.0.5", + "version": "2.0.6", "name": "ISiKProzedur", "status": "active", "experimental": false, diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json index 62806ccf..7b4f3797 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json @@ -1,18 +1,8 @@ { "resourceType": "StructureDefinition", "id": "ISiKValueSet", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category", - "valueString": "Foundation.Terminology" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "anonymous" - } - ], "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKValueSet", - "version": "2.0.5", + "version": "2.0.6", "name": "ISiKValueSet", "status": "active", "experimental": false, diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json index c69001c5..508cfe25 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ISiKVersicherungsverhaeltnisGesetzlich", "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKVersicherungsverhaeltnisGesetzlich", - "version": "2.0.5", + "version": "2.0.6", "name": "ISiKVersicherungsverhaeltnisGesetzlich", "status": "active", "experimental": false, diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json index f1c78fb1..70d73767 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ISiKVersicherungsverhaeltnisSelbstzahler", "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKVersicherungsverhaeltnisSelbstzahler", - "version": "2.0.5", + "version": "2.0.6", "name": "ISiKVersicherungsverhaeltnisSelbstzahler", "status": "active", "experimental": false, diff --git a/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json b/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json index 0132a2b2..a3601fb0 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json +++ b/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "PlannedEndDate", "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedEndDate", - "version": "2.0.5", + "version": "2.0.6", "name": "PlannedEndDate", "status": "active", "experimental": false, diff --git a/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json b/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json index ca07571a..2b2fc877 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json +++ b/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "PlannedStartDate", "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedStartDate", - "version": "2.0.5", + "version": "2.0.6", "name": "PlannedStartDate", "status": "active", "experimental": false, diff --git a/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json b/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json index dbc691ae..4ff4348a 100644 --- a/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json @@ -4,7 +4,7 @@ "name": "DiagnosesSCT", "id": "DiagnosesSCT", "description": "Enthaelt alle SNOMED Clinical finding, Event und Situation with explicit context codes", - "version": "2.0.5", + "version": "2.0.6", "url": "https://gematik.de/fhir/isik/v2/Basismodul/ValueSet/DiagnosesSCT", "experimental": false, "publisher": "gematik GmbH", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json b/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json index b0b85b23..61c4a983 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json @@ -4,7 +4,7 @@ "name": "ISiKAccountType", "id": "ISiKAccountType", "title": "ISiKAccountType", - "version": "2.0.5", + "version": "2.0.6", "url": "https://gematik.de/fhir/isik/v2/Basismodul/ValueSet/ISiKAccountType", "experimental": false, "publisher": "gematik GmbH", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json b/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json index fd4cd562..53d669fb 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json @@ -3,7 +3,7 @@ "status": "active", "name": "ISiKLocationPhysicalType", "id": "ISiKLocationPhysicalType", - "version": "2.0.5", + "version": "2.0.6", "url": "https://gematik.de/fhir/isik/v2/Basismodul/ValueSet/ISiKLocationPhysicalType", "experimental": false, "publisher": "gematik GmbH", diff --git a/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json b/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json index 928396b8..53380159 100644 --- a/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json @@ -4,7 +4,7 @@ "name": "ProzedurenCodesSCT", "id": "ProzedurenCodesSCT", "description": "Enthaelt alle SNOMED Procedure Codes", - "version": "2.0.5", + "version": "2.0.6", "url": "https://gematik.de/fhir/isik/v2/Basismodul/ValueSet/ProzedurenCodesSCT", "experimental": false, "publisher": "gematik GmbH", diff --git a/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json b/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json index 575b468f..7e4aada0 100644 --- a/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json @@ -4,7 +4,7 @@ "name": "ProzedurenKategorieSCT", "id": "ProzedurenKategorieSCT", "description": "Enthaelt alle SNOMED Codes für ein Mapping der OPS Klassentitel", - "version": "2.0.5", + "version": "2.0.6", "url": "https://gematik.de/fhir/isik/v2/Basismodul/ValueSet/ProzedurenKategorieSCT", "experimental": false, "publisher": "gematik GmbH", diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index 1922b20f..8aa8ef5a 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -2,10 +2,10 @@ canonical: https://gematik.de/fhir/isik/v2/Basismodul fhirVersion: 4.0.1 FSHOnly: true applyExtensionMetadataToRoot: false -id: Implementierungsleitfaden ISiK-Basismodul Stufe 2 2.0.5 -name: Implementierungsleitfaden ISiK-Basismodul Stufe 2 2.0.5 +id: Implementierungsleitfaden ISiK-Basismodul Stufe 2 2.0.6 +name: Implementierungsleitfaden ISiK-Basismodul Stufe 2 2.0.6 status: active -version: "2.0.5" +version: "2.0.6" publisher: name: Gematik GmbH url: https://www.gematik.de/ diff --git a/package.json b/package.json index 6f172a69..9b5f07d7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "de.gematik.isik-basismodul", - "version": "2.0.5", + "version": "2.0.6", "fhirVersions": [ "4.0.1" ],