Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,9 @@
</action>
<action>
<assert>
<description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
<description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
<direction value="request"/>
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
<stopTestOnFail value="false"/>
<warningOnly value="false"/>
</assert>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,9 @@
</action>
<action>
<assert>
<description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
<description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
<direction value="request"/>
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
<stopTestOnFail value="false"/>
<warningOnly value="false"/>
</assert>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,9 @@
</action>
<action>
<assert>
<description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
<description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
<direction value="request"/>
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
<stopTestOnFail value="false"/>
<warningOnly value="false"/>
</assert>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@
</action>
<action>
<assert>
<description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
<description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
<direction value="request"/>
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
<expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
<stopTestOnFail value="false"/>
<warningOnly value="false"/>
</assert>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"fhirPackage" :
[
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
"version" : "2.0.0-rc.1" } ],
"version" : "2.0.0-rc.2" } ],
"serverAlias" : "nictiz" }
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@
</request>
</entry>
<entry>
<fullUrl value="urn:uuid:17593a5d-6b14-11ec-0000-020000000000"/>
<fullUrl value="urn:uuid:db879a5d-6b3e-11ec-0000-020000000000"/>
<resource>
<MedicationRequest>
<meta>
Expand Down Expand Up @@ -402,7 +402,7 @@
</div>
</text>
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-RegistrationDateTime">
<valueDateTime value="${DATE, T, D, -12}T11:30:00+02:00"/>
<valueDateTime value="${DATE, T, D, -12}T11:24:00+02:00"/>
</extension>
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-RenderedDosageInstruction">
<valueString value="3 maal per dag 1 stuk en Bij pijn 1 stuk 's avonds, oraal"/>
Expand Down Expand Up @@ -591,7 +591,7 @@
</tr>
<tr>
<th>Volledige doseerinstructie</th>
<td>1 maal per 4 dagen stuks, oraal</td>
<td>4 maal per dag 1 stuk, oraal</td>
</tr>
<tr>
<th>Gebruiksduur</th>
Expand All @@ -600,10 +600,12 @@
<tr>
<th>Doseerinstructie</th>
<td>
<div>Timing: <div>eenmalig per 4 dagen</div>
<div>Timing: <div>4 maal per dag</div>
</div>
<div>Toedieningsweg: <span title="oraal (9 - G-Standaard thesaurus subtabel 0007)">oraal</span>
</div>
<div>Dosering: <div>Dosering: 1 Stuk</div>
</div>
</td>
</tr>
</tbody>
Expand All @@ -614,7 +616,7 @@
<valueDateTime value="${DATE, T, D, +7}T09:30:00+02:00"/>
</extension>
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-RenderedDosageInstruction">
<valueString value="1 maal per 4 dagen stuks, oraal"/>
<valueString value="4 maal per dag 1 stuk, oraal"/>
</extension>
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-TimeInterval.Period">
<valuePeriod>
Expand Down Expand Up @@ -688,8 +690,8 @@
<dosageInstruction>
<timing>
<repeat>
<frequency value="1"/>
<period value="4"/>
<frequency value="4"/>
<period value="1"/>
<periodUnit value="d"/>
</repeat>
</timing>
Expand All @@ -700,6 +702,22 @@
<display value="oraal"/>
</coding>
</route>
<doseAndRate>
<doseQuantity>
<extension url="http://hl7.org/fhir/StructureDefinition/iso21090-PQ-translation">
<valueQuantity>
<value value="1"/>
<unit value="Stuk"/>
<system value="urn:oid:2.16.840.1.113883.2.4.4.1.900.2"/>
<code value="245"/>
</valueQuantity>
</extension>
<value value="1"/>
<unit value="Stuk"/>
<system value="http://unitsofmeasure.org"/>
<code value="1"/>
</doseQuantity>
</doseAndRate>
</dosageInstruction>
<priorPrescription>
<type value="MedicationRequest"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</tr>
<tr>
<th>Volledige doseerinstructie</th>
<td>1 maal per 4 dagen stuks, oraal</td>
<td>4 maal per dag 1 stuk, oraal</td>
</tr>
<tr>
<th>Gebruiksduur</th>
Expand All @@ -44,10 +44,12 @@
<tr>
<th>Doseerinstructie</th>
<td>
<div>Timing: <div>eenmalig per 4 dagen</div>
<div>Timing: <div>4 maal per dag</div>
</div>
<div>Toedieningsweg: <span title="oraal (9 - G-Standaard thesaurus subtabel 0007)">oraal</span>
</div>
<div>Dosering: <div>Dosering: 1 Stuk</div>
</div>
</td>
</tr>
</tbody>
Expand All @@ -58,7 +60,7 @@
<valueDateTime value="${DATE, T, D, +7}T09:30:00+02:00"/>
</extension>
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-RenderedDosageInstruction">
<valueString value="1 maal per 4 dagen stuks, oraal"/>
<valueString value="4 maal per dag 1 stuk, oraal"/>
</extension>
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-TimeInterval.Period">
<valuePeriod>
Expand Down Expand Up @@ -132,8 +134,8 @@
<dosageInstruction>
<timing>
<repeat>
<frequency value="1"/>
<period value="4"/>
<frequency value="4"/>
<period value="1"/>
<periodUnit value="d"/>
</repeat>
</timing>
Expand All @@ -144,6 +146,22 @@
<display value="oraal"/>
</coding>
</route>
<doseAndRate>
<doseQuantity>
<extension url="http://hl7.org/fhir/StructureDefinition/iso21090-PQ-translation">
<valueQuantity>
<value value="1"/>
<unit value="Stuk"/>
<system value="urn:oid:2.16.840.1.113883.2.4.4.1.900.2"/>
<code value="245"/>
</valueQuantity>
</extension>
<value value="1"/>
<unit value="Stuk"/>
<system value="http://unitsofmeasure.org"/>
<code value="1"/>
</doseQuantity>
</doseAndRate>
</dosageInstruction>
<priorPrescription>
<type value="MedicationRequest"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</div>
</text>
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-RegistrationDateTime">
<valueDateTime value="${DATE, T, D, -12}T11:30:00+02:00"/>
<valueDateTime value="${DATE, T, D, -12}T11:24:00+02:00"/>
</extension>
<extension url="http://nictiz.nl/fhir/StructureDefinition/ext-RenderedDosageInstruction">
<valueString value="3 maal per dag 1 stuk en Bij pijn 1 stuk 's avonds, oraal"/>
Expand Down
Loading