_2.16.840.1.113883.10.20.24.3.41.cat1.erb in health-data-standards-3.5.3

- old
+ new

@@ -10,14 +10,20 @@
     <statusCode code="active"/> 
     <effectiveTime xsi:type="IVL_TS">
         <low <%= value_or_null_flavor(entry.start_time) %>/>
         <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
+
+    <% if entry.administrationTiming.present?
+      period = entry.administrationTiming['period'] %>
+      <effectiveTime xsi:type="PIVL_TS" institutionSpecified="true" operator="A">
+        <period value="<%= period['value']%>" unit="<%= period['unit']%>"/>
+      </effectiveTime>
+    <% end %>
     
     <%== render(:partial => 'medication_details', :locals => {:entry => entry, :route_oids=>field_oids["ROUTE"]}) %>
 
-
     <% if entry.product_form.present? -%>
     <administrationUnitCode code="<%= entry.product_form['code'] %>" codeSystem="<%= entry.product_form['codeSystem'] %>"/>
     <% end -%>
 
     <consumable>
@@ -32,7 +38,11 @@
           <name>Medication Factory Inc.</name>
         </manufacturerOrganization>
       </manufacturedProduct>
     </consumable>
     <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
+
+    <%== render(:partial => 'medication_dispense', :collection => entry.fulfillmentHistory, :locals => {:entry => entry, :value_set_map => value_set_map, :value_set_oid => value_set_oid}) %>
+
   </substanceAdministration>
+
 </entry>
\ No newline at end of file