lib/fhir_models/examples/xml/medicationstatementexample6.xml in fhir_models-3.0.4 vs lib/fhir_models/examples/xml/medicationstatementexample6.xml in fhir_models-4.0.0

- old
+ new

@@ -1,26 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?><MedicationStatement xmlns="http://hl7.org/fhir"> +<?xml version="1.0" encoding="UTF-8"?> +<MedicationStatement xmlns="http://hl7.org/fhir"> <id value="example006"/> - <text><status value="generated"/><div xmlns="http://www.w3.org/1999/xhtml"><p><b>Generated Narrative with Details</b></p><p><b>id</b>: example006</p><p><b>status</b>: active</p><p><b>medication</b>: Amoxicillin (product) <span>(Details : {SNOMED CT code &#39;27658006&#39; = &#39;p-Hydroxyampicillin&#39;, given as &#39;Amoxicillin (product)&#39;})</span></p><p><b>effective</b>: Feb 1, 2014</p><p><b>dateAsserted</b>: Feb 22, 2014</p><p><b>informationSource</b>: <a>Peter Chalmers</a></p><p><b>subject</b>: <a>Donald Duck</a></p><p><b>taken</b>: n</p><p><b>note</b>: Father indicates they miss the occasional dose</p><p><b>dosage</b>: </p></div></text><status value="active"/> + <meta> + <security> + <system value="http://terminology.hl7.org/CodeSystem/v3-ActReason"/> + <code value="HTEST"/> + <display value="test health data"/> + </security> + </meta> + <status value="active"/> <medicationCodeableConcept> <coding> <system value="http://snomed.info/sct"/> <code value="27658006"/> <display value="Amoxicillin (product)"/> </coding> </medicationCodeableConcept> + <subject> + <reference value="Patient/pat1"/> + <display value="Donald Duck"/> + </subject> <effectiveDateTime value="2014-02-01"/> <dateAsserted value="2014-02-22"/> <informationSource> <reference value="RelatedPerson/peter"/> <display value="Peter Chalmers"/> </informationSource> - <subject> - <reference value="Patient/pat1"/> - <display value="Donald Duck"/> - </subject> - <taken value="n"/> + + <note> <text value="Father indicates they miss the occasional dose"/> </note> <dosage> <sequence value="1"/> @@ -31,16 +40,26 @@ <system value="http://snomed.info/sct"/> <code value="260548002"/> <display value="Oral"/> </coding> </route> - <doseQuantity> - <value value="5"/> - <unit value="mL"/> - <system value="http://unitsofmeasure.org"/> - <code value="mL"/> - </doseQuantity> + <doseAndRate> + <type> + <coding> + <system value="http://terminology.hl7.org/CodeSystem/dose-rate-type"/> + <code value="ordered"/> + <display value="Ordered"/> + </coding> + </type> + <doseQuantity> + <value value="5"/> + <unit value="mL"/> + <system value="http://unitsofmeasure.org"/> + <code value="mL"/> + </doseQuantity> + </doseAndRate> + <maxDosePerPeriod> <numerator> <value value="3"/> </numerator> <denominator> @@ -48,6 +67,6 @@ <system value="http://unitsofmeasure.org"/> <code value="d"/> </denominator> </maxDosePerPeriod> </dosage> -</MedicationStatement> \ No newline at end of file +</MedicationStatement>