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

- old
+ new

@@ -10,14 +10,13 @@
     <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'] %>
+    <% if entry.administrationTiming.present? && entry.administrationTiming.key?('scalar') %>
       <effectiveTime xsi:type="PIVL_TS" institutionSpecified="true" operator="A">
-        <period value="<%= period['value']%>" unit="<%= period['unit']%>"/>
+        <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"]}) %>
 
     <% if entry.product_form.present? -%>
@@ -36,10 +35,10 @@
           <name>Medication Factory Inc.</name>
         </manufacturerOrganization>
       </manufacturedProduct>
     </consumable>
 
-    <%== render(:partial => 'medication_dispense', :collection => entry.fulfillmentHistory, :locals => {:entry => entry, :value_set_map => value_set_map, :value_set_oid => value_set_oid}) %>
+    <%== render(:partial => 'medication_dispense', :locals => {:entry => entry, :filtered_vs_map => filtered_vs_map}) %>
 
   </substanceAdministration>
 
 </entry>