From 4e8cfa1702e72ae5837cbde57d2a1a4d16902e34 Mon Sep 17 00:00:00 2001 From: Alexander Henket Date: Fri, 22 Mar 2024 09:14:50 +0100 Subject: [PATCH 1/8] Only parts relevant for BgZ-MSZ from branch contentAsserts --- .gitignore | 1 + .../bgz-msz-xis-1-1-retrieve-bgz.xml | 2 +- .../bgz-msz-xis-1-2-retrieve-bgz.xml | 2 +- .../Serving-XIS/bgz-msz-xis-1-1-serve-bgz.xml | 98 +++++++++---------- .../Serving-XIS/bgz-msz-xis-1-2-serve-bgz.xml | 92 ++++++++--------- src/build-nts-multiple.xml | 2 +- src/build-nts-single.xml | 2 +- src/build-single.xml | 11 +++ 8 files changed, 111 insertions(+), 99 deletions(-) diff --git a/.gitignore b/.gitignore index 92d5816a66..9448d358e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ lib/ build/ +tmp/ .project *.log /bin/ diff --git a/src/BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-1-retrieve-bgz.xml b/src/BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-1-retrieve-bgz.xml index ffcfb66364..e527af2612 100644 --- a/src/BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-1-retrieve-bgz.xml +++ b/src/BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-1-retrieve-bgz.xml @@ -259,7 +259,7 @@ - - + + @@ -36,8 +36,8 @@ - - + + @@ -50,7 +50,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -88,11 +88,11 @@ resource="Observation" count="3" nts:in-targets="#default"/> + description="contains .code.coding.code = '15188001'" expression=".where(code.where(coding.where(code = '15188001')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '301438001'" expression=".where(code.where(coding.where(code = '301438001')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '366979004'" expression=".where(code.where(coding.where(code = '366979004')))" nts:in-targets="Extended"/> @@ -106,15 +106,15 @@ resource="Condition" count="5" nts:in-targets="#default"/> + description="contains .code.coding.code = '267036007'" expression=".where(code.where(coding.where(code = '267036007')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '389145006'" expression=".where(code.where(coding.where(code = '389145006')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '195967001'" expression=".where(code.where(coding.where(code = '195967001')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '15188001'" expression=".where(code.where(coding.where(code = '15188001')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '16114001'" expression=".where(code.where(coding.where(code = '16114001')))" nts:in-targets="Extended"/> @@ -127,7 +127,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -191,9 +191,9 @@ resource="Flag" count="2" nts:in-targets="#default"/> + description="contains .code.coding.code = 'OTH'" expression=".where(code.where(coding.where(code = 'OTH')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '432415000'" expression=".where(code.where(coding.where(code = '432415000')))" nts:in-targets="Extended"/> @@ -207,11 +207,11 @@ resource="AllergyIntolerance" count="3" nts:in-targets="#default"/> + description="contains .code.coding.code = '13577000'" expression=".where(code.where(coding.where(code = '13577000')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '35'" expression=".where(code.where(coding.where(code = '35')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '111088007'" expression=".where(code.where(coding.where(code = '111088007')))" nts:in-targets="Extended"/> @@ -227,13 +227,13 @@ resource="Device" count="2" nts:in-targets="#default"/> + description="contains .device with reference to Device with type.coding.code = '360283003'" expression=".where(device.resolve().type.where(coding.where(code = '360283003')))" nts:in-targets="Extended"/> + description="contains .device with reference to Device with type.coding.code = '58938008'" expression=".where(device.resolve().type.where(coding.where(code = '58938008')))" nts:in-targets="Extended"/> + description="contains .type.coding.code = '360283003'" expression=".where(type.where(coding.where(code = '360283003')))" nts:in-targets="Extended"/> + description="contains .type.coding.code = '58938008'" expression=".where(type.where(coding.where(code = '58938008')))" nts:in-targets="Extended"/> @@ -247,9 +247,9 @@ resource="Immunization" count="2" nts:in-targets="#default"/> + description="contains .vaccineCode.coding.code = 'J07AM01'" expression=".where(vaccineCode.where(coding.where(code = 'J07AM01')))" nts:in-targets="Extended"/> + description="contains .vaccineCode.coding.code = 'J07BC20'" expression=".where(vaccineCode.where(coding.where(code = 'J07BC20')))" nts:in-targets="Extended"/> @@ -263,11 +263,11 @@ resource="Observation" count="3" nts:in-targets="#default"/> + description="contains a component with code = '8480-6' and valueQuantity.value = '140'" expression=".where(component.where(code.coding.where(code = '8480-6') and value.ofType(Quantity).value = 140))" nts:in-targets="Extended"/> + description="contains a component with code = '8480-6' and valueQuantity.value = '120'" expression=".where(component.where(code.coding.where(code = '8480-6') and value.ofType(Quantity).value = 120))" nts:in-targets="Extended"/> + description="contains a component with code = '8480-6' and valueQuantity.value = '130'" expression=".where(component.where(code.coding.where(code = '8480-6') and value.ofType(Quantity).value = 130))" nts:in-targets="Extended"/> @@ -299,7 +299,7 @@ - + @@ -312,7 +312,7 @@ - + @@ -320,7 +320,7 @@ @@ -328,19 +328,19 @@ resource="Specimen" count="2"/>--> + description="contains .code.coding.code = '59260-0'" expression=".where(code.where(coding.where(code = '59260-0')))" nts:in-targets="Extended"/>--> + description="contains .code.coding.code = '59260-0' and .valueQuantity.value = '9.2'" expression=".where(code.where(coding.where(code = '59260-0')) and value.ofType(Quantity).value = 9.2)" nts:in-targets="Extended"/> + description="contains .code.coding.code = '4544-3'" expression=".where(code.where(coding.where(code = '4544-3')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '6690-2'" expression=".where(code.where(coding.where(code = '6690-2')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '59260-0' and .valueQuantity.value = '8.9'" expression=".where(code.where(coding.where(code = '59260-0')) and value.ofType(Quantity).value = 8.9)" nts:in-targets="Extended"/> + description="has a .collection.collectedDateTime later than the other Specimen resource" expression="iif(Bundle.entry.resource.ofType(Specimen)[0].collection.collected < Bundle.entry.resource.ofType(Specimen)[1].collection.collected, Bundle.entry.resource.ofType(Specimen)[1], Bundle.entry.resource.ofType(Specimen)[0])" bundleExpression="true" nts:in-targets="Extended"/>--> @@ -382,11 +382,11 @@ resource="Encounter" count="3" nts:in-targets="#default"/> + description="contains .class.code = 'EMER'" expression=".where(class.code = 'EMER')" nts:in-targets="Extended"/> + description="contains .class.code = 'IMP'" expression=".where(class.code = 'IMP')" nts:in-targets="Extended"/> + description="contains .class.code = 'AMB'" expression=".where(class.code = 'AMB')" nts:in-targets="Extended"/> @@ -411,9 +411,9 @@ resource="ProcedureRequest" count="2" nts:in-targets="#default"/> + description="contains .code.coding.code = '111501000146106'" expression=".where(code.where(coding.where(code = '111501000146106')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '122531000146102'" expression=".where(code.where(coding.where(code = '122531000146102')))" nts:in-targets="Extended"/> @@ -427,9 +427,9 @@ resource="ImmunizationRecommendation" count="0" nts:in-targets="#default"/> + description="contains .recommendation.vaccineCode.coding.code = 'J07BC20'" expression=".where(recommendation.where(vaccineCode.where(coding.where(code = 'J07BC20'))))" nts:in-targets="Extended"/>--> diff --git a/src/BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz.xml b/src/BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz.xml index 5f02be7175..f1a8e9c503 100644 --- a/src/BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz.xml +++ b/src/BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz.xml @@ -20,8 +20,8 @@ - - + + @@ -36,8 +36,8 @@ - - + + @@ -50,7 +50,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -101,17 +101,17 @@ resource="Condition" count="6" nts:in-targets="#default"/> + description="contains .code.coding.code = '38341003'" expression=".where(code.where(coding.where(code = '38341003')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '412734009'" expression=".where(code.where(coding.where(code = '412734009')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '432504007'" expression=".where(code.where(coding.where(code = '432504007')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '2271000146103'" expression=".where(code.where(coding.where(code = '2271000146103')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '254837009'" expression=".where(code.where(coding.where(code = '254837009')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '58126003'" expression=".where(code.where(coding.where(code = '58126003')))" nts:in-targets="Extended"/> @@ -124,7 +124,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -189,7 +189,7 @@ - + @@ -203,7 +203,7 @@ resource="AllergyIntolerance" count="1" nts:in-targets="#default"/> + nts:in-targets="Extended"/> @@ -219,9 +219,9 @@ resource="Device" count="1" nts:in-targets="#default"/> + nts:in-targets="Extended"/> + nts:in-targets="Extended"/> @@ -235,7 +235,7 @@ resource="Immunization" count="1" nts:in-targets="#default"/> + nts:in-targets="Extended"/> @@ -249,11 +249,11 @@ resource="Observation" count="3" nts:in-targets="#default"/> + description="contains a component with code = '8480-6' and valueQuantity.value = '120'" expression=".where(component.where(code.coding.where(code = '8480-6') and value.ofType(Quantity).value = 120))" nts:in-targets="Extended"/> + description="contains a component with code = '8480-6' and valueQuantity.value = '130'" expression=".where(component.where(code.coding.where(code = '8480-6') and value.ofType(Quantity).value = 130))" nts:in-targets="Extended"/> + description="contains a component with code = '8480-6' and valueQuantity.value = '150'" expression=".where(component.where(code.coding.where(code = '8480-6') and value.ofType(Quantity).value = 150))" nts:in-targets="Extended"/> @@ -285,7 +285,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -306,7 +306,7 @@ @@ -314,15 +314,15 @@ resource="Specimen" count="2" nts:in-targets="#default"/>--> + description="contains .code.coding.code = '26484-6'" expression=".where(code.where(coding.where(code = '26484-6')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '732-8'" expression=".where(code.where(coding.where(code = '732-8')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '733-6'" expression=".where(code.where(coding.where(code = '733-6')))" nts:in-targets="Extended"/> - + description="contains .code.coding.code = '6875-9'" expression=".where(code.where(coding.where(code = '6875-9')))" nts:in-targets="Extended"/> + @@ -350,13 +350,13 @@ resource="Procedure" min="2" max="4" /> + description="contains .code.coding.code = '77381000146102'" expression=".where(code.where(coding.where(code = '77381000146102')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '84581000146105'" expression=".where(code.where(coding.where(code = '84581000146105')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '172043006'" expression=".where(code.where(coding.where(code = '172043006')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '103751000146104'" expression=".where(code.where(coding.where(code = '103751000146104')))" nts:in-targets="Extended"/> @@ -370,11 +370,11 @@ resource="Encounter" count="3" nts:in-targets="#default"/> + description="contains .class.code = 'IMP' and .hospitalization.admitSource exists" expression=".where(class.code = 'IMP' and hospitalization.admitSource.exists())" nts:in-targets="Extended"/> + description="contains .class.code = 'EMER'" expression=".where(class.code = 'EMER')" nts:in-targets="Extended"/> + description="contains .class.code = 'IMP' and .hospitalization.admitSource does not exist" expression=".where(class.code = 'IMP' and hospitalization.admitSource.exists().not())" nts:in-targets="Extended"/> @@ -399,13 +399,13 @@ resource="ProcedureRequest" count="4" nts:in-targets="#default"/> + description="contains .code.coding.code = '77381000146102'" expression=".where(code.where(coding.where(code = '77381000146102')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '84581000146105'" expression=".where(code.where(coding.where(code = '84581000146105')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '172043006'" expression=".where(code.where(coding.where(code = '172043006')))" nts:in-targets="Extended"/> + description="contains .code.coding.code = '103751000146104'" expression=".where(code.where(coding.where(code = '103751000146104')))" nts:in-targets="Extended"/> diff --git a/src/build-nts-multiple.xml b/src/build-nts-multiple.xml index e4856ff7be..2f26293253 100644 --- a/src/build-nts-multiple.xml +++ b/src/build-nts-multiple.xml @@ -9,7 +9,7 @@ - + diff --git a/src/build-nts-single.xml b/src/build-nts-single.xml index ae20a4c5c1..121fbcb12c 100644 --- a/src/build-nts-single.xml +++ b/src/build-nts-single.xml @@ -7,7 +7,7 @@ - + diff --git a/src/build-single.xml b/src/build-single.xml index 85654a0b8f..7435ff2cd8 100644 --- a/src/build-single.xml +++ b/src/build-single.xml @@ -8,6 +8,17 @@ + + + + + + + + + + + From c1f88809605d4d56f2b52e2cad6f7d079b5424a4 Mon Sep 17 00:00:00 2001 From: Alexander Henket Date: Fri, 22 Mar 2024 09:22:23 +0100 Subject: [PATCH 2/8] Replace target Extended with target CheckContent --- .../Serving-XIS/bgz-msz-xis-1-1-serve-bgz.xml | 96 +++++++++---------- .../Serving-XIS/bgz-msz-xis-1-2-serve-bgz.xml | 90 ++++++++--------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/src/BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-1-serve-bgz.xml b/src/BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-1-serve-bgz.xml index f23af1bd77..a46f443e7b 100644 --- a/src/BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-1-serve-bgz.xml +++ b/src/BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-1-serve-bgz.xml @@ -20,8 +20,8 @@ - - + + @@ -36,8 +36,8 @@ - - + + @@ -50,7 +50,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -88,11 +88,11 @@ resource="Observation" count="3" nts:in-targets="#default"/> + description="contains .code.coding.code = '15188001'" expression=".where(code.where(coding.where(code = '15188001')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '301438001'" expression=".where(code.where(coding.where(code = '301438001')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '366979004'" expression=".where(code.where(coding.where(code = '366979004')))" nts:in-targets="CheckContent"/> @@ -106,15 +106,15 @@ resource="Condition" count="5" nts:in-targets="#default"/> + description="contains .code.coding.code = '267036007'" expression=".where(code.where(coding.where(code = '267036007')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '389145006'" expression=".where(code.where(coding.where(code = '389145006')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '195967001'" expression=".where(code.where(coding.where(code = '195967001')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '15188001'" expression=".where(code.where(coding.where(code = '15188001')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '16114001'" expression=".where(code.where(coding.where(code = '16114001')))" nts:in-targets="CheckContent"/> @@ -127,7 +127,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -191,9 +191,9 @@ resource="Flag" count="2" nts:in-targets="#default"/> + description="contains .code.coding.code = 'OTH'" expression=".where(code.where(coding.where(code = 'OTH')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '432415000'" expression=".where(code.where(coding.where(code = '432415000')))" nts:in-targets="CheckContent"/> @@ -207,11 +207,11 @@ resource="AllergyIntolerance" count="3" nts:in-targets="#default"/> + description="contains .code.coding.code = '13577000'" expression=".where(code.where(coding.where(code = '13577000')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '35'" expression=".where(code.where(coding.where(code = '35')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '111088007'" expression=".where(code.where(coding.where(code = '111088007')))" nts:in-targets="CheckContent"/> @@ -227,13 +227,13 @@ resource="Device" count="2" nts:in-targets="#default"/> + description="contains .device with reference to Device with type.coding.code = '360283003'" expression=".where(device.resolve().type.where(coding.where(code = '360283003')))" nts:in-targets="CheckContent"/> + description="contains .device with reference to Device with type.coding.code = '58938008'" expression=".where(device.resolve().type.where(coding.where(code = '58938008')))" nts:in-targets="CheckContent"/> + description="contains .type.coding.code = '360283003'" expression=".where(type.where(coding.where(code = '360283003')))" nts:in-targets="CheckContent"/> + description="contains .type.coding.code = '58938008'" expression=".where(type.where(coding.where(code = '58938008')))" nts:in-targets="CheckContent"/> @@ -247,9 +247,9 @@ resource="Immunization" count="2" nts:in-targets="#default"/> + description="contains .vaccineCode.coding.code = 'J07AM01'" expression=".where(vaccineCode.where(coding.where(code = 'J07AM01')))" nts:in-targets="CheckContent"/> + description="contains .vaccineCode.coding.code = 'J07BC20'" expression=".where(vaccineCode.where(coding.where(code = 'J07BC20')))" nts:in-targets="CheckContent"/> @@ -263,11 +263,11 @@ resource="Observation" count="3" nts:in-targets="#default"/> + description="contains a component with code = '8480-6' and valueQuantity.value = '140'" expression=".where(component.where(code.coding.where(code = '8480-6') and value.ofType(Quantity).value = 140))" nts:in-targets="CheckContent"/> + description="contains a component with code = '8480-6' and valueQuantity.value = '120'" expression=".where(component.where(code.coding.where(code = '8480-6') and value.ofType(Quantity).value = 120))" nts:in-targets="CheckContent"/> + description="contains a component with code = '8480-6' and valueQuantity.value = '130'" expression=".where(component.where(code.coding.where(code = '8480-6') and value.ofType(Quantity).value = 130))" nts:in-targets="CheckContent"/> @@ -299,7 +299,7 @@ - + @@ -312,7 +312,7 @@ - + @@ -328,19 +328,19 @@ resource="Specimen" count="2"/>--> + description="contains .code.coding.code = '59260-0'" expression=".where(code.where(coding.where(code = '59260-0')))" nts:in-targets="CheckContent"/>--> + description="contains .code.coding.code = '59260-0' and .valueQuantity.value = '9.2'" expression=".where(code.where(coding.where(code = '59260-0')) and value.ofType(Quantity).value = 9.2)" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '4544-3'" expression=".where(code.where(coding.where(code = '4544-3')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '6690-2'" expression=".where(code.where(coding.where(code = '6690-2')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '59260-0' and .valueQuantity.value = '8.9'" expression=".where(code.where(coding.where(code = '59260-0')) and value.ofType(Quantity).value = 8.9)" nts:in-targets="CheckContent"/> + description="has a .collection.collectedDateTime later than the other Specimen resource" expression="iif(Bundle.entry.resource.ofType(Specimen)[0].collection.collected < Bundle.entry.resource.ofType(Specimen)[1].collection.collected, Bundle.entry.resource.ofType(Specimen)[1], Bundle.entry.resource.ofType(Specimen)[0])" bundleExpression="true" nts:in-targets="CheckContent"/>--> @@ -382,11 +382,11 @@ resource="Encounter" count="3" nts:in-targets="#default"/> + description="contains .class.code = 'EMER'" expression=".where(class.code = 'EMER')" nts:in-targets="CheckContent"/> + description="contains .class.code = 'IMP'" expression=".where(class.code = 'IMP')" nts:in-targets="CheckContent"/> + description="contains .class.code = 'AMB'" expression=".where(class.code = 'AMB')" nts:in-targets="CheckContent"/> @@ -411,9 +411,9 @@ resource="ProcedureRequest" count="2" nts:in-targets="#default"/> + description="contains .code.coding.code = '111501000146106'" expression=".where(code.where(coding.where(code = '111501000146106')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '122531000146102'" expression=".where(code.where(coding.where(code = '122531000146102')))" nts:in-targets="CheckContent"/> @@ -427,9 +427,9 @@ resource="ImmunizationRecommendation" count="0" nts:in-targets="#default"/> + description="contains .recommendation.vaccineCode.coding.code = 'J07BC20'" expression=".where(recommendation.where(vaccineCode.where(coding.where(code = 'J07BC20'))))" nts:in-targets="CheckContent"/>--> diff --git a/src/BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz.xml b/src/BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz.xml index f1a8e9c503..e10284a509 100644 --- a/src/BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz.xml +++ b/src/BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz.xml @@ -20,8 +20,8 @@ - - + + @@ -36,8 +36,8 @@ - - + + @@ -50,7 +50,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -101,17 +101,17 @@ resource="Condition" count="6" nts:in-targets="#default"/> + description="contains .code.coding.code = '38341003'" expression=".where(code.where(coding.where(code = '38341003')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '412734009'" expression=".where(code.where(coding.where(code = '412734009')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '432504007'" expression=".where(code.where(coding.where(code = '432504007')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '2271000146103'" expression=".where(code.where(coding.where(code = '2271000146103')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '254837009'" expression=".where(code.where(coding.where(code = '254837009')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '58126003'" expression=".where(code.where(coding.where(code = '58126003')))" nts:in-targets="CheckContent"/> @@ -124,7 +124,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -189,7 +189,7 @@ - + @@ -203,7 +203,7 @@ resource="AllergyIntolerance" count="1" nts:in-targets="#default"/> + nts:in-targets="CheckContent"/> @@ -219,9 +219,9 @@ resource="Device" count="1" nts:in-targets="#default"/> + nts:in-targets="CheckContent"/> + nts:in-targets="CheckContent"/> @@ -235,7 +235,7 @@ resource="Immunization" count="1" nts:in-targets="#default"/> + nts:in-targets="CheckContent"/> @@ -249,11 +249,11 @@ resource="Observation" count="3" nts:in-targets="#default"/> + description="contains a component with code = '8480-6' and valueQuantity.value = '120'" expression=".where(component.where(code.coding.where(code = '8480-6') and value.ofType(Quantity).value = 120))" nts:in-targets="CheckContent"/> + description="contains a component with code = '8480-6' and valueQuantity.value = '130'" expression=".where(component.where(code.coding.where(code = '8480-6') and value.ofType(Quantity).value = 130))" nts:in-targets="CheckContent"/> + description="contains a component with code = '8480-6' and valueQuantity.value = '150'" expression=".where(component.where(code.coding.where(code = '8480-6') and value.ofType(Quantity).value = 150))" nts:in-targets="CheckContent"/> @@ -285,7 +285,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -314,15 +314,15 @@ resource="Specimen" count="2" nts:in-targets="#default"/>--> + description="contains .code.coding.code = '26484-6'" expression=".where(code.where(coding.where(code = '26484-6')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '732-8'" expression=".where(code.where(coding.where(code = '732-8')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '733-6'" expression=".where(code.where(coding.where(code = '733-6')))" nts:in-targets="CheckContent"/> - + description="contains .code.coding.code = '6875-9'" expression=".where(code.where(coding.where(code = '6875-9')))" nts:in-targets="CheckContent"/> + @@ -350,13 +350,13 @@ resource="Procedure" min="2" max="4" /> + description="contains .code.coding.code = '77381000146102'" expression=".where(code.where(coding.where(code = '77381000146102')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '84581000146105'" expression=".where(code.where(coding.where(code = '84581000146105')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '172043006'" expression=".where(code.where(coding.where(code = '172043006')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '103751000146104'" expression=".where(code.where(coding.where(code = '103751000146104')))" nts:in-targets="CheckContent"/> @@ -370,11 +370,11 @@ resource="Encounter" count="3" nts:in-targets="#default"/> + description="contains .class.code = 'IMP' and .hospitalization.admitSource exists" expression=".where(class.code = 'IMP' and hospitalization.admitSource.exists())" nts:in-targets="CheckContent"/> + description="contains .class.code = 'EMER'" expression=".where(class.code = 'EMER')" nts:in-targets="CheckContent"/> + description="contains .class.code = 'IMP' and .hospitalization.admitSource does not exist" expression=".where(class.code = 'IMP' and hospitalization.admitSource.exists().not())" nts:in-targets="CheckContent"/> @@ -399,13 +399,13 @@ resource="ProcedureRequest" count="4" nts:in-targets="#default"/> + description="contains .code.coding.code = '77381000146102'" expression=".where(code.where(coding.where(code = '77381000146102')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '84581000146105'" expression=".where(code.where(coding.where(code = '84581000146105')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '172043006'" expression=".where(code.where(coding.where(code = '172043006')))" nts:in-targets="CheckContent"/> + description="contains .code.coding.code = '103751000146104'" expression=".where(code.where(coding.where(code = '103751000146104')))" nts:in-targets="CheckContent"/> From a311b37d6edf68a5bfd84ba2f907472643493160 Mon Sep 17 00:00:00 2001 From: Alexander Henket Date: Fri, 22 Mar 2024 09:22:34 +0100 Subject: [PATCH 3/8] Regenerated --- .../bgz-msz-xis-1-1-retrieve-bgz.xml | 2 +- .../bgz-msz-xis-1-2-retrieve-bgz.xml | 2 +- .../bgz-msz-xis-1-1-serve-bgz-json.xml | 2 +- .../bgz-msz-xis-1-1-serve-bgz-xml.xml | 2 +- .../bgz-msz-xis-1-2-serve-bgz-json.xml | 2 +- .../bgz-msz-xis-1-2-serve-bgz-xml.xml | 2 +- .../bgz-msz-xis-1-1-serve-bgz-json.xml | 2 +- .../bgz-msz-xis-1-1-serve-bgz-xml.xml | 2 +- .../bgz-msz-xis-1-2-serve-bgz-json.xml | 2 +- .../bgz-msz-xis-1-2-serve-bgz-xml.xml | 2 +- .../load-resources-purgecreateupdate-xml.xml | 594 +++++++++--------- 11 files changed, 307 insertions(+), 307 deletions(-) diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-1-retrieve-bgz.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-1-retrieve-bgz.xml index c9b4704d93..daee2192b2 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-1-retrieve-bgz.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-1-retrieve-bgz.xml @@ -1179,7 +1179,7 @@ - + diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-2-retrieve-bgz.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-2-retrieve-bgz.xml index c349ab27d7..007bdb8a8b 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-2-retrieve-bgz.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-2-retrieve-bgz.xml @@ -1179,7 +1179,7 @@ - + diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-json.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-json.xml index a66154dbb5..1ca36f9aa2 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-json.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-json.xml @@ -12728,7 +12728,7 @@ - + diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-xml.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-xml.xml index 6b2bbcb2ea..795744ab7f 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-xml.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-xml.xml @@ -12728,7 +12728,7 @@ - + diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-json.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-json.xml index b7879ac48d..82a577ce2a 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-json.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-json.xml @@ -10992,7 +10992,7 @@ - + diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-xml.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-xml.xml index 5bfacfcc63..bbf3b6f554 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-xml.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-xml.xml @@ -10992,7 +10992,7 @@ - + diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-1-serve-bgz-json.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-1-serve-bgz-json.xml index 9c7c2790cd..302ed9d97f 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-1-serve-bgz-json.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-1-serve-bgz-json.xml @@ -4404,7 +4404,7 @@ - + diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-1-serve-bgz-xml.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-1-serve-bgz-xml.xml index cc3b80755c..9167223adb 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-1-serve-bgz-xml.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-1-serve-bgz-xml.xml @@ -4404,7 +4404,7 @@ - + diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz-json.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz-json.xml index 8e64c23db1..719eb42d8a 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz-json.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz-json.xml @@ -4405,7 +4405,7 @@ - + diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz-xml.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz-xml.xml index c7c124a2cb..6d46fb4820 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz-xml.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS/bgz-msz-xis-1-2-serve-bgz-xml.xml @@ -4405,7 +4405,7 @@ - + diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/_LoadResources/load-resources-purgecreateupdate-xml.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/_LoadResources/load-resources-purgecreateupdate-xml.xml index 6150d9566a..ddcc42e128 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/_LoadResources/load-resources-purgecreateupdate-xml.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/_LoadResources/load-resources-purgecreateupdate-xml.xml @@ -182,21 +182,21 @@ - + - + - + @@ -434,56 +434,56 @@ - + - + - + - + - + - + - + - + @@ -518,42 +518,42 @@ - + - + - + - + - + - + @@ -574,98 +574,98 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -721,35 +721,35 @@ - + - + - + - + - + @@ -770,7 +770,7 @@ - + @@ -905,19 +905,19 @@ - + - + - + - + - + - + @@ -1085,44 +1085,44 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1145,34 +1145,34 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -1185,74 +1185,74 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1290,29 +1290,29 @@ - + - + - + - + - + - + - + - + - + - + @@ -1325,9 +1325,9 @@ - + - + @@ -1350,10 +1350,10 @@ - + - + @@ -1375,10 +1375,10 @@ - + - + @@ -1459,7 +1459,7 @@ - + @@ -1485,7 +1485,7 @@ - + @@ -1511,7 +1511,7 @@ - + @@ -1537,7 +1537,7 @@ - + @@ -1563,7 +1563,7 @@ - + @@ -1589,7 +1589,7 @@ - + @@ -1615,7 +1615,7 @@ - + @@ -1641,7 +1641,7 @@ - + @@ -1667,7 +1667,7 @@ - + @@ -1693,7 +1693,7 @@ - + @@ -1719,7 +1719,7 @@ - + @@ -1745,7 +1745,7 @@ - + @@ -1771,7 +1771,7 @@ - + @@ -1797,7 +1797,7 @@ - + @@ -1823,7 +1823,7 @@ - + @@ -1849,7 +1849,7 @@ - + @@ -1875,7 +1875,7 @@ - + @@ -1901,7 +1901,7 @@ - + @@ -1927,7 +1927,7 @@ - + @@ -1953,7 +1953,7 @@ - + @@ -1979,7 +1979,7 @@ - + @@ -2005,7 +2005,7 @@ - + @@ -2031,7 +2031,7 @@ - + @@ -2057,7 +2057,7 @@ - + @@ -2080,12 +2080,12 @@ - + - + - + @@ -2106,12 +2106,12 @@ - + - + - + @@ -2132,12 +2132,12 @@ - + - + - + @@ -2161,7 +2161,7 @@ - + @@ -2187,7 +2187,7 @@ - + @@ -2213,7 +2213,7 @@ - + @@ -2239,7 +2239,7 @@ - + @@ -2265,7 +2265,7 @@ - + @@ -2291,7 +2291,7 @@ - + @@ -2317,7 +2317,7 @@ - + @@ -2343,7 +2343,7 @@ - + @@ -2369,7 +2369,7 @@ - + @@ -2395,7 +2395,7 @@ - + @@ -2421,7 +2421,7 @@ - + @@ -2447,7 +2447,7 @@ - + @@ -2473,7 +2473,7 @@ - + @@ -2499,7 +2499,7 @@ - + @@ -2525,7 +2525,7 @@ - + @@ -2551,7 +2551,7 @@ - + @@ -2577,7 +2577,7 @@ - + @@ -2603,7 +2603,7 @@ - + @@ -2629,7 +2629,7 @@ - + @@ -2655,7 +2655,7 @@ - + @@ -2681,7 +2681,7 @@ - + @@ -2707,7 +2707,7 @@ - + @@ -2733,7 +2733,7 @@ - + @@ -2759,7 +2759,7 @@ - + @@ -2785,7 +2785,7 @@ - + @@ -2811,7 +2811,7 @@ - + @@ -2837,7 +2837,7 @@ - + @@ -2863,7 +2863,7 @@ - + @@ -2889,7 +2889,7 @@ - + @@ -2915,7 +2915,7 @@ - + @@ -2941,7 +2941,7 @@ - + @@ -2967,7 +2967,7 @@ - + @@ -2993,7 +2993,7 @@ - + @@ -3016,12 +3016,12 @@ - + - + - + @@ -3042,12 +3042,12 @@ - + - + - + @@ -3068,12 +3068,12 @@ - + - + - + @@ -3094,12 +3094,12 @@ - + - + - + @@ -3120,12 +3120,12 @@ - + - + - + @@ -3146,12 +3146,12 @@ - + - + - + @@ -3172,12 +3172,12 @@ - + - + - + @@ -3198,12 +3198,12 @@ - + - + - + @@ -3227,7 +3227,7 @@ - + @@ -3253,7 +3253,7 @@ - + @@ -3279,7 +3279,7 @@ - + @@ -3305,7 +3305,7 @@ - + @@ -3328,12 +3328,12 @@ - + - + - + @@ -3354,12 +3354,12 @@ - + - + - + @@ -3380,12 +3380,12 @@ - + - + - + @@ -3406,12 +3406,12 @@ - + - + - + @@ -3432,12 +3432,12 @@ - + - + - + @@ -3458,12 +3458,12 @@ - + - + - + @@ -3484,12 +3484,12 @@ - + - + - + @@ -3510,12 +3510,12 @@ - + - + - + @@ -3536,12 +3536,12 @@ - + - + - + @@ -3562,12 +3562,12 @@ - + - + - + @@ -3588,12 +3588,12 @@ - + - + - + @@ -3614,12 +3614,12 @@ - + - + - + @@ -3640,12 +3640,12 @@ - + - + - + @@ -3666,12 +3666,12 @@ - + - + - + @@ -3692,12 +3692,12 @@ - + - + - + @@ -3718,12 +3718,12 @@ - + - + - + @@ -3744,12 +3744,12 @@ - + - + - + @@ -3770,12 +3770,12 @@ - + - + - + @@ -3796,12 +3796,12 @@ - + - + - + @@ -3822,12 +3822,12 @@ - + - + - + @@ -3851,7 +3851,7 @@ - + @@ -3877,7 +3877,7 @@ - + @@ -3903,7 +3903,7 @@ - + @@ -3929,7 +3929,7 @@ - + @@ -3955,7 +3955,7 @@ - + @@ -3981,7 +3981,7 @@ - + @@ -4007,7 +4007,7 @@ - + @@ -4030,12 +4030,12 @@ - + - + - + @@ -4056,12 +4056,12 @@ - + - + - + @@ -4082,12 +4082,12 @@ - + - + - + @@ -4108,12 +4108,12 @@ - + - + - + @@ -4134,12 +4134,12 @@ - + - + - + @@ -4163,7 +4163,7 @@ - + @@ -4189,7 +4189,7 @@ - + @@ -4212,12 +4212,12 @@ - + - + - + @@ -4241,7 +4241,7 @@ - + From 37501ddff3fac745b12bc7f0131f5f6c9e250294 Mon Sep 17 00:00:00 2001 From: Alexander Henket Date: Fri, 22 Mar 2024 10:01:30 +0100 Subject: [PATCH 4/8] Output version of java before running --- src/BgZ-MSZ-1-2/Cert/build-BgZ-MSZ-1-2-Cert.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/BgZ-MSZ-1-2/Cert/build-BgZ-MSZ-1-2-Cert.sh b/src/BgZ-MSZ-1-2/Cert/build-BgZ-MSZ-1-2-Cert.sh index 6b0af9a8b3..7d4d28107b 100755 --- a/src/BgZ-MSZ-1-2/Cert/build-BgZ-MSZ-1-2-Cert.sh +++ b/src/BgZ-MSZ-1-2/Cert/build-BgZ-MSZ-1-2-Cert.sh @@ -10,4 +10,8 @@ JAVA_HOME=`/usr/libexec/java_home -v 1.8` #echo " to $PWD/_reference/resources/" #cp "$SOURCEDIR/*.xml" "$PWD/_reference/resources/" +echo ========================================================= +echo JAVA_HOME=$JAVA_HOME +echo ========================================================= + ant -f $PWD/../../build-single.xml -propertyfile $PWD/build.properties $* From edf1656859bfe297ca5bb176c61120740b24f997 Mon Sep 17 00:00:00 2001 From: Alexander Henket Date: Fri, 22 Mar 2024 10:27:42 +0100 Subject: [PATCH 5/8] More java version output --- src/BgZ-MSZ-1-2/Cert/build-BgZ-MSZ-1-2-Cert.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/BgZ-MSZ-1-2/Cert/build-BgZ-MSZ-1-2-Cert.sh b/src/BgZ-MSZ-1-2/Cert/build-BgZ-MSZ-1-2-Cert.sh index 7d4d28107b..85e4ad523e 100755 --- a/src/BgZ-MSZ-1-2/Cert/build-BgZ-MSZ-1-2-Cert.sh +++ b/src/BgZ-MSZ-1-2/Cert/build-BgZ-MSZ-1-2-Cert.sh @@ -12,6 +12,7 @@ JAVA_HOME=`/usr/libexec/java_home -v 1.8` echo ========================================================= echo JAVA_HOME=$JAVA_HOME +java -version echo ========================================================= ant -f $PWD/../../build-single.xml -propertyfile $PWD/build.properties $* From 7605a79f0370168d27450edbb1469839bbaad0c7 Mon Sep 17 00:00:00 2001 From: Alexander Henket Date: Fri, 22 Mar 2024 12:52:57 +0100 Subject: [PATCH 6/8] Integrate parts to support loggingGroovy branch that eliminates Nashorn --- src/build-multiple.xml | 2 ++ src/build-single.xml | 2 ++ src/build.properties | 1 + 3 files changed, 5 insertions(+) create mode 100644 src/build.properties diff --git a/src/build-multiple.xml b/src/build-multiple.xml index 5fb66ff3b5..84dadcc2c1 100644 --- a/src/build-multiple.xml +++ b/src/build-multiple.xml @@ -4,6 +4,8 @@ Build a NTS project using the parameters described on https://github.com/Nictiz/Nictiz-tooling-testscripts/tree/main/generate These parameters are normally defined in a build.properties file. --> + + diff --git a/src/build-single.xml b/src/build-single.xml index 7435ff2cd8..92d143ccfc 100644 --- a/src/build-single.xml +++ b/src/build-single.xml @@ -4,6 +4,8 @@ Build a NTS project using the parameters described on https://github.com/Nictiz/Nictiz-tooling-testscripts/tree/main/generate These parameters are normally defined in a build.properties file. --> + + diff --git a/src/build.properties b/src/build.properties new file mode 100644 index 0000000000..ceec3f452e --- /dev/null +++ b/src/build.properties @@ -0,0 +1 @@ +commoncomponents.dir = src/common-components From 6d2f92616ffee5f7e74538d885269f63b6d3e002 Mon Sep 17 00:00:00 2001 From: Eduard Date: Tue, 23 Apr 2024 17:57:19 +0200 Subject: [PATCH 7/8] MM-5169 Fixed the fixture when the AlertName is empty but there is stil a Problem --- .../resources/zib-Alert-bgz-msz-patB-alert1.xml | 13 +++++++------ .../resources/zib-Alert-bgz-msz-patB-alert1.xml | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/_reference/resources/zib-Alert-bgz-msz-patB-alert1.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/_reference/resources/zib-Alert-bgz-msz-patB-alert1.xml index bf2201c0ca..eff6a97d83 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/_reference/resources/zib-Alert-bgz-msz-patB-alert1.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/_reference/resources/zib-Alert-bgz-msz-patB-alert1.xml @@ -17,9 +17,7 @@ Code - - onbekend (ontbrekend gegeven) - + Zie probleem Detail @@ -52,9 +50,12 @@ - - - + + + + + + diff --git a/src/BgZ-MSZ-1-2/Cert/_reference/resources/zib-Alert-bgz-msz-patB-alert1.xml b/src/BgZ-MSZ-1-2/Cert/_reference/resources/zib-Alert-bgz-msz-patB-alert1.xml index 3957b7d7c9..cdff0c130b 100644 --- a/src/BgZ-MSZ-1-2/Cert/_reference/resources/zib-Alert-bgz-msz-patB-alert1.xml +++ b/src/BgZ-MSZ-1-2/Cert/_reference/resources/zib-Alert-bgz-msz-patB-alert1.xml @@ -17,9 +17,7 @@ Code - - onbekend (ontbrekend gegeven) - + Zie probleem Detail @@ -52,9 +50,12 @@ - - - + + + + + + From caa4efe8176733ad04c36f315a15abe7e84b3048 Mon Sep 17 00:00:00 2001 From: Pieter Edelman Date: Thu, 25 Apr 2024 11:26:58 +0200 Subject: [PATCH 8/8] MM-5169: Fixed the fixture when the AlertName is empty but there is still a problem --- .../bgz-msz-xis-1-1-retrieve-bgz.xml | 2 +- .../bgz-msz-xis-1-2-retrieve-bgz.xml | 2 +- .../bgz-msz-xis-1-1-serve-bgz-json.xml | 2 +- .../bgz-msz-xis-1-1-serve-bgz-xml.xml | 2 +- .../bgz-msz-xis-1-2-serve-bgz-json.xml | 6 +- .../bgz-msz-xis-1-2-serve-bgz-xml.xml | 6 +- .../bgz-msz-xis-1-1-serve-bgz-json.xml | 2 +- .../bgz-msz-xis-1-1-serve-bgz-xml.xml | 2 +- .../bgz-msz-xis-1-2-serve-bgz-json.xml | 2 +- .../bgz-msz-xis-1-2-serve-bgz-xml.xml | 2 +- .../load-resources-purgecreateupdate-xml.xml | 594 +++++++++--------- 11 files changed, 311 insertions(+), 311 deletions(-) diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-1-retrieve-bgz.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-1-retrieve-bgz.xml index daee2192b2..765f54fa42 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-1-retrieve-bgz.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-1-retrieve-bgz.xml @@ -5,7 +5,7 @@ - + diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-2-retrieve-bgz.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-2-retrieve-bgz.xml index 007bdb8a8b..796e10411f 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-2-retrieve-bgz.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Retrieving-XIS/bgz-msz-xis-1-2-retrieve-bgz.xml @@ -5,7 +5,7 @@ - + diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-json.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-json.xml index 1ca36f9aa2..33301eedf9 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-json.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-json.xml @@ -13,7 +13,7 @@ - + diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-xml.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-xml.xml index 795744ab7f..e4a16ff7a1 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-xml.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-xml.xml @@ -13,7 +13,7 @@ - + diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-json.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-json.xml index 82a577ce2a..909a82cff3 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-json.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-json.xml @@ -13,7 +13,7 @@ - + @@ -7643,9 +7643,9 @@ diff --git a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-xml.xml b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-xml.xml index bbf3b6f554..2e51e3202d 100644 --- a/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-xml.xml +++ b/dev/FHIR3-0-2-BgZ-MSZ-1-2/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-xml.xml @@ -13,7 +13,7 @@ - + @@ -7643,9 +7643,9 @@ - + - + - + @@ -434,56 +434,56 @@ - + - + - + - + - + - + - + - + @@ -518,42 +518,42 @@ - + - + - + - + - + - + @@ -574,98 +574,98 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -721,35 +721,35 @@ - + - + - + - + - + @@ -770,7 +770,7 @@ - + @@ -905,19 +905,19 @@ - + - + - + - + - + - + @@ -1085,44 +1085,44 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1145,34 +1145,34 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -1185,74 +1185,74 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1290,29 +1290,29 @@ - + - + - + - + - + - + - + - + - + - + @@ -1325,9 +1325,9 @@ - + - + @@ -1350,10 +1350,10 @@ - + - + @@ -1375,10 +1375,10 @@ - + - + @@ -1459,7 +1459,7 @@ - + @@ -1485,7 +1485,7 @@ - + @@ -1511,7 +1511,7 @@ - + @@ -1537,7 +1537,7 @@ - + @@ -1563,7 +1563,7 @@ - + @@ -1589,7 +1589,7 @@ - + @@ -1615,7 +1615,7 @@ - + @@ -1641,7 +1641,7 @@ - + @@ -1667,7 +1667,7 @@ - + @@ -1693,7 +1693,7 @@ - + @@ -1719,7 +1719,7 @@ - + @@ -1745,7 +1745,7 @@ - + @@ -1771,7 +1771,7 @@ - + @@ -1797,7 +1797,7 @@ - + @@ -1823,7 +1823,7 @@ - + @@ -1849,7 +1849,7 @@ - + @@ -1875,7 +1875,7 @@ - + @@ -1901,7 +1901,7 @@ - + @@ -1927,7 +1927,7 @@ - + @@ -1953,7 +1953,7 @@ - + @@ -1979,7 +1979,7 @@ - + @@ -2005,7 +2005,7 @@ - + @@ -2031,7 +2031,7 @@ - + @@ -2057,7 +2057,7 @@ - + @@ -2080,12 +2080,12 @@ - + - + - + @@ -2106,12 +2106,12 @@ - + - + - + @@ -2132,12 +2132,12 @@ - + - + - + @@ -2161,7 +2161,7 @@ - + @@ -2187,7 +2187,7 @@ - + @@ -2213,7 +2213,7 @@ - + @@ -2239,7 +2239,7 @@ - + @@ -2265,7 +2265,7 @@ - + @@ -2291,7 +2291,7 @@ - + @@ -2317,7 +2317,7 @@ - + @@ -2343,7 +2343,7 @@ - + @@ -2369,7 +2369,7 @@ - + @@ -2395,7 +2395,7 @@ - + @@ -2421,7 +2421,7 @@ - + @@ -2447,7 +2447,7 @@ - + @@ -2473,7 +2473,7 @@ - + @@ -2499,7 +2499,7 @@ - + @@ -2525,7 +2525,7 @@ - + @@ -2551,7 +2551,7 @@ - + @@ -2577,7 +2577,7 @@ - + @@ -2603,7 +2603,7 @@ - + @@ -2629,7 +2629,7 @@ - + @@ -2655,7 +2655,7 @@ - + @@ -2681,7 +2681,7 @@ - + @@ -2707,7 +2707,7 @@ - + @@ -2733,7 +2733,7 @@ - + @@ -2759,7 +2759,7 @@ - + @@ -2785,7 +2785,7 @@ - + @@ -2811,7 +2811,7 @@ - + @@ -2837,7 +2837,7 @@ - + @@ -2863,7 +2863,7 @@ - + @@ -2889,7 +2889,7 @@ - + @@ -2915,7 +2915,7 @@ - + @@ -2941,7 +2941,7 @@ - + @@ -2967,7 +2967,7 @@ - + @@ -2993,7 +2993,7 @@ - + @@ -3016,12 +3016,12 @@ - + - + - + @@ -3042,12 +3042,12 @@ - + - + - + @@ -3068,12 +3068,12 @@ - + - + - + @@ -3094,12 +3094,12 @@ - + - + - + @@ -3120,12 +3120,12 @@ - + - + - + @@ -3146,12 +3146,12 @@ - + - + - + @@ -3172,12 +3172,12 @@ - + - + - + @@ -3198,12 +3198,12 @@ - + - + - + @@ -3227,7 +3227,7 @@ - + @@ -3253,7 +3253,7 @@ - + @@ -3279,7 +3279,7 @@ - + @@ -3305,7 +3305,7 @@ - + @@ -3328,12 +3328,12 @@ - + - + - + @@ -3354,12 +3354,12 @@ - + - + - + @@ -3380,12 +3380,12 @@ - + - + - + @@ -3406,12 +3406,12 @@ - + - + - + @@ -3432,12 +3432,12 @@ - + - + - + @@ -3458,12 +3458,12 @@ - + - + - + @@ -3484,12 +3484,12 @@ - + - + - + @@ -3510,12 +3510,12 @@ - + - + - + @@ -3536,12 +3536,12 @@ - + - + - + @@ -3562,12 +3562,12 @@ - + - + - + @@ -3588,12 +3588,12 @@ - + - + - + @@ -3614,12 +3614,12 @@ - + - + - + @@ -3640,12 +3640,12 @@ - + - + - + @@ -3666,12 +3666,12 @@ - + - + - + @@ -3692,12 +3692,12 @@ - + - + - + @@ -3718,12 +3718,12 @@ - + - + - + @@ -3744,12 +3744,12 @@ - + - + - + @@ -3770,12 +3770,12 @@ - + - + - + @@ -3796,12 +3796,12 @@ - + - + - + @@ -3822,12 +3822,12 @@ - + - + - + @@ -3851,7 +3851,7 @@ - + @@ -3877,7 +3877,7 @@ - + @@ -3903,7 +3903,7 @@ - + @@ -3929,7 +3929,7 @@ - + @@ -3955,7 +3955,7 @@ - + @@ -3981,7 +3981,7 @@ - + @@ -4007,7 +4007,7 @@ - + @@ -4030,12 +4030,12 @@ - + - + - + @@ -4056,12 +4056,12 @@ - + - + - + @@ -4082,12 +4082,12 @@ - + - + - + @@ -4108,12 +4108,12 @@ - + - + - + @@ -4134,12 +4134,12 @@ - + - + - + @@ -4163,7 +4163,7 @@ - + @@ -4189,7 +4189,7 @@ - + @@ -4212,12 +4212,12 @@ - + - + - + @@ -4241,7 +4241,7 @@ - +