_2.16.840.1.113883.10.20.24.3.40.cat1.erb in health-data-standards-3.2.0

- old
+ new

@@ -4,15 +4,15 @@
     <!--  Result Observation (consolidation) template  -->
     <templateId root="2.16.840.1.113883.10.20.22.4.2"/>
     <!-- Laboratory Test, Result template -->
     <templateId root="2.16.840.1.113883.10.20.24.3.40"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => value_set_map,'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <text><%= entry.description %></text>
     <statusCode code="completed"/>
     <effectiveTime>
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'result_value', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first]}) %>
   </observation>
 </entry>
\ No newline at end of file