From 9b930614ab8c06a6bbf31c252f715c5919454c30 Mon Sep 17 00:00:00 2001 From: f-peverali Date: Wed, 27 Dec 2023 14:45:10 +0100 Subject: [PATCH 01/34] fix link description --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index ea6c9774..33a610da 100644 --- a/README.md +++ b/README.md @@ -5,5 +5,4 @@ Siehe [Basismodul Stufe 3](https://simplifier.net/isik-basis-v3) # ImplementationGuides Dieser Branch enthält .html Versionen der ImplementationGuides vorangegangener Versionen. - -- Stufe 1: https://gematik.github.io/spec-ISiK-Basismodul/index.html +Zur Übersicht der Versionen: https://gematik.github.io/spec-ISiK-Basismodul/index.html From 970ac403931659d1dde762141ad1ed55a2ebba8a Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Fri, 5 Jan 2024 10:39:22 +0100 Subject: [PATCH 02/34] add decision log draft (#344) * add decision log draft * Update ImplementationGuide/markdown/DecisionLog.md * Update ImplementationGuide/markdown/DecisionLog.md * Update ImplementationGuide/markdown/DecisionLog.md * Update ImplementationGuide/markdown/DecisionLog.md * Update ImplementationGuide/markdown/DecisionLog.md --- ImplementationGuide/markdown/DecisionLog.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 ImplementationGuide/markdown/DecisionLog.md diff --git a/ImplementationGuide/markdown/DecisionLog.md b/ImplementationGuide/markdown/DecisionLog.md new file mode 100644 index 00000000..7d177788 --- /dev/null +++ b/ImplementationGuide/markdown/DecisionLog.md @@ -0,0 +1,13 @@ +# Decision Log + +---- +Version: 3.0.1 + +Datum: 05.12.2023 + +* Problem: SNOMED Code (103693007|Diagnostic procedure) zur Codierung einer Prozeduren-Kategorie wurde zurückgezogen. + * Option A (ggf. mit Nennung der Risiken): Der obsolete Code wird ersetzt (165197003|Diagnostic assessment), um zu verhindern, dass Terminologieserver diesen nicht verarbeiten können. + * Risiko: Ein Breaking Change wird eingeführt. + * Option B (ggf. mit Nennung der Risiken): Der obsolete Code wird nicht angepasst, um einen Breaking Change zu vermeiden, mit dem Risiko, dass Terminologieserver diesen nicht verarbeiten können. + * Entscheidung: Option A - umgesetzt hier: obsoleter SNOMED Code ersetzt: https://github.com/gematik/spec-ISiK-Basismodul/pull/322/commits/d72f3a08a41b999074b4f33db299d5d71cd04be9 + From 2ee7134231a3a955b8dfe0f5af7f2a1f8680a2f2 Mon Sep 17 00:00:00 2001 From: f-peverali Date: Tue, 9 Jan 2024 16:59:27 +0100 Subject: [PATCH 03/34] update version --- ...lementierungsleitfadenIsiK_basismodul.json | 1074 ++++++++--------- ImplementationGuide/markdown/Einfuehrung.md | 94 +- ImplementationGuide/markdown/ReleaseNotes.md | 2 +- Resources/input/fsh/ruleset.fsh | 34 +- Resources/sushi-config.yaml | 16 +- package.json | 18 +- 6 files changed, 619 insertions(+), 619 deletions(-) diff --git a/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json b/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json index 840ec238..17918893 100644 --- a/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json +++ b/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json @@ -1,537 +1,537 @@ -{ - "resourceType": "ImplementationGuide", - "url": "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide/ISiK-Basismodul", - "version": "3.0.1", - "name": "Implementierungsleitfaden ISiK-Basismodul Stufe 3", - "status": "active", - "fhirVersion": [ - "4.0.1" - ], - "packageId": "de.gematik.isik-basismodul-stufe3", - "definition": { - "resource": [ - { - "reference": { - "reference": "Patient/test" - } - } - ], - "page": { - "nameUrl": "ImplementationGuide/markdown/Einfuehrung.md", - "title": "Einführung", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/ReleaseNotes.md", - "title": "Release Notes", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Motivation.md", - "title": "Motivation", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen.md", - "title": "Übergreifende Festlegungen", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Methodik.md", - "title": "Methodik", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md", - "title": "Bestätigungsrelevante Systeme", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/KompatibilitaetDerGematikSpezifikation.md", - "title": "Kompatibilität der gematik-Spezifikation", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/KompatibilitaetDerGematikSpezifikation_IHE.md", - "title": "IHE-Profile", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/KompatibilitaetDerGematikSpezifikation_Andere.md", - "title": "Nationale FHIR-Spezifikationen", - "generation": "markdown" - } - ] - }, - { - "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Must-Support-Flags.md", - "title": "Must-Support-Flags", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Repraesentationsformate.md", - "title": "Repräsentationsformate", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Suchparameter.md", - "title": "Suchparameter", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Rest.md", - "title": "REST-API", - "generation": "markdown" - } - ] - }, - { - "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte.md", - "title": "Datenobjekte", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/CapabilityStatement.md", - "title": "CapabilityStatement", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Patient.md", - "title": "Patient (Patient)", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/Patient/Patient_Motivation.md", - "title": "Motivation", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Patient/Patient_Kompatibilitaet.md", - "title": "Kompatibilität", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Patient/Patient_Profil.md", - "title": "Profil", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Patient/Patient_AnmerkungenZuDenMustSupportFeldern.md", - "title": "Anmerkungen zu den Must-Support Feldern", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Patient/Patient_Interaktionen.md", - "title": "Interaktionen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Patient/Patient_Beispiele.md", - "title": "Beispiele", - "generation": "markdown" - } - ] - }, - { - "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Kontakt.md", - "title": "Kontakt/Fall (Encounter)", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Motivation.md", - "title": "Motivation", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Kompatibilitaet.md", - "title": "Kompatibilität", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Profil.md", - "title": "Profil", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_AnmerkungenZuDenMustSupportFeldern.md", - "title": "Anmerkungen zu den Must-Support Feldern", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Interaktionen.md", - "title": "Interaktionen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Beispiele.md", - "title": "Beispiele", - "generation": "markdown" - } - ] - }, - { - "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Abrechnungsfall.md", - "title": "Abrechnungsfall (Account)", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Motivation.md", - "title": "Motivation", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Kompatibilitaet.md", - "title": "Kompatibilität", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Profil.md", - "title": "Profil", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_AnmerkungenZuDenMustSupportFeldern.md", - "title": "Anmerkungen zu den Must-Support Feldern", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Interaktionen.md", - "title": "Interaktionen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Beispiele.md", - "title": "Beispiele", - "generation": "markdown" - } - ] - }, - { - "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Diagnose.md", - "title": "Diagnose (Condition)", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/Diagnose/Diagnose_Motivation.md", - "title": "Motivation", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Diagnose/Diagnose_Kompatibilitaet.md", - "title": "Kompatibilität", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Diagnose/Diagnose_Profil.md", - "title": "Profil", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Diagnose/Diagnose_AnmerkungenZuDenMustSupportFeldern.md", - "title": "Anmerkungen zu den Must-Support Feldern", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Diagnose/Diagnose_Interaktionen.md", - "title": "Interaktionen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Diagnose/Diagnose_Beispiele.md", - "title": "Beispiele", - "generation": "markdown" - } - ] - }, - { - "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Prozedur.md", - "title": "Prozedur (Procedure)", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/Prozedur/Prozedur_Motivation.md", - "title": "Motivation", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Prozedur/Prozedur_Kompatibilitaet.md", - "title": "Kompatibilität", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Prozedur/Prozedur_Profil.md", - "title": "Profil", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Prozedur/Prozedur_AnmerkungenZuDenMustSupportFeldern.md", - "title": "Anmerkungen zu den Must-Support Feldern", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Prozedur/Prozedur_Interaktionen.md", - "title": "Interaktionen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Prozedur/Prozedur_Beispiele.md", - "title": "Beispiele", - "generation": "markdown" - } - ] - }, - { - "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Versicherungsverhaeltnis.md", - "title": "Versicherungsverhältnis (Coverage)", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Motivation.md", - "title": "Motivation", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Kompatibilitaet.md", - "title": "Kompatibilität", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Profil.md", - "title": "Profil", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_AnmerkungenZuDenMustSupportFeldern.md", - "title": "Anmerkungen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Interaktionen.md", - "title": "Interaktionen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Beispiele.md", - "title": "Beispiele", - "generation": "markdown" - } - ] - }, - { - "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Angehoeriger.md", - "title": "Angehöriger (RelatedPerson)", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/Angehoeriger/Angehoeriger_Motivation.md", - "title": "Motivation", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Angehoeriger/Angehoeriger_Kompatibilitaet.md", - "title": "Kompatibilität", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Angehoeriger/Angehoeriger_Profil.md", - "title": "Profil", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Angehoeriger/Angehoeriger_AnmerkungenZuDenMustSupportFeldern.md", - "title": "Anmerkungen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Angehoeriger/Angehoeriger_Interaktionen.md", - "title": "Interaktionen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Angehoeriger/Angehoeriger_Beispiele.md", - "title": "Beispiele", - "generation": "markdown" - } - ] - }, - { - "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_PersonImGesundheitsberuf.md", - "title": "PersonImGesundheitsberuf (Practitioner)", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_Motivation.md", - "title": "Motivation", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_Kompatibilitaet.md", - "title": "Kompatibilität", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_Profil.md", - "title": "Profil", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_AnmerkungenZuDenMustSupportFeldern.md", - "title": "Anmerkungen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_Interaktionen.md", - "title": "Interaktionen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_Beispiele.md", - "title": "Beispiele", - "generation": "markdown" - } - ] - }, - { - "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_BerichtSubsystem.md", - "title": "Bericht aus Subsystemen (Composition)", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Motivation.md", - "title": "Motivation", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Interaktionen.md", - "title": "Interaktionen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Profil.md", - "title": "Profil", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_AnmerkungenZuDenMustSupportFeldern.md", - "title": "Anmerkungen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Beispiele.md", - "title": "Beispiele", - "generation": "markdown" - } - ] - }, - { - "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_CodeSystem.md", - "title": "Katalog (CodeSystem)", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/Katalog/CodeSystem_Motivation.md", - "title": "Motivation", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Katalog/CodeSystem_Profil.md", - "title": "Profil", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Katalog/CodeSystem_Interaktionen.md", - "title": "Interaktionen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Katalog/CodeSystem_AnmerkungenZuDenMustSupportFeldern.md", - "title": "Anmerkungen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Katalog/CodeSystem_Beispiele.md", - "title": "Anmerkungen", - "generation": "markdown" - } - ] - }, - { - "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_ValueSet.md", - "title": "ValueSet (ValueSet)", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/ValueSet/ValueSet_Motivation.md", - "title": "Motivation", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/ValueSet/ValueSet_Kompatibilitaet.md", - "title": "Kompatibilität", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/ValueSet/ValueSet_Profil.md", - "title": "Profil", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/ValueSet/ValueSet_AnmerkungenZuDenMustSupportFeldern.md", - "title": "Anmerkungen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md", - "title": "Anmerkungen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/ValueSet/ValueSet_Beispiele.md", - "title": "Beispiele", - "generation": "markdown" - } - ] - }, - { - "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Binary.md", - "title": "Binary (Binary)", - "generation": "markdown", - "page": [ - { - "nameUrl": "ImplementationGuide/markdown/Binary/Binary_Motivation.md", - "title": "Motivation", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Binary/ValueSet_Kompatibilitaet.md", - "title": "Kompatibilität", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Binary/Binary_Profil.md", - "title": "Profil", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Binary/Binary_AnmerkungenZuDenMustSupportFeldern.md", - "title": "Anmerkungen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Binary/Binary_Interaktionen.md", - "title": "Anmerkungen", - "generation": "markdown" - }, - { - "nameUrl": "ImplementationGuide/markdown/Binary/Binary_Beispiele.md", - "title": "Beispiele", - "generation": "markdown" - } - ] - } - ] - } - ] - } - } -} +{ + "resourceType": "ImplementationGuide", + "url": "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide/ISiK-Basismodul", + "version": "3.0.2", + "name": "Implementierungsleitfaden ISiK-Basismodul Stufe 3", + "status": "active", + "fhirVersion": [ + "4.0.1" + ], + "packageId": "de.gematik.isik-basismodul-stufe3", + "definition": { + "resource": [ + { + "reference": { + "reference": "Patient/test" + } + } + ], + "page": { + "nameUrl": "ImplementationGuide/markdown/Einfuehrung.md", + "title": "Einführung", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/ReleaseNotes.md", + "title": "Release Notes", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Motivation.md", + "title": "Motivation", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen.md", + "title": "Übergreifende Festlegungen", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Methodik.md", + "title": "Methodik", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md", + "title": "Bestätigungsrelevante Systeme", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/KompatibilitaetDerGematikSpezifikation.md", + "title": "Kompatibilität der gematik-Spezifikation", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/KompatibilitaetDerGematikSpezifikation_IHE.md", + "title": "IHE-Profile", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/KompatibilitaetDerGematikSpezifikation_Andere.md", + "title": "Nationale FHIR-Spezifikationen", + "generation": "markdown" + } + ] + }, + { + "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Must-Support-Flags.md", + "title": "Must-Support-Flags", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Repraesentationsformate.md", + "title": "Repräsentationsformate", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Suchparameter.md", + "title": "Suchparameter", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Rest.md", + "title": "REST-API", + "generation": "markdown" + } + ] + }, + { + "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte.md", + "title": "Datenobjekte", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/CapabilityStatement.md", + "title": "CapabilityStatement", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Patient.md", + "title": "Patient (Patient)", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/Patient/Patient_Motivation.md", + "title": "Motivation", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Patient/Patient_Kompatibilitaet.md", + "title": "Kompatibilität", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Patient/Patient_Profil.md", + "title": "Profil", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Patient/Patient_AnmerkungenZuDenMustSupportFeldern.md", + "title": "Anmerkungen zu den Must-Support Feldern", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Patient/Patient_Interaktionen.md", + "title": "Interaktionen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Patient/Patient_Beispiele.md", + "title": "Beispiele", + "generation": "markdown" + } + ] + }, + { + "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Kontakt.md", + "title": "Kontakt/Fall (Encounter)", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Motivation.md", + "title": "Motivation", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Kompatibilitaet.md", + "title": "Kompatibilität", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Profil.md", + "title": "Profil", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_AnmerkungenZuDenMustSupportFeldern.md", + "title": "Anmerkungen zu den Must-Support Feldern", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Interaktionen.md", + "title": "Interaktionen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Beispiele.md", + "title": "Beispiele", + "generation": "markdown" + } + ] + }, + { + "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Abrechnungsfall.md", + "title": "Abrechnungsfall (Account)", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Motivation.md", + "title": "Motivation", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Kompatibilitaet.md", + "title": "Kompatibilität", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Profil.md", + "title": "Profil", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_AnmerkungenZuDenMustSupportFeldern.md", + "title": "Anmerkungen zu den Must-Support Feldern", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Interaktionen.md", + "title": "Interaktionen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Beispiele.md", + "title": "Beispiele", + "generation": "markdown" + } + ] + }, + { + "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Diagnose.md", + "title": "Diagnose (Condition)", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/Diagnose/Diagnose_Motivation.md", + "title": "Motivation", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Diagnose/Diagnose_Kompatibilitaet.md", + "title": "Kompatibilität", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Diagnose/Diagnose_Profil.md", + "title": "Profil", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Diagnose/Diagnose_AnmerkungenZuDenMustSupportFeldern.md", + "title": "Anmerkungen zu den Must-Support Feldern", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Diagnose/Diagnose_Interaktionen.md", + "title": "Interaktionen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Diagnose/Diagnose_Beispiele.md", + "title": "Beispiele", + "generation": "markdown" + } + ] + }, + { + "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Prozedur.md", + "title": "Prozedur (Procedure)", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/Prozedur/Prozedur_Motivation.md", + "title": "Motivation", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Prozedur/Prozedur_Kompatibilitaet.md", + "title": "Kompatibilität", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Prozedur/Prozedur_Profil.md", + "title": "Profil", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Prozedur/Prozedur_AnmerkungenZuDenMustSupportFeldern.md", + "title": "Anmerkungen zu den Must-Support Feldern", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Prozedur/Prozedur_Interaktionen.md", + "title": "Interaktionen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Prozedur/Prozedur_Beispiele.md", + "title": "Beispiele", + "generation": "markdown" + } + ] + }, + { + "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Versicherungsverhaeltnis.md", + "title": "Versicherungsverhältnis (Coverage)", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Motivation.md", + "title": "Motivation", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Kompatibilitaet.md", + "title": "Kompatibilität", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Profil.md", + "title": "Profil", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_AnmerkungenZuDenMustSupportFeldern.md", + "title": "Anmerkungen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Interaktionen.md", + "title": "Interaktionen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Beispiele.md", + "title": "Beispiele", + "generation": "markdown" + } + ] + }, + { + "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Angehoeriger.md", + "title": "Angehöriger (RelatedPerson)", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/Angehoeriger/Angehoeriger_Motivation.md", + "title": "Motivation", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Angehoeriger/Angehoeriger_Kompatibilitaet.md", + "title": "Kompatibilität", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Angehoeriger/Angehoeriger_Profil.md", + "title": "Profil", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Angehoeriger/Angehoeriger_AnmerkungenZuDenMustSupportFeldern.md", + "title": "Anmerkungen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Angehoeriger/Angehoeriger_Interaktionen.md", + "title": "Interaktionen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Angehoeriger/Angehoeriger_Beispiele.md", + "title": "Beispiele", + "generation": "markdown" + } + ] + }, + { + "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_PersonImGesundheitsberuf.md", + "title": "PersonImGesundheitsberuf (Practitioner)", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_Motivation.md", + "title": "Motivation", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_Kompatibilitaet.md", + "title": "Kompatibilität", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_Profil.md", + "title": "Profil", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_AnmerkungenZuDenMustSupportFeldern.md", + "title": "Anmerkungen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_Interaktionen.md", + "title": "Interaktionen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_Beispiele.md", + "title": "Beispiele", + "generation": "markdown" + } + ] + }, + { + "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_BerichtSubsystem.md", + "title": "Bericht aus Subsystemen (Composition)", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Motivation.md", + "title": "Motivation", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Interaktionen.md", + "title": "Interaktionen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Profil.md", + "title": "Profil", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_AnmerkungenZuDenMustSupportFeldern.md", + "title": "Anmerkungen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Beispiele.md", + "title": "Beispiele", + "generation": "markdown" + } + ] + }, + { + "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_CodeSystem.md", + "title": "Katalog (CodeSystem)", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/Katalog/CodeSystem_Motivation.md", + "title": "Motivation", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Katalog/CodeSystem_Profil.md", + "title": "Profil", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Katalog/CodeSystem_Interaktionen.md", + "title": "Interaktionen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Katalog/CodeSystem_AnmerkungenZuDenMustSupportFeldern.md", + "title": "Anmerkungen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Katalog/CodeSystem_Beispiele.md", + "title": "Anmerkungen", + "generation": "markdown" + } + ] + }, + { + "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_ValueSet.md", + "title": "ValueSet (ValueSet)", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/ValueSet/ValueSet_Motivation.md", + "title": "Motivation", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/ValueSet/ValueSet_Kompatibilitaet.md", + "title": "Kompatibilität", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/ValueSet/ValueSet_Profil.md", + "title": "Profil", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/ValueSet/ValueSet_AnmerkungenZuDenMustSupportFeldern.md", + "title": "Anmerkungen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md", + "title": "Anmerkungen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/ValueSet/ValueSet_Beispiele.md", + "title": "Beispiele", + "generation": "markdown" + } + ] + }, + { + "nameUrl": "ImplementationGuide/markdown/Datenobjekte/Datenobjekte_Binary.md", + "title": "Binary (Binary)", + "generation": "markdown", + "page": [ + { + "nameUrl": "ImplementationGuide/markdown/Binary/Binary_Motivation.md", + "title": "Motivation", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Binary/ValueSet_Kompatibilitaet.md", + "title": "Kompatibilität", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Binary/Binary_Profil.md", + "title": "Profil", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Binary/Binary_AnmerkungenZuDenMustSupportFeldern.md", + "title": "Anmerkungen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Binary/Binary_Interaktionen.md", + "title": "Anmerkungen", + "generation": "markdown" + }, + { + "nameUrl": "ImplementationGuide/markdown/Binary/Binary_Beispiele.md", + "title": "Beispiele", + "generation": "markdown" + } + ] + } + ] + } + ] + } + } +} diff --git a/ImplementationGuide/markdown/Einfuehrung.md b/ImplementationGuide/markdown/Einfuehrung.md index 09a6ddcb..2fb20db9 100644 --- a/ImplementationGuide/markdown/Einfuehrung.md +++ b/ImplementationGuide/markdown/Einfuehrung.md @@ -1,47 +1,47 @@ -gematik logo - ----- -Version: 3.0.1 - -Datum: 05.12.2023 - -Status: Aktiv - -Realm: Deutschland - - - -Abgekündigte Versionen oder Zwischenveröffentlichungen der Implementierungsleitfäden finden Sie unter: https://gematik.github.io/spec-ISiK-Basismodul/index.html - - ----- - - -# Interoperabler Datenaustausch durch Informationssysteme im Krankenhaus (ISiK) - -Die gematik wurde vom Gesetzgeber beauftragt, im Benehmen mit der Deutschen Krankenhausgesellschaft (DKG) und den maßgeblichen Bundesverbänden der Industrie im Gesundheitswesen, verbindliche Standards für den Austausch von Gesundheitsdaten mit Informationssystemen im Krankenhaus zu erarbeiten. Dieser FHIR ImplementationGuide (IG) beschreibt die für diesen Zweck entwickelten FHIR Profile und das [REST](https://de.wikipedia.org/wiki/Representational_State_Transfer)-basierte Application Programming Interface (API). Die REST-API wird im Wesentlichen [vom FHIR Standard vorgegeben](https://www.hl7.org/fhir/R4/http.html). Dieser Leitfaden konkretisiert die ISiK-relevanten Funktionen der Standard-REST-API und trifft inhaltliche Festlegungen zu den ISiK-relevanten Ressourcen in Form von Ressourcen-Profilen. - -Hersteller bestätigungsrelevanter Systeme sollen durch diesen IG in die Lage versetzt werden, eine konforme Implementierung zu erstellen und das Bestätigungsverfahren der gematik erfolgreich zu absolvieren. - -Weitere Informationen siehe [§373 SGB V](https://www.gesetze-im-internet.de/sgb_5/__373.html). - -Hinweis: Sowohl für die Implementierung der ISiK-Spezifikation als auch für den Betrieb eines Produktes, das die ISiK-Spezifikation implementiert, ist eine SNOMED-CT-Lizenz notwendig. Diese kann beim [National Release Center für SNOMED CT in Deutschland](https://www.bfarm.de/DE/Kodiersysteme/Terminologien/SNOMED-CT/_node.html) beantragt werden. - -**Kontakt** - -Bringen Sie Allgemeine Fragen und Anmerkungen gerne über unser Anfrageportal ein: [Anfragen ISiK + ISiP](https://service.gematik.de/servicedesk/customer/portal/16) - -Falls Sie keinen Zugang zum Anfrageportal haben und dieses nutzen wollen, senden Sie uns bitte eine Nachricht an die Adresse isik [ at ] gematik.de mit dem Betreff "Portalzugang". - -**Herausgeber** - -gematik GmbH - -[Impressum](https://www.gematik.de/impressum/) - -**Gender-Hinweis** - -Zugunsten des Leseflusses wird in dieser Publikation meist die -männliche Form verwendet. Wir bitten, dies nicht als Zeichen einer -geschlechtsspezifischen Wertung zu deuten. Diese Variante deckt auch alle -weiteren Geschlechter, neben männlich und weiblich, ab. +gematik logo + +---- +Version: 3.0.2 + +Datum: 09.01.2024 + +Status: Aktiv + +Realm: Deutschland + + + +Abgekündigte Versionen oder Zwischenveröffentlichungen der Implementierungsleitfäden finden Sie unter: https://gematik.github.io/spec-ISiK-Basismodul/index.html + + +---- + + +# Interoperabler Datenaustausch durch Informationssysteme im Krankenhaus (ISiK) + +Die gematik wurde vom Gesetzgeber beauftragt, im Benehmen mit der Deutschen Krankenhausgesellschaft (DKG) und den maßgeblichen Bundesverbänden der Industrie im Gesundheitswesen, verbindliche Standards für den Austausch von Gesundheitsdaten mit Informationssystemen im Krankenhaus zu erarbeiten. Dieser FHIR ImplementationGuide (IG) beschreibt die für diesen Zweck entwickelten FHIR Profile und das [REST](https://de.wikipedia.org/wiki/Representational_State_Transfer)-basierte Application Programming Interface (API). Die REST-API wird im Wesentlichen [vom FHIR Standard vorgegeben](https://www.hl7.org/fhir/R4/http.html). Dieser Leitfaden konkretisiert die ISiK-relevanten Funktionen der Standard-REST-API und trifft inhaltliche Festlegungen zu den ISiK-relevanten Ressourcen in Form von Ressourcen-Profilen. + +Hersteller bestätigungsrelevanter Systeme sollen durch diesen IG in die Lage versetzt werden, eine konforme Implementierung zu erstellen und das Bestätigungsverfahren der gematik erfolgreich zu absolvieren. + +Weitere Informationen siehe [§373 SGB V](https://www.gesetze-im-internet.de/sgb_5/__373.html). + +Hinweis: Sowohl für die Implementierung der ISiK-Spezifikation als auch für den Betrieb eines Produktes, das die ISiK-Spezifikation implementiert, ist eine SNOMED-CT-Lizenz notwendig. Diese kann beim [National Release Center für SNOMED CT in Deutschland](https://www.bfarm.de/DE/Kodiersysteme/Terminologien/SNOMED-CT/_node.html) beantragt werden. + +**Kontakt** + +Bringen Sie Allgemeine Fragen und Anmerkungen gerne über unser Anfrageportal ein: [Anfragen ISiK + ISiP](https://service.gematik.de/servicedesk/customer/portal/16) + +Falls Sie keinen Zugang zum Anfrageportal haben und dieses nutzen wollen, senden Sie uns bitte eine Nachricht an die Adresse isik [ at ] gematik.de mit dem Betreff "Portalzugang". + +**Herausgeber** + +gematik GmbH + +[Impressum](https://www.gematik.de/impressum/) + +**Gender-Hinweis** + +Zugunsten des Leseflusses wird in dieser Publikation meist die +männliche Form verwendet. Wir bitten, dies nicht als Zeichen einer +geschlechtsspezifischen Wertung zu deuten. Diese Variante deckt auch alle +weiteren Geschlechter, neben männlich und weiblich, ab. diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index 40547dec..334a7823 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -7,7 +7,7 @@ Die erste Ziffer X bezeichnet ein Major-Release und regelt die Gültigkeit von R ---- Version: 3.0.2 -Datum: WIP +Datum: 09.01.2024 * Hinzufügen optionaler Suchparameter für RelatedPerson: Add new optional SearchParameter for RelatedPerson.address - https://github.com/gematik/spec-ISiK-Basismodul/pull/345/commits/beca71aaae70538f52f934a072928e93d23fd6fd diff --git a/Resources/input/fsh/ruleset.fsh b/Resources/input/fsh/ruleset.fsh index 5dd5798e..04ba45a5 100644 --- a/Resources/input/fsh/ruleset.fsh +++ b/Resources/input/fsh/ruleset.fsh @@ -1,18 +1,18 @@ -RuleSet: Meta -* ^version = "3.0.1" -* ^status = #active -* ^experimental = false -* ^publisher = "gematik GmbH" -* ^date = "2023-12-05" - -RuleSet: MetaInstance -* version = "3.0.1" -* status = #active -* experimental = false -* publisher = "gematik GmbH" -* date = "2023-12-05" - -RuleSet: Meta-CapabilityStatement -* insert MetaInstance -* implementationGuide = "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide|3.0.1" +RuleSet: Meta +* ^version = "3.0.2" +* ^status = #active +* ^experimental = false +* ^publisher = "gematik GmbH" +* ^date = "2024-01-09" + +RuleSet: MetaInstance +* version = "3.0.2" +* status = #active +* experimental = false +* publisher = "gematik GmbH" +* date = "2024-01-09" + +RuleSet: Meta-CapabilityStatement +* insert MetaInstance +* implementationGuide = "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide|3.0.2" * url = "https://gematik.de/fhir/isik/v3/Basismodul/CapabilityStatement/basis-server" \ No newline at end of file diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index 4f44e2f0..b4624333 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -1,8 +1,8 @@ -canonical: https://gematik.de/fhir/isik/v3/Basismodul -fhirVersion: 4.0.1 -FSHOnly: true -applyExtensionMetadataToRoot: false -dependencies: - de.basisprofil.r4: 1.4.0 - hl7.fhir.r4.core: 4.0.1 - hl7.fhir.extensions.r5: 4.0.1 +canonical: https://gematik.de/fhir/isik/v3/Basismodul +fhirVersion: 4.0.1 +FSHOnly: true +applyExtensionMetadataToRoot: false +dependencies: + de.basisprofil.r4: 1.4.0 + hl7.fhir.r4.core: 4.0.1 + hl7.fhir.extensions.r5: 4.0.1 diff --git a/package.json b/package.json index 63366c8e..98ec8a71 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ -{ - "name": "de.gematik.isik-basismodul", - "version": "3.0.1", - "fhirVersions": [ - "4.0.1" - ], - "dependencies": { - "de.basisprofil.r4": "1.4.0" - } +{ + "name": "de.gematik.isik-basismodul", + "version": "3.0.2", + "fhirVersions": [ + "4.0.1" + ], + "dependencies": { + "de.basisprofil.r4": "1.4.0" + } } \ No newline at end of file From 761adec339c4b94f1687559d9fc0acba02247f74 Mon Sep 17 00:00:00 2001 From: f-peverali Date: Tue, 9 Jan 2024 17:01:31 +0100 Subject: [PATCH 04/34] update releasenotes --- ImplementationGuide/markdown/ReleaseNotes.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index 334a7823..852dad8a 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -9,7 +9,9 @@ Version: 3.0.2 Datum: 09.01.2024 -* Hinzufügen optionaler Suchparameter für RelatedPerson: Add new optional SearchParameter for RelatedPerson.address - https://github.com/gematik/spec-ISiK-Basismodul/pull/345/commits/beca71aaae70538f52f934a072928e93d23fd6fd +* Hinzufügen optionaler Suchparameter für RelatedPerson: Add new optional SearchParameter for RelatedPerson.address - Feature/anfisk 146 search related person by @f-peverali in https://github.com/gematik/spec-ISiK-Basismodul/pull/346 + +**Full Changelog**: https://github.com/gematik/spec-ISiK-Basismodul/compare/v.3.0.1...v.3.0.2 ---- Version: 3.0.1 From aeda6037d0e59749768f1d630ba9d91a657ca027 Mon Sep 17 00:00:00 2001 From: f-peverali Date: Tue, 9 Jan 2024 16:01:51 +0000 Subject: [PATCH 05/34] Commit from GitHub Actions (CI (FHIR Validation)) --- ...abilityStatement-ISiKCapabilityStatementBasisServer.json | 6 +++--- .../resources/CodeSystem-CodeSystemExample.json | 4 ++-- .../resources/SearchParameter-Encounter-date-start.json | 4 ++-- .../resources/SearchParameter-Encounter-end-date.json | 4 ++-- .../resources/StructureDefinition-ISiKAbrechnungsfall.json | 4 ++-- .../resources/StructureDefinition-ISiKAngehoeriger.json | 4 ++-- .../resources/StructureDefinition-ISiKBerichtBundle.json | 4 ++-- .../StructureDefinition-ISiKBerichtSubSysteme.json | 4 ++-- .../resources/StructureDefinition-ISiKBinary.json | 4 ++-- .../resources/StructureDefinition-ISiKCodeSystem.json | 4 ++-- .../resources/StructureDefinition-ISiKDiagnose.json | 4 ++-- ...ructureDefinition-ISiKKontaktGesundheitseinrichtung.json | 4 ++-- .../resources/StructureDefinition-ISiKPatient.json | 4 ++-- .../StructureDefinition-ISiKPersonImGesundheitsberuf.json | 4 ++-- .../resources/StructureDefinition-ISiKProzedur.json | 4 ++-- .../resources/StructureDefinition-ISiKValueSet.json | 4 ++-- ...reDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json | 4 ++-- ...Definition-ISiKVersicherungsverhaeltnisSelbstzahler.json | 4 ++-- .../resources/StructureDefinition-PlannedEndDate.json | 4 ++-- .../resources/StructureDefinition-PlannedStartDate.json | 4 ++-- .../StructureDefinition-identifier-abrechnungsnummer.json | 4 ++-- .../fsh-generated/resources/ValueSet-DiagnosesSCT.json | 4 ++-- .../resources/ValueSet-ISiKAccountIdentifierType.json | 4 ++-- .../fsh-generated/resources/ValueSet-ISiKAccountType.json | 4 ++-- .../resources/ValueSet-ISiKLocationPhysicalType.json | 4 ++-- .../resources/ValueSet-ProzedurenCodesSCT.json | 4 ++-- .../resources/ValueSet-ProzedurenKategorieSCT.json | 4 ++-- 27 files changed, 55 insertions(+), 55 deletions(-) diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json index 879ad5f6..ce694e82 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json @@ -2,13 +2,13 @@ "resourceType": "CapabilityStatement", "id": "ISiKCapabilityStatementBasisServer", "url": "https://gematik.de/fhir/isik/v3/Basismodul/CapabilityStatement/basis-server", - "version": "3.0.1", + "version": "3.0.2", "status": "active", "experimental": false, "publisher": "gematik GmbH", - "date": "2023-12-05", + "date": "2024-01-09", "implementationGuide": [ - "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide|3.0.1" + "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide|3.0.2" ], "name": "ISiKCapabilityStatementBasisServer", "title": "ISiK CapabilityStatement Basis Server", diff --git a/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json b/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json index fa63d590..ff253cb7 100644 --- a/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json +++ b/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json @@ -6,11 +6,11 @@ "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKCodeSystem" ] }, - "version": "3.0.1", + "version": "3.0.2", "status": "active", "experimental": false, "publisher": "gematik GmbH", - "date": "2023-12-05", + "date": "2024-01-09", "url": "http://example.org/fhir/CodeSystem/TestKatalog", "name": "TestKatalog", "content": "complete", diff --git a/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json b/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json index 123ee237..167f3ad2 100644 --- a/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json +++ b/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json @@ -3,11 +3,11 @@ "id": "Encounter-date-start", "url": "https://gematik.de/fhir/isik/v3/Basismodul/SearchParameter/Encounter-date-start", "description": "The actual start date of the Encounter (Backport from R5). The parameter cannot repeat or have multiple values.", - "version": "3.0.1", + "version": "3.0.2", "status": "active", "experimental": false, "publisher": "gematik GmbH", - "date": "2023-12-05", + "date": "2024-01-09", "name": "date-start", "code": "date-start", "base": [ diff --git a/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json b/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json index 2f312565..6581e328 100644 --- a/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json +++ b/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json @@ -3,11 +3,11 @@ "id": "Encounter-end-date", "url": "https://gematik.de/fhir/isik/v3/Basismodul/SearchParameter/Encounter-end-date", "description": "The actual end date of the Encounter (Backport from R5). The parameter cannot repeat or have multiple values.", - "version": "3.0.1", + "version": "3.0.2", "status": "active", "experimental": false, "publisher": "gematik GmbH", - "date": "2023-12-05", + "date": "2024-01-09", "name": "end-date", "code": "end-date", "base": [ diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json index 4fd00c53..786f8679 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKAbrechnungsfall", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAbrechnungsfall", - "version": "3.0.1", + "version": "3.0.2", "name": "ISiKAbrechnungsfall", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "description": "Dieses Profil beschreibt die Gruppierung von medizinischen Leistungen in ISiK-Szenarien", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json index 4529bfb9..f9d1dfc4 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKAngehoeriger", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAngehoeriger", - "version": "3.0.1", + "version": "3.0.2", "name": "ISiKAngehoeriger", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Nutzung von Angehörigen in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json index c1afe7b8..6b4593bb 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json @@ -2,12 +2,12 @@ "resourceType": "StructureDefinition", "id": "ISiKBerichtBundle", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKBerichtBundle", - "version": "3.0.1", + "version": "3.0.2", "name": "ISiKBerichtBundle", "title": "ISiKBerichtBundle", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "description": "A document style representation of the receipt (complete, self-contained, signed)", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json index 768114fd..69c2b975 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKBerichtSubSysteme", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKBerichtSubSysteme", - "version": "3.0.1", + "version": "3.0.2", "name": "ISiKBerichtSubSysteme", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Krankenhaus-interne Übermittlung eines Berichtes in Form eines Dokumentes, die in ISiK Szenarien von Subsystemen an Primärsysteme gesendet werden.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json index d813777f..3d7b3aa7 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json @@ -2,12 +2,12 @@ "resourceType": "StructureDefinition", "id": "ISiKBinary", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKBinary", - "version": "3.0.1", + "version": "3.0.2", "name": "ISiKBinary", "title": "ISiKBinary", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "description": "Die Binary-Ressource erlaubt den Umgang mit FHIR-fremden Formaten (z.B. PDFs, Bilder, CDA) innerhalb des FHIR-Frameworks.\r\nDazu werden die Daten base64-codiert in der Binary-Ressource (in XML oder JSON) transportiert oder \r\nüber die REST-API am Binary-Endpunkt in ihrem nativen Format bereitgestellt. \r\nBinary-Ressourcen werden von Attachment-Elementen in DocumentReference-Ressourcen verlinkt und damit in den Kontext anderer FHIR-Ressourcen\r\n(z.B. Patient und Encounter) gestellt. ", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json index ebfd635e..09f82796 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKCodeSystem", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKCodeSystem", - "version": "3.0.1", + "version": "3.0.2", "name": "ISiKCodeSystem", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "description": "Dieses Profil beschreibt die maschinenlesbare Repräsentation von system-sepzifischen Kodierungen in ISiK-Szenarien", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json index 6105deba..39bc426d 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKDiagnose", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKDiagnose", - "version": "3.0.1", + "version": "3.0.2", "name": "ISiKDiagnose", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Nutzung von Diagnosen in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json index 0ac9831e..42185598 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKKontaktGesundheitseinrichtung", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKKontaktGesundheitseinrichtung", - "version": "3.0.1", + "version": "3.0.2", "name": "ISiKKontaktGesundheitseinrichtung", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Herstellung eines Fallbezuges welcher in der Mehrheit der ISiK Szenarien im Krankenhaus essentiell ist.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json index 5343897f..9d08cfb8 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKPatient", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPatient", - "version": "3.0.1", + "version": "3.0.2", "name": "ISiKPatient", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "description": "Dieses Profil beschreibt die Nutzung von administrativen Patientendaten in ISiK-Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json index e913d509..080f29b7 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKPersonImGesundheitsberuf", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPersonImGesundheitsberuf", - "version": "3.0.1", + "version": "3.0.2", "name": "ISiKPersonImGesundheitsberuf", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Nutzung von in Gesundheitsberufen tätigen Personen in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json index 6c9d038e..58671556 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKProzedur", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKProzedur", - "version": "3.0.1", + "version": "3.0.2", "name": "ISiKProzedur", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "description": "Diese Profil ermöglicht die Nutzung von Prozedur-bezogenen Informationen in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json index a1d3ff87..d8221800 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKValueSet", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKValueSet", - "version": "3.0.1", + "version": "3.0.2", "name": "ISiKValueSet", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "description": "Dieses Profil beschreibt die maschinenlesbare Auswahl von Codes für die Kodierung spezifischer FHIR-Elemente in ISiK-Szenarien", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json index afac4bba..fa150f25 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKVersicherungsverhaeltnisGesetzlich", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKVersicherungsverhaeltnisGesetzlich", - "version": "3.0.1", + "version": "3.0.2", "name": "ISiKVersicherungsverhaeltnisGesetzlich", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Darstellung eines gesetzlichen Versicherungsverhältnisses in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json index 96346c66..3aafa55c 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKVersicherungsverhaeltnisSelbstzahler", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKVersicherungsverhaeltnisSelbstzahler", - "version": "3.0.1", + "version": "3.0.2", "name": "ISiKVersicherungsverhaeltnisSelbstzahler", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht Selbstzahler Szenarien in ISiK.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json b/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json index 79d61302..d113a403 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json +++ b/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "PlannedEndDate", "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedEndDate", - "version": "3.0.1", + "version": "3.0.2", "name": "PlannedEndDate", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "mapping": [ diff --git a/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json b/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json index 86a47b60..a1a48fc0 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json +++ b/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "PlannedStartDate", "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedStartDate", - "version": "3.0.1", + "version": "3.0.2", "name": "PlannedStartDate", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "mapping": [ diff --git a/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json b/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json index a90f3789..401bf7e7 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json +++ b/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json @@ -2,12 +2,12 @@ "resourceType": "StructureDefinition", "id": "identifier-abrechnungsnummer", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/identifier-abrechnungsnummer", - "version": "3.0.1", + "version": "3.0.2", "name": "IdentifierAbrechnungsnummer", "title": "Identifier-Profil für die Abbildung einer Abrechnungsnummer (\"Fallnummer\") ", "status": "active", "experimental": false, - "date": "2023-12-05", + "date": "2024-01-09", "publisher": "gematik GmbH", "description": "Identifier-Profil für die Abbildung einer organisationsspezifischen Abrechnungsnummer (\"Fallnummer\")", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json b/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json index 649e7ce5..7e4976a0 100644 --- a/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json @@ -5,10 +5,10 @@ "id": "DiagnosesSCT", "description": "Enthaelt alle SNOMED Clinical finding, Event und Situation with explicit context codes", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/DiagnosesSCT", - "version": "3.0.1", + "version": "3.0.2", "experimental": false, "publisher": "gematik GmbH", - "date": "2023-12-05", + "date": "2024-01-09", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json b/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json index 2a05c921..f740078e 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json @@ -5,10 +5,10 @@ "id": "ISiKAccountIdentifierType", "title": "ISiKAccountIdentifierType", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ISiKAccountIdentifierType", - "version": "3.0.1", + "version": "3.0.2", "experimental": false, "publisher": "gematik GmbH", - "date": "2023-12-05", + "date": "2024-01-09", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json b/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json index b01e4688..d08ad49c 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json @@ -5,10 +5,10 @@ "id": "ISiKAccountType", "title": "ISiKAccountType", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ISiKAccountType", - "version": "3.0.1", + "version": "3.0.2", "experimental": false, "publisher": "gematik GmbH", - "date": "2023-12-05", + "date": "2024-01-09", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json b/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json index e489e927..fbf9de4e 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json @@ -4,10 +4,10 @@ "name": "ISiKLocationPhysicalType", "id": "ISiKLocationPhysicalType", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ISiKLocationPhysicalType", - "version": "3.0.1", + "version": "3.0.2", "experimental": false, "publisher": "gematik GmbH", - "date": "2023-12-05", + "date": "2024-01-09", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json b/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json index 26d0e7b9..47b06ef9 100644 --- a/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json @@ -5,10 +5,10 @@ "id": "ProzedurenCodesSCT", "description": "Enthaelt alle SNOMED Procedure Codes", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ProzedurenCodesSCT", - "version": "3.0.1", + "version": "3.0.2", "experimental": false, "publisher": "gematik GmbH", - "date": "2023-12-05", + "date": "2024-01-09", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json b/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json index 37dcf42e..8753d1ff 100644 --- a/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json @@ -5,10 +5,10 @@ "id": "ProzedurenKategorieSCT", "description": "Enthaelt alle SNOMED Codes für ein Mapping der OPS Klassentitel", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ProzedurenKategorieSCT", - "version": "3.0.1", + "version": "3.0.2", "experimental": false, "publisher": "gematik GmbH", - "date": "2023-12-05", + "date": "2024-01-09", "compose": { "include": [ { From 0bdef0955d525cd1521675ca8167bd1bdd212788 Mon Sep 17 00:00:00 2001 From: Max Theilig Date: Mon, 15 Jan 2024 15:42:50 +0100 Subject: [PATCH 06/34] Feature/devops automation (#355) * initial devcontainer added * enhancement of workflow files * restrcuted image folders * auto-generated diagrams by GitHub Action after source code change Co-Authored-By: MaxMTheilig --- .devcontainer/Dockerfile | 59 ++++++++++ .devcontainer/codfsh-config.yaml | 9 ++ .devcontainer/devcontainer.json | 34 ++++++ .github/workflows/RenderAllDiagrams.yml | 102 ++++++++++++++++++ .github/workflows/main.yml | 14 ++- .../BerichtSubsystem_Interaktionen.md | 5 +- .../markdown/Datenobjekte/Datenobjekte.md | 3 +- ImplementationGuide/markdown/Einfuehrung.md | 2 +- .../Kontakt_Motivation.md | 14 +-- .../Darstellung_Composition_verarbeiten.docx | Bin 37030 -> 0 bytes Material/Gematik_Logo_Flag.png | Bin 19966 -> 0 bytes .../images}/Composition-Bundle.png | Bin .../images}/Encounter-Modell-Abrechnung.png | Bin .../images}/Encounter-Modell-Fallnummer.png | Bin .../images}/Encounter-Modell-ISiK.png | Bin .../images}/Encounter-Modell-MII.png | Bin .../images}/Encounter-Modell-Medizinisch.png | Bin .../images}/Encounter-Modelle.png | Bin Material/images/Gematik_Logo_Flag.svg | 40 +++++++ .../images/IG_Warning.jpg | Bin .../images/diagrams/Composition_Bundle.svg | 3 + ...ISiK Stufe 2 Vereinfachtes Infomodell.pdf} | Bin .../images/diagrams}/Infomodel.png | Bin .../diagrams/Vereinfachtes_Infomodell.svg | 3 + .../src/drawio/Composition_Bundle.drawio | 69 ++++++++++++ .../drawio/Vereinfachtes_Infomodell.drawio} | 0 26 files changed, 341 insertions(+), 16 deletions(-) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/codfsh-config.yaml create mode 100644 .devcontainer/devcontainer.json create mode 100644 .github/workflows/RenderAllDiagrams.yml delete mode 100644 Material/Darstellung_Composition_verarbeiten.docx delete mode 100644 Material/Gematik_Logo_Flag.png rename {ImplementationGuide/Images => Material/images}/Composition-Bundle.png (100%) rename {ImplementationGuide/Images => Material/images}/Encounter-Modell-Abrechnung.png (100%) rename {ImplementationGuide/Images => Material/images}/Encounter-Modell-Fallnummer.png (100%) rename {ImplementationGuide/Images => Material/images}/Encounter-Modell-ISiK.png (100%) rename {ImplementationGuide/Images => Material/images}/Encounter-Modell-MII.png (100%) rename {ImplementationGuide/Images => Material/images}/Encounter-Modell-Medizinisch.png (100%) rename {ImplementationGuide/Images => Material/images}/Encounter-Modelle.png (100%) create mode 100644 Material/images/Gematik_Logo_Flag.svg rename ImplementationGuide/Images/ig_bilder_Warning.jpg => Material/images/IG_Warning.jpg (100%) create mode 100644 Material/images/diagrams/Composition_Bundle.svg rename Material/{ISiK Stufe 2 Vereinfachtes Infomodell.drawio.pdf => images/diagrams/ISiK Stufe 2 Vereinfachtes Infomodell.pdf} (100%) rename {ImplementationGuide/Images => Material/images/diagrams}/Infomodel.png (100%) create mode 100644 Material/images/diagrams/Vereinfachtes_Infomodell.svg create mode 100644 Material/images/src/drawio/Composition_Bundle.drawio rename Material/{ISiK Stufe 2 Vereinfachtes Infomodell.drawio => images/src/drawio/Vereinfachtes_Infomodell.drawio} (100%) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000..987fa188 --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,59 @@ +FROM mcr.microsoft.com/devcontainers/base:alpine-3.18 + +# Setzen der Umgebungsvariablen +ENV FIRELY_TERMINAL_VERSION=3.1.0 +ENV JAVA_VALIDATOR_VERSION=6.0.11 +ENV SUSHI_VERSION=3.5.0 + +# Installieren der notwendige Tools +# Add Microsoft's .NET SDK repository and install .NET SDK +RUN wget https://dot.net/v1/dotnet-install.sh \ + && chmod +x dotnet-install.sh \ + && ./dotnet-install.sh --channel 6.0 --install-dir /usr/share/dotnet \ + && ln -s /usr/share/dotnet/dotnet /usr/local/bin \ + && rm dotnet-install.sh + +# Install ICU libraries +RUN apk add --no-cache icu-libs + +# Install Node.js and npm +RUN apk add --no-cache nodejs npm + +# Install Java (OpenJDK) +RUN apk add --no-cache openjdk11 + +# Install Firely Terminal as vscode user +# Switch to the vscode user +USER vscode + +# Install Firely Terminal +RUN dotnet tool install --global Firely.Terminal --version $FIRELY_TERMINAL_VERSION + +# Add .NET tools to PATH for vscode user +ENV PATH="/home/vscode/.dotnet/tools:${PATH}" + +# Switch back to root user to perform remaining installations +USER root + +RUN npm install -g fsh-sushi@$SUSHI_VERSION + +# Installieren der zusätzliche Abhängigkeiten +RUN apk update && apk add --no-cache jq findutils curl ca-certificates + +# Setup for FHIR Validator +RUN mkdir -p /home/vscode/.fhir/validators/ +RUN wget -q https://github.com/hapifhir/org.hl7.fhir.core/releases/download/$JAVA_VALIDATOR_VERSION/validator_cli.jar -O /home/vscode/.fhir/validators/validator_cli.jar + +# Set ownership +RUN mkdir -p /home/vscode/.fhir/packages && \ + chown -R vscode:vscode /home/vscode/.fhir/packages + +RUN mkdir -p /home/vscode/.fhir/settings/ +COPY codfsh-config.yaml /home/vscode/.fhir/settings/codfsh-config.yaml + +# Setzen des Arbeitsverzeichnis +WORKDIR /workspace + +COPY . /workspace + +CMD [ "/bin/bash" ] diff --git a/.devcontainer/codfsh-config.yaml b/.devcontainer/codfsh-config.yaml new file mode 100644 index 00000000..7b151129 --- /dev/null +++ b/.devcontainer/codfsh-config.yaml @@ -0,0 +1,9 @@ +sushi: + min_version: "3.5.0" +hapi: + min_version: "3.0.0" + parameters: + jurisdiction: DE + locale: de-DE + tx: "n/a" + debug: true diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..8072f952 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,34 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/alpine +{ + "name": "FHIR Development Container", + // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile + "build": { + "dockerfile": "Dockerfile" + }, + "customizations": { + "vscode": { + "extensions": [ + "gematikde.codfsh", + "MITRE-Health.vscode-language-fsh", + "ms-azuretools.vscode-docker" + ], + "settings": { + "codfsh.HapiValidator.Executable": "/home/vscode/.fhir/validators/validator_cli.jar", + "codfsh.HapiValidator.Settings.SettingsFile": "/home/vscode/.fhir/settings/codfsh-config.yaml" + } + } + } + + // Features to add to the dev container. More info: https://containers.dev/features. + // "features": {}, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "uname -a", + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} diff --git a/.github/workflows/RenderAllDiagrams.yml b/.github/workflows/RenderAllDiagrams.yml new file mode 100644 index 00000000..ee949a78 --- /dev/null +++ b/.github/workflows/RenderAllDiagrams.yml @@ -0,0 +1,102 @@ +name: Render All Diagrams + +on: + push: + paths: + - '**/Material/images/src/**/*.puml' + - '**/Material/images/src/**/*.drawio' + branches-ignore: + - 'main**' + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - name: Checkout repository + uses: actions/checkout@v4 + + # Installs Java distribution for running the plantUML jar + - name: Install Java + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' + check-latest: true + + # Install graphviz for plantuml + - name: Setup Graphviz + uses: ts-graphviz/setup-graphviz@v1 + + # Download plantUML jar + - name: Download plantuml file + run: | + wget -O plantuml.jar "https://github.com/plantuml/plantuml/releases/latest/download/plantuml.jar" + + # Clean Folder + - name: Ensure and clean folder + run: | + img_dir=Material/images/diagrams + mkdir -p $img_dir + rm -rf Material/images/diagrams/*.svg + + # Generate the SVGs from PUML + - name: Render PUML to SVG and Move files + run: | + FileNamePaths=$(find . -path "*/images/src/*/*.puml" -exec dirname {} \; | sort -u) + for dir in $FileNamePaths + do + # Render SVGs from PUMLs + find $dir -name "*.puml" -exec java -jar plantuml.jar -tsvg {} \; + done + + # Remove plantUML jar + - name: remove plantuml file + run: | + rm -f plantuml.jar + + # Generate the SVGs from DrawIO + - name: Render DrawIO to SVG with predefined action + uses: rlespinasse/drawio-export-action@v2 + with: + path: ./Material/images/src/drawio/ + remove-page-suffix: true + output: . + format: svg + action-mode: all + + # copies the created SVG files to the images/diagrams folder and deletes the drawio files + - name: Move SVGs to target image folder + run: | + img_dir=Material/images/diagrams + # Find all unique directories containing *.SVGs files under any /imgsrc/ folder + FileNamePaths=$(find . -path "*/images/src/*/*.svg" -exec dirname {} \; | sort -u) + for dir in $FileNamePaths + do + # Move SVGs to out directory + find $dir -name "*.svg" -exec mv {} $img_dir \; + done + + ## add and commit the new generated files + #- name: Create Pull Request + # uses: peter-evans/create-pull-request@v5 + # with: + # branch: auto/images-generation + # commit-message: Generated Images from source Code by GitHub Action + # title: Generated Images from GitHub Action + # assignees: ${{ github.actor }} + # reviewers: ${{ github.actor }} + # delete-branch: true + # labels: automated pr + + - name: Commit rendered files + uses: stefanzweifel/git-auto-commit-action@v5 + with: + commit_user_name: GitHub Actions Bot + commit_user_email: ActionBot@github.com + commit_message: auto-generated diagrams by GitHub Action after source code change \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d33d0d92..ceae92b3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,12 +4,15 @@ name: CI (FHIR Validation) # Controls when the action will run. on: - # Triggers the workflow on push or pull request events + # Triggers the workflow on push or pull request events but only for the master branch push: + paths: + - 'Resources/**' + branches-ignore: + - 'main**' pull_request: - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: + branches: + - 'main**' # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: @@ -46,4 +49,7 @@ jobs: - name: Add & Commit uses: EndBug/add-and-commit@v7 with: + committer_name: GitHub Actions Bot + committer_email: ActionBot@github.com add: 'Resources/fsh-generated/resources/' + message: auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) diff --git a/ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Interaktionen.md b/ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Interaktionen.md index 47f876e7..04e2bcc1 100644 --- a/ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Interaktionen.md +++ b/ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Interaktionen.md @@ -27,8 +27,9 @@ In der aktuellen Ausbaustufe von ISiK MUSS ein empfangenes Dokument in folgenden 4. Hinzufügen des Dokumentes und seiner Metadaten zur Fallakte des Patienten. 5. Visualisierung des Dokumentes und seiner Metadaten in der Fallakte des Patienten -{{render:ImplementationGuide/Images/Composition-Bundle.png}} -*Die Grafik zeigt an einem vereinfachten Beispiel die Zuordnung des HTML-Dokumentes zu Patient und Kontakt in der aktuellen Ausbaustufe von ISiK (schwarze Pfeile). Die grauen Pfeile deuten die Übernahme strukturierter Daten, wie sie in weiteren Ausbaustufen erforderlich wird.* +Composition Bundle + +Die Grafik zeigt an einem vereinfachten Beispiel die Zuordnung des HTML-Dokumentes zu Patient und Kontakt in der aktuellen Ausbaustufe von ISiK (schwarze Pfeile). Die grauen Pfeile deuten die Übernahme strukturierter Daten, wie sie in weiteren Ausbaustufen erforderlich wird. ### Hinweise zum Umgang mit der menschenlesbaren Repräsentation diff --git a/ImplementationGuide/markdown/Datenobjekte/Datenobjekte.md b/ImplementationGuide/markdown/Datenobjekte/Datenobjekte.md index af7cc9eb..6b5151e0 100644 --- a/ImplementationGuide/markdown/Datenobjekte/Datenobjekte.md +++ b/ImplementationGuide/markdown/Datenobjekte/Datenobjekte.md @@ -2,5 +2,4 @@ In den folgenden Unterkapiteln werden die ISiK-Datenobjekte, die in dem vereinfachten Informationsmodell dargestellt sind, und ihre FHIR-Spezifikation beschrieben. -{{render:ImplementationGuide/Images/Infomodel.png}} -*Vereinfachtes Informationsmodell* +Vereinfachtes Infomodell diff --git a/ImplementationGuide/markdown/Einfuehrung.md b/ImplementationGuide/markdown/Einfuehrung.md index 2fb20db9..688772d8 100644 --- a/ImplementationGuide/markdown/Einfuehrung.md +++ b/ImplementationGuide/markdown/Einfuehrung.md @@ -1,4 +1,4 @@ -gematik logo +gematik logo ---- Version: 3.0.2 diff --git a/ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Motivation.md b/ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Motivation.md index c45f72c2..1d1888aa 100644 --- a/ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Motivation.md +++ b/ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Motivation.md @@ -21,11 +21,11 @@ Der stationäre Aufenthalt oder der ambulante Kontakt eines Patienten in einer G * **Abrechnungsfall (Account):** Der Fall, im Sinne einer Gruppierung von medizinischen Leistungen, die in einem gemeinsamen Kontext abgerechnet werden, sind in FHIR durch die Ressource Account repräsentiert. Ein Abrechnungsfall kann mehrere Encounter umfassen (z.B. vorstationärer Besuch, stationärer Aufenthalt und nachstationäre Besuche) -{{render:ImplementationGuide/Images/Encounter-Modell-Abrechnung.png}} +{{render:Material/Images/Encounter-Modell-Abrechnung.png}} * **Medizinischer Fall (EpisodeOfCare):** Der medizinische Fall gruppiert Informationen, die im Kontext einer gemeinsamen (Dauer-)Diagnose stehen und wird in FHIR durch die EpisodeOfCare dargestellt. -{{render:ImplementationGuide/Images/Encounter-Modell-Medizinisch.png}} +{{render:Material/Images/Encounter-Modell-Medizinisch.png}} --- @@ -43,7 +43,7 @@ Als Kontakt des Patienten mit konkreten Servicestellen, wie z.B. Radiologie oder Zur Unterscheidung der verschiedenen Kontaktebenen wird in der MI-I eine Codierung in `Encounter.type` verwendet. Die Hierarchie der Encounter wird über die `Encounter.partOf`-Relation hergestellt. Ambulante Besuche werden in dem Modell derzeit noch nicht berücksichtigt. -{{render:ImplementationGuide/Images/Encounter-Modell-MII.png}} +{{render:Material/Images/Encounter-Modell-MII.png}} --- @@ -51,7 +51,7 @@ Zur Unterscheidung der verschiedenen Kontaktebenen wird in der MI-I eine Codieru Für die Ausbaustufe 2 und 3 des ISiK Basismoduls werden alle zuvor genannten Sichtweise und Modelle berücksichtigt: -{{render:ImplementationGuide/Images/Encounter-Modelle.png}} +{{render:Material/Images/Encounter-Modelle.png}} Verpflichtend umzusetzen ist für die bestätigungsrelevanten Systeme der Account, im Sinne der Gruppierung einzelner Besuche, zu einem gemeinsamen (Abrechnungs-)Fall sowie der Encounter der Ebene "Abteilungskontakt" im Sinne des Modells der Medizininformatikinitiative. @@ -61,7 +61,7 @@ Wichtig sind dabei jedoch folgende Punkte zu beachten: * Encounter im ISiK-Kontext sind stets als "Abteilungskontakte, im Sinne der MI-I mit dem entsprechenden `Encounter.type`-Code, zu kennzeichnen. * jegliche im ISiK-Basis-Modul, als auch in anderen ISiK-Modulen definierte Ressourcen, die über einen Encounter-Kontext verfügen, müssen auf einen ISiK-Encounter (Abteilungskontakt) referenzieren. -{{render:ImplementationGuide/Images/Encounter-Modell-ISiK.png}} +{{render:Material/Images/Encounter-Modell-ISiK.png}} --- @@ -78,8 +78,8 @@ Um insbesondere Subsysteme von der Pflicht zu entbinden, die Account-Ressource z | Hinweis | Änderung gegenüber ISiK-Basis-Modul Stufe 1!| |---------|---------------------| -| {{render:ImplementationGuide-Images-ig-bilder-Warning}} | Die Abbildung der Fallnummer als Identifier des Accounts ist abweichend von der im Basismodul Stufe 1 festgelegten Abbildung der Fallnummer als Identifier des Encounters. Diese Änderung ist erforderlich, da die Fallnummer nicht geeignet ist, einen Encounter eindeutig zu identifizieren. Der Encounter kann weiterhin einen von der Abrechnungsfallnummer unabhänigen Identifier enthalten (z.B. "Aufnahmenummer", Bewegungsnummer). Dieser identifiziert eineindeutig den jeweiligen Kontakt.| +| {{render:Material/Images/IG_Warning}} | Die Abbildung der Fallnummer als Identifier des Accounts ist abweichend von der im Basismodul Stufe 1 festgelegten Abbildung der Fallnummer als Identifier des Encounters. Diese Änderung ist erforderlich, da die Fallnummer nicht geeignet ist, einen Encounter eindeutig zu identifizieren. Der Encounter kann weiterhin einen von der Abrechnungsfallnummer unabhänigen Identifier enthalten (z.B. "Aufnahmenummer", Bewegungsnummer). Dieser identifiziert eineindeutig den jeweiligen Kontakt.| -{{render:ImplementationGuide/Images/Encounter-Modell-Fallnummer.png}} +{{render:Material/Images/Encounter-Modell-Fallnummer.png}} --- diff --git a/Material/Darstellung_Composition_verarbeiten.docx b/Material/Darstellung_Composition_verarbeiten.docx deleted file mode 100644 index 9ef98900834ab1dbaae81c7537e90f2948e42b89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37030 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 bM7lVHeYI*k$2a#hT;*G$k2~Kr?5BSNELDEo diff --git a/ImplementationGuide/Images/Composition-Bundle.png b/Material/images/Composition-Bundle.png similarity index 100% rename from ImplementationGuide/Images/Composition-Bundle.png rename to Material/images/Composition-Bundle.png diff --git a/ImplementationGuide/Images/Encounter-Modell-Abrechnung.png b/Material/images/Encounter-Modell-Abrechnung.png similarity index 100% rename from ImplementationGuide/Images/Encounter-Modell-Abrechnung.png rename to Material/images/Encounter-Modell-Abrechnung.png diff --git a/ImplementationGuide/Images/Encounter-Modell-Fallnummer.png b/Material/images/Encounter-Modell-Fallnummer.png similarity index 100% rename from ImplementationGuide/Images/Encounter-Modell-Fallnummer.png rename to Material/images/Encounter-Modell-Fallnummer.png diff --git a/ImplementationGuide/Images/Encounter-Modell-ISiK.png b/Material/images/Encounter-Modell-ISiK.png similarity index 100% rename from ImplementationGuide/Images/Encounter-Modell-ISiK.png rename to Material/images/Encounter-Modell-ISiK.png diff --git a/ImplementationGuide/Images/Encounter-Modell-MII.png b/Material/images/Encounter-Modell-MII.png similarity index 100% rename from ImplementationGuide/Images/Encounter-Modell-MII.png rename to Material/images/Encounter-Modell-MII.png diff --git a/ImplementationGuide/Images/Encounter-Modell-Medizinisch.png b/Material/images/Encounter-Modell-Medizinisch.png similarity index 100% rename from ImplementationGuide/Images/Encounter-Modell-Medizinisch.png rename to Material/images/Encounter-Modell-Medizinisch.png diff --git a/ImplementationGuide/Images/Encounter-Modelle.png b/Material/images/Encounter-Modelle.png similarity index 100% rename from ImplementationGuide/Images/Encounter-Modelle.png rename to Material/images/Encounter-Modelle.png diff --git a/Material/images/Gematik_Logo_Flag.svg b/Material/images/Gematik_Logo_Flag.svg new file mode 100644 index 00000000..20976701 --- /dev/null +++ b/Material/images/Gematik_Logo_Flag.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + diff --git a/ImplementationGuide/Images/ig_bilder_Warning.jpg b/Material/images/IG_Warning.jpg similarity index 100% rename from ImplementationGuide/Images/ig_bilder_Warning.jpg rename to Material/images/IG_Warning.jpg diff --git a/Material/images/diagrams/Composition_Bundle.svg b/Material/images/diagrams/Composition_Bundle.svg new file mode 100644 index 00000000..3d60601e --- /dev/null +++ b/Material/images/diagrams/Composition_Bundle.svg @@ -0,0 +1,3 @@ + + +
Bundle
Bundle
Patientenakten "54321"
Patientenakten "54321"
Composition

.text



.encounter


.subject


.section "Diagnosen"



.section "Laborwerte"
Composition...
Fallakte "12345"

Dokumente:
   - Befundbericht vom 9.10.2020





Diagnosen:
   - Diabetes Typ II

Laborwerte:
   - Blutzucker: 201mg/dl 

Fallakte "12345"...
<html<h1>Befundbericht</h1>
<p>Patient: Mustermann, Max (*01.01.1970)</p><h2>Diagnosen</h2>…
<h2>VitalParameter</h2>
…mit freundlichen Grüßen</html>
<html<h1>Befundbericht</h1>...
<html<h1>Befundbericht</h1>
<p>Patient: Mustermann, Max (*01.01.1970)</p><h2>Diagnosen</h2>…
<h2>VitalParameter</h2>
…mit freundlichen Grüßen</html>
<html<h1>Befundbericht</h1>...
Encounter.identifier
= 12345
Encounter.identifier...
Patient.identifier
= 54321
Patient.identifier...
Condition.display
= "Diabetes Typ II"
Condition.display...
Observation
.code = "Blutzucker"
.value = "201 mg/dl"
Observation...Text is not SVG - cannot display \ No newline at end of file diff --git a/Material/ISiK Stufe 2 Vereinfachtes Infomodell.drawio.pdf b/Material/images/diagrams/ISiK Stufe 2 Vereinfachtes Infomodell.pdf similarity index 100% rename from Material/ISiK Stufe 2 Vereinfachtes Infomodell.drawio.pdf rename to Material/images/diagrams/ISiK Stufe 2 Vereinfachtes Infomodell.pdf diff --git a/ImplementationGuide/Images/Infomodel.png b/Material/images/diagrams/Infomodel.png similarity index 100% rename from ImplementationGuide/Images/Infomodel.png rename to Material/images/diagrams/Infomodel.png diff --git a/Material/images/diagrams/Vereinfachtes_Infomodell.svg b/Material/images/diagrams/Vereinfachtes_Infomodell.svg new file mode 100644 index 00000000..7ce36884 --- /dev/null +++ b/Material/images/diagrams/Vereinfachtes_Infomodell.svg @@ -0,0 +1,3 @@ + + +
Person im Gesundheitsberuf
Person im Gesundheit...
Prozedur
Prozedur
Diagnose
Diagnose
Kontakt (Fall)
Kontakt (Fall)
Abrechnungsfall
Abrechnungsfall
Patient
Patient
Gesetzlich Versicherter
Gesetzlich Versicher...
Selbstzahler
Selbstzahler
Bericht aus Subsystem 
Bericht aus Subsystem 
Angehöriger
AngehörigerText is not SVG - cannot display \ No newline at end of file diff --git a/Material/images/src/drawio/Composition_Bundle.drawio b/Material/images/src/drawio/Composition_Bundle.drawio new file mode 100644 index 00000000..557f2acc --- /dev/null +++ b/Material/images/src/drawio/Composition_Bundle.drawio @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Material/ISiK Stufe 2 Vereinfachtes Infomodell.drawio b/Material/images/src/drawio/Vereinfachtes_Infomodell.drawio similarity index 100% rename from Material/ISiK Stufe 2 Vereinfachtes Infomodell.drawio rename to Material/images/src/drawio/Vereinfachtes_Infomodell.drawio From 543f959354497f62ea6326d7574718ab60554e78 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Mon, 15 Jan 2024 17:01:41 +0100 Subject: [PATCH 07/34] TC 3.0.3 - update HTTP response requirement #308 (#353) * init TC 3.0.3 * update HTTP response requirement #308 * Update ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Rest.md * Update ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Rest.md * Feature/devops automation (#355) * initial devcontainer added * enhancement of workflow files * restrcuted image folders * auto-generated diagrams by GitHub Action after source code change Co-Authored-By: MaxMTheilig * update releasenotes * update version * auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) --------- Co-authored-by: Alexander Zautke Co-authored-by: Max Theilig Co-authored-by: MaxMTheilig Co-authored-by: f-peverali --- .../ImplementierungsleitfadenIsiK_basismodul.json | 2 +- ImplementationGuide/markdown/Einfuehrung.md | 4 ++-- ImplementationGuide/markdown/ReleaseNotes.md | 9 +++++++++ .../UebergreifendeFestlegungen_Rest.md | 5 +++-- ...tyStatement-ISiKCapabilityStatementBasisServer.json | 6 +++--- .../resources/CodeSystem-CodeSystemExample.json | 4 ++-- .../SearchParameter-Encounter-date-start.json | 4 ++-- .../resources/SearchParameter-Encounter-end-date.json | 4 ++-- .../StructureDefinition-ISiKAbrechnungsfall.json | 4 ++-- .../StructureDefinition-ISiKAngehoeriger.json | 4 ++-- .../StructureDefinition-ISiKBerichtBundle.json | 4 ++-- .../StructureDefinition-ISiKBerichtSubSysteme.json | 4 ++-- .../resources/StructureDefinition-ISiKBinary.json | 4 ++-- .../resources/StructureDefinition-ISiKCodeSystem.json | 4 ++-- .../resources/StructureDefinition-ISiKDiagnose.json | 4 ++-- ...reDefinition-ISiKKontaktGesundheitseinrichtung.json | 4 ++-- .../resources/StructureDefinition-ISiKPatient.json | 4 ++-- ...ructureDefinition-ISiKPersonImGesundheitsberuf.json | 4 ++-- .../resources/StructureDefinition-ISiKProzedur.json | 4 ++-- .../resources/StructureDefinition-ISiKValueSet.json | 4 ++-- ...inition-ISiKVersicherungsverhaeltnisGesetzlich.json | 4 ++-- ...ition-ISiKVersicherungsverhaeltnisSelbstzahler.json | 4 ++-- .../resources/StructureDefinition-PlannedEndDate.json | 4 ++-- .../StructureDefinition-PlannedStartDate.json | 4 ++-- ...ructureDefinition-identifier-abrechnungsnummer.json | 4 ++-- .../fsh-generated/resources/ValueSet-DiagnosesSCT.json | 4 ++-- .../resources/ValueSet-ISiKAccountIdentifierType.json | 4 ++-- .../resources/ValueSet-ISiKAccountType.json | 4 ++-- .../resources/ValueSet-ISiKLocationPhysicalType.json | 4 ++-- .../resources/ValueSet-ProzedurenCodesSCT.json | 4 ++-- .../resources/ValueSet-ProzedurenKategorieSCT.json | 4 ++-- Resources/input/fsh/ruleset.fsh | 10 +++++----- package.json | 2 +- 33 files changed, 76 insertions(+), 66 deletions(-) diff --git a/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json b/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json index 17918893..9c27feae 100644 --- a/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json +++ b/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json @@ -1,7 +1,7 @@ { "resourceType": "ImplementationGuide", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide/ISiK-Basismodul", - "version": "3.0.2", + "version": "3.0.3", "name": "Implementierungsleitfaden ISiK-Basismodul Stufe 3", "status": "active", "fhirVersion": [ diff --git a/ImplementationGuide/markdown/Einfuehrung.md b/ImplementationGuide/markdown/Einfuehrung.md index 688772d8..8dbd1442 100644 --- a/ImplementationGuide/markdown/Einfuehrung.md +++ b/ImplementationGuide/markdown/Einfuehrung.md @@ -1,9 +1,9 @@ gematik logo ---- -Version: 3.0.2 +Version: 3.0.3 -Datum: 09.01.2024 +Datum: 15.01.2024 Status: Aktiv diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index 852dad8a..c30a3092 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -4,6 +4,15 @@ 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: 3.0.3 + +Datum: 15.01.2024 + +* Anpassung und Harmonisierung der Anforderungen zu HTTP-Responses: update HTTP response requirement #308 by @f-peverali in https://github.com/gematik/spec-ISiK-Basismodul/pull/354 + +**Full Changelog**: https://github.com/gematik/spec-ISiK-Basismodul/compare/v.3.0.2...v.3.0.3 + ---- Version: 3.0.2 diff --git a/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Rest.md b/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Rest.md index efd172fc..dbd05841 100644 --- a/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Rest.md +++ b/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Rest.md @@ -37,10 +37,11 @@ Sollte die erzeugte Ressource dauerhaft in das bestätigungsrelevante System üb Per Create-Interaktion erzeugte Ressourcen MÜSSEN im Falle einer erfolgreichen Übermittlung direkt über die READ- und SEARCH-Interaktionen zur Verfügung gestellt werden. -Ressourcen, die zu einem entsprechenden ISiK-Profil nicht konform sind, MÜSSEN durch das bestätigungsrelevante System abgelehnt werden. Als Antwort MUSS ein HTTP 400 Status Code mit einer ```OperationOutcome```-Ressource zurückgegeben werden. Diese enthält eine Auflistung aller Fehler in der übermittelten Ressource in kodierter Form. +Ressourcen, die zu einem entsprechenden ISiK-Profil nicht konform sind, MÜSSEN durch das bestätigungsrelevante System abgelehnt werden. Als Antwort MUSS ein HTTP Status-Code 400 - Bad Request mit einer ```OperationOutcome```-Ressource zurückgegeben werden, falls es sich um einen syntaktischen Fehler in der Repräsentation der Ressource handelt. Die ```OperationOutcome``` MUSS eine Auflistung aller Fehler in der übermittelten Ressource in kodierter Form vorweisen. Anderweitig (semantisch) invalide Ressourcen MÜSSEN ebenfalls mit einer entsprechenden OperationOutcome-Ressource abgewiesen werden. In diesem Fall SOLLTE der HTTP Status-Code HTTP 422 - Unprocessable Entity verwendet werden. + ## Update-Interaktionen -Das Update einer Ressource KANN per HTTP PUT (vgl. [FHIR RESTful API - update](https://www.hl7.org/fhir/R4/http.html#update)) unterstützt werden. Es ist zu beachten, dass beim Update einer Ressource bestimmte dazugehörige [Metadaten](https://www.hl7.org/fhir/R4/resource.html#Meta) beibehalten werden SOLLTEN. +Das Update einer Ressource KANN per HTTP PUT (vgl. [FHIR RESTful API - update](https://www.hl7.org/fhir/R4/http.html#update)) unterstützt werden. Es ist zu beachten, dass beim Update einer Ressource bestimmte dazugehörige [Metadaten](https://www.hl7.org/fhir/R4/resource.html#Meta) beibehalten werden SOLLTEN. Die gleichen Vorgaben für die Handhabung von invaliden Ressourcen wie beschrieben im Abschnitt "Create-Interaktionen", gelten auch für Update-Interaktionen. ## Sicherheitsaspekte diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json index ce694e82..eacb53a3 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json @@ -2,13 +2,13 @@ "resourceType": "CapabilityStatement", "id": "ISiKCapabilityStatementBasisServer", "url": "https://gematik.de/fhir/isik/v3/Basismodul/CapabilityStatement/basis-server", - "version": "3.0.2", + "version": "3.0.3", "status": "active", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-09", + "date": "2024-01-15", "implementationGuide": [ - "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide|3.0.2" + "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide|3.0.3" ], "name": "ISiKCapabilityStatementBasisServer", "title": "ISiK CapabilityStatement Basis Server", diff --git a/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json b/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json index ff253cb7..4ddd85e3 100644 --- a/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json +++ b/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json @@ -6,11 +6,11 @@ "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKCodeSystem" ] }, - "version": "3.0.2", + "version": "3.0.3", "status": "active", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-09", + "date": "2024-01-15", "url": "http://example.org/fhir/CodeSystem/TestKatalog", "name": "TestKatalog", "content": "complete", diff --git a/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json b/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json index 167f3ad2..53bac581 100644 --- a/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json +++ b/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json @@ -3,11 +3,11 @@ "id": "Encounter-date-start", "url": "https://gematik.de/fhir/isik/v3/Basismodul/SearchParameter/Encounter-date-start", "description": "The actual start date of the Encounter (Backport from R5). The parameter cannot repeat or have multiple values.", - "version": "3.0.2", + "version": "3.0.3", "status": "active", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-09", + "date": "2024-01-15", "name": "date-start", "code": "date-start", "base": [ diff --git a/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json b/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json index 6581e328..154786c0 100644 --- a/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json +++ b/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json @@ -3,11 +3,11 @@ "id": "Encounter-end-date", "url": "https://gematik.de/fhir/isik/v3/Basismodul/SearchParameter/Encounter-end-date", "description": "The actual end date of the Encounter (Backport from R5). The parameter cannot repeat or have multiple values.", - "version": "3.0.2", + "version": "3.0.3", "status": "active", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-09", + "date": "2024-01-15", "name": "end-date", "code": "end-date", "base": [ diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json index 786f8679..e324623f 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKAbrechnungsfall", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAbrechnungsfall", - "version": "3.0.2", + "version": "3.0.3", "name": "ISiKAbrechnungsfall", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "description": "Dieses Profil beschreibt die Gruppierung von medizinischen Leistungen in ISiK-Szenarien", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json index f9d1dfc4..1cba4724 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKAngehoeriger", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAngehoeriger", - "version": "3.0.2", + "version": "3.0.3", "name": "ISiKAngehoeriger", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Nutzung von Angehörigen in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json index 6b4593bb..a32b308e 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json @@ -2,12 +2,12 @@ "resourceType": "StructureDefinition", "id": "ISiKBerichtBundle", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKBerichtBundle", - "version": "3.0.2", + "version": "3.0.3", "name": "ISiKBerichtBundle", "title": "ISiKBerichtBundle", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "description": "A document style representation of the receipt (complete, self-contained, signed)", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json index 69c2b975..f7d5df50 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKBerichtSubSysteme", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKBerichtSubSysteme", - "version": "3.0.2", + "version": "3.0.3", "name": "ISiKBerichtSubSysteme", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Krankenhaus-interne Übermittlung eines Berichtes in Form eines Dokumentes, die in ISiK Szenarien von Subsystemen an Primärsysteme gesendet werden.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json index 3d7b3aa7..5fdf394f 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json @@ -2,12 +2,12 @@ "resourceType": "StructureDefinition", "id": "ISiKBinary", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKBinary", - "version": "3.0.2", + "version": "3.0.3", "name": "ISiKBinary", "title": "ISiKBinary", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "description": "Die Binary-Ressource erlaubt den Umgang mit FHIR-fremden Formaten (z.B. PDFs, Bilder, CDA) innerhalb des FHIR-Frameworks.\r\nDazu werden die Daten base64-codiert in der Binary-Ressource (in XML oder JSON) transportiert oder \r\nüber die REST-API am Binary-Endpunkt in ihrem nativen Format bereitgestellt. \r\nBinary-Ressourcen werden von Attachment-Elementen in DocumentReference-Ressourcen verlinkt und damit in den Kontext anderer FHIR-Ressourcen\r\n(z.B. Patient und Encounter) gestellt. ", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json index 09f82796..3beec620 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKCodeSystem", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKCodeSystem", - "version": "3.0.2", + "version": "3.0.3", "name": "ISiKCodeSystem", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "description": "Dieses Profil beschreibt die maschinenlesbare Repräsentation von system-sepzifischen Kodierungen in ISiK-Szenarien", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json index 39bc426d..29565033 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKDiagnose", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKDiagnose", - "version": "3.0.2", + "version": "3.0.3", "name": "ISiKDiagnose", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Nutzung von Diagnosen in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json index 42185598..4d4fc82c 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKKontaktGesundheitseinrichtung", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKKontaktGesundheitseinrichtung", - "version": "3.0.2", + "version": "3.0.3", "name": "ISiKKontaktGesundheitseinrichtung", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Herstellung eines Fallbezuges welcher in der Mehrheit der ISiK Szenarien im Krankenhaus essentiell ist.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json index 9d08cfb8..85a7803a 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKPatient", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPatient", - "version": "3.0.2", + "version": "3.0.3", "name": "ISiKPatient", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "description": "Dieses Profil beschreibt die Nutzung von administrativen Patientendaten in ISiK-Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json index 080f29b7..b625ad50 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKPersonImGesundheitsberuf", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPersonImGesundheitsberuf", - "version": "3.0.2", + "version": "3.0.3", "name": "ISiKPersonImGesundheitsberuf", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Nutzung von in Gesundheitsberufen tätigen Personen in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json index 58671556..6b161c85 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKProzedur", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKProzedur", - "version": "3.0.2", + "version": "3.0.3", "name": "ISiKProzedur", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "description": "Diese Profil ermöglicht die Nutzung von Prozedur-bezogenen Informationen in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json index d8221800..22e73e48 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKValueSet", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKValueSet", - "version": "3.0.2", + "version": "3.0.3", "name": "ISiKValueSet", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "description": "Dieses Profil beschreibt die maschinenlesbare Auswahl von Codes für die Kodierung spezifischer FHIR-Elemente in ISiK-Szenarien", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json index fa150f25..bcc04c04 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKVersicherungsverhaeltnisGesetzlich", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKVersicherungsverhaeltnisGesetzlich", - "version": "3.0.2", + "version": "3.0.3", "name": "ISiKVersicherungsverhaeltnisGesetzlich", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Darstellung eines gesetzlichen Versicherungsverhältnisses in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json index 3aafa55c..8b91088b 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKVersicherungsverhaeltnisSelbstzahler", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKVersicherungsverhaeltnisSelbstzahler", - "version": "3.0.2", + "version": "3.0.3", "name": "ISiKVersicherungsverhaeltnisSelbstzahler", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht Selbstzahler Szenarien in ISiK.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json b/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json index d113a403..6db608f9 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json +++ b/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "PlannedEndDate", "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedEndDate", - "version": "3.0.2", + "version": "3.0.3", "name": "PlannedEndDate", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "mapping": [ diff --git a/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json b/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json index a1a48fc0..d3d411bc 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json +++ b/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "PlannedStartDate", "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedStartDate", - "version": "3.0.2", + "version": "3.0.3", "name": "PlannedStartDate", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "mapping": [ diff --git a/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json b/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json index 401bf7e7..dda29202 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json +++ b/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json @@ -2,12 +2,12 @@ "resourceType": "StructureDefinition", "id": "identifier-abrechnungsnummer", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/identifier-abrechnungsnummer", - "version": "3.0.2", + "version": "3.0.3", "name": "IdentifierAbrechnungsnummer", "title": "Identifier-Profil für die Abbildung einer Abrechnungsnummer (\"Fallnummer\") ", "status": "active", "experimental": false, - "date": "2024-01-09", + "date": "2024-01-15", "publisher": "gematik GmbH", "description": "Identifier-Profil für die Abbildung einer organisationsspezifischen Abrechnungsnummer (\"Fallnummer\")", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json b/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json index 7e4976a0..c213c7bb 100644 --- a/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json @@ -5,10 +5,10 @@ "id": "DiagnosesSCT", "description": "Enthaelt alle SNOMED Clinical finding, Event und Situation with explicit context codes", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/DiagnosesSCT", - "version": "3.0.2", + "version": "3.0.3", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-09", + "date": "2024-01-15", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json b/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json index f740078e..da75b26a 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json @@ -5,10 +5,10 @@ "id": "ISiKAccountIdentifierType", "title": "ISiKAccountIdentifierType", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ISiKAccountIdentifierType", - "version": "3.0.2", + "version": "3.0.3", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-09", + "date": "2024-01-15", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json b/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json index d08ad49c..351282ff 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json @@ -5,10 +5,10 @@ "id": "ISiKAccountType", "title": "ISiKAccountType", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ISiKAccountType", - "version": "3.0.2", + "version": "3.0.3", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-09", + "date": "2024-01-15", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json b/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json index fbf9de4e..e8360c2f 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json @@ -4,10 +4,10 @@ "name": "ISiKLocationPhysicalType", "id": "ISiKLocationPhysicalType", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ISiKLocationPhysicalType", - "version": "3.0.2", + "version": "3.0.3", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-09", + "date": "2024-01-15", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json b/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json index 47b06ef9..57774fb6 100644 --- a/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json @@ -5,10 +5,10 @@ "id": "ProzedurenCodesSCT", "description": "Enthaelt alle SNOMED Procedure Codes", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ProzedurenCodesSCT", - "version": "3.0.2", + "version": "3.0.3", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-09", + "date": "2024-01-15", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json b/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json index 8753d1ff..aa99faf1 100644 --- a/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json @@ -5,10 +5,10 @@ "id": "ProzedurenKategorieSCT", "description": "Enthaelt alle SNOMED Codes für ein Mapping der OPS Klassentitel", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ProzedurenKategorieSCT", - "version": "3.0.2", + "version": "3.0.3", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-09", + "date": "2024-01-15", "compose": { "include": [ { diff --git a/Resources/input/fsh/ruleset.fsh b/Resources/input/fsh/ruleset.fsh index 04ba45a5..54c3d35f 100644 --- a/Resources/input/fsh/ruleset.fsh +++ b/Resources/input/fsh/ruleset.fsh @@ -1,18 +1,18 @@ RuleSet: Meta -* ^version = "3.0.2" +* ^version = "3.0.3" * ^status = #active * ^experimental = false * ^publisher = "gematik GmbH" -* ^date = "2024-01-09" +* ^date = "2024-01-15" RuleSet: MetaInstance -* version = "3.0.2" +* version = "3.0.3" * status = #active * experimental = false * publisher = "gematik GmbH" -* date = "2024-01-09" +* date = "2024-01-15" RuleSet: Meta-CapabilityStatement * insert MetaInstance -* implementationGuide = "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide|3.0.2" +* implementationGuide = "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide|3.0.3" * url = "https://gematik.de/fhir/isik/v3/Basismodul/CapabilityStatement/basis-server" \ No newline at end of file diff --git a/package.json b/package.json index 98ec8a71..9ce74b3c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "de.gematik.isik-basismodul", - "version": "3.0.2", + "version": "3.0.3", "fhirVersions": [ "4.0.1" ], From c9bccb2a5d0c0af1e8453d6b6b4c0b74b92898a8 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Tue, 16 Jan 2024 11:46:58 +0100 Subject: [PATCH 08/34] init TC 3.0.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9ce74b3c..dc187c6a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "de.gematik.isik-basismodul", - "version": "3.0.3", + "version": "3.0.4", "fhirVersions": [ "4.0.1" ], From e6ae18edd1dae278674e34597359b6c7f5782ac0 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Tue, 16 Jan 2024 11:49:44 +0100 Subject: [PATCH 09/34] update sentence on Account.identifier #245 --- .../Abrechnungsfall_AnmerkungenZuDenMustSupportFeldern.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_AnmerkungenZuDenMustSupportFeldern.md b/ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_AnmerkungenZuDenMustSupportFeldern.md index 0048e909..c525a091 100644 --- a/ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_AnmerkungenZuDenMustSupportFeldern.md +++ b/ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_AnmerkungenZuDenMustSupportFeldern.md @@ -6,7 +6,7 @@ ### `Account.identifier` -**Bedeutung:** Der Account muss die Aufnahmenummer des dazugehörigen Encounters enthalten. +**Bedeutung:** Der Account muss die Abrechnungsnummer des referenzierenden Kontaktes (Encounter) enthalten. Dies entspricht dem Wert des Elements Encounter.account.identifier. ### `Account.status` From c45e71657e79d4f5934d74fa1cb1766258ab8c37 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Wed, 31 Jan 2024 09:38:56 +0100 Subject: [PATCH 10/34] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 33a610da..887b21b2 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,4 @@ Siehe [Basismodul Stufe 3](https://simplifier.net/isik-basis-v3) # ImplementationGuides - -Dieser Branch enthält .html Versionen der ImplementationGuides vorangegangener Versionen. -Zur Übersicht der Versionen: https://gematik.github.io/spec-ISiK-Basismodul/index.html +Zur Übersicht der ImplementationGuides vorangegangener Versionen: https://gematik.github.io/spec-ISiK-Basismodul/index.html From 07c72cc1230d34995814e110b69bfa18f431c2db Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Fri, 2 Feb 2024 15:52:31 +0100 Subject: [PATCH 11/34] Fix coverage identifier ptdata 825 (#362) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update README.md * Ermittelung des GKV Versicherungsverhältnis sollte per Chaining auf Patienrt erfolgen * auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) --------- Co-authored-by: f-peverali <112709306+f-peverali@users.noreply.github.com> Co-authored-by: alexzautke --- ...tnis_AnmerkungenZuDenMustSupportFeldern.md | 5 +- .../Versicherungsverhaeltnis_Interaktionen.md | 7 -- README.md | 4 +- .../Coverage-CoverageGesetzlich.json | 14 --- ...SiKVersicherungsverhaeltnisGesetzlich.json | 92 ------------------- ...ISiKVersicherungsverhaeltnisGesetzlich.fsh | 22 ----- 6 files changed, 3 insertions(+), 141 deletions(-) diff --git a/ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_AnmerkungenZuDenMustSupportFeldern.md b/ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_AnmerkungenZuDenMustSupportFeldern.md index 52f20ff6..d849a75d 100644 --- a/ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_AnmerkungenZuDenMustSupportFeldern.md +++ b/ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_AnmerkungenZuDenMustSupportFeldern.md @@ -2,10 +2,9 @@ #### Das Profil ISiKVersicherungsverhaeltnisGesetzlich -### `Coverage.identifier:KrankenversichertenID` +### `Coverage.identifier` -**Bedeutung:** Der unveränderliche, 10-stellige Teil der Krankenversichertennummer zur Identifikation des Versicherten, die Krankenversicherten-ID. -**Hinweise:** Dieser identifier ist zur eindeutigen Identifikation des gesetzlich Versicherten nötig, in den von diesem Profil unterstützten Anwendungsszenarien, siehe [Beschreibung der Deutschen Basisprofile](https://ig.fhir.de/basisprofile-de/1.2.0/GesetzlicheKrankenversichertennummer10-stelligeKVID-Identifier.html). +**Hinweise:** Grundsätzlich ist zu beachten, dass das Versicherungsverhältnis für die gesetzliche Versicherung durch die 30-stellige KVNR identifiziert wird. Die 10-stellige KVNR ist hingegen ein Identifier für das Datenobjekt Patient. Siehe {{pagelink:ImplementationGuide/markdown/Patient_Profil.md, text:Datenobjekt - Patient}}. Es wird in ISiK davon ausgegangen, dass die 30-stellige KVNR nicht in bestätigungrelevanten Systemen geführt wird, sodass diese nicht als zuverlässiger Identifier für das Versicherungsverhältnis verwendbar ist. Bei einer Suche nach einem Versicherungsverhältnis SOLLTE dieses per Chaining auf das Datenobjekt Patient ermittelt werden. ### `Coverage.status` diff --git a/ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Interaktionen.md b/ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Interaktionen.md index 3216c70f..36d0fcf1 100644 --- a/ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Interaktionen.md +++ b/ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Interaktionen.md @@ -14,13 +14,6 @@ Folgende Suchparameter sind für das Bestätigungsverfahren relevant, auch in Ko Anwendungshinweise: Weitere Informationen zur Suche nach "_id" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Parameters for all resources"](https://hl7.org/fhir/R4/search.html#all). -2. Der Suchparameter "identifier" zur Suche nach einer Krankenversicherten-ID MUSS unterstützt werden: - - Beispiele: - - ```GET [base]/Coverage?identifier=http://fhir.de/CodeSystem/identifier-type-de-basis|0123456789``` - - Anwendungshinweise: Weitere Informationen zur Suche nach "Coverage.identifier" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Token Search"](https://hl7.org/fhir/R4/search.html#token). 3. Der Suchparameter "status" MUSS unterstützt werden: diff --git a/README.md b/README.md index 33a610da..887b21b2 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,4 @@ Siehe [Basismodul Stufe 3](https://simplifier.net/isik-basis-v3) # ImplementationGuides - -Dieser Branch enthält .html Versionen der ImplementationGuides vorangegangener Versionen. -Zur Übersicht der Versionen: https://gematik.github.io/spec-ISiK-Basismodul/index.html +Zur Übersicht der ImplementationGuides vorangegangener Versionen: https://gematik.github.io/spec-ISiK-Basismodul/index.html diff --git a/Resources/fsh-generated/resources/Coverage-CoverageGesetzlich.json b/Resources/fsh-generated/resources/Coverage-CoverageGesetzlich.json index 8765e898..2c8ac62a 100644 --- a/Resources/fsh-generated/resources/Coverage-CoverageGesetzlich.json +++ b/Resources/fsh-generated/resources/Coverage-CoverageGesetzlich.json @@ -31,20 +31,6 @@ "display": "Eine Gesundheitskasse" } ], - "identifier": [ - { - "type": { - "coding": [ - { - "code": "GKV", - "system": "http://fhir.de/CodeSystem/identifier-type-de-basis" - } - ] - }, - "system": "http://fhir.de/sid/gkv/kvid-10", - "value": "A234567890" - } - ], "status": "active", "beneficiary": { "reference": "Patient/PatientinMusterfrau" diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json index bcc04c04..37079583 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json @@ -22,98 +22,6 @@ "path": "Coverage", "definition": "Kostenübernahme im Rahmen eines gesetzlichen Versicherungsverhältnisses in Deutschland." }, - { - "id": "Coverage.identifier", - "path": "Coverage.identifier", - "slicing": { - "discriminator": [ - { - "type": "pattern", - "path": "$this" - } - ], - "rules": "open" - }, - "short": "Primärer Identifier der Versicherung", - "definition": "Ein gesetzliches Versicherungsverhältnis sollte stets durch die eindeutige 30-stellige Versicherungsnummer identifiziert werden. Ist diese nicht bekannt, so kann die 10-stellige KrankenversichertenID stattdessen verwendet werden. Diese ist aber nur in Verbindung mit dem Payor eindeutig einem Versicherungsverhältnis zuordenbar", - "mustSupport": true - }, - { - "id": "Coverage.identifier:Versicherungsnummer", - "path": "Coverage.identifier", - "sliceName": "Versicherungsnummer", - "min": 0, - "max": "1", - "patternIdentifier": { - "type": { - "coding": [ - { - "code": "GKV", - "system": "http://fhir.de/CodeSystem/identifier-type-de-basis" - } - ] - }, - "system": "http://fhir.de/sid/gkv/kvnr-30" - } - }, - { - "id": "Coverage.identifier:Versicherungsnummer.type", - "path": "Coverage.identifier.type", - "min": 1, - "mustSupport": true - }, - { - "id": "Coverage.identifier:Versicherungsnummer.system", - "path": "Coverage.identifier.system", - "mustSupport": true - }, - { - "id": "Coverage.identifier:Versicherungsnummer.value", - "path": "Coverage.identifier.value", - "mustSupport": true - }, - { - "id": "Coverage.identifier:KrankenversichertenID", - "path": "Coverage.identifier", - "sliceName": "KrankenversichertenID", - "min": 0, - "max": "1", - "type": [ - { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-kvid-10" - ] - } - ], - "patternIdentifier": { - "type": { - "coding": [ - { - "code": "GKV", - "system": "http://fhir.de/CodeSystem/identifier-type-de-basis" - } - ] - }, - "system": "http://fhir.de/sid/gkv/kvid-10" - } - }, - { - "id": "Coverage.identifier:KrankenversichertenID.type", - "path": "Coverage.identifier.type", - "min": 1, - "mustSupport": true - }, - { - "id": "Coverage.identifier:KrankenversichertenID.system", - "path": "Coverage.identifier.system", - "mustSupport": true - }, - { - "id": "Coverage.identifier:KrankenversichertenID.value", - "path": "Coverage.identifier.value", - "mustSupport": true - }, { "id": "Coverage.status", "path": "Coverage.status", diff --git a/Resources/input/fsh/ISiKVersicherungsverhaeltnisGesetzlich.fsh b/Resources/input/fsh/ISiKVersicherungsverhaeltnisGesetzlich.fsh index 7bd80e28..cfb69769 100644 --- a/Resources/input/fsh/ISiKVersicherungsverhaeltnisGesetzlich.fsh +++ b/Resources/input/fsh/ISiKVersicherungsverhaeltnisGesetzlich.fsh @@ -4,25 +4,6 @@ Id: ISiKVersicherungsverhaeltnisGesetzlich Description: "Dieses Profil ermöglicht die Darstellung eines gesetzlichen Versicherungsverhältnisses in ISiK Szenarien." * insert Meta * . ^definition = "Kostenübernahme im Rahmen eines gesetzlichen Versicherungsverhältnisses in Deutschland." -* identifier MS - * ^slicing.discriminator.type = #pattern - * ^slicing.discriminator.path = "$this" - * ^slicing.rules = #open - * ^short = "Primärer Identifier der Versicherung" - * ^definition = "Ein gesetzliches Versicherungsverhältnis sollte stets durch die eindeutige 30-stellige Versicherungsnummer identifiziert werden. Ist diese nicht bekannt, so kann die 10-stellige KrankenversichertenID stattdessen verwendet werden. Diese ist aber nur in Verbindung mit dem Payor eindeutig einem Versicherungsverhältnis zuordenbar" -* identifier contains Versicherungsnummer ..1 and KrankenversichertenID ..1 -* identifier[Versicherungsnummer] - * ^patternIdentifier.type = $identifier-type-de-basis#GKV - * ^patternIdentifier.system = $kvnr30 - * type 1.. MS - * system MS - * value MS -* identifier[KrankenversichertenID] only IdentifierKvid10 - * ^patternIdentifier.type = $identifier-type-de-basis#GKV - * ^patternIdentifier.system = $kvid10 - * type 1.. MS - * system MS - * value MS * status MS * type MS * ^comment = "28.07.2017 (zulip): TC Konsens bzgl. Verwendung eines eigenen ValueSets anstelle des im Standrad definierten preferred bindings, da die dortigen Codes nicht passen." @@ -62,9 +43,6 @@ Description: "Dieses Profil ermöglicht die Darstellung eines gesetzlichen Versi Instance: CoverageGesetzlich InstanceOf: ISiKVersicherungsverhaeltnisGesetzlich Usage: #example -* identifier[KrankenversichertenID] - * system = "http://fhir.de/sid/gkv/kvid-10" - * value = "A234567890" * status = #active * type = $versicherungsart-de-basis#GKV * beneficiary = Reference(PatientinMusterfrau) From 2e6842ebd3720ebdc65ace16f70ad5cc4d31f8d6 Mon Sep 17 00:00:00 2001 From: Max Theilig Date: Thu, 8 Feb 2024 12:33:27 +0100 Subject: [PATCH 12/34] ospo readme --- .github/CODE_OF_CONDUCT.md | 50 ++++++++++ .github/LICENSE.md | 194 +++++++++++++++++++++++++++++++++++++ .github/SECURITY.md | 6 ++ README.md | 47 ++++++++- 4 files changed, 293 insertions(+), 4 deletions(-) create mode 100644 .github/CODE_OF_CONDUCT.md create mode 100644 .github/LICENSE.md create mode 100644 .github/SECURITY.md diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..1835dbda --- /dev/null +++ b/.github/CODE_OF_CONDUCT.md @@ -0,0 +1,50 @@ +## Code of Conduct + +### Our Pledge + +In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. + +### Our Standards + +Examples of behavior that contributes to creating a positive environment include: +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or +advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Calls for violence, vilification and advertising +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +### Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +### Scope + +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. + +### Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at OSPO@gematik.de. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. + +### Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ \ No newline at end of file diff --git a/.github/LICENSE.md b/.github/LICENSE.md new file mode 100644 index 00000000..0984e3fd --- /dev/null +++ b/.github/LICENSE.md @@ -0,0 +1,194 @@ +Apache License +============== + +_Version 2.0, January 2004_ +_<>_ + +# TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +## 1. Definitions + +“License” shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +“Licensor” shall mean the copyright owner or entity authorized by the copyright +owner that is granting the License. + +“Legal Entity” shall mean the union of the acting entity and all other entities +that control, are controlled by, or are under common control with that entity. +For the purposes of this definition, “control” means **(i)** the power, direct or +indirect, to cause the direction or management of such entity, whether by +contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the +outstanding shares, or **(iii)** beneficial ownership of such entity. + +“You” (or “Your”) shall mean an individual or Legal Entity exercising +permissions granted by this License. + +“Source” form shall mean the preferred form for making modifications, including +but not limited to software source code, documentation source, and configuration +files. + +“Object” form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object code, +generated documentation, and conversions to other media types. + +“Work” shall mean the work of authorship, whether in Source or Object form, made +available under the License, as indicated by a copyright notice that is included +in or attached to the work (an example is provided in the Appendix below). + +“Derivative Works” shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative Works +shall not include works that remain separable from, or merely link (or bind by +name) to the interfaces of, the Work and Derivative Works thereof. + +“Contribution” shall mean any work of authorship, including the original version +of the Work and any modifications or additions to that Work or Derivative Works +thereof, that is intentionally submitted to Licensor for inclusion in the Work +by the copyright owner or by an individual or Legal Entity authorized to submit +on behalf of the copyright owner. For the purposes of this definition, +“submitted” means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and +issue tracking systems that are managed by, or on behalf of, the Licensor for +the purpose of discussing and improving the Work, but excluding communication +that is conspicuously marked or otherwise designated in writing by the copyright +owner as “Not a Contribution.” + +“Contributor” shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +## 2. Grant of Copyright License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +## 3. Grant of Patent License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by combination +of their Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this License +for that Work shall terminate as of the date such litigation is filed. + +## 4. Redistribution + +You may reproduce and distribute copies of the Work or Derivative Works thereof +in any medium, with or without modifications, and in Source or Object form, +provided that You meet the following conditions: + +* **(a)** You must give any other recipients of the Work or Derivative Works a copy of +this License; and +* **(b)** You must cause any modified files to carry prominent notices stating that You +changed the files; and +* **(c)** You must retain, in the Source form of any Derivative Works that You distribute, +all copyright, patent, trademark, and attribution notices from the Source form +of the Work, excluding those notices that do not pertain to any part of the +Derivative Works; and +* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of the +following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents of +the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. + +You may add Your own copyright statement to Your modifications and may provide +additional or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as a whole, +provided Your use, reproduction, and distribution of the Work otherwise complies +with the conditions stated in this License. + +## 5. Submission of Contributions + +Unless You explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of +any separate license agreement you may have executed with Licensor regarding +such Contributions. + +## 6. Trademarks + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +## 7. Disclaimer of Warranty + +Unless required by applicable law or agreed to in writing, Licensor provides the +Work (and each Contributor provides its Contributions) on an “AS IS” BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, +including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +## 8. Limitation of Liability + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, incidental, +or consequential damages of any character arising as a result of this License or +out of the use or inability to use the Work (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has +been advised of the possibility of such damages. + +## 9. Accepting Warranty or Additional Liability + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. However, +in accepting such obligations, You may act only on Your own behalf and on Your +sole responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability. + +_END OF TERMS AND CONDITIONS_ + +# APPENDIX: How to apply the Apache License to your work + +To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets `[]` replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included on +the same “printed page” as the copyright notice for easier identification within +third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/.github/SECURITY.md b/.github/SECURITY.md new file mode 100644 index 00000000..9e1731f4 --- /dev/null +++ b/.github/SECURITY.md @@ -0,0 +1,6 @@ +# Security Policy + +Since this software is not a productive version, please submit an issue or pull request for any bugs or vulnerabilities you find. + +In case of a responsible disclosure, please follow instructions +on https://www.gematik.de/datensicherheit#c1227. diff --git a/README.md b/README.md index 887b21b2..31b7de64 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,45 @@ -# ISiK-Basismodul-Stufe-3 +
-Siehe [Basismodul Stufe 3](https://simplifier.net/isik-basis-v3) +# ISiK-Basis -# ImplementationGuides -Zur Übersicht der ImplementationGuides vorangegangener Versionen: https://gematik.github.io/spec-ISiK-Basismodul/index.html +
+ Table of Contents +
    +
  1. + About The Project + +
    2. +
  2. License
    3. +
  3. Contact
    4. +
+
+ +## About The Project + +For full information and details, see [Simplifier Project Page for ISiK Basis Stufe 3](https://simplifier.net/isik-basis-v3) + +### Release Notes +See [ReleaseNotes.md](/ImplementationGuide/markdown/ReleaseNotes.md) for all information regarding the (newest) releases. + +## License + +Copyright 2024 gematik GmbH + +Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. + +See the [LICENSE](./LICENSE) for the specific language governing permissions and limitations under the License. + +Unless required by applicable law the software is provided "as is" without warranty of any kind, either express or implied, including, but not limited to, the warranties of fitness for a particular purpose, merchantability, and/or non-infringement. The authors or copyright holders shall not be liable in any manner whatsoever for any damages or other claims arising from, out of or in connection with the software or the use or other dealings with the software, whether in an action of contract, tort, or otherwise. + +The software is the result of research and development activities, therefore not necessarily quality assured and without the character of a liable product. For this reason, gematik does not provide any support or other user assistance (unless otherwise stated in individual cases and without justification of a legal obligation). Furthermore, there is no claim to further development and adaptation of the results to a more current state of the art. + +Gematik may remove published results temporarily or permanently from the place of publication at any time without prior notice or justification. + +## Contact + +**Team Data – ISiK and ISiP** + +For issues and requests please refer to: +https://service.gematik.de/servicedesk/customer/portal/16 \ No newline at end of file From 5b7f010d940f60b12345a14504de4a977cb9b3fe Mon Sep 17 00:00:00 2001 From: Max Theilig Date: Thu, 8 Feb 2024 13:53:22 +0100 Subject: [PATCH 13/34] apache license details --- .github/{LICENSE.md => APACHE_LICENSE.md} | 0 LICENSE.md | 13 +++++++++++++ README.md | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) rename .github/{LICENSE.md => APACHE_LICENSE.md} (100%) create mode 100644 LICENSE.md diff --git a/.github/LICENSE.md b/.github/APACHE_LICENSE.md similarity index 100% rename from .github/LICENSE.md rename to .github/APACHE_LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 00000000..bbe15e0f --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,13 @@ +## License + +Copyright 2024 gematik GmbH + +Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. + +See the [APACHE_LICENSE.md](.github/APACHE_LICENSE.md) for the specific language governing permissions and limitations under the License. + +Unless required by applicable law the software is provided "as is" without warranty of any kind, either express or implied, including, but not limited to, the warranties of fitness for a particular purpose, merchantability, and/or non-infringement. The authors or copyright holders shall not be liable in any manner whatsoever for any damages or other claims arising from, out of or in connection with the software or the use or other dealings with the software, whether in an action of contract, tort, or otherwise. + +The software is the result of research and development activities, therefore not necessarily quality assured and without the character of a liable product. For this reason, gematik does not provide any support or other user assistance (unless otherwise stated in individual cases and without justification of a legal obligation). Furthermore, there is no claim to further development and adaptation of the results to a more current state of the art. + +Gematik may remove published results temporarily or permanently from the place of publication at any time without prior notice or justification. \ No newline at end of file diff --git a/README.md b/README.md index 31b7de64..58c441e0 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Copyright 2024 gematik GmbH Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. -See the [LICENSE](./LICENSE) for the specific language governing permissions and limitations under the License. +See the [APACHE_LICENSE.md](.github/APACHE_LICENSE.md) for the specific language governing permissions and limitations under the License. Unless required by applicable law the software is provided "as is" without warranty of any kind, either express or implied, including, but not limited to, the warranties of fitness for a particular purpose, merchantability, and/or non-infringement. The authors or copyright holders shall not be liable in any manner whatsoever for any damages or other claims arising from, out of or in connection with the software or the use or other dealings with the software, whether in an action of contract, tort, or otherwise. From e8ef0737f1275554fc5c00d37a3e9176c57c1a59 Mon Sep 17 00:00:00 2001 From: Max Theilig Date: Fri, 9 Feb 2024 16:38:06 +0100 Subject: [PATCH 14/34] update for NoteJS 20 --- .github/workflows/RenderAllDiagrams.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/RenderAllDiagrams.yml b/.github/workflows/RenderAllDiagrams.yml index ee949a78..e01d80ed 100644 --- a/.github/workflows/RenderAllDiagrams.yml +++ b/.github/workflows/RenderAllDiagrams.yml @@ -23,15 +23,15 @@ jobs: # Installs Java distribution for running the plantUML jar - name: Install Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '17' + java-version: '21' check-latest: true # Install graphviz for plantuml - name: Setup Graphviz - uses: ts-graphviz/setup-graphviz@v1 + uses: ts-graphviz/setup-graphviz@v2 # Download plantUML jar - name: Download plantuml file From ce8ea6028922dce5b5fdb6e34a8ade4c21bfca92 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Mon, 12 Feb 2024 10:01:31 +0100 Subject: [PATCH 15/34] update releasenote --- ImplementationGuide/markdown/ReleaseNotes.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index c30a3092..6aebfc59 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -4,6 +4,12 @@ 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: 3.0.4 + +Datum: tbd + +* Entfernen der Festlegungen zum .identifier in ISiKVersicherungsverhaeltnisGesetzlich - https://github.com/gematik/spec-ISiK-Basismodul/pull/362 + ---- Version: 3.0.3 From b3250382e721d8790b75a94e8ba2130742cc36cf Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Mon, 12 Feb 2024 10:29:08 +0100 Subject: [PATCH 16/34] update encounter type in condition ptdata 879 (#363) * update requirement on encounter from condition * update ReleaseNotes --- .../Diagnose/Diagnose_AnmerkungenZuDenMustSupportFeldern.md | 2 +- ImplementationGuide/markdown/ReleaseNotes.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ImplementationGuide/markdown/Diagnose/Diagnose_AnmerkungenZuDenMustSupportFeldern.md b/ImplementationGuide/markdown/Diagnose/Diagnose_AnmerkungenZuDenMustSupportFeldern.md index 8fdc5ae3..72cd0382 100644 --- a/ImplementationGuide/markdown/Diagnose/Diagnose_AnmerkungenZuDenMustSupportFeldern.md +++ b/ImplementationGuide/markdown/Diagnose/Diagnose_AnmerkungenZuDenMustSupportFeldern.md @@ -45,7 +45,7 @@ Die Freitextdiagnose darf nur alleinstehend angegeben werden, solange keine kodi **Hinweise:** -Eine Verlinkung der Referenz auf den dazugehörigen Kontakt SOLLTE auf die Ebene des Einrichtungskontaktes erfolgen, falls die Kontaktebene (Encounter.type) kodiert wird. +Eine Verlinkung der Referenz auf den dazugehörigen Kontakt SOLL auf die Ebene des Abteilungskontaktes (entsprechend ISiKKontaktGesundheitseinrichtung) erfolgen. Bei der Auswahl des Kontaktes ist zu beachten, dass mehrere Encounter-Ressourcen mit identischen Aufnahmenummer-Identifiern existieren können (Abbildung Vor- und nachstationäre Kontakte). ### `Condition.recordedDate` diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index 6aebfc59..987aceb0 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -8,7 +8,8 @@ Version: 3.0.4 Datum: tbd -* Entfernen der Festlegungen zum .identifier in ISiKVersicherungsverhaeltnisGesetzlich - https://github.com/gematik/spec-ISiK-Basismodul/pull/362 +* Entfernen der Festlegungen zum .identifier in ISiKVersicherungsverhaeltnisGesetzlich: https://github.com/gematik/spec-ISiK-Basismodul/pull/362 +* Korrektur der Anforderung zur Encounter-Kontaktebene: https://github.com/gematik/spec-ISiK-Basismodul/pull/363 ---- Version: 3.0.3 From 884c04efbc4ee4d442a72c8157c6c595ba5890e8 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Tue, 13 Feb 2024 10:53:44 +0100 Subject: [PATCH 17/34] add UC description --- ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md b/ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md index 25450180..332e04c8 100644 --- a/ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md +++ b/ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md @@ -51,6 +51,8 @@ Folgende Suchparameter sind für das Bestätigungsverfahren relevant, auch in Ko ```GET [base]/ValueSet?context-type-value=http://terminology.hl7.org/CodeSystem/usage-context-type|focus$http://hl7.org/fhir/resource-types|Encounter``` + Mit dieser Abfrage können hausinterne Kataloge anhand des Ressource Type ermittelt werden. Insbesondere im Kontext der [Terminvereinbarung durch einen Termin-Requestor wird die Abfrage genutzt](https://simplifier.net/guide/isik-terminplanung-v3/ImplementationGuide-markdown-Datenobjekte-Operations?version=current). + Anwendungshinweise: Weitere Informationen zur Suche nach "CodeSystem.useContext" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Composite Search Parameters"](https://www.hl7.org/fhir/R4/search.html#composite). --- \ No newline at end of file From 29ddb257272b35af9eefc39f575ff1c3a40c3d1d Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Tue, 13 Feb 2024 11:24:59 +0100 Subject: [PATCH 18/34] Update ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md --- .../markdown/ValueSet/ValueSet_Interaktionen.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md b/ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md index 332e04c8..b571c463 100644 --- a/ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md +++ b/ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md @@ -51,7 +51,11 @@ Folgende Suchparameter sind für das Bestätigungsverfahren relevant, auch in Ko ```GET [base]/ValueSet?context-type-value=http://terminology.hl7.org/CodeSystem/usage-context-type|focus$http://hl7.org/fhir/resource-types|Encounter``` - Mit dieser Abfrage können hausinterne Kataloge anhand des Ressource Type ermittelt werden. Insbesondere im Kontext der [Terminvereinbarung durch einen Termin-Requestor wird die Abfrage genutzt](https://simplifier.net/guide/isik-terminplanung-v3/ImplementationGuide-markdown-Datenobjekte-Operations?version=current). + Mit dieser Abfrage können hausinterne Kataloge anhand des Ressource Type ermittelt werden. Diese Informationen sind relevant im Kontext von: +- Hausinternen Prozeduren/Diagnosen-Codes +- Kodierung von Encounter-Informationen z.B. Wahlleistungen, Kodierung des Typs einer Location + + Auch im Kontext der [Terminvereinbarung durch einen Termin-Requestor wird die Abfrage genutzt](https://simplifier.net/guide/isik-terminplanung-v3/ImplementationGuide-markdown-Datenobjekte-Operations?version=current). Anwendungshinweise: Weitere Informationen zur Suche nach "CodeSystem.useContext" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Composite Search Parameters"](https://www.hl7.org/fhir/R4/search.html#composite). From b3938eaec8c4fefaed5cea52d02f033d14a673a7 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Tue, 13 Feb 2024 11:35:31 +0100 Subject: [PATCH 19/34] update releasenotes --- ImplementationGuide/markdown/ReleaseNotes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index 987aceb0..674da7cf 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -10,6 +10,7 @@ Datum: tbd * Entfernen der Festlegungen zum .identifier in ISiKVersicherungsverhaeltnisGesetzlich: https://github.com/gematik/spec-ISiK-Basismodul/pull/362 * Korrektur der Anforderung zur Encounter-Kontaktebene: https://github.com/gematik/spec-ISiK-Basismodul/pull/363 +* Hinweis zur Nutzung des Suchparameter "context-type-value" hinzugefügt: https://github.com/gematik/spec-ISiK-Basismodul/pull/364 ---- Version: 3.0.3 From 87a54f79333c5ba6be450b8ab6ec227d65f9db05 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:43:26 +0100 Subject: [PATCH 20/34] rm constraints + add suggestion --- ...nImGesundheitsberuf_AnmerkungenZuDenMustSupportFeldern.md | 4 ---- Resources/input/fsh/ISiKPersonImGesundheitsberuf.fsh | 5 +++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_AnmerkungenZuDenMustSupportFeldern.md b/ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_AnmerkungenZuDenMustSupportFeldern.md index 03c0f301..a3eb1989 100644 --- a/ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_AnmerkungenZuDenMustSupportFeldern.md +++ b/ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_AnmerkungenZuDenMustSupportFeldern.md @@ -28,8 +28,4 @@ Während die Deutschen Basisprofile hier die Abkürzung LANR verwenden, ist im K **Bedeutung:** Geburtsdatum. Ist das Geburtsdatum des Arztes bekannt, MUSS es bereitgestellt werden. -### `Practitioner.qualification` - -**Bedeutung:** Ärztliche Qualifikation(en). Es MÜSSEN die Qualifikationen des Arztes bereitgestellt werden, um nach Ärzten einer Qualifikation zu suchen oder sie bspw. in Dokumenten anzuzeigen. - --- diff --git a/Resources/input/fsh/ISiKPersonImGesundheitsberuf.fsh b/Resources/input/fsh/ISiKPersonImGesundheitsberuf.fsh index b6cea8bf..0fed9a12 100644 --- a/Resources/input/fsh/ISiKPersonImGesundheitsberuf.fsh +++ b/Resources/input/fsh/ISiKPersonImGesundheitsberuf.fsh @@ -86,8 +86,9 @@ Description: "Dieses Profil ermöglicht die Nutzung von in Gesundheitsberufen t * ^slicing.discriminator.path = "url" * ^slicing.rules = #open * birthDate.extension contains $data-absent-reason named Data-Absent-Reason 0..1 MS -* qualification.code.coding 1.. -* qualification.code.coding from $KBV_VS_Base_Practitioner_Speciality (preferred) +* qualification.code ^comment = "Zur Kodierung der Qualifikation ist das entsprechende [ValueSet der KBV](https://fhir.kbv.de/ValueSet/KBV_VS_Base_Practitioner_Speciality) zu empfehlen." + + Instance: PractitionerWalterArzt InstanceOf: ISiKPersonImGesundheitsberuf From aab26b8c4026ea3c5a8e8d193faf403e8804aa0e Mon Sep 17 00:00:00 2001 From: f-peverali Date: Fri, 16 Feb 2024 14:49:22 +0000 Subject: [PATCH 21/34] auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) --- ...ructureDefinition-ISiKPersonImGesundheitsberuf.json | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json index b625ad50..e27891e8 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json @@ -489,13 +489,9 @@ "mustSupport": true }, { - "id": "Practitioner.qualification.code.coding", - "path": "Practitioner.qualification.code.coding", - "min": 1, - "binding": { - "strength": "preferred", - "valueSet": "https://fhir.kbv.de/ValueSet/KBV_VS_Base_Practitioner_Speciality" - } + "id": "Practitioner.qualification.code", + "path": "Practitioner.qualification.code", + "comment": "Zur Kodierung der Qualifikation ist das entsprechende [ValueSet der KBV](https://fhir.kbv.de/ValueSet/KBV_VS_Base_Practitioner_Speciality) zu empfehlen." } ] } From 458de537db6745d93c02d1cb018289b15e1df9ca Mon Sep 17 00:00:00 2001 From: Max Theilig Date: Mon, 19 Feb 2024 12:58:57 +0100 Subject: [PATCH 22/34] adjusted name of IG --- .../ImplementierungsleitfadenIsiK_basismodul.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json b/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json index 9c27feae..b5f4e45b 100644 --- a/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json +++ b/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json @@ -2,7 +2,7 @@ "resourceType": "ImplementationGuide", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide/ISiK-Basismodul", "version": "3.0.3", - "name": "Implementierungsleitfaden ISiK-Basismodul Stufe 3", + "name": "Implementierungsleitfaden ISiK-Basismodul", "status": "active", "fhirVersion": [ "4.0.1" From 01a52f82f84adca742c59d7804b371bfa205dff8 Mon Sep 17 00:00:00 2001 From: Max Theilig Date: Mon, 19 Feb 2024 16:16:08 +0100 Subject: [PATCH 23/34] upgrade ci integration --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ceae92b3..8158ed58 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Java and .NET are already installed on ubuntu-latest @@ -47,7 +47,7 @@ jobs: EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA - name: Add & Commit - uses: EndBug/add-and-commit@v7 + uses: EndBug/add-and-commit@v9 with: committer_name: GitHub Actions Bot committer_email: ActionBot@github.com From 1f61aa1deffcd8bb2929ea857117c7a9e794a00a Mon Sep 17 00:00:00 2001 From: Max Theilig Date: Mon, 19 Feb 2024 16:16:08 +0100 Subject: [PATCH 24/34] upgrade ci integration --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ceae92b3..8158ed58 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Java and .NET are already installed on ubuntu-latest @@ -47,7 +47,7 @@ jobs: EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA - name: Add & Commit - uses: EndBug/add-and-commit@v7 + uses: EndBug/add-and-commit@v9 with: committer_name: GitHub Actions Bot committer_email: ActionBot@github.com From 4370bc945c8c1c31769ed796422aff7a57ea0c4b Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Tue, 27 Feb 2024 14:09:57 +0100 Subject: [PATCH 25/34] Abrechnungsfall - Fallbezogene Abrechnungsrelevanz von Diagnosen und Prozeduren - ANFISK 206 (#366) * update ReleaseNotes * update cardinality * auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) * add description * auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) * Update ImplementationGuide/markdown/ReleaseNotes.md --------- Co-authored-by: f-peverali --- ImplementationGuide/markdown/DecisionLog.md | 8 ++++++++ ImplementationGuide/markdown/ReleaseNotes.md | 1 + .../StructureDefinition-ISiKAbrechnungsfall.json | 3 ++- Resources/input/fsh/ISiKAbrechnungsfall.fsh | 4 +++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ImplementationGuide/markdown/DecisionLog.md b/ImplementationGuide/markdown/DecisionLog.md index e5ab113a..eb0cf9e9 100644 --- a/ImplementationGuide/markdown/DecisionLog.md +++ b/ImplementationGuide/markdown/DecisionLog.md @@ -1,5 +1,13 @@ # Decision Log +Version Technical Correction 3.0.4 + +* Problem: In der [Extension Abrechnungsart](http://fhir.de/StructureDefinition/ExtensionAbrechnungsDiagnoseProzedur) ist eine eindeutige Zuweisung zwischen Use und Referenz nicht möglich aufgrund der Kardinalität von Use - (vergleiche ANFISK-206) + * Option zur Lösung: + * Die Extension sollte in ISiK auf 0..* gesetzt werden + * In den Basisprofilen sollte die Extension angepasst werden, sodass Use auf 0..1 gesetzt wird + * ggf. erneute Prüfung der Codes unter "Use" prüfen + ---- Version: Technical Correction 3.0.2 diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index 674da7cf..83d9b222 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -11,6 +11,7 @@ Datum: tbd * Entfernen der Festlegungen zum .identifier in ISiKVersicherungsverhaeltnisGesetzlich: https://github.com/gematik/spec-ISiK-Basismodul/pull/362 * Korrektur der Anforderung zur Encounter-Kontaktebene: https://github.com/gematik/spec-ISiK-Basismodul/pull/363 * Hinweis zur Nutzung des Suchparameter "context-type-value" hinzugefügt: https://github.com/gematik/spec-ISiK-Basismodul/pull/364 +* Lockerung für Extension Kardinalität in Account zu ..* und hinzufügen einer: eschreibung:https://github.com/gematik/spec-ISiK-Basismodul/pull/366/files ---- Version: 3.0.3 diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json index e324623f..f39c5282 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json @@ -43,8 +43,9 @@ "id": "Account.extension:AbrechnungsDiagnoseProzedur", "path": "Account.extension", "sliceName": "AbrechnungsDiagnoseProzedur", + "comment": "In dieser Extension SOLL das 'Use' Element nur einfach verwendet werden, um eine eindeutige Zuweisung (1 zu N) gegenüber dem Element 'Referenz' zu gewährleisten.", "min": 0, - "max": "1", + "max": "*", "type": [ { "code": "Extension", diff --git a/Resources/input/fsh/ISiKAbrechnungsfall.fsh b/Resources/input/fsh/ISiKAbrechnungsfall.fsh index 79a951d8..4e9ad87e 100644 --- a/Resources/input/fsh/ISiKAbrechnungsfall.fsh +++ b/Resources/input/fsh/ISiKAbrechnungsfall.fsh @@ -4,7 +4,9 @@ Id: ISiKAbrechnungsfall Description: "Dieses Profil beschreibt die Gruppierung von medizinischen Leistungen in ISiK-Szenarien" * insert Meta * extension MS -* extension contains http://fhir.de/StructureDefinition/ExtensionAbrechnungsDiagnoseProzedur named AbrechnungsDiagnoseProzedur 0..1 MS +* extension contains http://fhir.de/StructureDefinition/ExtensionAbrechnungsDiagnoseProzedur named AbrechnungsDiagnoseProzedur 0..* MS +* extension[AbrechnungsDiagnoseProzedur] + * ^comment = "In dieser Extension SOLL das 'Use' Element nur einfach verwendet werden, um eine eindeutige Zuweisung (1 zu N) gegenüber dem Element 'Referenz' zu gewährleisten." * id MS * identifier 1.. MS * ^slicing.discriminator.type = #pattern From d0e91001721d47aa8cad02e7e93475229c986f88 Mon Sep 17 00:00:00 2001 From: Alexander Zautke Date: Wed, 28 Feb 2024 10:35:28 +0100 Subject: [PATCH 26/34] =?UTF-8?q?Hinweis=20hinzugef=C3=BCgt,=20dass=20die?= =?UTF-8?q?=20Regeln=20zur=20Verarbeitung=20von=20Dokumenten=20in=20der=20?= =?UTF-8?q?Basis=20nur=20f=C3=BCr=20Document=20Bundles=20gelten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../markdown/BerichtSubsystem/BerichtSubsystem_Interaktionen.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Interaktionen.md b/ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Interaktionen.md index 04e2bcc1..bcc26cbb 100644 --- a/ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Interaktionen.md +++ b/ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_Interaktionen.md @@ -19,6 +19,8 @@ Unterscheidungshinweis: Informationen zu Interaktionen mit Dokument-Binaries fin ### Verarbeitung des Dokumentes +**Hinweis:** Die nachfolgenden Regeln für die Verarbeitung eines Dokumentes gelten nur für Document-Bundles die an den oben genannten Endpunkt gesendet werden. Weitere ISiK-Module können Regeln für die Verarbeitung von anderen Bundle-Typen (z.B. 'transaction') aufstellen. + In der aktuellen Ausbaustufe von ISiK MUSS ein empfangenes Dokument in folgenden Schritten verarbeitet werden: 1. Extraktion der Patient-Ressource aus dem Bundle und Herstellung des Patientenbezuges anhand eines eindeutigen Identifiers ('Patient.identifier') oder ähnlich identifizieren Merkmalen From 5f2fd1893863fef7238d155b348cbb753fe46c84 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Thu, 29 Feb 2024 10:48:49 +0100 Subject: [PATCH 27/34] update: content-mode Requirement (#367) * update: content-mode Requirement * add UC description * Update ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md Co-authored-by: Alexander Zautke * Update ValueSet_Interaktionen.md * update requirements on ISIKKatalog ANFISK211 * auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) * Update ImplementationGuide/markdown/Katalog/CodeSystem_Interaktionen.md * Update ImplementationGuide/markdown/Katalog/CodeSystem_Interaktionen.md * update after review * Update ImplementationGuide/markdown/Katalog/CodeSystem_Motivation.md Co-authored-by: Alexander Zautke * Update ImplementationGuide/markdown/Katalog/CodeSystem_Motivation.md * revert. SHALL for two CONDITIONAL parameters --------- Co-authored-by: Alexander Zautke Co-authored-by: alexey-tschudnowsky Co-authored-by: f-peverali --- ImplementationGuide/markdown/DecisionLog.md | 10 ++ .../Katalog/CodeSystem_Interaktionen.md | 39 +------ .../markdown/Katalog/CodeSystem_Motivation.md | 12 ++- ImplementationGuide/markdown/ReleaseNotes.md | 4 +- .../ValueSet/ValueSet_Interaktionen.md | 15 ++- ...nt-ISiKCapabilityStatementBasisServer.json | 102 +----------------- .../input/fsh/ISiKCapabilityStatement.fsh | 28 +---- 7 files changed, 41 insertions(+), 169 deletions(-) diff --git a/ImplementationGuide/markdown/DecisionLog.md b/ImplementationGuide/markdown/DecisionLog.md index eb0cf9e9..3f82d9dd 100644 --- a/ImplementationGuide/markdown/DecisionLog.md +++ b/ImplementationGuide/markdown/DecisionLog.md @@ -1,5 +1,14 @@ # Decision Log + +Datum 27.02. +* Problem: Die MUSS-Anforderungen im Kontext von ISIKKatalog scheinen zu umfassend zu sein. +* Lösung: Schwächung der Anforderungen für das Profil als ganzes: + * Ressource ISIKKatalog als optional kennzeichnen (im Capability Statement). Alle anderen Suchparameter entfernen - genauso für IG. Nur für diese bleiben Test-Cases (optional) erhalten. + * Nur die Suchparameter "_id" Und "url" sind MUSS-Anforderungen (auch nur, wenn die Ressource optional unterstützt wird), da ein bekanntes Codesystem abrufbar sein sollte, wenn die Ressource an sich unterstützt wird. + *Anmerkungen und MUST-SUpport Felder bleiben unberührt (SOLL). + +---- Version Technical Correction 3.0.4 * Problem: In der [Extension Abrechnungsart](http://fhir.de/StructureDefinition/ExtensionAbrechnungsDiagnoseProzedur) ist eine eindeutige Zuweisung zwischen Use und Referenz nicht möglich aufgrund der Kardinalität von Use - (vergleiche ANFISK-206) @@ -8,6 +17,7 @@ Version Technical Correction 3.0.4 * In den Basisprofilen sollte die Extension angepasst werden, sodass Use auf 0..1 gesetzt wird * ggf. erneute Prüfung der Codes unter "Use" prüfen + ---- Version: Technical Correction 3.0.2 diff --git a/ImplementationGuide/markdown/Katalog/CodeSystem_Interaktionen.md b/ImplementationGuide/markdown/Katalog/CodeSystem_Interaktionen.md index 4196437a..bec9df1b 100644 --- a/ImplementationGuide/markdown/Katalog/CodeSystem_Interaktionen.md +++ b/ImplementationGuide/markdown/Katalog/CodeSystem_Interaktionen.md @@ -1,10 +1,10 @@ ### Interaktionen -Für die Ressource CodeSystem MUSS die REST-Interaktion "READ" implementiert werden. +Für die Ressource CodeSystem MUSS die REST-Interaktion "READ" implementiert werden, falls die Resource CodeSystem umgesetzt wird. Folgende Suchparameter sind für das Bestätigungsverfahren relevant, auch in Kombination: -1. Der Suchparameter "_id" MUSS unterstützt werden: +1. Der Suchparameter "_id" MUSS unterstützt werden, falls die Resource CodeSystem umgesetzt wird: Beispiele: @@ -12,7 +12,7 @@ Folgende Suchparameter sind für das Bestätigungsverfahren relevant, auch in Ko Anwendungshinweise: Weitere Informationen zur Suche nach "_id" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Parameters for all resources"](https://hl7.org/fhir/R4/search.html#all). -1. Der Suchparameter "url" MUSS unterstützt werden: +1. Der Suchparameter "url" MUSS unterstützt werden, falls die Resource CodeSystem umgesetzt wird: Beispiele: @@ -20,37 +20,4 @@ Folgende Suchparameter sind für das Bestätigungsverfahren relevant, auch in Ko Anwendungshinweise: Weitere Informationen zur Suche nach "CodeSystem.url" finden sich in der [FHIR-Basisspezifikation - Abschnitt "uri"](https://www.hl7.org/fhir/R4/search.html#uri). -1. Der Suchparameter "name" MUSS unterstützt werden: - - Beispiele: - - ```GET [base]/CodeSystem?name=TestCodeSystem``` - - Anwendungshinweise: Weitere Informationen zur Suche nach "CodeSystem.name" finden sich in der [FHIR-Basisspezifikation - Abschnitt "String Search"](https://hl7.org/fhir/R4/search.html#string). - -1. Der Suchparameter "status" MUSS unterstützt werden: - - Beispiele: - - ```GET [base]/CodeSystem?status=active``` - - Anwendungshinweise: Weitere Informationen zur Suche nach "CodeSystem.status" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Token Search""](https://hl7.org/fhir/R4/search.html#token). - - -1. Der Suchparameter "version" MUSS unterstützt werden: - - Beispiele: - - ```GET [base]/CodeSystem?version=1.0.0``` - - Anwendungshinweise: Weitere Informationen zur Suche nach "CodeSystem.version" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Token Search"](https://hl7.org/fhir/R4/search.html#token). - -1. Der Suchparameter "content-mode" MUSS unterstützt werden: - - Beispiele: - - ```GET [base]/CodeSystem?content-mode=complete``` - - Anwendungshinweise: Weitere Informationen zur Suche nach "CodeSystem.content" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Token Search"](https://hl7.org/fhir/R4/search.html#token). - --- \ No newline at end of file diff --git a/ImplementationGuide/markdown/Katalog/CodeSystem_Motivation.md b/ImplementationGuide/markdown/Katalog/CodeSystem_Motivation.md index bdabb341..21465881 100644 --- a/ImplementationGuide/markdown/Katalog/CodeSystem_Motivation.md +++ b/ImplementationGuide/markdown/Katalog/CodeSystem_Motivation.md @@ -1,6 +1,16 @@ ### Motivation -ISiK erlaubt in diversen Kontexten die Erweiterung der Kodierung durch Krankenhaus- / Systeminterne Kodierungen. +#### Katalog +ISiK erlaubt in diversen Kontexten die Erweiterung der Kodierung durch Krankenhaus-/Systeminterne Kodierungen. Das Profil ISiKKatalog (CodeSystem) als Profil erlaubt die Repräsentation der dazugehörigen Codes und Displaywerte. + Eine maschinenlesbare Repräsentation dieser Kodierungen erlaubt es Clients dazugehörige Anzeigetext und Definitionen zu verarbeiten. +Ein Codesystem eignet sich auch dazu, auf dessen Basis definierte [ValueSets zu expandieren](https://hl7.org/fhir/R4/valueset-operation-expand.html). +Da ISiKValueSet expandierte Valuesets vorsieht, ist eine dynamische Expansion in der Regel nicht erforderlich. +Darüber hinausgehend ist ein Use Case im Kontext der Katalogabfrage folgender: Ein Client möchte eine Expansion neu generieren (z.B. mit anderen Expansionen-Parametern), um das ValueSet beispielsweise in einer anderen Sprache auszugeben. + +#### Normativer Status und Bestätigung + +Dieses Profil MUSS im Rahmen der Bestätigung NICHT unterstützt werden. Falls das Profil unterstützt werden soll, MÜSSEN die hier definierten Festlegungen greifen (auch im Bestätigungsverfahren). + --- \ No newline at end of file diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index 83d9b222..b8ce6a0c 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -10,9 +10,11 @@ Datum: tbd * Entfernen der Festlegungen zum .identifier in ISiKVersicherungsverhaeltnisGesetzlich: https://github.com/gematik/spec-ISiK-Basismodul/pull/362 * Korrektur der Anforderung zur Encounter-Kontaktebene: https://github.com/gematik/spec-ISiK-Basismodul/pull/363 -* Hinweis zur Nutzung des Suchparameter "context-type-value" hinzugefügt: https://github.com/gematik/spec-ISiK-Basismodul/pull/364 +* Hinweis zur Nutzung des Suchparameter "context-type-value" hinzugefügt: https://github.com/gematik/spec-ISiK-Basismodul/pull/367 +* Änderung der Anforderung zu KANN für Profil ISIKKatalog: https://github.com/gematik/spec-ISiK-Basismodul/pull/367 * Lockerung für Extension Kardinalität in Account zu ..* und hinzufügen einer: eschreibung:https://github.com/gematik/spec-ISiK-Basismodul/pull/366/files + ---- Version: 3.0.3 diff --git a/ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md b/ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md index b571c463..86a258b2 100644 --- a/ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md +++ b/ImplementationGuide/markdown/ValueSet/ValueSet_Interaktionen.md @@ -51,12 +51,17 @@ Folgende Suchparameter sind für das Bestätigungsverfahren relevant, auch in Ko ```GET [base]/ValueSet?context-type-value=http://terminology.hl7.org/CodeSystem/usage-context-type|focus$http://hl7.org/fhir/resource-types|Encounter``` - Mit dieser Abfrage können hausinterne Kataloge anhand des Ressource Type ermittelt werden. Diese Informationen sind relevant im Kontext von: -- Hausinternen Prozeduren/Diagnosen-Codes -- Kodierung von Encounter-Informationen z.B. Wahlleistungen, Kodierung des Typs einer Location - Auch im Kontext der [Terminvereinbarung durch einen Termin-Requestor wird die Abfrage genutzt](https://simplifier.net/guide/isik-terminplanung-v3/ImplementationGuide-markdown-Datenobjekte-Operations?version=current). + Mit dieser Abfrage können hausinterne Kataloge anhand des Ressource-Typs ermittelt werden. Diese Informationen sind u.a. relevant im Kontext von: + - Hausinternen Prozeduren/Diagnosen-Codes + - Kodierung von Encounter-Informationen (z.B. Wahlleistungen, Orttypen) + + Use Cases im Zusammenhang: + + (A) Zur Konfigurationszeit können passende ValueSets von einem Server spezifisch für einen Ressourcentyp abgerufen und vorbereitend auf eine Systemintegration begutachtet bzw. in Client-Systeme eingebunden werden. In diesem Sinne wird die Abfrage im Kontext der [Terminvereinbarung durch einen Termin-Requestor genutzt](https://simplifier.net/guide/isik-terminplanung-v3/ImplementationGuide-markdown-Datenobjekte-Operations?version=current). + + (B) Zur Laufzeit können spezifische ValueSets synchronisiert bzw. direkt in die Eingabemasken von Clients eingebunden werden. Anwendungshinweise: Weitere Informationen zur Suche nach "CodeSystem.useContext" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Composite Search Parameters"](https://www.hl7.org/fhir/R4/search.html#composite). ---- \ No newline at end of file +--- diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json index eacb53a3..4cd96102 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json @@ -1548,107 +1548,7 @@ "extension": [ { "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", - "valueCode": "SHALL" - } - ], - "type": "CodeSystem", - "supportedProfile": [ - "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKCodeSystem" - ], - "interaction": [ - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", - "valueCode": "SHALL" - } - ], - "code": "read" - }, - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", - "valueCode": "SHALL" - } - ], - "code": "search-type" - } - ], - "searchParam": [ - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", - "valueCode": "SHALL" - } - ], - "name": "_id", - "definition": "http://hl7.org/fhir/SearchParameter/Resource-id", - "type": "token" - }, - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", - "valueCode": "SHALL" - } - ], - "name": "url", - "definition": "http://hl7.org/fhir/SearchParameter/conformance-url", - "type": "uri" - }, - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", - "valueCode": "SHALL" - } - ], - "name": "name", - "definition": "http://hl7.org/fhir/SearchParameter/conformance-name", - "type": "string" - }, - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", - "valueCode": "SHALL" - } - ], - "name": "status", - "definition": "http://hl7.org/fhir/SearchParameter/conformance-status", - "type": "token" - }, - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", - "valueCode": "SHALL" - } - ], - "name": "version", - "definition": "http://hl7.org/fhir/SearchParameter/conformance-version", - "type": "token" - }, - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", - "valueCode": "SHALL" - } - ], - "name": "content-mode", - "definition": "http://hl7.org/fhir/SearchParameter/CodeSystem-content-mode", - "type": "token" - } - ] - }, - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", - "valueCode": "SHALL" + "valueCode": "MAY" } ], "type": "ValueSet", diff --git a/Resources/input/fsh/ISiKCapabilityStatement.fsh b/Resources/input/fsh/ISiKCapabilityStatement.fsh index c0aaabab..097e16ce 100644 --- a/Resources/input/fsh/ISiKCapabilityStatement.fsh +++ b/Resources/input/fsh/ISiKCapabilityStatement.fsh @@ -597,14 +597,14 @@ Usage: #definition * rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/Practitioner-name" * rest.resource[=].searchParam[=].type = #string * rest.resource[+].extension.url = $capabilitystatement-expectation -* rest.resource[=].extension.valueCode = #SHALL +* rest.resource[=].extension.valueCode = #MAY * rest.resource[=].type = #CodeSystem * rest.resource[=].supportedProfile = "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKCodeSystem" * rest.resource[=].interaction[0].extension.url = $capabilitystatement-expectation -* rest.resource[=].interaction[=].extension.valueCode = #SHALL +* rest.resource[=].interaction[=].extension.valueCode = #MAY * rest.resource[=].interaction[=].code = #read * rest.resource[=].interaction[+].extension.url = $capabilitystatement-expectation -* rest.resource[=].interaction[=].extension.valueCode = #SHALL +* rest.resource[=].interaction[=].extension.valueCode = #MAY * rest.resource[=].interaction[=].code = #search-type * rest.resource[=].searchParam[0].extension.url = $capabilitystatement-expectation * rest.resource[=].searchParam[=].extension.valueCode = #SHALL @@ -616,28 +616,6 @@ Usage: #definition * rest.resource[=].searchParam[=].name = "url" * rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/conformance-url" * rest.resource[=].searchParam[=].type = #uri -* rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation -* rest.resource[=].searchParam[=].extension.valueCode = #SHALL -* rest.resource[=].searchParam[=].name = "name" -* rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/conformance-name" -* rest.resource[=].searchParam[=].type = #string -* rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation -* rest.resource[=].searchParam[=].extension.valueCode = #SHALL -* rest.resource[=].searchParam[=].name = "status" -* rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/conformance-status" -* rest.resource[=].searchParam[=].type = #token -* rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation -* rest.resource[=].searchParam[=].extension.valueCode = #SHALL -* rest.resource[=].searchParam[=].name = "version" -* rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/conformance-version" -* rest.resource[=].searchParam[=].type = #token -* rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation -* rest.resource[=].searchParam[=].extension.valueCode = #SHALL -* rest.resource[=].searchParam[=].name = "content-mode" -* rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/CodeSystem-content-mode" -* rest.resource[=].searchParam[=].type = #token -* rest.resource[+].extension.url = $capabilitystatement-expectation -* rest.resource[=].extension.valueCode = #SHALL * rest.resource[=].type = #ValueSet * rest.resource[=].supportedProfile = "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKValueSet" * rest.resource[=].interaction[0].extension.url = $capabilitystatement-expectation From d9907cb14a33275e9008d6e82bd25de2f4bbbf09 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Thu, 29 Feb 2024 10:53:13 +0100 Subject: [PATCH 28/34] add description for rendering issue ANFISK 222 (#373) * add description for rendering issue ANFISK 222 --- .../StructureDefinition-ISiKKontaktGesundheitseinrichtung.json | 3 +++ Resources/input/fsh/ISiKKontaktGesundheitseinrichtung.fsh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json index 4d4fc82c..4c969d59 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json @@ -601,6 +601,7 @@ { "id": "Encounter.location:Zimmer.physicalType", "path": "Encounter.location.physicalType", + "comment": "Die Kodierung in diesem Slice entstammt folgendem Valueset - gelistet unter .location.(All slices.)physicalType: https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ISiKLocationPhysicalType", "min": 1, "patternCodeableConcept": { "coding": [ @@ -640,6 +641,7 @@ { "id": "Encounter.location:Bett.physicalType", "path": "Encounter.location.physicalType", + "comment": "Die Kodierung in diesem Slice entstammt folgendem Valueset - gelistet unter .location.(All slices.)physicalType: https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ISiKLocationPhysicalType", "min": 1, "patternCodeableConcept": { "coding": [ @@ -679,6 +681,7 @@ { "id": "Encounter.location:Station.physicalType", "path": "Encounter.location.physicalType", + "comment": "Die Kodierung in diesem Slice entstammt folgendem Valueset - gelistet unter .location.(All slices.)physicalType: https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ISiKLocationPhysicalType", "min": 1, "patternCodeableConcept": { "coding": [ diff --git a/Resources/input/fsh/ISiKKontaktGesundheitseinrichtung.fsh b/Resources/input/fsh/ISiKKontaktGesundheitseinrichtung.fsh index fcdd22ba..7d93a862 100644 --- a/Resources/input/fsh/ISiKKontaktGesundheitseinrichtung.fsh +++ b/Resources/input/fsh/ISiKKontaktGesundheitseinrichtung.fsh @@ -100,18 +100,21 @@ Description: "Dieses Profil ermöglicht die Herstellung eines Fallbezuges welche * display 1.. MS * physicalType 1..1 MS * physicalType = http://terminology.hl7.org/CodeSystem/location-physical-type#wa + * ^comment = "Die Kodierung in diesem Slice entstammt folgendem Valueset - gelistet unter .location.(All slices.)physicalType: https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ISiKLocationPhysicalType" * location[Zimmer] * location 1.. MS * identifier 1.. MS * display 1.. MS * physicalType 1..1 MS * physicalType = http://terminology.hl7.org/CodeSystem/location-physical-type#ro + * ^comment = "Die Kodierung in diesem Slice entstammt folgendem Valueset - gelistet unter .location.(All slices.)physicalType: https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ISiKLocationPhysicalType" * location[Bett] * location 1.. MS * identifier 1.. MS * display 1.. MS * physicalType 1..1 MS * physicalType = http://terminology.hl7.org/CodeSystem/location-physical-type#bd + * ^comment = "Die Kodierung in diesem Slice entstammt folgendem Valueset - gelistet unter .location.(All slices.)physicalType: https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ISiKLocationPhysicalType" * serviceProvider MS * identifier 1.. MS * display 1.. MS From 98538e2f2dbdab9fb9e1314c562c2f4da4953834 Mon Sep 17 00:00:00 2001 From: Max Theilig Date: Thu, 29 Feb 2024 18:25:29 +0100 Subject: [PATCH 29/34] ambiguous MAY searchparameter corrected --- .../Abrechnungsfall_Interaktionen.md | 8 -------- .../markdown/Diagnose/Diagnose_Interaktionen.md | 8 -------- .../Kontakt_Interaktionen.md | 8 -------- .../markdown/Patient/Patient_Interaktionen.md | 8 -------- .../PersonImGesundheitsberuf_Interaktionen.md | 8 -------- .../markdown/Prozedur/Prozedur_Interaktionen.md | 8 -------- .../UebergreifendeFestlegungen_Suchparameter.md | 8 -------- .../Versicherungsverhaeltnis_Interaktionen.md | 16 ---------------- 8 files changed, 72 deletions(-) diff --git a/ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Interaktionen.md b/ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Interaktionen.md index ad508d02..67b9f7db 100644 --- a/ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Interaktionen.md +++ b/ImplementationGuide/markdown/Abrechnungsfall/Abrechnungsfall_Interaktionen.md @@ -44,12 +44,4 @@ Folgende Suchparameter sind für das Bestätigungsverfahren relevant, auch in Ko Anwendungshinweise: Weitere Informationen zur Suche nach "Account.subject" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Reference Search"](https://www.hl7.org/fhir/R4/search.html#reference). -1. Der Suchparameter "_profile" KANN unterstützt werden: - - Beispiele: - - ```GET [base]/Account?_profile=https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAbrechnungsfall``` - - Anwendungshinweise: Weitere Informationen zur Suche nach "_profile" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Parameters for all resources"](https://hl7.org/fhir/R4/search.html#all). - --- diff --git a/ImplementationGuide/markdown/Diagnose/Diagnose_Interaktionen.md b/ImplementationGuide/markdown/Diagnose/Diagnose_Interaktionen.md index d613b501..5e5d43e4 100644 --- a/ImplementationGuide/markdown/Diagnose/Diagnose_Interaktionen.md +++ b/ImplementationGuide/markdown/Diagnose/Diagnose_Interaktionen.md @@ -64,14 +64,6 @@ Folgende Suchparameter sind für das Bestätigungsverfahren relevant, auch in Ko Anwendungshinweise: Weitere Informationen zur Suche nach "Condition.related" finden sich im [Leitfaden Basis DE (R4) - Abschnitt "Diagnosen (Condition) - Doppel-/Mehrfachkodierte ICD-Codes"](https://ig.fhir.de/basisprofile-de/1.2.0/Ressourcen-DiagnosenCondition.html). -1. Der Suchparameter "_profile" KANN unterstützt werden: - - Beispiele: - - ```GET [base]/Condition?_profile=https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKDiagnose``` - - Anwendungshinweise: Weitere Informationen zur Suche nach "_profile" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Parameters for all resources"](https://hl7.org/fhir/R4/search.html#all). - 1. Der Suchparameter "category" KANN unterstützt werden: Beispiele: diff --git a/ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Interaktionen.md b/ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Interaktionen.md index 70405003..7a031dcb 100644 --- a/ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Interaktionen.md +++ b/ImplementationGuide/markdown/KontaktGesundheitseinrichtung/Kontakt_Interaktionen.md @@ -114,13 +114,5 @@ Folgende Suchparameter sind für das Bestätigungsverfahren relevant, auch in Ko Anwendungshinweise: Weitere Informationen zur Suche nach "Encounter.serviceProvider" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Reference Search"](https://www.hl7.org/fhir/R4/search.html#reference). -1. Der Suchparameter "_profile" KANN unterstützt werden: - - Beispiele: - - ```GET [base]/Encounter?_profile=https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKKontaktGesundheitseinrichtung``` - - Anwendungshinweise: Weitere Informationen zur Suche nach "_profile" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Parameters for all resources"](https://hl7.org/fhir/R4/search.html#all). - --- diff --git a/ImplementationGuide/markdown/Patient/Patient_Interaktionen.md b/ImplementationGuide/markdown/Patient/Patient_Interaktionen.md index 7fe6ff8b..e64dd511 100644 --- a/ImplementationGuide/markdown/Patient/Patient_Interaktionen.md +++ b/ImplementationGuide/markdown/Patient/Patient_Interaktionen.md @@ -78,14 +78,6 @@ Folgende Suchparameter sind für das Bestätigungsverfahren relevant, auch in Ko Anwendungshinweise: Weitere Informationen zur Suche nach "Patient.name" finden sich in der [FHIR-Basisspezifikation - Abschnitt "String Search"](https://hl7.org/fhir/R4/search.html#string). -1. Der Suchparameter "_profile" KANN unterstützt werden: - - Beispiele: - - ```GET [base]/Patient?_profile=https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPatient``` - - Anwendungshinweise: Weitere Informationen zur Suche nach "_profile" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Parameters for all resources"](https://hl7.org/fhir/R4/search.html#all). - 1. Der Suchparameter "address" KANN unterstützt werden: Beispiele diff --git a/ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_Interaktionen.md b/ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_Interaktionen.md index 07d77d58..97a37b42 100644 --- a/ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_Interaktionen.md +++ b/ImplementationGuide/markdown/PersonImGesundheitsberuf/PersonImGesundheitsberuf_Interaktionen.md @@ -46,14 +46,6 @@ Folgende Suchparameter sind für das Bestätigungsverfahren relevant, auch in Ko Anwendungshinweise: Weitere Informationen zur Suche nach "Practitioner.name" finden sich in der [FHIR-Basisspezifikation - Abschnitt "String Search"](https://hl7.org/fhir/R4/search.html#string). -1. Der Suchparameter "_profile" KANN unterstützt werden: - - Beispiele: - - ```GET [base]/Practitioner?_profile=``` - - Anwendungshinweise: Weitere Informationen zur Suche nach "_profile" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Parameters for all resources"](https://www.hl7.org/fhir/R4/search.html#all). - 1. Der Suchparameter "address" KANN unterstützt werden: Beispiele: diff --git a/ImplementationGuide/markdown/Prozedur/Prozedur_Interaktionen.md b/ImplementationGuide/markdown/Prozedur/Prozedur_Interaktionen.md index e8e7637b..82ce263c 100644 --- a/ImplementationGuide/markdown/Prozedur/Prozedur_Interaktionen.md +++ b/ImplementationGuide/markdown/Prozedur/Prozedur_Interaktionen.md @@ -72,12 +72,4 @@ Folgende Suchparameter sind für das Bestätigungsverfahren relevant, auch in Ko Dieser Suchparameter ist für die Umsetzung des IHE QEDm Profils verpflichtend. -1. Der Suchparameter für "_profile" KANN unterstützt werden: - - Beispiele: - - ```GET [base]/Procedure?_profile=https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKDiagnose``` - - Anwendungshinweise: Weitere Informationen zur Suche nach "_profile" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Parameters for all resources"](https://hl7.org/fhir/R4/search.html#all) - --- diff --git a/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Suchparameter.md b/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Suchparameter.md index 4cb12b99..7ea2088a 100644 --- a/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Suchparameter.md +++ b/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_Suchparameter.md @@ -136,14 +136,6 @@ Folgende Suchparameter MÜSSEN für alle bestätigungsrelevante Datenojekte impl Der ```:iterate``` Modifier KANN unterstützt werden. - -Folgende Suchparameter KÖNNEN für alle bestätigungsrelevante Datenojekte implementiert werden: - -* ``_profile`` - - - Beispiele: ``GET [base]/Patient?_profile=https://gematik.de/fhir/ISiK/v3/StructureDefinition/ISiKPatient`` - - Anwendungshinweise: Weitere Informationen zur Suche nach "_id" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Parameters for all resources"](https://hl7.org/fhir/R4/search.html#all). - Die aufgelisteten Suchparameter MÜSSEN entsprechend der Vorgaben für das CapabilityStatement pro Ressource aufgelistet werden. ## Best Practice Empfehlungen für Standard-Suchfilter diff --git a/ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Interaktionen.md b/ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Interaktionen.md index 3216c70f..057b8246 100644 --- a/ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Interaktionen.md +++ b/ImplementationGuide/markdown/Versicherungsverhaeltnis/Versicherungsverhaeltnis_Interaktionen.md @@ -62,14 +62,6 @@ Folgende Suchparameter sind für das Bestätigungsverfahren relevant, auch in Ko Anwendungshinweise: Weitere Informationen zur Suche nach "Coverage.payor" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Reference Search"](https://www.hl7.org/fhir/R4/search.html#reference). -8. Der Suchparameter "_profile" KANN unterstützt werden: - - Beispiele: - - ```GET [base]/Coverage?_profile=https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKVersicherungsverhaeltnisGesetzlich``` - - Anwendungshinweise: Weitere Informationen zur Suche nach "_profile" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Parameters for all resources"](https://www.hl7.org/fhir/R4/search.html#all). - #### Profil ISiKVersicherungsverhaeltnisSelbstzahler 1. Der Suchparameter "_id" MUSS unterstützt werden: @@ -120,12 +112,4 @@ Folgende Suchparameter sind für das Bestätigungsverfahren relevant, auch in Ko Anwendungshinweise: Weitere Informationen zur Suche nach "Coverage.type" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Token Search"](https://hl7.org/fhir/R4/search.html#token). -1. Der Suchparameter "_profile" KANN unterstützt werden: - - Beispiele: - - ```GET [base]/Coverage?_profile=https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKVersicherungsverhaeltnisSelbstzahler``` - - Anwendungshinweise: Weitere Informationen zur Suche nach "_profile" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Parameters for all resources"](https://www.hl7.org/fhir/R4/search.html#all). - --- \ No newline at end of file From 9ab316326a99a8042fc5359eefd7e8b97033dfd1 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Fri, 1 Mar 2024 12:59:55 +0100 Subject: [PATCH 30/34] fix: version --> 3.0.4 --- ImplementationGuide/markdown/Einfuehrung.md | 2 +- Resources/input/fsh/ruleset.fsh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ImplementationGuide/markdown/Einfuehrung.md b/ImplementationGuide/markdown/Einfuehrung.md index 8dbd1442..1d2bb5b3 100644 --- a/ImplementationGuide/markdown/Einfuehrung.md +++ b/ImplementationGuide/markdown/Einfuehrung.md @@ -1,7 +1,7 @@ gematik logo ---- -Version: 3.0.3 +Version: 3.0.4 Datum: 15.01.2024 diff --git a/Resources/input/fsh/ruleset.fsh b/Resources/input/fsh/ruleset.fsh index 54c3d35f..0b1f2d93 100644 --- a/Resources/input/fsh/ruleset.fsh +++ b/Resources/input/fsh/ruleset.fsh @@ -1,12 +1,12 @@ RuleSet: Meta -* ^version = "3.0.3" +* ^version = "3.0.4" * ^status = #active * ^experimental = false * ^publisher = "gematik GmbH" * ^date = "2024-01-15" RuleSet: MetaInstance -* version = "3.0.3" +* version = "3.0.4" * status = #active * experimental = false * publisher = "gematik GmbH" @@ -14,5 +14,5 @@ RuleSet: MetaInstance RuleSet: Meta-CapabilityStatement * insert MetaInstance -* implementationGuide = "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide|3.0.3" +* implementationGuide = "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide|3.0.4" * url = "https://gematik.de/fhir/isik/v3/Basismodul/CapabilityStatement/basis-server" \ No newline at end of file From f2f72e54b3238460cea8777c1e599acf59577783 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Fri, 1 Mar 2024 13:01:08 +0100 Subject: [PATCH 31/34] fix: version --> 3.0.4 --- ...apabilityStatement-ISiKCapabilityStatementBasisServer.json | 4 ++-- .../fsh-generated/resources/CodeSystem-CodeSystemExample.json | 2 +- .../resources/SearchParameter-Encounter-date-start.json | 2 +- .../resources/SearchParameter-Encounter-end-date.json | 2 +- .../resources/StructureDefinition-ISiKAbrechnungsfall.json | 2 +- .../resources/StructureDefinition-ISiKAngehoeriger.json | 2 +- .../resources/StructureDefinition-ISiKBerichtBundle.json | 2 +- .../resources/StructureDefinition-ISiKBerichtSubSysteme.json | 2 +- .../resources/StructureDefinition-ISiKBinary.json | 2 +- .../resources/StructureDefinition-ISiKCodeSystem.json | 2 +- .../resources/StructureDefinition-ISiKDiagnose.json | 2 +- ...StructureDefinition-ISiKKontaktGesundheitseinrichtung.json | 2 +- .../resources/StructureDefinition-ISiKPatient.json | 2 +- .../StructureDefinition-ISiKPersonImGesundheitsberuf.json | 2 +- .../resources/StructureDefinition-ISiKProzedur.json | 2 +- .../resources/StructureDefinition-ISiKValueSet.json | 2 +- ...tureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json | 2 +- ...reDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json | 2 +- .../resources/StructureDefinition-PlannedEndDate.json | 2 +- .../resources/StructureDefinition-PlannedStartDate.json | 2 +- .../StructureDefinition-identifier-abrechnungsnummer.json | 2 +- Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json | 2 +- .../resources/ValueSet-ISiKAccountIdentifierType.json | 2 +- .../fsh-generated/resources/ValueSet-ISiKAccountType.json | 2 +- .../resources/ValueSet-ISiKLocationPhysicalType.json | 2 +- .../fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json | 2 +- .../resources/ValueSet-ProzedurenKategorieSCT.json | 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json index 4cd96102..51623756 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json @@ -2,13 +2,13 @@ "resourceType": "CapabilityStatement", "id": "ISiKCapabilityStatementBasisServer", "url": "https://gematik.de/fhir/isik/v3/Basismodul/CapabilityStatement/basis-server", - "version": "3.0.3", + "version": "3.0.4", "status": "active", "experimental": false, "publisher": "gematik GmbH", "date": "2024-01-15", "implementationGuide": [ - "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide|3.0.3" + "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide|3.0.4" ], "name": "ISiKCapabilityStatementBasisServer", "title": "ISiK CapabilityStatement Basis Server", diff --git a/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json b/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json index 4ddd85e3..69492d85 100644 --- a/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json +++ b/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json @@ -6,7 +6,7 @@ "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKCodeSystem" ] }, - "version": "3.0.3", + "version": "3.0.4", "status": "active", "experimental": false, "publisher": "gematik GmbH", diff --git a/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json b/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json index 53bac581..d82e48a5 100644 --- a/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json +++ b/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json @@ -3,7 +3,7 @@ "id": "Encounter-date-start", "url": "https://gematik.de/fhir/isik/v3/Basismodul/SearchParameter/Encounter-date-start", "description": "The actual start date of the Encounter (Backport from R5). The parameter cannot repeat or have multiple values.", - "version": "3.0.3", + "version": "3.0.4", "status": "active", "experimental": false, "publisher": "gematik GmbH", diff --git a/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json b/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json index 154786c0..a8b04517 100644 --- a/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json +++ b/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json @@ -3,7 +3,7 @@ "id": "Encounter-end-date", "url": "https://gematik.de/fhir/isik/v3/Basismodul/SearchParameter/Encounter-end-date", "description": "The actual end date of the Encounter (Backport from R5). The parameter cannot repeat or have multiple values.", - "version": "3.0.3", + "version": "3.0.4", "status": "active", "experimental": false, "publisher": "gematik GmbH", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json index f39c5282..f7a7cfd9 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ISiKAbrechnungsfall", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAbrechnungsfall", - "version": "3.0.3", + "version": "3.0.4", "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 1cba4724..77a98773 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ISiKAngehoeriger", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAngehoeriger", - "version": "3.0.3", + "version": "3.0.4", "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 a32b308e..e00c71dd 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ISiKBerichtBundle", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKBerichtBundle", - "version": "3.0.3", + "version": "3.0.4", "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 f7d5df50..a8120ece 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ISiKBerichtSubSysteme", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKBerichtSubSysteme", - "version": "3.0.3", + "version": "3.0.4", "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 5fdf394f..f8a451b5 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ISiKBinary", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKBinary", - "version": "3.0.3", + "version": "3.0.4", "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 3beec620..4b9fb6d5 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ISiKCodeSystem", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKCodeSystem", - "version": "3.0.3", + "version": "3.0.4", "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 29565033..77d7bbe2 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ISiKDiagnose", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKDiagnose", - "version": "3.0.3", + "version": "3.0.4", "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 4c969d59..dd6b07d5 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ISiKKontaktGesundheitseinrichtung", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKKontaktGesundheitseinrichtung", - "version": "3.0.3", + "version": "3.0.4", "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 85a7803a..fa6ef879 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ISiKPatient", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPatient", - "version": "3.0.3", + "version": "3.0.4", "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 e27891e8..823d48af 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ISiKPersonImGesundheitsberuf", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPersonImGesundheitsberuf", - "version": "3.0.3", + "version": "3.0.4", "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 6b161c85..0983bbc1 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ISiKProzedur", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKProzedur", - "version": "3.0.3", + "version": "3.0.4", "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 22e73e48..f06cda30 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "ISiKValueSet", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKValueSet", - "version": "3.0.3", + "version": "3.0.4", "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 37079583..c31395b9 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/v3/Basismodul/StructureDefinition/ISiKVersicherungsverhaeltnisGesetzlich", - "version": "3.0.3", + "version": "3.0.4", "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 8b91088b..bccb0345 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/v3/Basismodul/StructureDefinition/ISiKVersicherungsverhaeltnisSelbstzahler", - "version": "3.0.3", + "version": "3.0.4", "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 6db608f9..720a49b5 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": "3.0.3", + "version": "3.0.4", "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 d3d411bc..4fd8968c 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": "3.0.3", + "version": "3.0.4", "name": "PlannedStartDate", "status": "active", "experimental": false, diff --git a/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json b/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json index dda29202..d783c55f 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json +++ b/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json @@ -2,7 +2,7 @@ "resourceType": "StructureDefinition", "id": "identifier-abrechnungsnummer", "url": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/identifier-abrechnungsnummer", - "version": "3.0.3", + "version": "3.0.4", "name": "IdentifierAbrechnungsnummer", "title": "Identifier-Profil für die Abbildung einer Abrechnungsnummer (\"Fallnummer\") ", "status": "active", diff --git a/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json b/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json index c213c7bb..59336da8 100644 --- a/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json @@ -5,7 +5,7 @@ "id": "DiagnosesSCT", "description": "Enthaelt alle SNOMED Clinical finding, Event und Situation with explicit context codes", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/DiagnosesSCT", - "version": "3.0.3", + "version": "3.0.4", "experimental": false, "publisher": "gematik GmbH", "date": "2024-01-15", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json b/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json index da75b26a..e8fae456 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json @@ -5,7 +5,7 @@ "id": "ISiKAccountIdentifierType", "title": "ISiKAccountIdentifierType", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ISiKAccountIdentifierType", - "version": "3.0.3", + "version": "3.0.4", "experimental": false, "publisher": "gematik GmbH", "date": "2024-01-15", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json b/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json index 351282ff..70c6df31 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json @@ -5,7 +5,7 @@ "id": "ISiKAccountType", "title": "ISiKAccountType", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ISiKAccountType", - "version": "3.0.3", + "version": "3.0.4", "experimental": false, "publisher": "gematik GmbH", "date": "2024-01-15", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json b/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json index e8360c2f..481b958a 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json @@ -4,7 +4,7 @@ "name": "ISiKLocationPhysicalType", "id": "ISiKLocationPhysicalType", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ISiKLocationPhysicalType", - "version": "3.0.3", + "version": "3.0.4", "experimental": false, "publisher": "gematik GmbH", "date": "2024-01-15", diff --git a/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json b/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json index 57774fb6..5232ff3a 100644 --- a/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json @@ -5,7 +5,7 @@ "id": "ProzedurenCodesSCT", "description": "Enthaelt alle SNOMED Procedure Codes", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ProzedurenCodesSCT", - "version": "3.0.3", + "version": "3.0.4", "experimental": false, "publisher": "gematik GmbH", "date": "2024-01-15", diff --git a/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json b/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json index aa99faf1..21dd2dc3 100644 --- a/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json @@ -5,7 +5,7 @@ "id": "ProzedurenKategorieSCT", "description": "Enthaelt alle SNOMED Codes für ein Mapping der OPS Klassentitel", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ValueSet/ProzedurenKategorieSCT", - "version": "3.0.3", + "version": "3.0.4", "experimental": false, "publisher": "gematik GmbH", "date": "2024-01-15", From ca46fe4700c0c5f03a087d74ec9a468a676aac81 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Fri, 1 Mar 2024 14:17:04 +0100 Subject: [PATCH 32/34] update version --- .../ImplementierungsleitfadenIsiK_basismodul.json | 2 +- ImplementationGuide/markdown/Einfuehrung.md | 2 +- Resources/input/fsh/ruleset.fsh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json b/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json index b5f4e45b..809b7704 100644 --- a/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json +++ b/ImplementationGuide/ImplementierungsleitfadenIsiK_basismodul.json @@ -1,7 +1,7 @@ { "resourceType": "ImplementationGuide", "url": "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide/ISiK-Basismodul", - "version": "3.0.3", + "version": "3.0.4", "name": "Implementierungsleitfaden ISiK-Basismodul", "status": "active", "fhirVersion": [ diff --git a/ImplementationGuide/markdown/Einfuehrung.md b/ImplementationGuide/markdown/Einfuehrung.md index 1d2bb5b3..d999e755 100644 --- a/ImplementationGuide/markdown/Einfuehrung.md +++ b/ImplementationGuide/markdown/Einfuehrung.md @@ -3,7 +3,7 @@ ---- Version: 3.0.4 -Datum: 15.01.2024 +Datum: 01.03.2024 Status: Aktiv diff --git a/Resources/input/fsh/ruleset.fsh b/Resources/input/fsh/ruleset.fsh index 0b1f2d93..a5908b0f 100644 --- a/Resources/input/fsh/ruleset.fsh +++ b/Resources/input/fsh/ruleset.fsh @@ -3,14 +3,14 @@ RuleSet: Meta * ^status = #active * ^experimental = false * ^publisher = "gematik GmbH" -* ^date = "2024-01-15" +* ^date = "2024-03-01" RuleSet: MetaInstance * version = "3.0.4" * status = #active * experimental = false * publisher = "gematik GmbH" -* date = "2024-01-15" +* date = "2024-03-01" RuleSet: Meta-CapabilityStatement * insert MetaInstance From 1925b1f4218b6a963469807d8a599d25db7a1c9e Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Fri, 1 Mar 2024 14:18:26 +0100 Subject: [PATCH 33/34] update releasenotes --- ImplementationGuide/markdown/ReleaseNotes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index b8ce6a0c..b6f42f9f 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -6,13 +6,13 @@ Die erste Ziffer X bezeichnet ein Major-Release und regelt die Gültigkeit von R Version: 3.0.4 -Datum: tbd +Datum: 1.3.2024 * Entfernen der Festlegungen zum .identifier in ISiKVersicherungsverhaeltnisGesetzlich: https://github.com/gematik/spec-ISiK-Basismodul/pull/362 * Korrektur der Anforderung zur Encounter-Kontaktebene: https://github.com/gematik/spec-ISiK-Basismodul/pull/363 * Hinweis zur Nutzung des Suchparameter "context-type-value" hinzugefügt: https://github.com/gematik/spec-ISiK-Basismodul/pull/367 * Änderung der Anforderung zu KANN für Profil ISIKKatalog: https://github.com/gematik/spec-ISiK-Basismodul/pull/367 -* Lockerung für Extension Kardinalität in Account zu ..* und hinzufügen einer: eschreibung:https://github.com/gematik/spec-ISiK-Basismodul/pull/366/files +* Lockerung für Extension Kardinalität in Account zu ..* und hinzufügen einer Beschreibung: https://github.com/gematik/spec-ISiK-Basismodul/pull/366 ---- From a873a1ae83306cd6daece9ae7e2024e1eeed10b9 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Fri, 1 Mar 2024 14:46:51 +0100 Subject: [PATCH 34/34] add sushi generated files --- Resources/fsh-generated/fsh-index.json | 402 ++++++++++++++++++ Resources/fsh-generated/fsh-index.txt | 51 +++ ...nt-ISiKCapabilityStatementBasisServer.json | 2 +- .../CodeSystem-CodeSystemExample.json | 2 +- .../SearchParameter-Encounter-date-start.json | 2 +- .../SearchParameter-Encounter-end-date.json | 2 +- ...ructureDefinition-ISiKAbrechnungsfall.json | 2 +- .../StructureDefinition-ISiKAngehoeriger.json | 2 +- ...StructureDefinition-ISiKBerichtBundle.json | 2 +- ...ctureDefinition-ISiKBerichtSubSysteme.json | 2 +- .../StructureDefinition-ISiKBinary.json | 2 +- .../StructureDefinition-ISiKCodeSystem.json | 2 +- .../StructureDefinition-ISiKDiagnose.json | 2 +- ...ion-ISiKKontaktGesundheitseinrichtung.json | 2 +- .../StructureDefinition-ISiKPatient.json | 2 +- ...finition-ISiKPersonImGesundheitsberuf.json | 2 +- .../StructureDefinition-ISiKProzedur.json | 2 +- .../StructureDefinition-ISiKValueSet.json | 2 +- ...SiKVersicherungsverhaeltnisGesetzlich.json | 2 +- ...KVersicherungsverhaeltnisSelbstzahler.json | 2 +- .../StructureDefinition-PlannedEndDate.json | 2 +- .../StructureDefinition-PlannedStartDate.json | 2 +- ...finition-identifier-abrechnungsnummer.json | 2 +- .../resources/ValueSet-DiagnosesSCT.json | 2 +- .../ValueSet-ISiKAccountIdentifierType.json | 2 +- .../resources/ValueSet-ISiKAccountType.json | 2 +- .../ValueSet-ISiKLocationPhysicalType.json | 2 +- .../ValueSet-ProzedurenCodesSCT.json | 2 +- .../ValueSet-ProzedurenKategorieSCT.json | 2 +- 29 files changed, 480 insertions(+), 27 deletions(-) create mode 100644 Resources/fsh-generated/fsh-index.json create mode 100644 Resources/fsh-generated/fsh-index.txt diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json new file mode 100644 index 00000000..400a4ab7 --- /dev/null +++ b/Resources/fsh-generated/fsh-index.json @@ -0,0 +1,402 @@ +[ + { + "outputFile": "Account-AbrechnungsfallAmbulant.json", + "fshName": "AbrechnungsfallAmbulant", + "fshType": "Instance", + "fshFile": "ISiKAbrechnungsfall.fsh", + "startLine": 43, + "endLine": 55 + }, + { + "outputFile": "Binary-Binary-JPEG-Example-short.json", + "fshName": "Binary-JPEG-Example-short", + "fshType": "Instance", + "fshFile": "ISiKBinary.fsh", + "startLine": 17, + "endLine": 21 + }, + { + "outputFile": "Binary-Binary-JPEG-Example.json", + "fshName": "Binary-JPEG-Example", + "fshType": "Instance", + "fshFile": "ISiKBinary.fsh", + "startLine": 30, + "endLine": 34 + }, + { + "outputFile": "Binary-Binary-PDF-Example-short.json", + "fshName": "Binary-PDF-Example-short", + "fshType": "Instance", + "fshFile": "ISiKBinary.fsh", + "startLine": 23, + "endLine": 28 + }, + { + "outputFile": "Binary-Binary-PDF-Example.json", + "fshName": "Binary-PDF-Example", + "fshType": "Instance", + "fshFile": "ISiKBinary.fsh", + "startLine": 36, + "endLine": 41 + }, + { + "outputFile": "Bundle-ISiKBundle-Example.json", + "fshName": "ISiKBundle-Example", + "fshType": "Instance", + "fshFile": "ISiKBerichtBundle.fsh", + "startLine": 24, + "endLine": 38 + }, + { + "outputFile": "CapabilityStatement-ISiKCapabilityStatementBasisServer.json", + "fshName": "ISiKCapabilityStatementBasisServer", + "fshType": "Instance", + "fshFile": "ISiKCapabilityStatement.fsh", + "startLine": 1, + "endLine": 668 + }, + { + "outputFile": "CodeSystem-CodeSystemExample.json", + "fshName": "CodeSystemExample", + "fshType": "Instance", + "fshFile": "ISiKCodeSystem.fsh", + "startLine": 17, + "endLine": 27 + }, + { + "outputFile": "Composition-composition-blutdruck.json", + "fshName": "composition-blutdruck", + "fshType": "Instance", + "fshFile": "ISiKBerichtSubSysteme.fsh", + "startLine": 66, + "endLine": 83 + }, + { + "outputFile": "Condition-BehandlungsDiagnoseFreitext.json", + "fshName": "BehandlungsDiagnoseFreitext", + "fshType": "Instance", + "fshFile": "ISiKDiagnose.fsh", + "startLine": 123, + "endLine": 130 + }, + { + "outputFile": "Condition-Example-condition-ausrufezeichen-primaer.json", + "fshName": "Example-condition-ausrufezeichen-primaer", + "fshType": "Instance", + "fshFile": "ISiKDiagnose.fsh", + "startLine": 57, + "endLine": 66 + }, + { + "outputFile": "Condition-Example-condition-ausrufezeichen-sekundaer.json", + "fshName": "Example-condition-ausrufezeichen-sekundaer", + "fshType": "Instance", + "fshFile": "ISiKDiagnose.fsh", + "startLine": 68, + "endLine": 81 + }, + { + "outputFile": "Condition-Example-condition-kreuz-stern-primaer.json", + "fshName": "Example-condition-kreuz-stern-primaer", + "fshType": "Instance", + "fshFile": "ISiKDiagnose.fsh", + "startLine": 83, + "endLine": 95 + }, + { + "outputFile": "Condition-Example-condition-kreuz-stern-sekundaer.json", + "fshName": "Example-condition-kreuz-stern-sekundaer", + "fshType": "Instance", + "fshFile": "ISiKDiagnose.fsh", + "startLine": 97, + "endLine": 110 + }, + { + "outputFile": "Condition-MittelgradigeIntelligenzminderung.json", + "fshName": "MittelgradigeIntelligenzminderung", + "fshType": "Instance", + "fshFile": "ISiKDiagnose.fsh", + "startLine": 112, + "endLine": 121 + }, + { + "outputFile": "Coverage-CoverageGesetzlich.json", + "fshName": "CoverageGesetzlich", + "fshType": "Instance", + "fshFile": "ISiKVersicherungsverhaeltnisGesetzlich.fsh", + "startLine": 43, + "endLine": 52 + }, + { + "outputFile": "Coverage-CoveragePrivat.json", + "fshName": "CoveragePrivat", + "fshType": "Instance", + "fshFile": "ISiKVersicherungsverhaeltnisSelbstzahler.fsh", + "startLine": 16, + "endLine": 22 + }, + { + "outputFile": "Encounter-Fachabteilungskontakt.json", + "fshName": "Fachabteilungskontakt", + "fshType": "Instance", + "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh", + "startLine": 136, + "endLine": 173 + }, + { + "outputFile": "Encounter-FachabteilungskontaktMinimal.json", + "fshName": "FachabteilungskontaktMinimal", + "fshType": "Instance", + "fshFile": "ISiKBerichtBundle.fsh", + "startLine": 55, + "endLine": 68 + }, + { + "outputFile": "Patient-PatientinMusterfrau.json", + "fshName": "PatientinMusterfrau", + "fshType": "Instance", + "fshFile": "ISiKPatient.fsh", + "startLine": 108, + "endLine": 158 + }, + { + "outputFile": "Patient-PatientinMusterfrauMinimal.json", + "fshName": "PatientinMusterfrauMinimal", + "fshType": "Instance", + "fshFile": "ISiKBerichtBundle.fsh", + "startLine": 41, + "endLine": 53 + }, + { + "outputFile": "Practitioner-PractitionerWalterArzt.json", + "fshName": "PractitionerWalterArzt", + "fshType": "Instance", + "fshFile": "ISiKPersonImGesundheitsberuf.fsh", + "startLine": 93, + "endLine": 128 + }, + { + "outputFile": "Procedure-Appendektomie.json", + "fshName": "Appendektomie", + "fshType": "Instance", + "fshFile": "ISiKProzedur.fsh", + "startLine": 52, + "endLine": 65 + }, + { + "outputFile": "RelatedPerson-ISiKAngehoerigerMustermann.json", + "fshName": "ISiKAngehoerigerMustermann", + "fshType": "Instance", + "fshFile": "ISiKAngehoeriger.fsh", + "startLine": 47, + "endLine": 57 + }, + { + "outputFile": "SearchParameter-Encounter-date-start.json", + "fshName": "Encounter-date-start", + "fshType": "Instance", + "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh", + "startLine": 216, + "endLine": 234 + }, + { + "outputFile": "SearchParameter-Encounter-end-date.json", + "fshName": "Encounter-end-date", + "fshType": "Instance", + "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh", + "startLine": 236, + "endLine": 254 + }, + { + "outputFile": "StructureDefinition-ISiKAbrechnungsfall.json", + "fshName": "ISiKAbrechnungsfall", + "fshType": "Profile", + "fshFile": "ISiKAbrechnungsfall.fsh", + "startLine": 1, + "endLine": 29 + }, + { + "outputFile": "StructureDefinition-ISiKAngehoeriger.json", + "fshName": "ISiKAngehoeriger", + "fshType": "Profile", + "fshFile": "ISiKAngehoeriger.fsh", + "startLine": 1, + "endLine": 45 + }, + { + "outputFile": "StructureDefinition-ISiKBerichtBundle.json", + "fshName": "ISiKBerichtBundle", + "fshType": "Profile", + "fshFile": "ISiKBerichtBundle.fsh", + "startLine": 1, + "endLine": 22 + }, + { + "outputFile": "StructureDefinition-ISiKBerichtSubSysteme.json", + "fshName": "ISiKBerichtSubSysteme", + "fshType": "Profile", + "fshFile": "ISiKBerichtSubSysteme.fsh", + "startLine": 1, + "endLine": 64 + }, + { + "outputFile": "StructureDefinition-ISiKBinary.json", + "fshName": "ISiKBinary", + "fshType": "Profile", + "fshFile": "ISiKBinary.fsh", + "startLine": 1, + "endLine": 15 + }, + { + "outputFile": "StructureDefinition-ISiKCodeSystem.json", + "fshName": "ISiKCodeSystem", + "fshType": "Profile", + "fshFile": "ISiKCodeSystem.fsh", + "startLine": 1, + "endLine": 15 + }, + { + "outputFile": "StructureDefinition-ISiKDiagnose.json", + "fshName": "ISiKDiagnose", + "fshType": "Profile", + "fshFile": "ISiKDiagnose.fsh", + "startLine": 1, + "endLine": 55 + }, + { + "outputFile": "StructureDefinition-ISiKKontaktGesundheitseinrichtung.json", + "fshName": "ISiKKontaktGesundheitseinrichtung", + "fshType": "Profile", + "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh", + "startLine": 1, + "endLine": 120 + }, + { + "outputFile": "StructureDefinition-ISiKPatient.json", + "fshName": "ISiKPatient", + "fshType": "Profile", + "fshFile": "ISiKPatient.fsh", + "startLine": 1, + "endLine": 106 + }, + { + "outputFile": "StructureDefinition-ISiKPersonImGesundheitsberuf.json", + "fshName": "ISiKPersonImGesundheitsberuf", + "fshType": "Profile", + "fshFile": "ISiKPersonImGesundheitsberuf.fsh", + "startLine": 1, + "endLine": 89 + }, + { + "outputFile": "StructureDefinition-ISiKProzedur.json", + "fshName": "ISiKProzedur", + "fshType": "Profile", + "fshFile": "ISiKProzedur.fsh", + "startLine": 1, + "endLine": 50 + }, + { + "outputFile": "StructureDefinition-ISiKValueSet.json", + "fshName": "ISiKValueSet", + "fshType": "Profile", + "fshFile": "ISiKValueSet.fsh", + "startLine": 1, + "endLine": 22 + }, + { + "outputFile": "StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json", + "fshName": "ISiKVersicherungsverhaeltnisGesetzlich", + "fshType": "Profile", + "fshFile": "ISiKVersicherungsverhaeltnisGesetzlich.fsh", + "startLine": 1, + "endLine": 41 + }, + { + "outputFile": "StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json", + "fshName": "ISiKVersicherungsverhaeltnisSelbstzahler", + "fshType": "Profile", + "fshFile": "ISiKVersicherungsverhaeltnisSelbstzahler.fsh", + "startLine": 1, + "endLine": 14 + }, + { + "outputFile": "StructureDefinition-PlannedEndDate.json", + "fshName": "PlannedEndDate", + "fshType": "Extension", + "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh", + "startLine": 130, + "endLine": 134 + }, + { + "outputFile": "StructureDefinition-PlannedStartDate.json", + "fshName": "PlannedStartDate", + "fshType": "Extension", + "fshFile": "ISiKKontaktGesundheitseinrichtung.fsh", + "startLine": 123, + "endLine": 127 + }, + { + "outputFile": "StructureDefinition-identifier-abrechnungsnummer.json", + "fshName": "IdentifierAbrechnungsnummer", + "fshType": "Profile", + "fshFile": "ISiKAbrechnungsfall.fsh", + "startLine": 31, + "endLine": 41 + }, + { + "outputFile": "ValueSet-DiagnosesSCT.json", + "fshName": "DiagnosesSCT", + "fshType": "ValueSet", + "fshFile": "valueSets.fsh", + "startLine": 1, + "endLine": 8 + }, + { + "outputFile": "ValueSet-ISiKAccountIdentifierType.json", + "fshName": "ISiKAccountIdentifierType", + "fshType": "ValueSet", + "fshFile": "valueSets.fsh", + "startLine": 42, + "endLine": 46 + }, + { + "outputFile": "ValueSet-ISiKAccountType.json", + "fshName": "ISiKAccountType", + "fshType": "ValueSet", + "fshFile": "valueSets.fsh", + "startLine": 35, + "endLine": 40 + }, + { + "outputFile": "ValueSet-ISiKLocationPhysicalType.json", + "fshName": "ISiKLocationPhysicalType", + "fshType": "ValueSet", + "fshFile": "valueSets.fsh", + "startLine": 27, + "endLine": 32 + }, + { + "outputFile": "ValueSet-ISiKValueSetExample.json", + "fshName": "ISiKValueSetExample", + "fshType": "Instance", + "fshFile": "ISiKValueSet.fsh", + "startLine": 24, + "endLine": 37 + }, + { + "outputFile": "ValueSet-ProzedurenCodesSCT.json", + "fshName": "ProzedurenCodesSCT", + "fshType": "ValueSet", + "fshFile": "valueSets.fsh", + "startLine": 10, + "endLine": 14 + }, + { + "outputFile": "ValueSet-ProzedurenKategorieSCT.json", + "fshName": "ProzedurenKategorieSCT", + "fshType": "ValueSet", + "fshFile": "valueSets.fsh", + "startLine": 16, + "endLine": 25 + } +] diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt new file mode 100644 index 00000000..2e5147fc --- /dev/null +++ b/Resources/fsh-generated/fsh-index.txt @@ -0,0 +1,51 @@ +Output File Name Type FSH File Lines +Account-AbrechnungsfallAmbulant.json AbrechnungsfallAmbulant Instance ISiKAbrechnungsfall.fsh 43 - 55 +Binary-Binary-JPEG-Example-short.json Binary-JPEG-Example-short Instance ISiKBinary.fsh 17 - 21 +Binary-Binary-JPEG-Example.json Binary-JPEG-Example Instance ISiKBinary.fsh 30 - 34 +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 +CapabilityStatement-ISiKCapabilityStatementBasisServer.json ISiKCapabilityStatementBasisServer Instance ISiKCapabilityStatement.fsh 1 - 668 +CodeSystem-CodeSystemExample.json CodeSystemExample Instance ISiKCodeSystem.fsh 17 - 27 +Composition-composition-blutdruck.json composition-blutdruck Instance ISiKBerichtSubSysteme.fsh 66 - 83 +Condition-BehandlungsDiagnoseFreitext.json BehandlungsDiagnoseFreitext Instance ISiKDiagnose.fsh 123 - 130 +Condition-Example-condition-ausrufezeichen-primaer.json Example-condition-ausrufezeichen-primaer Instance ISiKDiagnose.fsh 57 - 66 +Condition-Example-condition-ausrufezeichen-sekundaer.json Example-condition-ausrufezeichen-sekundaer Instance ISiKDiagnose.fsh 68 - 81 +Condition-Example-condition-kreuz-stern-primaer.json Example-condition-kreuz-stern-primaer Instance ISiKDiagnose.fsh 83 - 95 +Condition-Example-condition-kreuz-stern-sekundaer.json Example-condition-kreuz-stern-sekundaer Instance ISiKDiagnose.fsh 97 - 110 +Condition-MittelgradigeIntelligenzminderung.json MittelgradigeIntelligenzminderung Instance ISiKDiagnose.fsh 112 - 121 +Coverage-CoverageGesetzlich.json CoverageGesetzlich Instance ISiKVersicherungsverhaeltnisGesetzlich.fsh 43 - 52 +Coverage-CoveragePrivat.json CoveragePrivat Instance ISiKVersicherungsverhaeltnisSelbstzahler.fsh 16 - 22 +Encounter-Fachabteilungskontakt.json Fachabteilungskontakt Instance ISiKKontaktGesundheitseinrichtung.fsh 136 - 173 +Encounter-FachabteilungskontaktMinimal.json FachabteilungskontaktMinimal Instance ISiKBerichtBundle.fsh 55 - 68 +Patient-PatientinMusterfrau.json PatientinMusterfrau Instance ISiKPatient.fsh 108 - 158 +Patient-PatientinMusterfrauMinimal.json PatientinMusterfrauMinimal Instance ISiKBerichtBundle.fsh 41 - 53 +Practitioner-PractitionerWalterArzt.json PractitionerWalterArzt Instance ISiKPersonImGesundheitsberuf.fsh 93 - 128 +Procedure-Appendektomie.json Appendektomie Instance ISiKProzedur.fsh 52 - 65 +RelatedPerson-ISiKAngehoerigerMustermann.json ISiKAngehoerigerMustermann Instance ISiKAngehoeriger.fsh 47 - 57 +SearchParameter-Encounter-date-start.json Encounter-date-start Instance ISiKKontaktGesundheitseinrichtung.fsh 216 - 234 +SearchParameter-Encounter-end-date.json Encounter-end-date Instance ISiKKontaktGesundheitseinrichtung.fsh 236 - 254 +StructureDefinition-ISiKAbrechnungsfall.json ISiKAbrechnungsfall Profile ISiKAbrechnungsfall.fsh 1 - 29 +StructureDefinition-ISiKAngehoeriger.json ISiKAngehoeriger Profile ISiKAngehoeriger.fsh 1 - 45 +StructureDefinition-ISiKBerichtBundle.json ISiKBerichtBundle Profile ISiKBerichtBundle.fsh 1 - 22 +StructureDefinition-ISiKBerichtSubSysteme.json ISiKBerichtSubSysteme Profile ISiKBerichtSubSysteme.fsh 1 - 64 +StructureDefinition-ISiKBinary.json ISiKBinary Profile ISiKBinary.fsh 1 - 15 +StructureDefinition-ISiKCodeSystem.json ISiKCodeSystem Profile ISiKCodeSystem.fsh 1 - 15 +StructureDefinition-ISiKDiagnose.json ISiKDiagnose Profile ISiKDiagnose.fsh 1 - 55 +StructureDefinition-ISiKKontaktGesundheitseinrichtung.json ISiKKontaktGesundheitseinrichtung Profile ISiKKontaktGesundheitseinrichtung.fsh 1 - 120 +StructureDefinition-ISiKPatient.json ISiKPatient Profile ISiKPatient.fsh 1 - 106 +StructureDefinition-ISiKPersonImGesundheitsberuf.json ISiKPersonImGesundheitsberuf Profile ISiKPersonImGesundheitsberuf.fsh 1 - 89 +StructureDefinition-ISiKProzedur.json ISiKProzedur Profile ISiKProzedur.fsh 1 - 50 +StructureDefinition-ISiKValueSet.json ISiKValueSet Profile ISiKValueSet.fsh 1 - 22 +StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json ISiKVersicherungsverhaeltnisGesetzlich Profile ISiKVersicherungsverhaeltnisGesetzlich.fsh 1 - 41 +StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json ISiKVersicherungsverhaeltnisSelbstzahler Profile ISiKVersicherungsverhaeltnisSelbstzahler.fsh 1 - 14 +StructureDefinition-PlannedEndDate.json PlannedEndDate Extension ISiKKontaktGesundheitseinrichtung.fsh 130 - 134 +StructureDefinition-PlannedStartDate.json PlannedStartDate Extension ISiKKontaktGesundheitseinrichtung.fsh 123 - 127 +StructureDefinition-identifier-abrechnungsnummer.json IdentifierAbrechnungsnummer Profile ISiKAbrechnungsfall.fsh 31 - 41 +ValueSet-DiagnosesSCT.json DiagnosesSCT ValueSet valueSets.fsh 1 - 8 +ValueSet-ISiKAccountIdentifierType.json ISiKAccountIdentifierType ValueSet valueSets.fsh 42 - 46 +ValueSet-ISiKAccountType.json ISiKAccountType ValueSet valueSets.fsh 35 - 40 +ValueSet-ISiKLocationPhysicalType.json ISiKLocationPhysicalType ValueSet valueSets.fsh 27 - 32 +ValueSet-ISiKValueSetExample.json ISiKValueSetExample Instance ISiKValueSet.fsh 24 - 37 +ValueSet-ProzedurenCodesSCT.json ProzedurenCodesSCT ValueSet valueSets.fsh 10 - 14 +ValueSet-ProzedurenKategorieSCT.json ProzedurenKategorieSCT ValueSet valueSets.fsh 16 - 25 \ No newline at end of file diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json index 51623756..1c1c917b 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json @@ -6,7 +6,7 @@ "status": "active", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-15", + "date": "2024-03-01", "implementationGuide": [ "https://gematik.de/fhir/isik/v3/Basismodul/ImplementationGuide|3.0.4" ], diff --git a/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json b/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json index 69492d85..f7b0ceef 100644 --- a/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json +++ b/Resources/fsh-generated/resources/CodeSystem-CodeSystemExample.json @@ -10,7 +10,7 @@ "status": "active", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-15", + "date": "2024-03-01", "url": "http://example.org/fhir/CodeSystem/TestKatalog", "name": "TestKatalog", "content": "complete", diff --git a/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json b/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json index d82e48a5..2e99da4f 100644 --- a/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json +++ b/Resources/fsh-generated/resources/SearchParameter-Encounter-date-start.json @@ -7,7 +7,7 @@ "status": "active", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-15", + "date": "2024-03-01", "name": "date-start", "code": "date-start", "base": [ diff --git a/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json b/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json index a8b04517..0d8b439e 100644 --- a/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json +++ b/Resources/fsh-generated/resources/SearchParameter-Encounter-end-date.json @@ -7,7 +7,7 @@ "status": "active", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-15", + "date": "2024-03-01", "name": "end-date", "code": "end-date", "base": [ diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json index f7a7cfd9..03acd2f7 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json @@ -6,7 +6,7 @@ "name": "ISiKAbrechnungsfall", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "description": "Dieses Profil beschreibt die Gruppierung von medizinischen Leistungen in ISiK-Szenarien", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json index 77a98773..7b74d400 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json @@ -6,7 +6,7 @@ "name": "ISiKAngehoeriger", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Nutzung von Angehörigen in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json index e00c71dd..576c455e 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json @@ -7,7 +7,7 @@ "title": "ISiKBerichtBundle", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "description": "A document style representation of the receipt (complete, self-contained, signed)", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json index a8120ece..0bf4a699 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json @@ -6,7 +6,7 @@ "name": "ISiKBerichtSubSysteme", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Krankenhaus-interne Übermittlung eines Berichtes in Form eines Dokumentes, die in ISiK Szenarien von Subsystemen an Primärsysteme gesendet werden.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json index f8a451b5..7175073f 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json @@ -7,7 +7,7 @@ "title": "ISiKBinary", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "description": "Die Binary-Ressource erlaubt den Umgang mit FHIR-fremden Formaten (z.B. PDFs, Bilder, CDA) innerhalb des FHIR-Frameworks.\r\nDazu werden die Daten base64-codiert in der Binary-Ressource (in XML oder JSON) transportiert oder \r\nüber die REST-API am Binary-Endpunkt in ihrem nativen Format bereitgestellt. \r\nBinary-Ressourcen werden von Attachment-Elementen in DocumentReference-Ressourcen verlinkt und damit in den Kontext anderer FHIR-Ressourcen\r\n(z.B. Patient und Encounter) gestellt. ", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json index 4b9fb6d5..a4a1dc96 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json @@ -6,7 +6,7 @@ "name": "ISiKCodeSystem", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "description": "Dieses Profil beschreibt die maschinenlesbare Repräsentation von system-sepzifischen Kodierungen in ISiK-Szenarien", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json index 77d7bbe2..b343a1d8 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json @@ -6,7 +6,7 @@ "name": "ISiKDiagnose", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Nutzung von Diagnosen in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json index dd6b07d5..543ea0a4 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json @@ -6,7 +6,7 @@ "name": "ISiKKontaktGesundheitseinrichtung", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Herstellung eines Fallbezuges welcher in der Mehrheit der ISiK Szenarien im Krankenhaus essentiell ist.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json index fa6ef879..3bd8da26 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json @@ -6,7 +6,7 @@ "name": "ISiKPatient", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "description": "Dieses Profil beschreibt die Nutzung von administrativen Patientendaten in ISiK-Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json index 823d48af..1dfc52c8 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json @@ -6,7 +6,7 @@ "name": "ISiKPersonImGesundheitsberuf", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Nutzung von in Gesundheitsberufen tätigen Personen in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json index 0983bbc1..5b36bb1e 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json @@ -6,7 +6,7 @@ "name": "ISiKProzedur", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "description": "Diese Profil ermöglicht die Nutzung von Prozedur-bezogenen Informationen in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json index f06cda30..734df94c 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json @@ -6,7 +6,7 @@ "name": "ISiKValueSet", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "description": "Dieses Profil beschreibt die maschinenlesbare Auswahl von Codes für die Kodierung spezifischer FHIR-Elemente in ISiK-Szenarien", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json index c31395b9..b97385c0 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json @@ -6,7 +6,7 @@ "name": "ISiKVersicherungsverhaeltnisGesetzlich", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Darstellung eines gesetzlichen Versicherungsverhältnisses in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json index bccb0345..db407c8c 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json @@ -6,7 +6,7 @@ "name": "ISiKVersicherungsverhaeltnisSelbstzahler", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht Selbstzahler Szenarien in ISiK.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json b/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json index 720a49b5..0a440f20 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json +++ b/Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json @@ -6,7 +6,7 @@ "name": "PlannedEndDate", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "mapping": [ diff --git a/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json b/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json index 4fd8968c..bca89aa1 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json +++ b/Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json @@ -6,7 +6,7 @@ "name": "PlannedStartDate", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "mapping": [ diff --git a/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json b/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json index d783c55f..09bab433 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json +++ b/Resources/fsh-generated/resources/StructureDefinition-identifier-abrechnungsnummer.json @@ -7,7 +7,7 @@ "title": "Identifier-Profil für die Abbildung einer Abrechnungsnummer (\"Fallnummer\") ", "status": "active", "experimental": false, - "date": "2024-01-15", + "date": "2024-03-01", "publisher": "gematik GmbH", "description": "Identifier-Profil für die Abbildung einer organisationsspezifischen Abrechnungsnummer (\"Fallnummer\")", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json b/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json index 59336da8..db2d9d74 100644 --- a/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json @@ -8,7 +8,7 @@ "version": "3.0.4", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-15", + "date": "2024-03-01", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json b/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json index e8fae456..90257c1e 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKAccountIdentifierType.json @@ -8,7 +8,7 @@ "version": "3.0.4", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-15", + "date": "2024-03-01", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json b/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json index 70c6df31..9647429a 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json @@ -8,7 +8,7 @@ "version": "3.0.4", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-15", + "date": "2024-03-01", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json b/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json index 481b958a..139b0717 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json @@ -7,7 +7,7 @@ "version": "3.0.4", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-15", + "date": "2024-03-01", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json b/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json index 5232ff3a..5fde7834 100644 --- a/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json @@ -8,7 +8,7 @@ "version": "3.0.4", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-15", + "date": "2024-03-01", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json b/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json index 21dd2dc3..bc570a3a 100644 --- a/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json +++ b/Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json @@ -8,7 +8,7 @@ "version": "3.0.4", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-01-15", + "date": "2024-03-01", "compose": { "include": [ {