health-data-standards 3.1.1 → 3.2.0

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.1.cat1.erb

@@ -4,7 +4,7 @@
     <templateId root="2.16.840.1.113883.10.20.22.4.44"/>
     <templateId root="2.16.840.1.113883.10.20.24.3.1"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, :extra_content => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry,'value_set_map' => value_set_map, :extra_content => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <text><%= entry.description %></text>
     <statusCode code="active"/>
     <effectiveTime>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.103.cat1.erb

@@ -6,7 +6,7 @@
     <statusCode code="completed" />
     <effectiveTime <%= value_or_null_flavor(entry.start_time) %>/>
     <%== code_display(entry, 'preferred_code_sets' => ['SNOMED-CT'],
-                             'tag_name' => 'value',
+                             'tag_name' => 'value','value_set_map' => value_set_map,
                              'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\"") %>
   </observation>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.105.cat1.erb

@@ -47,7 +47,7 @@
             <templateId root="2.16.840.1.113883.10.20.22.4.23"/>
             <id root="<%= UUID.generate %>"/>
             <manufacturedMaterial>
-              <%== code_display(entry, :extra_content => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+              <%== code_display(entry,'value_set_map' => value_set_map, :extra_content => "sdtc:valueSet=\"#{value_set_oid}\"") %>
             </manufacturedMaterial>
             <manufacturerOrganization>
               <name>Medication Factory Inc.</name>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.11.cat1.erb

@@ -16,7 +16,7 @@
     </effectiveTime>
     <%== render(:partial => 'ordinality', :locals => {:entry => entry}) %>
     
-    <%== code_display(entry, {'tag_name' => 'value', 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM'],
+    <%== code_display(entry, {'tag_name' => 'value', 'value_set_map' => value_set_map,'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM'],
                                                     'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\""}) %>
 
     <entryRelationship typeCode="REFR">

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.12.cat1.erb

@@ -40,7 +40,7 @@
           <low <%= value_or_null_flavor(entry.start_time) %>/>
           <high <%= value_or_null_flavor(entry.end_time) %>/>
         </effectiveTime>
-        <%== code_display(entry, 'preferred_code_sets' => ['SNOMED-CT'],
+        <%== code_display(entry, 'value_set_map' => value_set_map,'preferred_code_sets' => ['SNOMED-CT'],
                          'tag_name' => 'value',
                          'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\"") %>
       </observation>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.13.cat1.erb

@@ -17,7 +17,7 @@
   </effectiveTime>
   <%== render(:partial => 'ordinality', :locals => {:entry => entry}) %>
 
-  <%== code_display(entry, 'tag_name' => 'value', 'preferred_code_sets' => ['SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'LOINC'], 'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\"") %>
+  <%== code_display(entry, 'value_set_map' => value_set_map,'tag_name' => 'value', 'preferred_code_sets' => ['SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'LOINC'], 'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\"") %>
   <!-- Status -->
   <entryRelationship typeCode="REFR">
     <observation classCode="OBS" moodCode="EVN">

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.14.cat1.erb

@@ -16,7 +16,7 @@
     </effectiveTime>
     <%== render(:partial => 'ordinality', :locals => {:entry => entry}) %>
 
-    <%== code_display(entry, 'tag_name' => 'value', 'preferred_code_sets' => ['SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'CPT'],
+    <%== code_display(entry, 'value_set_map' => value_set_map,'tag_name' => 'value', 'preferred_code_sets' => ['SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'CPT'],
                              'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\"") %>
     <!-- Status -->
     <entryRelationship typeCode="REFR">

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.17.cat1.erb

@@ -6,7 +6,7 @@
   <!-- Diagnostic Study, Order template -->
   <templateId root="2.16.840.1.113883.10.20.24.3.17"/>
   <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-  <%== code_display(entry, 'preferred_code_sets' => ['LOINC'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+  <%== code_display(entry, 'value_set_map' => value_set_map,'preferred_code_sets' => ['LOINC'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
   <text><%= entry.description %></text>
   <statusCode code="new"/>
 

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.18.cat1.erb

@@ -6,7 +6,7 @@
     <!-- Diagnostic Study, Performed template -->
     <templateId root="2.16.840.1.113883.10.20.24.3.18"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'preferred_code_sets' => ['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' => ['SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'LOINC'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <text><%= entry.description %></text>
     <statusCode code="completed"/>
     <effectiveTime>
@@ -15,7 +15,7 @@
       <!-- Attribute: End Datetime -->
       <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]}) %>
     <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
   </observation>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.2.cat1.erb

@@ -3,13 +3,14 @@
     <!-- Communication from patient to provider -->
     <templateId root="2.16.840.1.113883.10.20.24.3.2"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>  
-    <%== code_display(entry, :extra_content => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => value_set_map, :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>
 
     <participant typeCode="AUT">

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.20.cat1.erb

@@ -5,7 +5,7 @@
     <!-- Diagnostic Study, Result template -->
     <templateId root="2.16.840.1.113883.10.20.24.3.20"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'preferred_code_sets' => ['SNOMED-CT', 'LOINC'],
+    <%== code_display(entry,'value_set_map' => value_set_map, 'preferred_code_sets' => ['SNOMED-CT', 'LOINC'],
                              'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\"") %>
     <text><%= entry.description %></text>  
     <statusCode code="completed"/>
@@ -14,7 +14,7 @@
       <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]}) %>
     <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
   </observation>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.22.cat1.erb

@@ -5,7 +5,7 @@
     <!-- Encounter order template -->
     <templateId root="2.16.840.1.113883.10.20.24.3.22"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, :extra_content => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => value_set_map, :extra_content => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <text><%= entry.description %></text>
     <statusCode code="new"/>
   

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.23.cat1.erb

@@ -5,7 +5,7 @@
     <!-- Encounter performed template -->
     <templateId root="2.16.840.1.113883.10.20.24.3.23"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'preferred_code_sets' => ['SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <text><%= entry.description %></text>
     <statusCode code="completed"/>
     <effectiveTime>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.28.cat1.erb

@@ -5,7 +5,7 @@
     <!-- Functional Status, Result template -->
     <templateId root="2.16.840.1.113883.10.20.24.3.28"/>
     <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"/>
 
@@ -15,6 +15,6 @@
     </effectiveTime>
 
     <!-- Result -->
-    <%== render(:partial => 'result_value', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first]}) %>
   </observation>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.3.cat1.erb

@@ -2,12 +2,13 @@
   <act classCode="ACT" moodCode="EVN" <%== negation_indicator(entry) %>>
     <templateId root="2.16.840.1.113883.10.20.24.3.3"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>  
-    <%== code_display(entry, 'preferred_code_sets' => ['SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <text><%= entry.description %></text>
     <statusCode code="completed"/>
     
     <effectiveTime>
-      <low <%= value_or_null_flavor(entry.as_point_in_time) %>/>
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+      <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
     
     <participant typeCode="AUT">

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.31.cat1.erb

@@ -5,7 +5,7 @@
     <!-- Intervention Order template -->
     <templateId root="2.16.840.1.113883.10.20.24.3.31"/>
     <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}\"") %>
     <statusCode code="completed"/>
      <effectiveTime>
       <low <%= value_or_null_flavor(entry.start_time) %>/>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.32.cat1.erb

@@ -4,7 +4,7 @@
     <templateId root="2.16.840.1.113883.10.20.22.4.12"/>
     <templateId root="2.16.840.1.113883.10.20.24.3.32"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <statusCode code="completed"/>
     <effectiveTime>
       <low <%= value_or_null_flavor(entry.start_time) %>/>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.34.cat1.erb

@@ -4,7 +4,7 @@
     <templateId root="2.16.840.1.113883.10.20.22.4.12"/>
     <templateId root="2.16.840.1.113883.10.20.24.3.34"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <statusCode code="completed"/>
     <effectiveTime>
       <low <%= value_or_null_flavor(entry.start_time) %>/>
@@ -17,7 +17,7 @@
         <!-- 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'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+        <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
         <statusCode code="completed"/>
         <effectiveTime <%= value_or_null_flavor(entry.start_time) %>/>
         <% ev = entry.values.first

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.37.cat1.erb

@@ -5,7 +5,7 @@
     <!-- Lab Test Order -->
     <templateId root="2.16.840.1.113883.10.20.24.3.37"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'preferred_code_sets' => ['LOINC'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <text><%= entry.description %></text>
     <statusCode code="new"/>
 

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.38.cat1.erb

@@ -3,7 +3,7 @@
     <!-- Lab test performed -->
     <templateId root="2.16.840.1.113883.10.20.24.3.38"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <text><%= entry.description %></text>
     <statusCode code="completed"/>
 

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.4.cat1.erb

@@ -3,7 +3,7 @@
     <!-- Communication from provider to provider -->
     <templateId root="2.16.840.1.113883.10.20.24.3.4"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <text><%= entry.description %></text>
     <statusCode code="completed"/>
 

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.40.cat1.erb

@@ -6,13 +6,13 @@
     <!-- 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>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.41.cat1.erb

@@ -26,7 +26,7 @@
         <templateId root="2.16.840.1.113883.10.20.22.4.23"/>
         <id root="<%= UUID.generate %>"/>
         <manufacturedMaterial>
-          <%== 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', 'RxNorm'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
         </manufacturedMaterial>
         <manufacturerOrganization>
           <name>Medication Factory Inc.</name>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.42.cat1.erb

@@ -27,7 +27,7 @@
             <templateId root="2.16.840.1.113883.10.20.22.4.23"/>
             <id root="<%= UUID.generate %>"/>
             <manufacturedMaterial>
-              <%== code_display(entry, 'preferred_code_sets' => ['RxNorm', 'CVX', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+              <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['RxNorm', 'CVX', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
             </manufacturedMaterial>
           </manufacturedProduct>
         </consumable>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.43.cat1.erb

@@ -15,7 +15,7 @@
     <participant typeCode="CSM">
       <participantRole classCode="MANU">
         <playingEntity classCode="MMAT">
-          <%== code_display(entry, 'preferred_code_sets' => ['RxNorm', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+          <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['RxNorm', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
           <name><%= entry.description %></name>
         </playingEntity>
       </participantRole>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.44.cat1.erb

@@ -16,7 +16,7 @@
     <participant typeCode="CSM">
       <participantRole classCode="MANU">
         <playingEntity classCode="MMAT">
-          <%== code_display(entry, 'preferred_code_sets' => ['RxNorm', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+          <%== code_display(entry, 'value_set_map' => value_set_map,'preferred_code_sets' => ['RxNorm', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
           <name><%= entry.description %></name>
         </playingEntity>
       </participantRole>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.45.cat1.erb

@@ -18,7 +18,7 @@
         <templateId root="2.16.840.1.113883.10.20.22.4.23"/>
         <id root="<%= UUID.generate %>"/>
         <manufacturedMaterial>
-          <%== code_display(entry, :extra_content => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+          <%== code_display(entry, 'value_set_map' => value_set_map, :extra_content => "sdtc:valueSet=\"#{value_set_oid}\"") %>
         </manufacturedMaterial>
       </manufacturedProduct>
     </product>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.46.cat1.erb

@@ -21,7 +21,7 @@
     <participant typeCode="CSM">
       <participantRole classCode="MANU">
         <playingEntity classCode="MMAT">
-          <%== code_display(entry, 'preferred_code_sets' => ['RxNorm', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+          <%== code_display(entry,'value_set_map' => value_set_map, 'preferred_code_sets' => ['RxNorm', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
         </playingEntity>
       </participantRole>
     </participant>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.47.cat1.erb

@@ -11,13 +11,14 @@
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
+     <%== render(:partial => 'medication_details', :locals => {:entry => entry}) %>
     <consumable>
       <manufacturedProduct classCode="MANU">
         <!-- Medication Information (consolidation) template -->
         <templateId root="2.16.840.1.113883.10.20.22.4.23"/>
         <id root="<%= UUID.generate %>"/>
         <manufacturedMaterial>
-          <%== code_display(entry, 'preferred_code_sets' => ['RxNorm', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+          <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['RxNorm', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
         </manufacturedMaterial>
       </manufacturedProduct>
     </consumable>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.55.cat1.erb

@@ -3,8 +3,8 @@
   <observation classCode="OBS" moodCode="EVN">
     <templateId root="2.16.840.1.113883.10.20.24.3.55"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <code code="48768-6" codeSystemName="LOINC" displayName="Payment source"/> 
+    <code code="48768-6" codeSystemName="LOINC" codeSystem="2.16.840.1.113883.6.1" displayName="Payment source"/> 
     <statusCode code="completed"/>
-    <%== code_display(entry, 'tag_name' => 'value', 'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"2.16.840.1.114222.4.11.3591\"") %>
+    <%== code_display(entry, 'preferred_code_sets' =>["SOP","Source of Payment Typology"] , 'tag_name' => 'value', 'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"2.16.840.1.114222.4.11.3591\"") %>
   </observation>            
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.57.cat1.erb

@@ -6,7 +6,7 @@
     <!-- Physical Exam, Finding template -->
     <templateId root="2.16.840.1.113883.10.20.24.3.57"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>    
+    <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>    
 
     <statusCode code="completed"/>
 
@@ -14,6 +14,6 @@
       <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>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.59.cat1.erb

@@ -5,13 +5,13 @@
     <!-- Physical Exam, Performed template -->
     <templateId root="2.16.840.1.113883.10.20.24.3.59"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'preferred_code_sets' => ['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' => ['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>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.62.cat1.erb

@@ -23,7 +23,7 @@
         <!-- Procedure Activity Procedure-->
         <templateId root="2.16.840.1.113883.10.20.22.4.14"/>
         <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>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.63.cat1.erb

@@ -5,7 +5,7 @@
     <!-- QRDA Procedure, Order TemplateId --> 
     <templateId root="2.16.840.1.113883.10.20.24.3.63"/> 
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-PCS', 'ICD-10-PCS'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-PCS', 'ICD-10-PCS'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <text><%= entry.description %></text>
     <statusCode code="new"/>
     <!-- Attribute: method--> 

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.64.cat1.erb

@@ -5,7 +5,7 @@
     <!-- Procedure Activity Procedure-->
     <templateId root="2.16.840.1.113883.10.20.22.4.14"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'CPT', 'ICD-9-PCS', 'ICD-10-PCS'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'CPT', 'ICD-9-PCS', 'ICD-10-PCS'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <text><%= entry.description %></text>
     <statusCode code="completed"/>
     <effectiveTime>
@@ -27,4 +27,8 @@
     </entryRelationship>
     <% end -%>
   </procedure>
-</entry>
+</entry>
+
+<% unless entry.values.compact.empty? %>
+  <%== render(:partial => '2.16.840.1.113883.10.20.24.3.66', :locals => {:entry => entry,:value_set_oid=>value_set_oid,:value_set_map=>value_set_map }) %>
+<% end -%>  

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.66.cat1.erb

@@ -6,7 +6,7 @@
     <!-- 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>
@@ -24,10 +24,10 @@
         <!-- 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>