_2.16.840.1.113883.10.20.24.3.69.cat1.erb in health-data-standards-3.1.0

- old
+ new

@@ -8,16 +8,21 @@
     <%== code_display(entry, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <statusCode code="completed"/>
 
     <effectiveTime>
       <low <%= value_or_null_flavor(entry.start_time) %>/>
+      <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
 
     <% ev = entry.values.first
-       if ev.present? && ev.respond_to?(:scalar) -%>
+       if ev.present? && ev.respond_to?(:scalar) 
+        if is_num?(ev.scalar) -%>
     <value xsi:type="INT" value="<%= ev.scalar %>"/>
+        <% else -%>
+        <value xsi:type="ST"><%= ev.scalar%></value>
+        <% end %>  
     <% else -%>
-    <value nullFlavor="UNK"/>
+    <value  xsi:type="CD" nullFlavor="UNK"/>
     <% end -%>
     <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
   </observation>
 </entry>
\ No newline at end of file