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

- old
+ new

@@ -1,5 +1,8 @@
+<% vals = entry.values.empty? ? [nil] : entry.values 
+   vals.each do |value| 
+ %>   
 <entry>
   <observation classCode="OBS" moodCode="EVN" <%== negation_indicator(entry) %>>
     <!-- Consolidation Assessment Scale Observation templateId -->
     <templateId root="2.16.840.1.113883.10.20.22.4.69"/>
     <!-- Risk Category Assessment -->
@@ -10,23 +13,10 @@
 
     <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? 
-        if 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 %>
-       <%== code_display(entry, 'tag_name'=>'value', 'value_set_map' => value_set_map,'preferred_code_sets' => ['LOINC', 'SNOMED-CT'],'extra_content' =>'xsi:type="CD"') %>
-       <% end %>  
-    <% else -%>
-    <value  xsi:type="CD" nullFlavor="UNK"/>
-    <% end -%>
+    <%== render(:partial => 'result_value', :locals => {:values => [value], :result_oids=>result_oids} ) %>
     <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
   </observation>
-</entry>
+</entry>
+<% end %>
\ No newline at end of file