Merge pull request #412 from Nictiz/NICTIZ-30974

Nictiz-30974: Added BgZ-MSZ 2.0.0-beta.3

Author: Ashwin-nictiz

Configuration/roles.properties

@@ -1,4 +1,4 @@
-roles = PHR-Client, XIS-Server, Sending-System, Receiving-System, Serving-System, Retrieving-System, Retrieving-XIS, Serving-XIS, Retrieving-PHR, Sending-PHR, Receiving-XIS
+roles = PHR-Client, XIS-Server, Sending-System, Receiving-System, Serving-System, Retrieving-System, Retrieving-XIS, Serving-XIS, Validation-Retrieving-XIS, Validation-Serving-XIS, Retrieving-PHR, Sending-PHR, Receiving-XIS
 role.description.PHR-Client = Personal Health Record (PHR/PGO) in MedMij context
 role.description.XIS-Server = XIS (DVA) in MedMij context
 role.description.Sending-System = System that sends information to a receiving system
@@ -7,6 +7,8 @@ role.description.Serving-System = Server that can be queried by a client (Retrie
 role.description.Retrieving-System = Client that queries information from a server (Serving-System)
 role.description.Serving-XIS = XIS that can be queried by a client
 role.description.Retrieving-XIS = XIS that queries information from a server
+role.description.Validation-Serving-XIS = XIS that can be queried by a client for validation
+role.description.Validation-Retrieving-XIS = XIS that queries information from a server for validation
 role.description.Retrieving-PHR = PHR that queries information from a server
 role.description.Sending-PHR = PHR that sends information to a receiving 
 role.description.Receiving-XIS = XIS that receives information from a sending system

output/STU3/BgZ-MSZ-2-0/Retrieve-BgZ/Cert/Retrieving-XIS/bgz-msz-xis-1-1-retrieve-bgz.xml

@@ -3,7 +3,7 @@
    <id value="bgz-msz-xis-1-1-retrieve-bgz"/>
    <url value="http://nictiz.nl/fhir/TestScript/bgz-msz-xis-1-1-retrieve-bgz"/>
    <version value="stu3-3.0-patchlevel 2025.35"/>
-   <name value="BgZ MSZ - PHR Client - Scenario 1.1 - Retrieve BgZ resources of J houten"/>
+   <name value="BgZ MSZ - Client - Scenario 1.1 - Retrieve BgZ resources of J houten"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
    <contact>

output/STU3/BgZ-MSZ-2-0/Retrieve-BgZ/Cert/Retrieving-XIS/bgz-msz-xis-1-2-retrieve-bgz.xml

@@ -3,7 +3,7 @@
    <id value="bgz-msz-xis-1-2-retrieve-bgz"/>
    <url value="http://nictiz.nl/fhir/TestScript/bgz-msz-xis-1-2-retrieve-bgz"/>
    <version value="stu3-3.0-patchlevel 2025.35"/>
-   <name value="BgZ MSZ - PHR Client - Scenario 1.2 - retrieve BgZ resources of M B Bergzoon-Verheul"/>
+   <name value="BgZ MSZ - Client - Scenario 1.2 - retrieve BgZ resources of M B Bergzoon-Verheul"/>
    <status value="active"/>
    <publisher value="Nictiz"/>
    <contact>
@@ -395,15 +395,6 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <action>
-         <assert>
-            <description value="Confirm that the response Bundle contains 1 Provenance resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(Provenance)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
    </test>
    <test id="08-retrieve-LivingSituation">
       <name value="Scenario 1.2 - LivingSituation"/>

output/STU3/BgZ-MSZ-2-0/Retrieve-BgZ/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-json.xml

@@ -4083,7 +4083,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_revinclude=Provenance:target&amp;patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909587&amp;code=http://snomed.info/sct|387713003,http://snomed.info/sct|258174001"/>
+            <params value="?_revinclude=Provenance:target&amp;patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909587&amp;category=http://snomed.info/sct|387713003,http://snomed.info/sct|258174001"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${patient-token-id}"/>
@@ -4626,7 +4626,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_revinclude=Provenance:target&amp;patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909587&amp;status=active&amp;_include=CareTeam:participant"/>
+            <params value="?_revinclude=Provenance:target&amp;status=active&amp;_include=CareTeam:participant"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${patient-token-id}"/>

output/STU3/BgZ-MSZ-2-0/Retrieve-BgZ/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-1-serve-bgz-xml.xml

@@ -4083,7 +4083,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_revinclude=Provenance:target&amp;patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909587&amp;code=http://snomed.info/sct|387713003,http://snomed.info/sct|258174001"/>
+            <params value="?_revinclude=Provenance:target&amp;patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909587&amp;category=http://snomed.info/sct|387713003,http://snomed.info/sct|258174001"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${patient-token-id}"/>
@@ -4626,7 +4626,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_revinclude=Provenance:target&amp;patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909587&amp;status=active&amp;_include=CareTeam:participant"/>
+            <params value="?_revinclude=Provenance:target&amp;status=active&amp;_include=CareTeam:participant"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${patient-token-id}"/>

output/STU3/BgZ-MSZ-2-0/Retrieve-BgZ/Cert/Serving-XIS-CheckContent/bgz-msz-xis-1-2-serve-bgz-json.xml

@@ -1334,15 +1334,6 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <action>
-         <assert>
-            <description value="Confirm that the response Bundle contains 1 Provenance resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(Provenance)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
    </test>
    <test id="08-serve-LivingSituation">
       <name value="Scenario 1.2 - LivingSituation"/>
@@ -1705,6 +1696,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
+      <action>
+         <assert>
+            <description value="Confirm that the response Bundle contains 1 Provenance resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(Provenance)).count() = 1"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
    </test>
    <test id="10-serve-AlcoholUse">
       <name value="Scenario 1.2 - AlcoholUse"/>
@@ -4653,7 +4653,7 @@
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?_revinclude=Provenance:target&amp;patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999911259&amp;status=active&amp;_include=CareTeam:participant"/>
+            <params value="?_revinclude=Provenance:target&amp;status=active&amp;_include=CareTeam:participant"/>
             <requestHeader>
                <field value="Authorization"/>
                <value value="${patient-token-id}"/>