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

- old
+ new

@@ -4,11 +4,11 @@
          (Implied Template) -->
     <templateId root="2.16.840.1.113883.10.20.22.4.14"/>
     <!-- QRDA Procedure, Result TemplateId -->
     <templateId root="2.16.840.1.113883.10.20.24.3.66"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'CPT'], '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) %>/>
@@ -22,13 +22,13 @@
         <!-- Result Observation template (consolidation) -->
         <templateId root="2.16.840.1.113883.10.20.22.4.2"/>
         <!-- Result template -->
         <templateId root="2.16.840.1.113883.10.20.24.3.87"/>
         <id root="<%= UUID.generate %>"/>
-        <%== code_display(entry, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+        <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
         <statusCode code="completed"/>
         <effectiveTime <%= value_or_null_flavor(entry.start_time) %>/>
-        <%== render(:partial => 'result_value', :locals => {:entry => entry}) %>
+        <%== render(:partial => 'result_value', :locals => {:values => entry.values}) %>
       </observation>
     </entryRelationship>
   </procedure>
 </entry>
\ No newline at end of file