_result_value.cat1.erb in health-data-standards-3.2.0

- old
+ new
@@ -1,16 +1,19 @@
-<% ev = entry.values.first
-   if ev.present?
-     if ev.respond_to?(:codes) -%>
-<%== code_display(ev, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM'], 'tag_name' => 'value', 'extra_content' => "xsi:type=\"CD\"") %>
-<%   elsif ev.respond_to?(:scalar) -%>
-<%     if is_num?(ev.scalar) -%>
-<value xsi:type="PQ" value="<%= ev.scalar %>" <% if ev.units && (ev.units != "") -%>unit="<%= ev.units %>"<% end -%>/>
-<%     elsif is_bool?(ev.scalar)%>
-<value xsi:type="BL" value="<%= ev.scalar %>" />
-<%     else -%>
-<value xsi:type="ST" ><%= ev.scalar %></value> 
-<%     end 
-     end
+<% values.compact!
+   if !values.empty?
+      values.each do |ev| 
+	     if ev.respond_to?(:codes) -%>
+	<%== code_display(ev, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM'], 'tag_name' => 'value', 'extra_content' => "xsi:type=\"CD\"") %>
+	<%   elsif ev.respond_to?(:scalar) -%>
+	<%     if is_num?(ev.scalar) -%>
+	<value xsi:type="PQ" value="<%= ev.scalar %>" <% if ev.units && (ev.units != "") -%>unit="<%= ev.units %>"<% end -%>/>
+	<%     elsif is_bool?(ev.scalar)%>
+	<value xsi:type="BL" value="<%= ev.scalar %>" />
+	<%     else -%>
+	<value xsi:type="ST" ><%= ev.scalar %></value> 
+	<%     end 
+	     end
+      end
+   # else is empty   
    else -%>
 <value xsi:type="CD" nullFlavor="UNK"/>
 <% end -%>
\ No newline at end of file