templates/cat1/r5/_2.16.840.1.113883.10.20.24.3.47.cat1.erb in health-data-standards-4.1.0 vs templates/cat1/r5/_2.16.840.1.113883.10.20.24.3.47.cat1.erb in health-data-standards-4.2.0

@@ -13,17 +13,18 @@
     </effectiveTime>
     <% if entry.negationInd %>
       <effectiveTime xsi:type="PIVL_TS" institutionSpecified="true" operator="A">
         <period nullFlavor="NA"/>
       </effectiveTime>
-    <% elsif entry.administrationTiming.present?
-      period = entry.administrationTiming['period'] %>
+    <% elsif 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.allowedAdministrations.present? %>
       <repeatNumber value="<%== entry.allowedAdministrations %>" />
+    <% elsif entry.refills.present? %>
+      <repeatNumber value="<%== entry.refills['scalar'] %>" />
     <% end %>
      <%== render(:partial => 'medication_details', :locals => {:entry => entry, :route_oids=>field_oids["ROUTE"]}) %>
     <consumable>
       <manufacturedProduct classCode="MANU">
         <!-- Medication Information (consolidation) template -->