Skip to content

Commit 5f1b7b3

Browse files
eyhlaieyhlai
committed
Merge remote-tracking branch 'origin/MP9-3.0.0-rc.1' into NICTIZ-34243
2 parents 61a53ef + 4f33de1 commit 5f1b7b3

File tree

901 files changed

+176646
-3632
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

901 files changed

+176646
-3632
lines changed

‎Configuration/QualificationTokens.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@
10821082
},
10831083
{
10841084
"accessToken": "Bearer 988c42b3-738c-11f0-b558-0800200c9a66",
1085-
"resourceId": "nl-core-Patient-mp9-AvandeXXX_Toorn",
1085+
"resourceId": "nl-core-Patient-mp9-AvandeXXX-Toorn",
10861086
"familyName": "XXX_Toorn",
10871087
"bsn": "999908868",
10881088
"qualificationScript": "MP9 Cert"
@@ -1309,4 +1309,4 @@
13091309
"bsn": "999909162",
13101310
"qualificationScript": "MP9 3-beta"
13111311
}
1312-
]
1312+
]

‎Configuration/package.version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package.nictiz.fhir.nl.stu3.images = 1.0.3
66
package.nictiz.fhir.nl.stu3.questionnaires = 2.0.8
77
package.nictiz.fhir.nl.stu3.zib2017 = 2.2.18
88
package.nictiz.fhir.nl.stu3.zib2020-preadopt = 0.1.3
9-
package.nictiz.fhir.nl.r4.medicationprocess9 = 2.0.0-beta.6
9+
package.nictiz.fhir.nl.r4.medicationprocess9 = 2.0.0-rc.1
1010
package.nictiz.fhir.nl.r4.immunization = 2.0.0
1111
package.nictiz.fhir.nl.r4.patientcorrections = 1.0.6
1212
package.hl7.fhir.uv.sdc = 2.0.0

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receive/MVE-script3-json.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
<use value="work"/>
1515
</telecom>
1616
</contact>
17+
<<<<<<< HEAD:output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receive/MVE-script3-json.xml
1718
<description value="Scenario 3.x - Receive MedicationData for H. XXX_Kerkhoff."/>
19+
=======
20+
<description value="Scenario 3.8c - Receive PrescrProcessing for C van de XXX_Voortman."/>
21+
>>>>>>> origin/MP9-3.0.0-rc.1:output/R4/MP9-3-0-0-beta/MO/Test/PrescrProcessing/Receiving-System/3-8c-Stoppen-parallelle-TA-json.xml
1822
<origin>
1923
<extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
2024
<valueBoolean value="false"/>

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receive/MVE-script3-xml.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
<use value="work"/>
1515
</telecom>
1616
</contact>
17+
<<<<<<< HEAD:output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receive/MVE-script3-xml.xml
1718
<description value="Scenario 3.x - Receive MedicationData for H. XXX_Kerkhoff."/>
19+
=======
20+
<description value="Scenario 3.8c - Receive PrescrProcessing for C van de XXX_Voortman."/>
21+
>>>>>>> origin/MP9-3.0.0-rc.1:output/R4/MP9-3-0-0-beta/MO/Test/PrescrProcessing/Receiving-System/3-8c-Stoppen-parallelle-TA-xml.xml
1822
<origin>
1923
<extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
2024
<valueBoolean value="false"/>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
{ "goal" : "Cert",
3+
"fhirVersion" : "R4",
4+
"informationStandard" : "MP9 3.0.0-rc.1",
5+
"usecase" : "MO",
6+
"role" :
7+
{ "name" : "Receiving-System",
8+
"description" : "System that receives information from a sending system" },
9+
"category" : "MedicationData",
10+
"fhirPackage" :
11+
[
12+
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
13+
"version" : "2.0.0-rc.1" } ],
14+
"serverAlias" : "nictiz" }

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieve/MedicationAdministration/CONS-MTD-Scenarioset12a.xml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
3+
<id value="mp9-Consolidation-MedicationAdministration-retrieve-12a-x"/>
4+
<url value="http://nictiz.nl/fhir/TestScript/mp9-Consolidation-MedicationAdministration-retrieve-12a-x"/>
5+
<version value="r4-mp9-3.0.0-beta-patchlevel 2025.31"/>
6+
<name value="Medication Process 9 3.0.0-beta - Consolidation - MedicationAdministration - Retrieve - Scenario 12a.x"/>
7+
<status value="active"/>
8+
<publisher value="Nictiz"/>
9+
<contact>
10+
<name value="Nictiz"/>
11+
<telecom>
12+
<system value="email"/>
13+
<value value="[email protected]"/>
14+
<use value="work"/>
15+
</telecom>
16+
</contact>
17+
<description value="Scenario 12a.x - TEST Medicatiegegevens Scenarioset 12a (Consolidatie)"/>
18+
<origin>
19+
<extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
20+
<valueBoolean value="true"/>
21+
</extension>
22+
<index value="1"/>
23+
<profile>
24+
<system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
25+
<code value="FHIR-Client"/>
26+
</profile>
27+
</origin>
28+
<destination>
29+
<extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
30+
<valueBoolean value="false"/>
31+
</extension>
32+
<index value="1"/>
33+
<profile>
34+
<system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
35+
<code value="FHIR-Server"/>
36+
</profile>
37+
</destination>
38+
<test id="Scenario-12a-x">
39+
<name value="Scenario 12a.x"/>
40+
<description value="TEST Medicatiegegevens Scenarioset 12a (Consolidatie)"/>
41+
<action>
42+
<operation>
43+
<type>
44+
<system value="http://hl7.org/fhir/restful-interaction"/>
45+
<code value="search"/>
46+
</type>
47+
<resource value=""/>
48+
<description value="Test client to retrieve resource(s) representing MP9 building block MedicationAdministration"/>
49+
<destination value="1"/>
50+
<encodeRequestUrl value="true"/>
51+
<origin value="1"/>
52+
<params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909204&amp;category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
53+
</operation>
54+
</action>
55+
<action>
56+
<assert>
57+
<description value="Make sure that the server of the test simulator gives a success response."/>
58+
<operator value="in"/>
59+
<responseCode value="200,201"/>
60+
<stopTestOnFail value="true"/>
61+
<warningOnly value="false"/>
62+
</assert>
63+
</action>
64+
<action>
65+
<assert>
66+
<description value="Confirm that the server of the test simulator returns a Bundle."/>
67+
<direction value="response"/>
68+
<resource value="Bundle"/>
69+
<stopTestOnFail value="false"/>
70+
<warningOnly value="false"/>
71+
</assert>
72+
</action>
73+
<action>
74+
<assert>
75+
<description value="Confirm that the returned searchset Bundle contains 4 resource(s). "/>
76+
<direction value="response"/>
77+
<expression value="Bundle.entry.where(resource.is()).count() = 4"/>
78+
<stopTestOnFail value="false"/>
79+
<warningOnly value="false"/>
80+
</assert>
81+
</action>
82+
<action>
83+
<assert>
84+
<description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 4 and 2 Medication resources.)"/>
85+
<direction value="response"/>
86+
<expression value="Bundle.entry.count() &gt;= 6"/>
87+
<stopTestOnFail value="false"/>
88+
<warningOnly value="false"/>
89+
</assert>
90+
</action>
91+
</test>
92+
</TestScript>

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieve/MedicationAdministration/CONS-MTD-Scenarioset12b.xml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
3+
<id value="mp9-Consolidation-MedicationAdministration-retrieve-12b-x"/>
4+
<url value="http://nictiz.nl/fhir/TestScript/mp9-Consolidation-MedicationAdministration-retrieve-12b-x"/>
5+
<version value="r4-mp9-3.0.0-beta-patchlevel 2025.31"/>
6+
<name value="Medication Process 9 3.0.0-beta - Consolidation - MedicationAdministration - Retrieve - Scenario 12b.x"/>
7+
<status value="active"/>
8+
<publisher value="Nictiz"/>
9+
<contact>
10+
<name value="Nictiz"/>
11+
<telecom>
12+
<system value="email"/>
13+
<value value="[email protected]"/>
14+
<use value="work"/>
15+
</telecom>
16+
</contact>
17+
<description value="Scenario 12b.x - TEST Medicatiegegevens Scenarioset 12b (Consolidatie)"/>
18+
<origin>
19+
<extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
20+
<valueBoolean value="true"/>
21+
</extension>
22+
<index value="1"/>
23+
<profile>
24+
<system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
25+
<code value="FHIR-Client"/>
26+
</profile>
27+
</origin>
28+
<destination>
29+
<extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
30+
<valueBoolean value="false"/>
31+
</extension>
32+
<index value="1"/>
33+
<profile>
34+
<system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
35+
<code value="FHIR-Server"/>
36+
</profile>
37+
</destination>
38+
<test id="Scenario-12b-x">
39+
<name value="Scenario 12b.x"/>
40+
<description value="TEST Medicatiegegevens Scenarioset 12b (Consolidatie)"/>
41+
<action>
42+
<operation>
43+
<type>
44+
<system value="http://hl7.org/fhir/restful-interaction"/>
45+
<code value="search"/>
46+
</type>
47+
<resource value=""/>
48+
<description value="Test client to retrieve resource(s) representing MP9 building block MedicationAdministration"/>
49+
<destination value="1"/>
50+
<encodeRequestUrl value="true"/>
51+
<origin value="1"/>
52+
<params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909216&amp;category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
53+
</operation>
54+
</action>
55+
<action>
56+
<assert>
57+
<description value="Make sure that the server of the test simulator gives a success response."/>
58+
<operator value="in"/>
59+
<responseCode value="200,201"/>
60+
<stopTestOnFail value="true"/>
61+
<warningOnly value="false"/>
62+
</assert>
63+
</action>
64+
<action>
65+
<assert>
66+
<description value="Confirm that the server of the test simulator returns a Bundle."/>
67+
<direction value="response"/>
68+
<resource value="Bundle"/>
69+
<stopTestOnFail value="false"/>
70+
<warningOnly value="false"/>
71+
</assert>
72+
</action>
73+
<action>
74+
<assert>
75+
<description value="Confirm that the returned searchset Bundle contains 4 resource(s). "/>
76+
<direction value="response"/>
77+
<expression value="Bundle.entry.where(resource.is()).count() = 4"/>
78+
<stopTestOnFail value="false"/>
79+
<warningOnly value="false"/>
80+
</assert>
81+
</action>
82+
<action>
83+
<assert>
84+
<description value="Confirm that the returned searchset Bundle contains at least 5 entries. (Consists of 4 and 1 Medication resources.)"/>
85+
<direction value="response"/>
86+
<expression value="Bundle.entry.count() &gt;= 5"/>
87+
<stopTestOnFail value="false"/>
88+
<warningOnly value="false"/>
89+
</assert>
90+
</action>
91+
</test>
92+
</TestScript>

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieve/MedicationAdministration/CONS-MTD-Scenarioset12o.xml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
3+
<id value="mp9-Consolidation-MedicationAdministration-retrieve-12o-x"/>
4+
<url value="http://nictiz.nl/fhir/TestScript/mp9-Consolidation-MedicationAdministration-retrieve-12o-x"/>
5+
<version value="r4-mp9-3.0.0-beta-patchlevel 2025.31"/>
6+
<name value="Medication Process 9 3.0.0-beta - Consolidation - MedicationAdministration - Retrieve - Scenario 12o.x"/>
7+
<status value="active"/>
8+
<publisher value="Nictiz"/>
9+
<contact>
10+
<name value="Nictiz"/>
11+
<telecom>
12+
<system value="email"/>
13+
<value value="[email protected]"/>
14+
<use value="work"/>
15+
</telecom>
16+
</contact>
17+
<description value="Scenario 12o.x - TEST Medicatiegegevens Scenarioset 12o (Consolidatie)"/>
18+
<origin>
19+
<extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
20+
<valueBoolean value="true"/>
21+
</extension>
22+
<index value="1"/>
23+
<profile>
24+
<system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
25+
<code value="FHIR-Client"/>
26+
</profile>
27+
</origin>
28+
<destination>
29+
<extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
30+
<valueBoolean value="false"/>
31+
</extension>
32+
<index value="1"/>
33+
<profile>
34+
<system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
35+
<code value="FHIR-Server"/>
36+
</profile>
37+
</destination>
38+
<test id="Scenario-12o-x">
39+
<name value="Scenario 12o.x"/>
40+
<description value="TEST Medicatiegegevens Scenarioset 12o (Consolidatie)"/>
41+
<action>
42+
<operation>
43+
<type>
44+
<system value="http://hl7.org/fhir/restful-interaction"/>
45+
<code value="search"/>
46+
</type>
47+
<resource value=""/>
48+
<description value="Test client to retrieve resource(s) representing MP9 building block MedicationAdministration"/>
49+
<destination value="1"/>
50+
<encodeRequestUrl value="true"/>
51+
<origin value="1"/>
52+
<params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908868&amp;category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
53+
</operation>
54+
</action>
55+
<action>
56+
<assert>
57+
<description value="Make sure that the server of the test simulator gives a success response."/>
58+
<operator value="in"/>
59+
<responseCode value="200,201"/>
60+
<stopTestOnFail value="true"/>
61+
<warningOnly value="false"/>
62+
</assert>
63+
</action>
64+
<action>
65+
<assert>
66+
<description value="Confirm that the server of the test simulator returns a Bundle."/>
67+
<direction value="response"/>
68+
<resource value="Bundle"/>
69+
<stopTestOnFail value="false"/>
70+
<warningOnly value="false"/>
71+
</assert>
72+
</action>
73+
<action>
74+
<assert>
75+
<description value="Confirm that the returned searchset Bundle contains 4 resource(s). "/>
76+
<direction value="response"/>
77+
<expression value="Bundle.entry.where(resource.is()).count() = 4"/>
78+
<stopTestOnFail value="false"/>
79+
<warningOnly value="false"/>
80+
</assert>
81+
</action>
82+
<action>
83+
<assert>
84+
<description value="Confirm that the returned searchset Bundle contains at least 5 entries. (Consists of 4 and 1 Medication resources.)"/>
85+
<direction value="response"/>
86+
<expression value="Bundle.entry.count() &gt;= 5"/>
87+
<stopTestOnFail value="false"/>
88+
<warningOnly value="false"/>
89+
</assert>
90+
</action>
91+
</test>
92+
</TestScript>

0 commit comments

Comments
 (0)