Skip to content

Commit 217fc30

Browse files
lisaDekker-nictizlisaDekker-nictiz
committed
Resolve conflicts by accepting INCOMING changes
2 parents d31b458 + 0cc89c4 commit 217fc30

File tree

1,296 files changed

+110208
-9348
lines changed

Some content is hidden

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

1,296 files changed

+110208
-9348
lines changed

‎Configuration/QualificationTokens.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@
10961096
},
10971097
{
10981098
"accessToken": "Bearer 988c42b3-738c-11f0-b558-0800200c9a66",
1099-
"resourceId": "nl-core-Patient-mp9-AXXX_Toorn",
1099+
"resourceId": "nl-core-Patient-mp9-AvandeXXX-Toorn",
11001100
"familyName": "XXX_Toorn",
11011101
"bsn": "999908868",
11021102
"qualificationScript": "MP9 Cert"

‎Configuration/QualificationTokens.xml‎

Lines changed: 1313 additions & 0 deletions
Large diffs are not rendered by default.

‎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.2
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

‎buildscripts/MP9-3-complete.bat‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
@setlocal enabledelayedexpansion
22
@echo off
33

4-
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"
4+
@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"
5+
echo.ant MP9-3-0-0-beta_Test...
6+
call ant -f ..\src\build-multiple.xml -Dinput.dirs="src/MP9-3-0-0-beta/Test" >MP9-3-0-0-beta_Test.log
57

8+
echo.ant MP9-3-0-0-beta_Test-MedMij...
9+
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
10+
11+
echo.ant MP9-3-0-0-beta_Cert...
12+
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
13+
14+
echo.ant MP9-3-0-0-beta_Cert-MedMij...
15+
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
16+
17+
echo.Done
618
pause

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
{ "goal" : "Cert",
33
"fhirVersion" : "R4",
4-
"informationStandard" : "MP9 3.0.0-beta.3",
4+
"informationStandard" : "MP9 3.0.0-rc.1",
55
"usecase" : "MO",
66
"role" :
77
{ "name" : "Receiving-System",
@@ -10,5 +10,5 @@
1010
"fhirPackage" :
1111
[
1212
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
13-
"version" : "2.0.0-beta.6" } ],
13+
"version" : "2.0.0-rc.3" } ],
1414
"serverAlias" : "nictiz" }

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,11 @@
7676
<warningOnly value="false"/>
7777
</assert>
7878
</action>
79-
<action>
80-
<assert>
81-
<description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
82-
<direction value="response"/>
83-
<expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
84-
<stopTestOnFail value="false"/>
85-
<warningOnly value="false"/>
86-
</assert>
87-
</action>
79+
<!-- NICTIZ-35941 -->
80+
<!--<nts:include value="assert-returnCount" scope="project">
81+
<nts:with-parameter name="resource" value="MedicationDispense"/>
82+
<nts:with-parameter name="count" value="3"/>
83+
</nts:include> -->
8884
<action>
8985
<assert>
9086
<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‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,11 @@
7676
<warningOnly value="false"/>
7777
</assert>
7878
</action>
79-
<action>
80-
<assert>
81-
<description value="Confirm that the returned searchset Bundle contains 2 MedicationDispense resource(s). "/>
82-
<direction value="response"/>
83-
<expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
84-
<stopTestOnFail value="false"/>
85-
<warningOnly value="false"/>
86-
</assert>
87-
</action>
79+
<!-- NICTIZ-35941 -->
80+
<!-- <nts:include value="assert-returnCount" scope="project">
81+
<nts:with-parameter name="resource" value="MedicationDispense"/>
82+
<nts:with-parameter name="count" value="2"/>
83+
</nts:include> -->
8884
<action>
8985
<assert>
9086
<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‎

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-AdministrationAgreement-retrieve-10-x"/>
4+
<url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-retrieve-10-x"/>
5+
<version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
6+
<name value="Medication Process 9 3.0.0-beta - AdministrationAgreement - Retrieve - Scenario 10.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 10.x - KWAL Medicatiegegevens TA Script 10 (filterqueries pre-livegang kwalificatie)"/>
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-10-x">
39+
<name value="Scenario 10.x"/>
40+
<description value="KWAL Medicatiegegevens TA Script 10 (filterqueries pre-livegang kwalificatie)"/>
41+
<action>
42+
<operation>
43+
<type>
44+
<system value="http://hl7.org/fhir/restful-interaction"/>
45+
<code value="search"/>
46+
</type>
47+
<resource value="MedicationDispense"/>
48+
<description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
49+
<destination value="1"/>
50+
<encodeRequestUrl value="true"/>
51+
<origin value="1"/>
52+
<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"/>
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 5 MedicationDispense resource(s). "/>
76+
<direction value="response"/>
77+
<expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 5"/>
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 8 entries. (Consists of 5 MedicationDispense and 3 Medication resources.)"/>
85+
<direction value="response"/>
86+
<expression value="Bundle.entry.count() &gt;= 8"/>
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/Retrieving-System/AdministrationAgreement/TA-Scenarioset9.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-AdministrationAgreement-retrieve-9-x"/>
4+
<url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-retrieve-9-x"/>
5+
<version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
6+
<name value="Medication Process 9 3.0.0-beta - AdministrationAgreement - Retrieve - Scenario 9.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 9.x - KWAL Medicatiegegevens TA script 9"/>
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-9-x">
39+
<name value="Scenario 9.x"/>
40+
<description value="KWAL Medicatiegegevens TA script 9"/>
41+
<action>
42+
<operation>
43+
<type>
44+
<system value="http://hl7.org/fhir/restful-interaction"/>
45+
<code value="search"/>
46+
</type>
47+
<resource value="MedicationDispense"/>
48+
<description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
49+
<destination value="1"/>
50+
<encodeRequestUrl value="true"/>
51+
<origin value="1"/>
52+
<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"/>
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 8 MedicationDispense resource(s). "/>
76+
<direction value="response"/>
77+
<expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 8"/>
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 9 entries. (Consists of 8 MedicationDispense and 1 Medication resources.)"/>
85+
<direction value="response"/>
86+
<expression value="Bundle.entry.count() &gt;= 9"/>
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/Retrieving-System/AdministrationAgreement/properties.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
{ "goal" : "Cert",
33
"fhirVersion" : "R4",
4-
"informationStandard" : "MP9 3.0.0-beta.3",
4+
"informationStandard" : "MP9 3.0.0-rc.1",
55
"usecase" : "MO",
66
"role" :
77
{ "name" : "Retrieving-System",
@@ -11,5 +11,5 @@
1111
"fhirPackage" :
1212
[
1313
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
14-
"version" : "2.0.0-beta.6" } ],
14+
"version" : "2.0.0-rc.3" } ],
1515
"serverAlias" : "nictiz" }

0 commit comments

Comments
 (0)