Skip to content

Commit cd7de9d

Browse files
LilianMinneLilianMinne
committed
fix phr scrips echo count hc and bpd
1 parent f0c0671 commit cd7de9d

File tree

33 files changed

+2600
-2275
lines changed

33 files changed

+2600
-2275
lines changed

‎dev/FHIR3-0-2-Geboortezorg/Zwangerschapskaart_alpha/PHR-Client/gbz-fhir3-0-2-izk-phr-2-1.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -687,30 +687,6 @@
687687
<warningOnly value="false"/>
688688
</assert>
689689
</action>
690-
<!-- alcoholgebruik -->
691-
<action>
692-
<assert>
693-
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
694-
<valueBoolean value="false"/>
695-
</extension>
696-
<description value="Confirm that the returned searchset Bundle contains 1 Observation resource(s) with code http://snomed.info/sct | 228273003. (alcohol use)"/>
697-
<direction value="response"/>
698-
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://snomed.info/sct' and code = '228273003').count()=1).exists()"/>
699-
<warningOnly value="false"/>
700-
</assert>
701-
</action>
702-
<!-- tabakgebruik -->
703-
<action>
704-
<assert>
705-
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
706-
<valueBoolean value="false"/>
707-
</extension>
708-
<description value="Confirm that the returned searchset Bundle contains 1 Observation resource(s) with code http://snomed.info/sct | 365980008. (tobacco use)"/>
709-
<direction value="response"/>
710-
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://snomed.info/sct' and code = '365980008').count()=1).exists()"/>
711-
<warningOnly value="false"/>
712-
</assert>
713-
</action>
714690
<!-- woonsituatie -->
715691
<action>
716692
<assert>
@@ -1144,9 +1120,33 @@
11441120
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
11451121
<valueBoolean value="false"/>
11461122
</extension>
1147-
<description value="Confirm that the response Bundle contains 0 Observation resource(s). "/>
1123+
<description value="Confirm that the response Bundle contains 2 Observation resource(s). "/>
11481124
<direction value="response"/>
1149-
<expression value="Bundle.entry.where(resource.is(Observation)).count() = 0"/>
1125+
<expression value="Bundle.entry.where(resource.is(Observation)).count() = 2"/>
1126+
<warningOnly value="false"/>
1127+
</assert>
1128+
</action>
1129+
<!-- alcoholgebruik -->
1130+
<action>
1131+
<assert>
1132+
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
1133+
<valueBoolean value="false"/>
1134+
</extension>
1135+
<description value="Confirm that the returned searchset Bundle contains 1 Observation resource(s) with code http://snomed.info/sct | 228273003. (alcohol use)"/>
1136+
<direction value="response"/>
1137+
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://snomed.info/sct' and code = '228273003').count()=1).exists()"/>
1138+
<warningOnly value="false"/>
1139+
</assert>
1140+
</action>
1141+
<!-- tabakgebruik -->
1142+
<action>
1143+
<assert>
1144+
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
1145+
<valueBoolean value="false"/>
1146+
</extension>
1147+
<description value="Confirm that the returned searchset Bundle contains 1 Observation resource(s) with code http://snomed.info/sct | 365980008. (tobacco use)"/>
1148+
<direction value="response"/>
1149+
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://snomed.info/sct' and code = '365980008').count()=1).exists()"/>
11501150
<warningOnly value="false"/>
11511151
</assert>
11521152
</action>

‎dev/FHIR3-0-2-Geboortezorg/Zwangerschapskaart_alpha/PHR-Client/gbz-fhir3-0-2-izk-phr-2-2.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -879,18 +879,6 @@
879879
<warningOnly value="false"/>
880880
</assert>
881881
</action>
882-
<!-- alcoholgebruik -->
883-
<action>
884-
<assert>
885-
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
886-
<valueBoolean value="false"/>
887-
</extension>
888-
<description value="Confirm that the returned searchset Bundle contains 1 Observation resource(s) with code http://snomed.info/sct | 228273003. (alcohol use)"/>
889-
<direction value="response"/>
890-
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://snomed.info/sct' and code = '228273003').count()=1).exists()"/>
891-
<warningOnly value="false"/>
892-
</assert>
893-
</action>
894882
<!-- Apgar Score 10-minuten -->
895883
<action>
896884
<assert>
@@ -1023,18 +1011,6 @@
10231011
<warningOnly value="false"/>
10241012
</assert>
10251013
</action>
1026-
<!-- tabakgebruik -->
1027-
<action>
1028-
<assert>
1029-
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
1030-
<valueBoolean value="false"/>
1031-
</extension>
1032-
<description value="Confirm that the returned searchset Bundle contains 1 Observation resource(s) with code http://snomed.info/sct | 365980008. (tobacco use)"/>
1033-
<direction value="response"/>
1034-
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://snomed.info/sct' and code = '365980008').count()=1).exists()"/>
1035-
<warningOnly value="false"/>
1036-
</assert>
1037-
</action>
10381014
</test>
10391015
<test id="8b-RetrieveObservations">
10401016
<name value="8b-RetrieveObservations"/>
@@ -1096,9 +1072,33 @@
10961072
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
10971073
<valueBoolean value="false"/>
10981074
</extension>
1099-
<description value="Confirm that the response Bundle contains 0 Observation resource(s). "/>
1075+
<description value="Confirm that the response Bundle contains 2 Observation resource(s). "/>
11001076
<direction value="response"/>
1101-
<expression value="Bundle.entry.where(resource.is(Observation)).count() = 0"/>
1077+
<expression value="Bundle.entry.where(resource.is(Observation)).count() = 2"/>
1078+
<warningOnly value="false"/>
1079+
</assert>
1080+
</action>
1081+
<!-- alcoholgebruik -->
1082+
<action>
1083+
<assert>
1084+
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
1085+
<valueBoolean value="false"/>
1086+
</extension>
1087+
<description value="Confirm that the returned searchset Bundle contains 1 Observation resource(s) with code http://snomed.info/sct | 228273003. (alcohol use)"/>
1088+
<direction value="response"/>
1089+
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://snomed.info/sct' and code = '228273003').count()=1).exists()"/>
1090+
<warningOnly value="false"/>
1091+
</assert>
1092+
</action>
1093+
<!-- tabakgebruik -->
1094+
<action>
1095+
<assert>
1096+
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
1097+
<valueBoolean value="false"/>
1098+
</extension>
1099+
<description value="Confirm that the returned searchset Bundle contains 1 Observation resource(s) with code http://snomed.info/sct | 365980008. (tobacco use)"/>
1100+
<direction value="response"/>
1101+
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://snomed.info/sct' and code = '365980008').count()=1).exists()"/>
11021102
<warningOnly value="false"/>
11031103
</assert>
11041104
</action>

‎dev/FHIR3-0-2-Geboortezorg/Zwangerschapskaart_alpha/PHR-Client/gbz-fhir3-0-2-izk-phr-3-1.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -539,9 +539,9 @@
539539
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
540540
<valueBoolean value="false"/>
541541
</extension>
542-
<description value="Confirm that the returned searchset Bundle contains 2 Observation resource(s) with code http://loinc.org | 11820-8. (hoofdomtrek)"/>
542+
<description value="Confirm that the returned searchset Bundle contains 1 Observation resource(s) with code http://snomed.info/sct | 363812007. (hoofdomtrek)"/>
543543
<direction value="response"/>
544-
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://loinc.org' and code = '11820-8').count()=2).exists()"/>
544+
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://snomed.info/sct' and code = '363812007').count()=1).exists()"/>
545545
<warningOnly value="false"/>
546546
</assert>
547547
</action>
@@ -551,9 +551,9 @@
551551
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
552552
<valueBoolean value="false"/>
553553
</extension>
554-
<description value="Confirm that the returned searchset Bundle contains 2 Observation resource(s) with code http://loinc.org | 11820-8. (BPD)"/>
554+
<description value="Confirm that the returned searchset Bundle contains 1 Observation resource(s) with code http://loinc.org | 11820-8. (BPD)"/>
555555
<direction value="response"/>
556-
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://loinc.org' and code = '11820-8').count()=2).exists()"/>
556+
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://loinc.org' and code = '11820-8').count()=1).exists()"/>
557557
<warningOnly value="false"/>
558558
</assert>
559559
</action>

‎dev/FHIR3-0-2-Geboortezorg/Zwangerschapskaart_alpha/PHR-Client/gbz-fhir3-0-2-izk-phr-3-2.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -539,9 +539,9 @@
539539
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
540540
<valueBoolean value="false"/>
541541
</extension>
542-
<description value="Confirm that the returned searchset Bundle contains 2 Observation resource(s) with code http://loinc.org | 11820-8. (hoofdomtrek)"/>
542+
<description value="Confirm that the returned searchset Bundle contains 1 Observation resource(s) with code http://snomed.info/sct | 363812007. (hoofdomtrek)"/>
543543
<direction value="response"/>
544-
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://loinc.org' and code = '11820-8').count()=2).exists()"/>
544+
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://snomed.info/sct' and code = '363812007').count()=1).exists()"/>
545545
<warningOnly value="false"/>
546546
</assert>
547547
</action>
@@ -551,9 +551,9 @@
551551
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
552552
<valueBoolean value="false"/>
553553
</extension>
554-
<description value="Confirm that the returned searchset Bundle contains 2 Observation resource(s) with code http://loinc.org | 11820-8. (BPD)"/>
554+
<description value="Confirm that the returned searchset Bundle contains 1 Observation resource(s) with code http://loinc.org | 11820-8. (BPD)"/>
555555
<direction value="response"/>
556-
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://loinc.org' and code = '11820-8').count()=2).exists()"/>
556+
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://loinc.org' and code = '11820-8').count()=1).exists()"/>
557557
<warningOnly value="false"/>
558558
</assert>
559559
</action>

‎dev/FHIR3-0-2-Geboortezorg/Zwangerschapskaart_alpha/PHR-Client/gbz-fhir3-0-2-izk-phr-3-3.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -515,9 +515,9 @@
515515
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
516516
<valueBoolean value="false"/>
517517
</extension>
518-
<description value="Confirm that the returned searchset Bundle contains 2 Observation resource(s) with code http://loinc.org | 11820-8. (hoofdomtrek)"/>
518+
<description value="Confirm that the returned searchset Bundle contains 1 Observation resource(s) with code http://snomed.info/sct | 363812007. (hoofdomtrek)"/>
519519
<direction value="response"/>
520-
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://loinc.org' and code = '11820-8').count()=2).exists()"/>
520+
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://snomed.info/sct' and code = '363812007').count()=1).exists()"/>
521521
<warningOnly value="false"/>
522522
</assert>
523523
</action>
@@ -527,9 +527,9 @@
527527
<extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
528528
<valueBoolean value="false"/>
529529
</extension>
530-
<description value="Confirm that the returned searchset Bundle contains 2 Observation resource(s) with code http://loinc.org | 11820-8. (BPD)"/>
530+
<description value="Confirm that the returned searchset Bundle contains 1 Observation resource(s) with code http://loinc.org | 11820-8. (BPD)"/>
531531
<direction value="response"/>
532-
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://loinc.org' and code = '11820-8').count()=2).exists()"/>
532+
<expression value="Bundle.where(entry.where(resource.is(Observation)).resource.code.coding.where(system = 'http://loinc.org' and code = '11820-8').count()=1).exists()"/>
533533
<warningOnly value="false"/>
534534
</assert>
535535
</action>

0 commit comments

Comments
 (0)