Skip to content

Nictiz 33770 #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2025
Merged

Nictiz 33770 #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
454961a
NICTIZ-33770 work in progress - first updates to TestScripts VLK casus 3
VGiakoumi Sep 11, 2025
225f059
NICTIZ-33770 work in progress - updates to TestScripts VLK casus 3
VGiakoumi Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Geboortezorg-3-0/Cert/PHR-Client/gbz-fhir3-0-2-izk-phr-4-3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<name value="Nictiz Geboortezorg - Client - Scenario 4.3 - Retrieve Integrale Zwangerschapskaart resources of Micha Yassien-Mohamed (perinatal and maternal death)"/>
<description value="Scenario 4.3: Retrieve Integrale Zwangerschapskaart resources of Micha Yassien-Mohamed (perinatal and maternal death)"/>
<nts:authToken patientResourceId="MICHAXXX-Yassien-Mohamed"/>
<nts:fixture id="episodeofcare-fixture" href="Verloskunde-Casus3/medmij-gbz-bc-MaternalRecord-ca7cf58a-200b-417c-acb5-8aa6a6e692d5.xml"/>
<nts:fixture id="episodeofcare-fixture" href="Verloskunde-Casus3/mm-gbz-bc-MaternalRecord-7fec6c37-6aed-11ec-0000-020000000000.xml"/>
<variable><name value="episode-id"/><expression value="EpisodeOfCare.id"/><sourceId value="episodeofcare-fixture"/></variable>
<variable><name value="T"/><defaultValue value="${CURRENTDATE}"/></variable>

Expand Down
44 changes: 35 additions & 9 deletions src/Geboortezorg-3-0/Cert/XIS-Server/gbz-fhir3-0-2-izk-xis-4-3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<nts:with-parameter name="count" value="1"/>
<nts:with-parameter name="atLeast"/>
</nts:include>
<nts:contentAsserts href="Verloskunde-Casus3/medmij-gbz-nl-core-patient-MICHAXXX-Yassien-Mohamed.xml"
<nts:contentAsserts href="Verloskunde-Casus3/MICHA-M-XXX-YASSIEN-MOHAMED.xml"
nts:in-targets="CheckContent"/>
</test>

Expand Down Expand Up @@ -77,7 +77,7 @@
<description value="Test Server query operation for MaternalRecord (EpisodeOfCare) including managing organization (Organization) and care manager (Practitioner)"/>
<nts:include value="medmij/test.xis.successfulSearch" scope="common">
<nts:with-parameter name="resource" value="EpisodeOfCare"/>
<nts:with-parameter name="params" value="?type=http://snomed.info/sct|364320009&amp;_include=EpisodeOfCare:organization&amp;_include=EpisodeOfCare:care-manager"/>
<nts:with-parameter name="params" value="?type=http://snomed.info/sct|364320009&amp;_include=EpisodeOfCare:organization&amp;_include=EpisodeOfCare:care-manager"/> <!--in de fixture heten de elementen managingOrganization en careManager, hoe werkt dit hier?-->
<nts:with-parameter name="responseId" value="fixture-5-ServeMaternalRecord"/>
</nts:include>
<nts:include value="assert.response.numResources"
Expand All @@ -92,7 +92,7 @@
scope="common"
resource="Practitioner"
count="1"/>
<nts:contentAsserts href="Verloskunde-Casus3/medmij-gbz-bc-MaternalRecord-ca7cf58a-200b-417c-acb5-8aa6a6e692d5.xml"
<nts:contentAsserts href="Verloskunde-Casus3/mm-gbz-bc-MaternalRecord-7fec6c37-6aed-11ec-0000-020000000000.xml"
nts:in-targets="CheckContent"/>
</test>

Expand All @@ -113,6 +113,7 @@
<nts:with-parameter name="code" value="118185001"/>
<nts:with-parameter name="system" value="http://snomed.info/sct"/>
</nts:include>
<!--VG: moet hier een content assert komen?-->
</test>

<!-- Encounters -->
Expand All @@ -133,11 +134,11 @@
<nts:with-parameter name="count" value="2"/>
<nts:with-parameter name="code" value="11429006"/>
</nts:include>
<nts:contentAsserts href="Verloskunde-Casus3/medmij-gbz-bc-Encounter-aefcd71f-074a-4cd6-ab78-4e4ae3b4cd33.xml"
<nts:contentAsserts href="Verloskunde-Casus3/mm-gbz-bc-Encounter-1e6a5fff-6b29-11ec-1275-020000000000.xml"
selector="iif(Bundle.entry.resource.ofType(Encounter).where(type.where(coding.code='11429006'))[0].period.start &lt; Bundle.entry.resource.ofType(Encounter).where(type.where(coding.code='11429006'))[1].period.start, Bundle.entry.resource.ofType(Encounter).where(type.where(coding.code='11429006'))[0], Bundle.entry.resource.ofType(Encounter).where(type.where(coding.code='11429006'))[1])"
nts:in-targets="CheckContent">
</nts:contentAsserts>
<nts:contentAsserts href="Verloskunde-Casus3/medmij-gbz-bc-Encounter-c15a2ac6-4fb1-4147-a9c9-0f4ad3f61be1.xml"
<nts:contentAsserts href="Verloskunde-Casus3/mm-gbz-bc-Encounter-5d92cb4f-6b2e-11ec-1275-020000000000.xml"
selector="iif(Bundle.entry.resource.ofType(Encounter).where(type.where(coding.code='11429006'))[0].period.start &gt; Bundle.entry.resource.ofType(Encounter).where(type.where(coding.code='11429006'))[1].period.start, Bundle.entry.resource.ofType(Encounter).where(type.where(coding.code='11429006'))[0], Bundle.entry.resource.ofType(Encounter).where(type.where(coding.code='11429006'))[1])"
nts:in-targets="CheckContent">
</nts:contentAsserts>
Expand Down Expand Up @@ -167,23 +168,23 @@
<nts:with-parameter name="code" value="11996-6"/>
<nts:with-parameter name="system" value="http://loinc.org"/>
</nts:include>
<!-- a terme datum -->
<!-- geschatte a terme datum -->
<nts:include value="gbz-assert-returnCountWithCode">
<nts:with-parameter name="additionalDescription" value="(geschatte a terme datum)"/>
<nts:with-parameter name="resource" value="Observation"/>
<nts:with-parameter name="count" value="1"/>
<nts:with-parameter name="code" value="161714006"/>
<nts:with-parameter name="system" value="http://snomed.info/sct"/>
</nts:include>
<nts:contentAsserts href="Verloskunde-Casus3/medmij-gbz-zib-Pregnancy-Parity-11977-6-9680b939-560e-472e-9ad5-1ee9b62873ea.xml"
<nts:contentAsserts href="Verloskunde-Casus3/mm-gbz-zib-Pregnancy-Parity11977-6-8657760f-6ab3-11ec-2334-020000000000.xml"
nts:in-targets="CheckContent">
<nts:discriminator>code.where(coding.where(code='11977-6'))</nts:discriminator>
</nts:contentAsserts>
<nts:contentAsserts href="Verloskunde-Casus3/medmij-gbz-zib-Pregnancy-Gravidity-11996-6-7eea12fa-8dbf-4957-9500-931888b76138.xml"
<nts:contentAsserts href="Verloskunde-Casus3/mm-gbz-zib-Pregnancy-Gravidity11996-6-83c5900b-6b72-11ec-2334-020000000000.xml"
nts:in-targets="CheckContent">
<nts:discriminator>code.where(coding.where(code='11996-6'))</nts:discriminator>
</nts:contentAsserts>
<nts:contentAsserts href="Verloskunde-Casus3/medmij-gbz-zib-PregnancyObservation-161714006-96430b3a-55b6-4b26-8f1d-bb2d0ae5d034.xml"
<nts:contentAsserts href="Verloskunde-Casus3/mm-gbz-bc-PregnancyObservation161714006-0230ba02-6ad4-11ec-2334-020000000000.xml"
nts:in-targets="CheckContent">
<nts:discriminator>code.where(coding.where(code='161714006'))</nts:discriminator>
</nts:contentAsserts>
Expand All @@ -197,7 +198,32 @@
<nts:with-parameter name="resource" value="Observation"/>
<nts:with-parameter name="params" value="?context:Encounter.episodeofcare=EpisodeOfCare/${episode-id}"/>
</nts:include>
<!--aantal levende foetussen-->
<nts:include value="gbz-assert-returnCountWithCode">
<nts:with-parameter name="additionalDescription" value="(bloeddruk)"/>
<nts:with-parameter name="resource" value="Observation"/>
<nts:with-parameter name="count" value="1"/>
<nts:with-parameter name="code" value="142931000146106"/>
<nts:with-parameter name="system" value="http://snomed.info/sct"/>
</nts:include>
<nts:contentAsserts href="Verloskunde-Casus3/mm-gbz-bc-PregnancyObservation142931000146106-8b7853cb-6ae4-11ec-2214-020000000000.xml"
nts:in-targets="CheckContent">
<nts:discriminator>code.where(coding.where(code=142931000146106))</nts:discriminator>
</nts:contentAsserts>
<!--Bloeddruk panel-->
<nts:include value="gbz-assert-returnCountWithCode">
<nts:with-parameter name="additionalDescription" value="(bloeddruk)"/>
<nts:with-parameter name="resource" value="Observation"/>
<nts:with-parameter name="count" value="1"/>
<nts:with-parameter name="code" value="85354-9"/>
<nts:with-parameter name="system" value="http://loinc.org"/>
</nts:include>
<nts:contentAsserts href="Verloskunde-Casus3/mm-gbz-zib-BloodPressure85354-9-0899e443-6b74-11ec-2106-020000000000.xml"
nts:in-targets="CheckContent">
<nts:discriminator>code.where(coding.where(code=85354-9))</nts:discriminator>
</nts:contentAsserts>
<!-- foetale sterfte -->
<!--kan deze fixture op basis van code niet terugvinden - later checken wat hier aan de hand is?-->
<nts:include value="gbz-assert-returnCountWithCode">
<nts:with-parameter name="additionalDescription" value="(bloeddruk)"/>
<nts:with-parameter name="resource" value="Observation"/>
Expand Down