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

- old
+ new

@@ -23,23 +23,22 @@
         <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 %>
         <% if entry.route.present? -%>
         <!-- Attribute: route -->
             <routeCode code="<%= entry.route[:code] %>" codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.route[:code_system]) %>"/>
         <% end -%>
         
         <!-- Attribute: dose -->
         <% if entry.dose.present? -%>
-          <doseQuantity value="<%= entry.dose[:value]%>"/>
+          <doseQuantity value="<%= entry.dose[:scalar]%>"/>
         <% end -%>
 
         <% if entry.product_form.present? -%>
         <administrationUnitCode code="<%= entry.product_form['code'] %>" codeSystem="<%= entry.product_form['codeSystem'] %>"/>
         <% end -%>