Mp9 3.0.0 rc.1

Configuration/QualificationTokens.json

@@ -1096,7 +1096,7 @@
     },
     {
         "accessToken": "Bearer 988c42b3-738c-11f0-b558-0800200c9a66",
-        "resourceId": "nl-core-Patient-mp9-AXXX_Toorn",
+        "resourceId": "nl-core-Patient-mp9-AvandeXXX-Toorn",
         "familyName": "XXX_Toorn",
         "bsn": "999908868",
         "qualificationScript": "MP9 Cert"

Configuration/package.version.properties

@@ -6,7 +6,7 @@ package.nictiz.fhir.nl.stu3.images = 1.0.3
 package.nictiz.fhir.nl.stu3.questionnaires = 2.0.8
 package.nictiz.fhir.nl.stu3.zib2017 = 2.2.18
 package.nictiz.fhir.nl.stu3.zib2020-preadopt = 0.1.3
-package.nictiz.fhir.nl.r4.medicationprocess9 = 2.0.0-beta.6
+package.nictiz.fhir.nl.r4.medicationprocess9 = 2.0.0-rc.2
 package.nictiz.fhir.nl.r4.immunization = 2.0.0
 package.nictiz.fhir.nl.r4.patientcorrections = 1.0.6
 package.hl7.fhir.uv.sdc = 2.0.0

buildscripts/MP9-3-complete.bat

@@ -1,6 +1,18 @@
 @setlocal enabledelayedexpansion
 @echo off
 
-call ant -f ..\src\build-multiple.xml -Dinput.dirs="src/MP9-3-0-0-beta/Test, src/MP9-3-0-0-beta/Test-MedMij, src/MP9-3-0-0-beta/Cert, src/MP9-3-0-0-beta/Cert-MedMij"
+@REM call ant -f ..\src\build-multiple.xml -Dinput.dirs="src/MP9-3-0-0-beta/Test, src/MP9-3-0-0-beta/Test-MedMij, src/MP9-3-0-0-beta/Cert, src/MP9-3-0-0-beta/Cert-MedMij"
+echo.ant MP9-3-0-0-beta_Test...
+call ant -f ..\src\build-multiple.xml -Dinput.dirs="src/MP9-3-0-0-beta/Test" >MP9-3-0-0-beta_Test.log
 
+echo.ant MP9-3-0-0-beta_Test-MedMij...
+call ant -f ..\src\build-multiple.xml -Dinput.dirs="src/MP9-3-0-0-beta/Test-MedMij" >MP9-3-0-0-beta_Test-MedMij.log
+
+echo.ant MP9-3-0-0-beta_Cert...
+call ant -f ..\src\build-multiple.xml -Dinput.dirs="src/MP9-3-0-0-beta/Cert, src/MP9-3-0-0-beta/Cert-MedMij" >MP9-3-0-0-beta_Cert.log
+
+echo.ant MP9-3-0-0-beta_Cert-MedMij...
+call ant -f ..\src\build-multiple.xml -Dinput.dirs="src/MP9-3-0-0-beta/Cert-MedMij" >MP9-3-0-0-beta_Cert-MedMij.log
+
+echo.Done
 pause

output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/properties.json

@@ -1,7 +1,7 @@
 
   { "goal" : "Cert",
     "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-beta.3",
+    "informationStandard" : "MP9 3.0.0-rc.1",
     "usecase" : "MO",
     "role" : 
     { "name" : "Receiving-System",
@@ -10,5 +10,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-beta.6" } ],
+        "version" : "2.0.0-rc.3" } ],
     "serverAlias" : "nictiz" }

output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml

@@ -75,15 +75,11 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
+      <!-- NICTIZ-35941 -->
+      <!--<nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="MedicationDispense"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include> -->
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>

output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml

@@ -75,15 +75,11 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
+      <!-- NICTIZ-35941 -->
+      <!-- <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="MedicationDispense"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include> -->
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationDispense and 2 Medication resources.)"/>

output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset10.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
+   <id value="mp9-AdministrationAgreement-retrieve-10-x"/>
+   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-retrieve-10-x"/>
+   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
+   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 10.x"/>
+   <status value="active"/>
+   <publisher value="Nictiz"/>
+   <contact>
+      <name value="Nictiz"/>
+      <telecom>
+         <system value="email"/>
+         <value value="[email protected]"/>
+         <use value="work"/>
+      </telecom>
+   </contact>
+   <description value="Scenario 10.x - KWAL Medicatiegegevens TA Script 10 (filterqueries pre-livegang kwalificatie)"/>
+   <origin>
+      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
+         <valueBoolean value="true"/>
+      </extension>
+      <index value="1"/>
+      <profile>
+         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
+         <code value="FHIR-Client"/>
+      </profile>
+   </origin>
+   <destination>
+      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
+         <valueBoolean value="false"/>
+      </extension>
+      <index value="1"/>
+      <profile>
+         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
+         <code value="FHIR-Server"/>
+      </profile>
+   </destination>
+   <test id="Scenario-10-x">
+      <name value="Scenario 10.x"/>
+      <description value="KWAL Medicatiegegevens TA Script 10 (filterqueries pre-livegang kwalificatie)"/>
+      <action>
+         <operation>
+            <type>
+               <system value="http://hl7.org/fhir/restful-interaction"/>
+               <code value="search"/>
+            </type>
+            <resource value="MedicationDispense"/>
+            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
+            <destination value="1"/>
+            <encodeRequestUrl value="true"/>
+            <origin value="1"/>
+            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908911&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
+         </operation>
+      </action>
+      <action>
+         <assert>
+            <description value="Make sure that the server of the test simulator gives a success response."/>
+            <operator value="in"/>
+            <responseCode value="200,201"/>
+            <stopTestOnFail value="true"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the server of the test simulator returns a Bundle."/>
+            <direction value="response"/>
+            <resource value="Bundle"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 5 MedicationDispense resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 5"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains at least 8 entries. (Consists of 5 MedicationDispense and 3 Medication resources.)"/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.count() &gt;= 8"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+   </test>
+</TestScript>

output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset9.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
+   <id value="mp9-AdministrationAgreement-retrieve-9-x"/>
+   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-retrieve-9-x"/>
+   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
+   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 9.x"/>
+   <status value="active"/>
+   <publisher value="Nictiz"/>
+   <contact>
+      <name value="Nictiz"/>
+      <telecom>
+         <system value="email"/>
+         <value value="[email protected]"/>
+         <use value="work"/>
+      </telecom>
+   </contact>
+   <description value="Scenario 9.x - KWAL Medicatiegegevens TA script 9"/>
+   <origin>
+      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
+         <valueBoolean value="true"/>
+      </extension>
+      <index value="1"/>
+      <profile>
+         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
+         <code value="FHIR-Client"/>
+      </profile>
+   </origin>
+   <destination>
+      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
+         <valueBoolean value="false"/>
+      </extension>
+      <index value="1"/>
+      <profile>
+         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
+         <code value="FHIR-Server"/>
+      </profile>
+   </destination>
+   <test id="Scenario-9-x">
+      <name value="Scenario 9.x"/>
+      <description value="KWAL Medicatiegegevens TA script 9"/>
+      <action>
+         <operation>
+            <type>
+               <system value="http://hl7.org/fhir/restful-interaction"/>
+               <code value="search"/>
+            </type>
+            <resource value="MedicationDispense"/>
+            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
+            <destination value="1"/>
+            <encodeRequestUrl value="true"/>
+            <origin value="1"/>
+            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908923&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
+         </operation>
+      </action>
+      <action>
+         <assert>
+            <description value="Make sure that the server of the test simulator gives a success response."/>
+            <operator value="in"/>
+            <responseCode value="200,201"/>
+            <stopTestOnFail value="true"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the server of the test simulator returns a Bundle."/>
+            <direction value="response"/>
+            <resource value="Bundle"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 8 MedicationDispense resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 8"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains at least 9 entries. (Consists of 8 MedicationDispense and 1 Medication resources.)"/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.count() &gt;= 9"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+   </test>
+</TestScript>

output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/properties.json

@@ -1,7 +1,7 @@
 
   { "goal" : "Cert",
     "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-beta.3",
+    "informationStandard" : "MP9 3.0.0-rc.1",
     "usecase" : "MO",
     "role" : 
     { "name" : "Retrieving-System",
@@ -11,5 +11,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-beta.6" } ],
+        "version" : "2.0.0-rc.3" } ],
     "serverAlias" : "nictiz" }

output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml

@@ -70,23 +70,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
+      <!-- NICTIZ-35941 -->
+      <!--<nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
+      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+         <nts:with-parameter name="count" value="3"/>
+         <nts:with-parameter name="breakdown"
+                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      </nts:include> -->
    </test>
 </TestScript>