_results.cat1.erb in health-data-standards-4.2.0

- old
+ new

@@ -1,17 +1,20 @@
 <% entry.values.each do |value| %>
   <entryRelationship typeCode="REFR">
    <observation classCode="OBS" moodCode="EVN">
      <!-- Conforms to C-CDA R2 Result Observation (V2) -->
      <templateId root="2.16.840.1.113883.10.20.22.4.2" extension="2015-08-01"/>
-     <!-- Result (QRDA I R3) -->
-     <templateId root="2.16.840.1.113883.10.20.24.3.87" extension="2016-02-01"/>
      <id root="1.3.6.1.4.1.115" extension="<%= identifier_for(value) %>"/>
       <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['*']) %>
       <statusCode code="completed"/>
       <effectiveTime>
+        <% if entry.result_date_time? %>
+        <low <%= value_or_null_flavor(entry.result_date_time) %>/>
+        <high <%= value_or_null_flavor(entry.result_date_time) %>/>
+        <% else %>
         <low <%= value_or_null_flavor(entry.start_time) %>/>
         <high <%= value_or_null_flavor(entry.end_time) %>/>
+        <% end %>
       </effectiveTime>
      <%== render(:partial=> 'result_value', :locals => {:values => [value], :result_oids=>result_oids}) %>
    </observation>
   </entryRelationship>
 <% end %>