From 345d776f3b75442e391d8787c71a051628050b9e Mon Sep 17 00:00:00 2001 From: Francois Peverali Date: Fri, 17 Nov 2023 13:18:40 +0100 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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