From ee8a612c4cf28bef8f94a2f1b3ece8fb3efedec2 Mon Sep 17 00:00:00 2001 From: Francois Peverali Date: Wed, 15 Nov 2023 11:03:14 +0100 Subject: [PATCH 01/22] add clarification on ISIKBinary use --- ImplementationGuide/markdown/Binary/Binary_Motivation.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ImplementationGuide/markdown/Binary/Binary_Motivation.md b/ImplementationGuide/markdown/Binary/Binary_Motivation.md index 28d8c04f..a24c81ed 100644 --- a/ImplementationGuide/markdown/Binary/Binary_Motivation.md +++ b/ImplementationGuide/markdown/Binary/Binary_Motivation.md @@ -6,4 +6,7 @@ Dazu werden die Daten base64-codiert in der Binary-Ressource (in XML oder JSON) Binary-Ressourcen werden von Attachment-Elementen verlinkt und damit in den Kontext anderer FHIR-Ressourcen (z.B. Patient und Encounter) gestellt. +Im Rahmen des ISIK Basismoduls ist eine Implementierung des ISIKBinary-Profils nicht zwingend notwendig (zumindest für Stufe 1). +Das Profil ist Teil des ISIK Basismoduls, da es sich als übergreifend genutzte Ressource sowohl im [Modul Terminplanung](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Modul-Terminplanung-Stufe-3/ImplementationGuide-markdown-Datenobjekte?version=current) als auch im [Modul Dokumentenaustausch](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Modul-Dokumentenaustausch-Stufe-3/ImplementationGuide-markdown-Datenobjekte?version=current) implementiert werden muss. + --- From 677f5682455eba4c0a4de029c233347da5fc4fa5 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:30:50 +0100 Subject: [PATCH 02/22] Update Binary_Motivation.md --- ImplementationGuide/markdown/Binary/Binary_Motivation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ImplementationGuide/markdown/Binary/Binary_Motivation.md b/ImplementationGuide/markdown/Binary/Binary_Motivation.md index a24c81ed..332e9e9b 100644 --- a/ImplementationGuide/markdown/Binary/Binary_Motivation.md +++ b/ImplementationGuide/markdown/Binary/Binary_Motivation.md @@ -6,7 +6,7 @@ Dazu werden die Daten base64-codiert in der Binary-Ressource (in XML oder JSON) Binary-Ressourcen werden von Attachment-Elementen verlinkt und damit in den Kontext anderer FHIR-Ressourcen (z.B. Patient und Encounter) gestellt. -Im Rahmen des ISIK Basismoduls ist eine Implementierung des ISIKBinary-Profils nicht zwingend notwendig (zumindest für Stufe 1). -Das Profil ist Teil des ISIK Basismoduls, da es sich als übergreifend genutzte Ressource sowohl im [Modul Terminplanung](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Modul-Terminplanung-Stufe-3/ImplementationGuide-markdown-Datenobjekte?version=current) als auch im [Modul Dokumentenaustausch](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Modul-Dokumentenaustausch-Stufe-3/ImplementationGuide-markdown-Datenobjekte?version=current) implementiert werden muss. +Im Rahmen des ISIK Basismoduls ist eine Implementierung des ISIKBinary-Profils nicht zwingend notwendig. +Das Profil ist Teil des ISIK Basismoduls, da es als übergreifend genutzte Ressource sowohl im [Modul Terminplanung](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Modul-Terminplanung-Stufe-3/ImplementationGuide-markdown-Datenobjekte?version=current) als auch im [Modul Dokumentenaustausch](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Modul-Dokumentenaustausch-Stufe-3/ImplementationGuide-markdown-Datenobjekte?version=current) implementiert werden muss. --- From 6eb912e83442cc16520004a2e8b383149bc5249d Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:06:59 +0100 Subject: [PATCH 03/22] Update Binary_Motivation.md --- ImplementationGuide/markdown/Binary/Binary_Motivation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImplementationGuide/markdown/Binary/Binary_Motivation.md b/ImplementationGuide/markdown/Binary/Binary_Motivation.md index 332e9e9b..70fe5e68 100644 --- a/ImplementationGuide/markdown/Binary/Binary_Motivation.md +++ b/ImplementationGuide/markdown/Binary/Binary_Motivation.md @@ -6,7 +6,7 @@ Dazu werden die Daten base64-codiert in der Binary-Ressource (in XML oder JSON) Binary-Ressourcen werden von Attachment-Elementen verlinkt und damit in den Kontext anderer FHIR-Ressourcen (z.B. Patient und Encounter) gestellt. -Im Rahmen des ISIK Basismoduls ist eine Implementierung des ISIKBinary-Profils nicht zwingend notwendig. +Das ISIK-Binary-Profil ist _nicht_ Bestandteil der Implementierung des ISIK Basismoduls Das Profil ist Teil des ISIK Basismoduls, da es als übergreifend genutzte Ressource sowohl im [Modul Terminplanung](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Modul-Terminplanung-Stufe-3/ImplementationGuide-markdown-Datenobjekte?version=current) als auch im [Modul Dokumentenaustausch](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Modul-Dokumentenaustausch-Stufe-3/ImplementationGuide-markdown-Datenobjekte?version=current) implementiert werden muss. --- From 68f3b2e19ea1c472290a20cfadd13d7542ccd956 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:09:00 +0100 Subject: [PATCH 04/22] Update Binary_Motivation.md --- ImplementationGuide/markdown/Binary/Binary_Motivation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImplementationGuide/markdown/Binary/Binary_Motivation.md b/ImplementationGuide/markdown/Binary/Binary_Motivation.md index 70fe5e68..d523bbb6 100644 --- a/ImplementationGuide/markdown/Binary/Binary_Motivation.md +++ b/ImplementationGuide/markdown/Binary/Binary_Motivation.md @@ -6,7 +6,7 @@ Dazu werden die Daten base64-codiert in der Binary-Ressource (in XML oder JSON) Binary-Ressourcen werden von Attachment-Elementen verlinkt und damit in den Kontext anderer FHIR-Ressourcen (z.B. Patient und Encounter) gestellt. -Das ISIK-Binary-Profil ist _nicht_ Bestandteil der Implementierung des ISIK Basismoduls +Das ISIK-Binary-Profil ist *nicht* Bestandteil der Implementierung des ISIK Basismoduls Das Profil ist Teil des ISIK Basismoduls, da es als übergreifend genutzte Ressource sowohl im [Modul Terminplanung](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Modul-Terminplanung-Stufe-3/ImplementationGuide-markdown-Datenobjekte?version=current) als auch im [Modul Dokumentenaustausch](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Modul-Dokumentenaustausch-Stufe-3/ImplementationGuide-markdown-Datenobjekte?version=current) implementiert werden muss. --- From bf240525699ef396991b41737feb5c114afb8650 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:14:00 +0100 Subject: [PATCH 05/22] Update Binary_Motivation.md --- ImplementationGuide/markdown/Binary/Binary_Motivation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImplementationGuide/markdown/Binary/Binary_Motivation.md b/ImplementationGuide/markdown/Binary/Binary_Motivation.md index d523bbb6..0f5175ec 100644 --- a/ImplementationGuide/markdown/Binary/Binary_Motivation.md +++ b/ImplementationGuide/markdown/Binary/Binary_Motivation.md @@ -6,7 +6,7 @@ Dazu werden die Daten base64-codiert in der Binary-Ressource (in XML oder JSON) Binary-Ressourcen werden von Attachment-Elementen verlinkt und damit in den Kontext anderer FHIR-Ressourcen (z.B. Patient und Encounter) gestellt. -Das ISIK-Binary-Profil ist *nicht* Bestandteil der Implementierung des ISIK Basismoduls +Das ISIK-Binary-Profil ist *nicht* Bestandteil der Implementierung des ISIK Basismoduls. Das Profil ist Teil des ISIK Basismoduls, da es als übergreifend genutzte Ressource sowohl im [Modul Terminplanung](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Modul-Terminplanung-Stufe-3/ImplementationGuide-markdown-Datenobjekte?version=current) als auch im [Modul Dokumentenaustausch](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Modul-Dokumentenaustausch-Stufe-3/ImplementationGuide-markdown-Datenobjekte?version=current) implementiert werden muss. --- From 345d776f3b75442e391d8787c71a051628050b9e Mon Sep 17 00:00:00 2001 From: Francois Peverali Date: Fri, 17 Nov 2023 13:18:40 +0100 Subject: [PATCH 06/22] fix invariant context #330 --- Resources/input/fsh/ISiKAngehoeriger.fsh | 4 ++-- Resources/input/fsh/ISiKPatient.fsh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/input/fsh/ISiKAngehoeriger.fsh b/Resources/input/fsh/ISiKAngehoeriger.fsh index 85f70e64..7a96ff33 100644 --- a/Resources/input/fsh/ISiKAngehoeriger.fsh +++ b/Resources/input/fsh/ISiKAngehoeriger.fsh @@ -19,6 +19,7 @@ Description: "Dieses Profil ermöglicht die Nutzung von Angehörigen in ISiK Sze Strassenanschrift 0..* MS and Postfach 0..* MS * address[Postfach] only AddressDeBasis + * obeys address-cnt-2or3-char * ^patternAddress.type = #postal * type 1.. MS * line 1.. MS @@ -29,9 +30,9 @@ Description: "Dieses Profil ermöglicht die Nutzung von Angehörigen in ISiK Sze * city 1.. MS * postalCode 1.. MS * country 1.. MS - * obeys address-cnt-2or3-char * ^constraint[1].source = Canonical(ISiKAngehoeriger) * address[Strassenanschrift] only AddressDeBasis + * obeys address-cnt-2or3-char * extension[Stadtteil] MS * ^patternAddress.type = #both * type 1.. MS @@ -43,7 +44,6 @@ Description: "Dieses Profil ermöglicht die Nutzung von Angehörigen in ISiK Sze * city 1.. MS * postalCode 1.. MS * country 1.. MS - * obeys address-cnt-2or3-char * ^constraint[1].source = Canonical(ISiKAngehoeriger) Instance: ISiKAngehoerigerMustermann diff --git a/Resources/input/fsh/ISiKPatient.fsh b/Resources/input/fsh/ISiKPatient.fsh index ce476c78..46c5b0cd 100644 --- a/Resources/input/fsh/ISiKPatient.fsh +++ b/Resources/input/fsh/ISiKPatient.fsh @@ -80,6 +80,7 @@ Description: "Dieses Profil beschreibt die Nutzung von administrativen Patienten Strassenanschrift 0..* MS and Postfach 0..* MS * address[Postfach] only AddressDeBasis + * obeys address-cnt-2or3-char * ^patternAddress.type = #postal * type 1.. MS * line 1.. MS @@ -90,9 +91,9 @@ Description: "Dieses Profil beschreibt die Nutzung von administrativen Patienten * city 1.. MS * postalCode 1.. MS * country 1.. MS - * obeys address-cnt-2or3-char * ^constraint[1].source = Canonical(ISiKPatient) * address[Strassenanschrift] only AddressDeBasis + * obeys address-cnt-2or3-char * extension[Stadtteil] MS * ^patternAddress.type = #both * type 1.. MS @@ -104,7 +105,6 @@ Description: "Dieses Profil beschreibt die Nutzung von administrativen Patienten * city 1.. MS * postalCode 1.. MS * country 1.. MS - * obeys address-cnt-2or3-char * ^constraint[1].source = Canonical(ISiKPatient) Instance: PatientinMusterfrau From f7f3c1de562c48f9d1a4e6f195fd8424d17cf3ad Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Mon, 20 Nov 2023 09:44:12 +0100 Subject: [PATCH 07/22] Update Resources/input/fsh/ISiKAngehoeriger.fsh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Yannick Börner <39551832+ylboerner@users.noreply.github.com> --- Resources/input/fsh/ISiKAngehoeriger.fsh | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/input/fsh/ISiKAngehoeriger.fsh b/Resources/input/fsh/ISiKAngehoeriger.fsh index 7a96ff33..93eefa0c 100644 --- a/Resources/input/fsh/ISiKAngehoeriger.fsh +++ b/Resources/input/fsh/ISiKAngehoeriger.fsh @@ -44,7 +44,6 @@ Description: "Dieses Profil ermöglicht die Nutzung von Angehörigen in ISiK Sze * city 1.. MS * postalCode 1.. MS * country 1.. MS - * ^constraint[1].source = Canonical(ISiKAngehoeriger) Instance: ISiKAngehoerigerMustermann InstanceOf: ISiKAngehoeriger From d8442ff560e3cc6e6722286e6901f51e034f16c5 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Mon, 20 Nov 2023 09:44:25 +0100 Subject: [PATCH 08/22] Update Resources/input/fsh/ISiKAngehoeriger.fsh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Yannick Börner <39551832+ylboerner@users.noreply.github.com> --- Resources/input/fsh/ISiKAngehoeriger.fsh | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/input/fsh/ISiKAngehoeriger.fsh b/Resources/input/fsh/ISiKAngehoeriger.fsh index 93eefa0c..a1069ca0 100644 --- a/Resources/input/fsh/ISiKAngehoeriger.fsh +++ b/Resources/input/fsh/ISiKAngehoeriger.fsh @@ -30,7 +30,6 @@ Description: "Dieses Profil ermöglicht die Nutzung von Angehörigen in ISiK Sze * city 1.. MS * postalCode 1.. MS * country 1.. MS - * ^constraint[1].source = Canonical(ISiKAngehoeriger) * address[Strassenanschrift] only AddressDeBasis * obeys address-cnt-2or3-char * extension[Stadtteil] MS From b28c21000e21d499b1a037d9a3500abbb7b78ca0 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Wed, 22 Nov 2023 08:23:17 +0100 Subject: [PATCH 09/22] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Yannick Börner <39551832+ylboerner@users.noreply.github.com> --- Resources/input/fsh/ISiKPatient.fsh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/input/fsh/ISiKPatient.fsh b/Resources/input/fsh/ISiKPatient.fsh index 46c5b0cd..5802ab10 100644 --- a/Resources/input/fsh/ISiKPatient.fsh +++ b/Resources/input/fsh/ISiKPatient.fsh @@ -91,7 +91,6 @@ Description: "Dieses Profil beschreibt die Nutzung von administrativen Patienten * city 1.. MS * postalCode 1.. MS * country 1.. MS - * ^constraint[1].source = Canonical(ISiKPatient) * address[Strassenanschrift] only AddressDeBasis * obeys address-cnt-2or3-char * extension[Stadtteil] MS @@ -105,7 +104,6 @@ Description: "Dieses Profil beschreibt die Nutzung von administrativen Patienten * city 1.. MS * postalCode 1.. MS * country 1.. MS - * ^constraint[1].source = Canonical(ISiKPatient) Instance: PatientinMusterfrau InstanceOf: ISiKPatient From 0b63834f0ca5012719e932b6768f36c420098970 Mon Sep 17 00:00:00 2001 From: Patrick Werner Date: Thu, 23 Nov 2023 11:28:15 +0100 Subject: [PATCH 10/22] Update main.yml trigger gh action on every PR --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 57bf663f..1994d635 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,6 @@ on: push: branches: [ master-isik-stufe-2 ] pull_request: - branches: [ master-isik-stufe-2 ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From a509175cdb878c358de405e2e80a292a1c20180b Mon Sep 17 00:00:00 2001 From: Patrick Werner Date: Thu, 23 Nov 2023 12:09:13 +0100 Subject: [PATCH 11/22] Update main.yml --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1994d635..0923ee24 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,9 +4,8 @@ name: CI (FHIR Validation) # Controls when the action will run. on: - # Triggers the workflow on push or pull request events but only for the master branch + # Triggers the workflow on push or pull request events push: - branches: [ master-isik-stufe-2 ] pull_request: # Allows you to run this workflow manually from the Actions tab From 25250eab9e7cf9ba8d84306473bb5834b67102ed Mon Sep 17 00:00:00 2001 From: Francois Peverali Date: Thu, 23 Nov 2023 16:57:47 +0100 Subject: [PATCH 12/22] add: CpS statements for account PTDATA663 --- ...tlegungen_BestaetigungsrelevanteSysteme.md | 6 ++- .../input/fsh/ISiKCapabilityStatement.fsh | 48 +++++++++++++++++-- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md b/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md index 270f1109..2e95e4d9 100644 --- a/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md +++ b/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md @@ -46,4 +46,8 @@ ISiK-Modul Terminplanung [z.B. für die Umsetzung von KHZG Fördertatbestand 2] - KIS - Patientenportal-Terminmodul -Hinweise und Rückfragen zu den bestätigungsrelevante Systemen können an die [DKG-Geschäftsstelle](https://www.dkgev.de/dkg/verband-auf-einen-blick/geschaeftsstelle/) gerichtet werden. \ No newline at end of file +Hinweise und Rückfragen zu den bestätigungsrelevante Systemen können an die [DKG-Geschäftsstelle](https://www.dkgev.de/dkg/verband-auf-einen-blick/geschaeftsstelle/) gerichtet werden. + +## Weitere Festlegungen auf Profilebene im CapabilityStatement + +Festlegungen zu Anforderungen auf Profilebene werden im [ISIKCapabilityStatement](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Basismodul-Stufe-3/ImplementationGuide-markdown-CapabilityStatement?version=current) geführt. \ No newline at end of file diff --git a/Resources/input/fsh/ISiKCapabilityStatement.fsh b/Resources/input/fsh/ISiKCapabilityStatement.fsh index ac4810a6..960b4f3e 100644 --- a/Resources/input/fsh/ISiKCapabilityStatement.fsh +++ b/Resources/input/fsh/ISiKCapabilityStatement.fsh @@ -138,6 +138,7 @@ Usage: #definition * rest.resource[=].searchRevInclude[+] = "Account:patient" * rest.resource[=].searchRevInclude[=].extension.url = $capabilitystatement-expectation * rest.resource[=].searchRevInclude[=].extension.valueCode = #SHALL + * rest.resource[+].extension.url = $capabilitystatement-expectation * rest.resource[=].extension.valueCode = #SHALL * rest.resource[=].type = #Encounter @@ -203,9 +204,6 @@ Usage: #definition * rest.resource[=].searchParam[=].name = "end-date" * rest.resource[=].searchParam[=].definition = "https://gematik.de/fhir/isik/v3/Basismodul/SearchParameter/Encounter-end-date" * rest.resource[=].searchParam[=].type = #date - - - * rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation * rest.resource[=].searchParam[=].extension.valueCode = #MAY * rest.resource[=].searchParam[=].name = "location" @@ -248,6 +246,50 @@ Usage: #definition * rest.resource[=].searchRevInclude[+] = "Procedure:encounter" * rest.resource[=].searchRevInclude[=].extension.url = $capabilitystatement-expectation * rest.resource[=].searchRevInclude[=].extension.valueCode = #SHALL + + +* rest.resource[+].extension.url = $capabilitystatement-expectation +* rest.resource[=].extension.valueCode = #SHALL +* rest.resource[=].type = #Account +* rest.resource[=].supportedProfile = "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAbrechnungsfall" +* rest.resource[=].interaction[0].extension.url = $capabilitystatement-expectation +* rest.resource[=].interaction[=].extension.valueCode = #SHALL +* rest.resource[=].interaction[=].code = #read +* rest.resource[=].interaction[+].extension.url = $capabilitystatement-expectation +* rest.resource[=].interaction[=].extension.valueCode = #SHALL +* rest.resource[=].interaction[=].code = #search-type +* rest.resource[=].searchParam[0].extension.url = $capabilitystatement-expectation +* rest.resource[=].searchParam[=].extension.valueCode = #SHALL +* rest.resource[=].searchParam[=].name = "_id" +* rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/Resource-id" +* rest.resource[=].searchParam[=].type = #token +* rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation +* rest.resource[=].searchParam[=].extension.valueCode = #SHALL +* rest.resource[=].searchParam[=].name = "identifier" +* rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/clinical-identifier" +* rest.resource[=].searchParam[=].type = #token +* 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/Account-status" +* rest.resource[=].searchParam[=].type = #token +* 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/clinical-type" +* rest.resource[=].searchParam[=].type = #token +* 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/clinical-patient" +* rest.resource[=].searchParam[=].type = #token +* rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation +* rest.resource[=].searchParam[=].extension.valueCode = #MAY +* rest.resource[=].searchParam[=].name = "_profile" +* rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/Resource-profile" +* rest.resource[=].searchParam[=].type = #uri + + * rest.resource[+].extension.url = $capabilitystatement-expectation * rest.resource[=].extension.valueCode = #SHALL * rest.resource[=].type = #Condition From 746896dae53d984fc2c6db9ba7835feeb196e153 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Fri, 24 Nov 2023 10:00:10 +0100 Subject: [PATCH 13/22] Update Resources/input/fsh/ISiKCapabilityStatement.fsh --- Resources/input/fsh/ISiKCapabilityStatement.fsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/input/fsh/ISiKCapabilityStatement.fsh b/Resources/input/fsh/ISiKCapabilityStatement.fsh index 960b4f3e..8611199d 100644 --- a/Resources/input/fsh/ISiKCapabilityStatement.fsh +++ b/Resources/input/fsh/ISiKCapabilityStatement.fsh @@ -275,7 +275,7 @@ Usage: #definition * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation * rest.resource[=].searchParam[=].extension.valueCode = #SHALL -* rest.resource[=].searchParam[=].name = "status" +* rest.resource[=].searchParam[=].name = "type" * rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/clinical-type" * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation From d12db013b77a4657de26bb68b5484b6262a8d0c0 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Fri, 24 Nov 2023 10:01:44 +0100 Subject: [PATCH 14/22] Update Resources/input/fsh/ISiKCapabilityStatement.fsh --- Resources/input/fsh/ISiKCapabilityStatement.fsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/input/fsh/ISiKCapabilityStatement.fsh b/Resources/input/fsh/ISiKCapabilityStatement.fsh index 8611199d..a5ad2876 100644 --- a/Resources/input/fsh/ISiKCapabilityStatement.fsh +++ b/Resources/input/fsh/ISiKCapabilityStatement.fsh @@ -280,7 +280,7 @@ Usage: #definition * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation * rest.resource[=].searchParam[=].extension.valueCode = #SHALL -* rest.resource[=].searchParam[=].name = "status" +* rest.resource[=].searchParam[=].name = "patient" * rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/clinical-patient" * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation From 4bf40541aecdfa5b35131be4bcffc02ff37a22c3 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Fri, 24 Nov 2023 10:08:42 +0100 Subject: [PATCH 15/22] Update Resources/input/fsh/ISiKCapabilityStatement.fsh --- Resources/input/fsh/ISiKCapabilityStatement.fsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/input/fsh/ISiKCapabilityStatement.fsh b/Resources/input/fsh/ISiKCapabilityStatement.fsh index a5ad2876..4ea06832 100644 --- a/Resources/input/fsh/ISiKCapabilityStatement.fsh +++ b/Resources/input/fsh/ISiKCapabilityStatement.fsh @@ -282,7 +282,7 @@ Usage: #definition * rest.resource[=].searchParam[=].extension.valueCode = #SHALL * rest.resource[=].searchParam[=].name = "patient" * rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/clinical-patient" -* rest.resource[=].searchParam[=].type = #token +* rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation * rest.resource[=].searchParam[=].extension.valueCode = #MAY * rest.resource[=].searchParam[=].name = "_profile" From 917503e541fa5707ba885dd5715d7f20122b024e Mon Sep 17 00:00:00 2001 From: f-peverali Date: Fri, 24 Nov 2023 09:42:03 +0000 Subject: [PATCH 16/22] Commit from GitHub Actions (CI (FHIR Validation)) --- ...nt-ISiKCapabilityStatementBasisServer.json | 100 ++++++++++++++++++ .../StructureDefinition-ISiKAngehoeriger.json | 36 +++---- .../StructureDefinition-ISiKPatient.json | 36 +++---- 3 files changed, 136 insertions(+), 36 deletions(-) diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json index ff63f686..b2fdbcfc 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json @@ -648,6 +648,106 @@ } ] }, + { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", + "valueCode": "SHALL" + } + ], + "type": "Account", + "supportedProfile": [ + "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAbrechnungsfall" + ], + "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": "identifier", + "definition": "http://hl7.org/fhir/SearchParameter/clinical-identifier", + "type": "token" + }, + { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", + "valueCode": "SHALL" + } + ], + "name": "status", + "definition": "http://hl7.org/fhir/SearchParameter/Account-status", + "type": "token" + }, + { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", + "valueCode": "SHALL" + } + ], + "name": "type", + "definition": "http://hl7.org/fhir/SearchParameter/clinical-type", + "type": "token" + }, + { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", + "valueCode": "SHALL" + } + ], + "name": "patient", + "definition": "http://hl7.org/fhir/SearchParameter/clinical-patient", + "type": "reference" + }, + { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", + "valueCode": "MAY" + } + ], + "name": "_profile", + "definition": "http://hl7.org/fhir/SearchParameter/Resource-profile", + "type": "uri" + } + ] + }, { "extension": [ { diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json index 0125f1d2..c25a0d3e 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json @@ -120,6 +120,15 @@ "patternAddress": { "type": "both" }, + "constraint": [ + { + "key": "address-cnt-2or3-char", + "severity": "warning", + "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", + "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", + "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAngehoeriger" + } + ], "mustSupport": true }, { @@ -180,15 +189,6 @@ "id": "RelatedPerson.address:Strassenanschrift.country", "path": "RelatedPerson.address.country", "min": 1, - "constraint": [ - { - "key": "address-cnt-2or3-char", - "severity": "warning", - "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", - "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", - "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAngehoeriger" - } - ], "mustSupport": true }, { @@ -208,6 +208,15 @@ "patternAddress": { "type": "postal" }, + "constraint": [ + { + "key": "address-cnt-2or3-char", + "severity": "warning", + "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", + "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", + "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAngehoeriger" + } + ], "mustSupport": true }, { @@ -262,15 +271,6 @@ "id": "RelatedPerson.address:Postfach.country", "path": "RelatedPerson.address.country", "min": 1, - "constraint": [ - { - "key": "address-cnt-2or3-char", - "severity": "warning", - "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", - "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", - "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAngehoeriger" - } - ], "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json index c12b8b9c..857afa00 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json @@ -466,6 +466,15 @@ "patternAddress": { "type": "both" }, + "constraint": [ + { + "key": "address-cnt-2or3-char", + "severity": "warning", + "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", + "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", + "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPatient" + } + ], "mustSupport": true }, { @@ -526,15 +535,6 @@ "id": "Patient.address:Strassenanschrift.country", "path": "Patient.address.country", "min": 1, - "constraint": [ - { - "key": "address-cnt-2or3-char", - "severity": "warning", - "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", - "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", - "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPatient" - } - ], "mustSupport": true }, { @@ -554,6 +554,15 @@ "patternAddress": { "type": "postal" }, + "constraint": [ + { + "key": "address-cnt-2or3-char", + "severity": "warning", + "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", + "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", + "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPatient" + } + ], "mustSupport": true }, { @@ -608,15 +617,6 @@ "id": "Patient.address:Postfach.country", "path": "Patient.address.country", "min": 1, - "constraint": [ - { - "key": "address-cnt-2or3-char", - "severity": "warning", - "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", - "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", - "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPatient" - } - ], "mustSupport": true } ] From 8c576e3e3023b4fc69de6c085532f0fdcfc58f48 Mon Sep 17 00:00:00 2001 From: ylboerner Date: Sat, 25 Nov 2023 16:30:06 +0000 Subject: [PATCH 17/22] Commit from GitHub Actions (CI (FHIR Validation)) --- .../StructureDefinition-ISiKAngehoeriger.json | 36 +++++++++---------- .../StructureDefinition-ISiKPatient.json | 36 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json index 0125f1d2..c25a0d3e 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json @@ -120,6 +120,15 @@ "patternAddress": { "type": "both" }, + "constraint": [ + { + "key": "address-cnt-2or3-char", + "severity": "warning", + "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", + "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", + "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAngehoeriger" + } + ], "mustSupport": true }, { @@ -180,15 +189,6 @@ "id": "RelatedPerson.address:Strassenanschrift.country", "path": "RelatedPerson.address.country", "min": 1, - "constraint": [ - { - "key": "address-cnt-2or3-char", - "severity": "warning", - "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", - "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", - "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAngehoeriger" - } - ], "mustSupport": true }, { @@ -208,6 +208,15 @@ "patternAddress": { "type": "postal" }, + "constraint": [ + { + "key": "address-cnt-2or3-char", + "severity": "warning", + "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", + "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", + "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAngehoeriger" + } + ], "mustSupport": true }, { @@ -262,15 +271,6 @@ "id": "RelatedPerson.address:Postfach.country", "path": "RelatedPerson.address.country", "min": 1, - "constraint": [ - { - "key": "address-cnt-2or3-char", - "severity": "warning", - "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", - "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", - "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKAngehoeriger" - } - ], "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json index c12b8b9c..857afa00 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json @@ -466,6 +466,15 @@ "patternAddress": { "type": "both" }, + "constraint": [ + { + "key": "address-cnt-2or3-char", + "severity": "warning", + "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", + "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", + "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPatient" + } + ], "mustSupport": true }, { @@ -526,15 +535,6 @@ "id": "Patient.address:Strassenanschrift.country", "path": "Patient.address.country", "min": 1, - "constraint": [ - { - "key": "address-cnt-2or3-char", - "severity": "warning", - "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", - "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", - "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPatient" - } - ], "mustSupport": true }, { @@ -554,6 +554,15 @@ "patternAddress": { "type": "postal" }, + "constraint": [ + { + "key": "address-cnt-2or3-char", + "severity": "warning", + "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", + "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", + "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPatient" + } + ], "mustSupport": true }, { @@ -608,15 +617,6 @@ "id": "Patient.address:Postfach.country", "path": "Patient.address.country", "min": 1, - "constraint": [ - { - "key": "address-cnt-2or3-char", - "severity": "warning", - "human": "The content of the country element (if present) SHALL be selected EITHER from ValueSet ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2 OR MAY be selected from ISO Country Alpha-3 Value Set http://hl7.org/fhir/ValueSet/iso3166-1-3, IF the country is not specified in value Set ISO Country Alpha-2 http://hl7.org/fhir/ValueSet/iso3166-1-2.", - "expression": "country.empty() or (country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-2') or country.memberOf('http://hl7.org/fhir/ValueSet/iso3166-1-3'))", - "source": "https://gematik.de/fhir/isik/v3/Basismodul/StructureDefinition/ISiKPatient" - } - ], "mustSupport": true } ] From d33bc135cafff56a50c7603acae99dc2fcc364d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannick=20B=C3=B6rner?= Date: Sat, 25 Nov 2023 17:00:13 -0500 Subject: [PATCH 18/22] fix: Remove broken link --- ImplementationGuide/markdown/Patient/Patient_Kompatibilitaet.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImplementationGuide/markdown/Patient/Patient_Kompatibilitaet.md b/ImplementationGuide/markdown/Patient/Patient_Kompatibilitaet.md index 702a3136..c354a80f 100644 --- a/ImplementationGuide/markdown/Patient/Patient_Kompatibilitaet.md +++ b/ImplementationGuide/markdown/Patient/Patient_Kompatibilitaet.md @@ -6,7 +6,7 @@ Instanzen, die gegen ISiKPatient valide sind, sind auch (mit wenigen Einschränk * [Profil KBV_PR_Base_Patient der KBV Basisprofile - v1.2.1](https://simplifier.net/packages/kbv.basis/1.2.1) * hier ist zu beachten, dass die KBV im Patienten-Profil für Address.country ein "extensible"-Binding auf die DEÜV-Codes festlegt; dies weicht von der ISiK Verwendung von ISO-Codes ab * [Profil Patient im International Patient Summary (IPS) - STU-1](https://hl7.org/fhir/uv/ips/StructureDefinition-Patient-uv-ips.html) -* [Profil Patient der MI-Initiative - v2.0.0](https://simplifier.net/medizininformatikinitiative-modulperson/sdmiipersonpatient) +* Profil Patient der MI-Initiative - v2.0.0 * wenn in identifier:pid.assigner eine Referenz auf eine Organisation angegeben wurde * wenn in identifier:versichertenId_GKV.assigner die IK-NR der Krankenversicherung angegeben ist * [Profil Patient der KBV Archiv- und Wechselschnittstelle - v1.2.0](https://simplifier.net/pvs-archivierungs-undwechselschnittstelle/kbv_pr_aw_patient) From e7d268f2e1d628922ba821ffcbc15ddb212f3283 Mon Sep 17 00:00:00 2001 From: alexey-tschudnowsky Date: Mon, 27 Nov 2023 09:03:10 +0100 Subject: [PATCH 19/22] wrong field name for Composition context --- .../BerichtSubsystem_AnmerkungenZuDenMustSupportFeldern.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_AnmerkungenZuDenMustSupportFeldern.md b/ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_AnmerkungenZuDenMustSupportFeldern.md index fff30947..319bef3e 100644 --- a/ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_AnmerkungenZuDenMustSupportFeldern.md +++ b/ImplementationGuide/markdown/BerichtSubsystem/BerichtSubsystem_AnmerkungenZuDenMustSupportFeldern.md @@ -63,7 +63,7 @@ Beispiel: **Bedeutung:** Patientenbezug des Dokumentes -### `Composition.context` +### `Composition.encounter` **Bedeutung:** Fallbezug des Dokumentes From 54dffa42c92f45eccda9cfc10a25e493b28dfcc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannick=20B=C3=B6rner?= <39551832+ylboerner@users.noreply.github.com> Date: Thu, 30 Nov 2023 06:45:35 -0500 Subject: [PATCH 20/22] Update ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md --- .../UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md b/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md index 2e95e4d9..c616b95f 100644 --- a/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md +++ b/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md @@ -50,4 +50,4 @@ Hinweise und Rückfragen zu den bestätigungsrelevante Systemen können an die [ ## Weitere Festlegungen auf Profilebene im CapabilityStatement -Festlegungen zu Anforderungen auf Profilebene werden im [ISIKCapabilityStatement](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Basismodul-Stufe-3/ImplementationGuide-markdown-CapabilityStatement?version=current) geführt. \ No newline at end of file +Festlegungen zu Anforderungen auf Profilebene werden unter {{pagelink:ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md}} geführt. \ No newline at end of file From b999f3a5887ae161c55e0025ca0cbd6a272e79cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannick=20B=C3=B6rner?= <39551832+ylboerner@users.noreply.github.com> Date: Thu, 30 Nov 2023 06:49:17 -0500 Subject: [PATCH 21/22] Update ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md --- .../UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md b/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md index c616b95f..843191bd 100644 --- a/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md +++ b/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md @@ -48,6 +48,6 @@ ISiK-Modul Terminplanung [z.B. für die Umsetzung von KHZG Fördertatbestand 2] Hinweise und Rückfragen zu den bestätigungsrelevante Systemen können an die [DKG-Geschäftsstelle](https://www.dkgev.de/dkg/verband-auf-einen-blick/geschaeftsstelle/) gerichtet werden. -## Weitere Festlegungen auf Profilebene im CapabilityStatement +## Festlegungen auf Profilebene im CapabilityStatement Festlegungen zu Anforderungen auf Profilebene werden unter {{pagelink:ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md}} geführt. \ No newline at end of file From ff84a3db00d3e584167b78290928b9ad4d4e317d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannick=20B=C3=B6rner?= <39551832+ylboerner@users.noreply.github.com> Date: Thu, 30 Nov 2023 06:50:00 -0500 Subject: [PATCH 22/22] Update ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md --- .../UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md b/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md index 843191bd..be991c25 100644 --- a/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md +++ b/ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md @@ -50,4 +50,4 @@ Hinweise und Rückfragen zu den bestätigungsrelevante Systemen können an die [ ## Festlegungen auf Profilebene im CapabilityStatement -Festlegungen zu Anforderungen auf Profilebene werden unter {{pagelink:ImplementationGuide/markdown/UebergreifendeFestlegungen/UebergreifendeFestlegungen_BestaetigungsrelevanteSysteme.md}} geführt. \ No newline at end of file +Festlegungen zu Anforderungen auf Profilebene werden unter {{pagelink:ImplementationGuide/markdown/CapabilityStatement.md}} geführt. \ No newline at end of file