_2.16.840.1.113883.10.20.24.3.42.cat1.erb in health-data-standards-4.2.0

- old
+ new

@@ -9,10 +9,15 @@
     <statusCode code="completed"/>
     <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? && entry.administrationTiming.key?('scalar') %>
+      <effectiveTime xsi:type="PIVL_TS" institutionSpecified="true" operator="A">
+        <period value="<%= entry.administrationTiming['scalar']%>" <% if entry.administrationTiming['units'] && (entry.administrationTiming['units'] != "") -%>unit="<%= entry.administrationTiming['units']%>"<% end %>/>
+      </effectiveTime>
+    <% end %>
     <%== render(:partial => 'medication_details', :locals => {:entry => entry, :route_oids=>field_oids["ROUTE"]}) %>
     <consumable>
       <manufacturedProduct classCode="MANU">
         <!-- Medication Information (consolidation) template -->
         <templateId root="2.16.840.1.113883.10.20.22.4.23" extension="2014-06-09"/>
@@ -21,7 +26,8 @@
           <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['*']) %>
         </manufacturedMaterial>
       </manufacturedProduct>
     </consumable>
     <%== render(:partial => 'reason', :locals => {:entry => entry,:reason_oids=>field_oids["REASON"]}) %>
+    <%== render(:partial => 'medication_dispense', :locals => {:entry => entry, :filtered_vs_map => filtered_vs_map}) %>
   </substanceAdministration>
-</entry>
\ No newline at end of file
+</entry>