lib/fhir_models/examples/xml/medicationexample15.xml in fhir_models-1.8.3 vs lib/fhir_models/examples/xml/medicationexample15.xml in fhir_models-3.0.1
- old
+ new
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?><Medication xmlns="http://hl7.org/fhir">
<id value="medexample015"/>
- <text><status value="generated"/><div xmlns="http://www.w3.org/1999/xhtml"><p><b>Generated Narrative with Details</b></p><p><b>id</b>: medexample015</p><p><b>contained</b>: , </p><p><b>code</b>: Capecitabine 500mg oral tablet (Xeloda) <span>(Details : {RxNorm code '213293' = '213293', given as 'Capecitabine 500mg oral tablet (Xeloda)'})</span></p><p><b>isBrand</b>: true</p><p><b>manufacturer</b>: id: org2; name: Gene Inc</p><blockquote><p><b>product</b></p><p><b>form</b>: Tablet dose form (qualifier value) <span>(Details : {SNOMED CT code '385055001' = 'Tablet dose form (qualifier value)', given as 'Tablet dose form (qualifier value)'})</span></p><h3>Ingredients</h3><table><tr><td>-</td><td><b>Item[x]</b></td><td><b>Amount</b></td></tr><tr><td>*</td><td>id: sub04; Capecitabine (substance) <span>(Details : {SNOMED CT code '386906001' = 'Capecitabine (substance)', given as 'Capecitabine (substance)'})</span></td><td>500 mg<span> (Details: UCUM code mg = 'mg')</span>/1 TAB<span> (Details: http://hl7.org/fhir/v3/orderableDrugForm code TAB = 'Tablet')</span></td></tr></table><h3>Batches</h3><table><tr><td>-</td><td><b>LotNumber</b></td><td><b>ExpirationDate</b></td></tr><tr><td>*</td><td>9494788</td><td>May 22, 2017</td></tr></table></blockquote><blockquote><p><b>package</b></p><p><b>container</b>: Bottle - unit of produce usage (qualifier value) <span>(Details : {SNOMED CT code '419672006' = 'Bottle - unit of product usage (qualifier value)', given as 'Bottle - unit of produce usage (qualifier value)'})</span></p><h3>Contents</h3><table><tr><td>-</td><td><b>Item[x]</b></td></tr><tr><td>*</td><td>Capecitabine 500mg tablets (product) <span>(Details : {SNOMED CT code '134622004' = 'Capecitabine 500mg tablet (product)', given as 'Capecitabine 500mg tablets (product)'})</span></td></tr></table></blockquote></div></text><contained>
+ <text><status value="generated"/><div xmlns="http://www.w3.org/1999/xhtml"><p><b>Generated Narrative with Details</b></p><p><b>id</b>: medexample015</p><p><b>contained</b>: , </p><p><b>code</b>: Capecitabine 500mg oral tablet (Xeloda) <span>(Details : {RxNorm code '213293' = '213293', given as 'Capecitabine 500mg oral tablet (Xeloda)'})</span></p><p><b>isBrand</b>: true</p><p><b>manufacturer</b>: id: org2; name: Gene Inc</p><p><b>form</b>: Tablet dose form (qualifier value) <span>(Details : {SNOMED CT code '385055001' = 'Tablet', given as 'Tablet dose form (qualifier value)'})</span></p><h3>Ingredients</h3><table><tr><td>-</td><td><b>Item[x]</b></td><td><b>Amount</b></td></tr><tr><td>*</td><td>id: sub04; Capecitabine (substance) <span>(Details : {SNOMED CT code '386906001' = 'Capecitabine', given as 'Capecitabine (substance)'})</span></td><td>500 mg<span> (Details: UCUM code mg = 'mg')</span>/1 TAB<span> (Details: http://hl7.org/fhir/v3/orderableDrugForm code TAB = 'Tablet')</span></td></tr></table><blockquote><p><b>package</b></p><p><b>container</b>: Bottle - unit of produce usage (qualifier value) <span>(Details : {SNOMED CT code '419672006' = 'Bottle', given as 'Bottle - unit of produce usage (qualifier value)'})</span></p><h3>Contents</h3><table><tr><td>-</td><td><b>Item[x]</b></td></tr><tr><td>*</td><td>Capecitabine 500mg tablets (product) <span>(Details : {SNOMED CT code '134622004' = 'Capecitabine 500mg tablet', given as 'Capecitabine 500mg tablets (product)'})</span></td></tr></table><h3>Batches</h3><table><tr><td>-</td><td><b>LotNumber</b></td><td><b>ExpirationDate</b></td></tr><tr><td>*</td><td>9494788</td><td>May 22, 2017</td></tr></table></blockquote></div></text><contained>
<Organization>
<id value="org2"/>
<name value="Gene Inc"/>
</Organization>
</contained>
@@ -27,11 +27,10 @@
</code>
<isBrand value="true"/>
<manufacturer>
<reference value="#org2"/>
</manufacturer>
- <product>
<form>
<coding>
<system value="http://snomed.info/sct"/>
<code value="385055001"/>
<display value="Tablet dose form (qualifier value)"/>
@@ -52,15 +51,12 @@
<system value="http://hl7.org/fhir/v3/orderableDrugForm"/>
<code value="TAB"/>
</denominator>
</amount>
</ingredient>
- <batch>
- <lotNumber value="9494788"/>
- <expirationDate value="2017-05-22"/>
- </batch>
- </product>
+
+
<package>
<container>
<coding>
<system value="http://snomed.info/sct"/>
<code value="419672006"/>
@@ -75,7 +71,11 @@
<code value="134622004"/>
<display value="Capecitabine 500mg tablets (product)"/>
</coding>
</itemCodeableConcept>
</content>
+ <batch>
+ <lotNumber value="9494788"/>
+ <expirationDate value="2017-05-22"/>
+ </batch>
</package>
</Medication>
\ No newline at end of file