Skip to content

Commit 5a3655a

Browse files
eyhlaieyhlai
committed
NICTIZ-34243 Testscripts opnieuw gegenereerd
1 parent 9e433b4 commit 5a3655a

File tree

71 files changed

+650
-942
lines changed

Some content is hidden

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

71 files changed

+650
-942
lines changed

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationPrescription/Receiving-System/script9-stop-json.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@
192192
</action>
193193
<action>
194194
<assert>
195-
<description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
195+
<description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
196196
<direction value="request"/>
197-
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
197+
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
198198
<stopTestOnFail value="false"/>
199199
<warningOnly value="false"/>
200200
</assert>

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationPrescription/Receiving-System/script9-stop-xml.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@
192192
</action>
193193
<action>
194194
<assert>
195-
<description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
195+
<description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
196196
<direction value="request"/>
197-
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
197+
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
198198
<stopTestOnFail value="false"/>
199199
<warningOnly value="false"/>
200200
</assert>

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationPrescription/Sending-System-Nictiz-intern/script9-stop.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,9 @@
206206
</action>
207207
<action>
208208
<assert>
209-
<description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
209+
<description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
210210
<direction value="request"/>
211-
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
211+
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
212212
<stopTestOnFail value="false"/>
213213
<warningOnly value="false"/>
214214
</assert>

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationPrescription/Sending-System/script9-stop.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,9 @@
193193
</action>
194194
<action>
195195
<assert>
196-
<description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
196+
<description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
197197
<direction value="request"/>
198-
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
198+
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
199199
<stopTestOnFail value="false"/>
200200
<warningOnly value="false"/>
201201
</assert>

‎output/R4/MP9-3-0-0-beta/MO/Cert/_reference/fixtures/av-mp-va-kwal-script7-v30.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
"value": 2,
199199
"unit": "dag",
200200
"system": "http://unitsofmeasure.org",
201-
"code": "dag"
201+
"code": "d"
202202
},
203203
"whenHandedOver": "${DATE, T, D, -1}T09:10:00+02:00"
204204
},

‎output/R4/MP9-3-0-0-beta/MO/Cert/_reference/fixtures/av-mp-va-kwal-script7-v30.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
<value value="2"/>
270270
<unit value="dag"/>
271271
<system value="http://unitsofmeasure.org"/>
272-
<code value="dag"/>
272+
<code value="d"/>
273273
</daysSupply>
274274
<whenHandedOver value="${DATE, T, D, -1}T09:10:00+02:00"/>
275275
</MedicationDispense>

‎output/R4/MP9-3-0-0-beta/MO/Cert/_reference/fixtures/av-mp-va-kwal-script8-stop-v30.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"type": "transaction",
88
"entry": [ {
9-
"fullUrl": "urn:uuid:786ba9a8-6b17-11ec-0000-020000000000",
9+
"fullUrl": "urn:uuid:2d513b22-6b2d-11ec-0000-020000000000",
1010
"resource": {
1111
"resourceType": "MedicationDispense",
1212
"meta": {
@@ -21,6 +21,15 @@
2121
"div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n <table>\n <caption>MedicationDispense. Subject: Patient, J. XXX_Laan. Id: MBH_300_SCRIPT8_TA_STAKEN (urn:oid:2.16.840.1.113883.2.4.3.11.999.77.422037009.1), Categorie: <span title=\"toedieningsafspraak (422037009 - SNOMED CT)\">toedieningsafspraak</span>, Status: onbekend<span style=\"display: block;\">Uitvoerende: Healthcare provider (organization), Apotheek De Gulle Gaper</span>\n </caption>\n <tbody>\n <tr>\n <th>Medicamenteuze behandel-id</th>\n <td>MBH_300_SCRIPT8 (urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1)</td>\n </tr>\n <tr>\n <th>Gebaseerd op</th>\n <td>\n <div>Medicamenteuze behandel-id: MBH_300_SCRIPT8 (urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1)</div>relatie naar medicatieafspraak met identificatie: MBH_300_SCRIPT8_MA_STAKEN || 2.16.840.1.113883.2.4.3.11.999.77.16076005.1 (Id: MBH_300_SCRIPT8_MA_STAKEN (urn:oid:2.16.840.1.113883.2.4.3.11.999.77.16076005.1))</td>\n </tr>\n <tr>\n <th>Uitvoerende</th>\n <td>\n <div>Healthcare provider (organization), Apotheek De Gulle Gaper</div>\n </td>\n </tr>\n <tr>\n <th>Medicatie</th>\n <td>FRAXIPARINE FORTE INJV 11400IE/0,6ML(19000IE/ML)WW</td>\n </tr>\n <tr>\n <th>Doseerinstructie</th>\n <td>\n <div>Timing: <div>12:00</div>\n </div>\n <div>Toedieningsweg: <span title=\"subcutaan (21 - G-Standaard thesaurus subtabel 0007)\">subcutaan</span>\n </div>\n <div>Dosering: <div>Dosering: 0.6 milliliter</div>\n </div>\n </td>\n </tr>\n </tbody>\n </table>\n </div>"
2222
},
2323
"extension": [ {
24+
"url": "http://nictiz.nl/fhir/StructureDefinition/ext-AdministrationAgreement.ReasonModificationOrDiscontinuation",
25+
"valueCodeableConcept": {
26+
"coding": [ {
27+
"system": "http://snomed.info/sct",
28+
"code": "62014003",
29+
"display": "ongewenste reactie op medicatie en/of drugs"
30+
} ]
31+
}
32+
}, {
2433
"url": "http://nictiz.nl/fhir/StructureDefinition/ext-RegistrationDateTime",
2534
"valueDateTime": "${DATE, T, D, +0}T09:10:00+02:00"
2635
}, {

‎output/R4/MP9-3-0-0-beta/MO/Cert/_reference/fixtures/av-mp-va-kwal-script8-stop-v30.xml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</meta>
66
<type value="transaction"/>
77
<entry>
8-
<fullUrl value="urn:uuid:786ba9a8-6b17-11ec-0000-020000000000"/>
8+
<fullUrl value="urn:uuid:2d513b22-6b2d-11ec-0000-020000000000"/>
99
<resource>
1010
<MedicationDispense>
1111
<meta>
@@ -56,6 +56,15 @@
5656
</table>
5757
</div>
5858
</text>
59+
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-AdministrationAgreement.ReasonModificationOrDiscontinuation">
60+
<valueCodeableConcept>
61+
<coding>
62+
<system value="http://snomed.info/sct"/>
63+
<code value="62014003"/>
64+
<display value="ongewenste reactie op medicatie en/of drugs"/>
65+
</coding>
66+
</valueCodeableConcept>
67+
</extension>
5968
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-RegistrationDateTime">
6069
<valueDateTime value="${DATE, T, D, +0}T09:10:00+02:00"/>
6170
</extension>

‎output/R4/MP9-3-0-0-beta/MO/Cert/_reference/fixtures/mg-mp-mg-kwal-MA-script9-v30.xml‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@
331331
</request>
332332
</entry>
333333
<entry>
334-
<fullUrl value="urn:uuid:17593a5d-6b14-11ec-0000-020000000000"/>
334+
<fullUrl value="urn:uuid:db879a5d-6b3e-11ec-0000-020000000000"/>
335335
<resource>
336336
<MedicationRequest>
337337
<meta>
@@ -402,7 +402,7 @@
402402
</div>
403403
</text>
404404
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-RegistrationDateTime">
405-
<valueDateTime value="${DATE, T, D, -12}T11:30:00+02:00"/>
405+
<valueDateTime value="${DATE, T, D, -12}T11:24:00+02:00"/>
406406
</extension>
407407
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-RenderedDosageInstruction">
408408
<valueString value="3 maal per dag 1 stuk en Bij pijn 1 stuk 's avonds, oraal"/>
@@ -591,7 +591,7 @@
591591
</tr>
592592
<tr>
593593
<th>Volledige doseerinstructie</th>
594-
<td>1 maal per 4 dagen stuks, oraal</td>
594+
<td>4 maal per dag 1 stuk, oraal</td>
595595
</tr>
596596
<tr>
597597
<th>Gebruiksduur</th>
@@ -600,10 +600,12 @@
600600
<tr>
601601
<th>Doseerinstructie</th>
602602
<td>
603-
<div>Timing: <div>eenmalig per 4 dagen</div>
603+
<div>Timing: <div>4 maal per dag</div>
604604
</div>
605605
<div>Toedieningsweg: <span title="oraal (9 - G-Standaard thesaurus subtabel 0007)">oraal</span>
606606
</div>
607+
<div>Dosering: <div>Dosering: 1 Stuk</div>
608+
</div>
607609
</td>
608610
</tr>
609611
</tbody>
@@ -614,7 +616,7 @@
614616
<valueDateTime value="${DATE, T, D, +7}T09:30:00+02:00"/>
615617
</extension>
616618
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-RenderedDosageInstruction">
617-
<valueString value="1 maal per 4 dagen stuks, oraal"/>
619+
<valueString value="4 maal per dag 1 stuk, oraal"/>
618620
</extension>
619621
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-TimeInterval.Period">
620622
<valuePeriod>
@@ -688,8 +690,8 @@
688690
<dosageInstruction>
689691
<timing>
690692
<repeat>
691-
<frequency value="1"/>
692-
<period value="4"/>
693+
<frequency value="4"/>
694+
<period value="1"/>
693695
<periodUnit value="d"/>
694696
</repeat>
695697
</timing>
@@ -700,6 +702,22 @@
700702
<display value="oraal"/>
701703
</coding>
702704
</route>
705+
<doseAndRate>
706+
<doseQuantity>
707+
<extension url="http://hl7.org/fhir/StructureDefinition/iso21090-PQ-translation">
708+
<valueQuantity>
709+
<value value="1"/>
710+
<unit value="Stuk"/>
711+
<system value="urn:oid:2.16.840.1.113883.2.4.4.1.900.2"/>
712+
<code value="245"/>
713+
</valueQuantity>
714+
</extension>
715+
<value value="1"/>
716+
<unit value="Stuk"/>
717+
<system value="http://unitsofmeasure.org"/>
718+
<code value="1"/>
719+
</doseQuantity>
720+
</doseAndRate>
703721
</dosageInstruction>
704722
<priorPrescription>
705723
<type value="MedicationRequest"/>

‎output/R4/MP9-3-0-0-beta/MO/Cert/_reference/fixtures/mp-MedAgr-mp9-MBH300SCRIPT9MAANNULERING.xml‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</tr>
3636
<tr>
3737
<th>Volledige doseerinstructie</th>
38-
<td>1 maal per 4 dagen stuks, oraal</td>
38+
<td>4 maal per dag 1 stuk, oraal</td>
3939
</tr>
4040
<tr>
4141
<th>Gebruiksduur</th>
@@ -44,10 +44,12 @@
4444
<tr>
4545
<th>Doseerinstructie</th>
4646
<td>
47-
<div>Timing: <div>eenmalig per 4 dagen</div>
47+
<div>Timing: <div>4 maal per dag</div>
4848
</div>
4949
<div>Toedieningsweg: <span title="oraal (9 - G-Standaard thesaurus subtabel 0007)">oraal</span>
5050
</div>
51+
<div>Dosering: <div>Dosering: 1 Stuk</div>
52+
</div>
5153
</td>
5254
</tr>
5355
</tbody>
@@ -58,7 +60,7 @@
5860
<valueDateTime value="${DATE, T, D, +7}T09:30:00+02:00"/>
5961
</extension>
6062
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-RenderedDosageInstruction">
61-
<valueString value="1 maal per 4 dagen stuks, oraal"/>
63+
<valueString value="4 maal per dag 1 stuk, oraal"/>
6264
</extension>
6365
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-TimeInterval.Period">
6466
<valuePeriod>
@@ -132,8 +134,8 @@
132134
<dosageInstruction>
133135
<timing>
134136
<repeat>
135-
<frequency value="1"/>
136-
<period value="4"/>
137+
<frequency value="4"/>
138+
<period value="1"/>
137139
<periodUnit value="d"/>
138140
</repeat>
139141
</timing>
@@ -144,6 +146,22 @@
144146
<display value="oraal"/>
145147
</coding>
146148
</route>
149+
<doseAndRate>
150+
<doseQuantity>
151+
<extension url="http://hl7.org/fhir/StructureDefinition/iso21090-PQ-translation">
152+
<valueQuantity>
153+
<value value="1"/>
154+
<unit value="Stuk"/>
155+
<system value="urn:oid:2.16.840.1.113883.2.4.4.1.900.2"/>
156+
<code value="245"/>
157+
</valueQuantity>
158+
</extension>
159+
<value value="1"/>
160+
<unit value="Stuk"/>
161+
<system value="http://unitsofmeasure.org"/>
162+
<code value="1"/>
163+
</doseQuantity>
164+
</doseAndRate>
147165
</dosageInstruction>
148166
<priorPrescription>
149167
<type value="MedicationRequest"/>

0 commit comments

Comments
 (0)