_2.16.840.1.113883.10.20.24.3.18.cat1.erb in health-data-standards-3.2.8

- 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) %>>
     <!-- Consolidated Procedure Activity Observation templateId 
        (Implied Template) -->
     <templateId root="2.16.840.1.113883.10.20.22.4.13"/>
@@ -13,9 +16,10 @@
       <!-- Attribute: Start Datetime -->
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <!-- Attribute: End Datetime -->
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first]}) %>
-    <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
+    <%== 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