templates/cat1/_2.16.840.1.113883.10.20.24.3.69.cat1.erb in health-data-standards-3.2.7 vs templates/cat1/_2.16.840.1.113883.10.20.24.3.69.cat1.erb in health-data-standards-3.2.8

- old
+ new

@@ -12,17 +12,21 @@ <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 is_num?(ev.scalar) -%> + 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 -%> + <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 => 'reason', :locals => {:entry => entry}) %> + <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %> </observation> </entry> \ No newline at end of file