health-data-standards 3.6.1 → 3.7.0

data/templates/cat1/{_2.16.840.1.113883.10.20.24.3.14.cat1.erb → r2/_2.16.840.1.113883.10.20.24.3.14.cat1.erb}

@@ -1,11 +1,26 @@
 <entry>
+  <act classCode="ACT" moodCode="EVN">
+    <!-- Conforms to C-CDA Problem Concern Act (V2) -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.3" extension="2014-06-09" />
+    <!-- Diagnosis Resolved Concern Act -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.125" extension="2014-12-01" />
+    <id root="<%= UUID.generate %>"/>
+    <code code="CONC" codeSystem="2.16.840.1.113883.5.6" displayName="Concern" />
+    <statusCode code="completed" />
+    <effectiveTime>
+      <!-- Attribute: Start Datetime -->
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+      <!-- Attribute: Stop Datetime -->
+      <high <%= value_or_null_flavor(entry.end_time) %>/>
+    </effectiveTime>
+    <entryRelationship typeCode="SUBJ">
   <observation classCode="OBS" moodCode="EVN">
     <!--  Problem observation template -->
-    <templateId root="2.16.840.1.113883.10.20.22.4.4"/>
+    <templateId root="2.16.840.1.113883.10.20.22.4.4" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
     <!-- Diagnosis, resolved template -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.14"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.14" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <code code="282291009" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="diagnosis"/>
+    <code code="29308-4" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="diagnosis"/>
     
     <statusCode code="completed"/>
     <effectiveTime>
@@ -14,11 +29,11 @@
       <!-- Attribute: Stop Datetime -->
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'ordinality', :locals => {:entry => entry, :ordinality_oids=>field_oids["ORDINAL"]}}) %>
+    <%== render(:partial => 'ordinality', :locals => {:entry => entry, :ordinality_oids=>field_oids["ORDINAL"]}) %>
 
-    <%== code_display(entry, 'value_set_map' => value_set_map,'tag_name' => 'value', 'preferred_code_sets' => ['SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'CPT'],
+    <%== code_display(entry, 'value_set_map' => filtered_vs_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}\"") %>
-    <text><%= entry.description %></text>
+    <% if r2_compatibility %>
     <!-- Status -->
     <entryRelationship typeCode="REFR">
       <observation classCode="OBS" moodCode="EVN">
@@ -32,5 +47,8 @@
         <value code="413322009" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="resolved" xsi:type="CD"/>
       </observation>
     </entryRelationship>
+    <% end %>
   </observation>
+  </entryRelationship>
+  </act>
 </entry>

data/templates/cat1/r2/_2.16.840.1.113883.10.20.24.3.140.cat1.erb

@@ -0,0 +1,39 @@
+<entry>
+  <act classCode="ACT" moodCode="EVN" <%== negation_indicator(entry) %>>
+    <!-- Immunization, Administered template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.140"/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <code code="416118004" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="Administration"/>
+    <statusCode code="completed"/>
+    <effectiveTime xsi:type="IVL_TS">
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+      <high <%= value_or_null_flavor(entry.end_time) %>/>
+    </effectiveTime>
+    <entryRelationship typeCode="COMP">
+      <substanceAdministration classCode="SBADM" moodCode="EVN">
+        <!-- Immunization Activity template -->
+        <templateId root="2.16.840.1.113883.10.20.22.4.52" extension="2014-06-09"/>
+        <id root="<%= UUID.generate %>"/>
+        <text><%= entry.description %></text>
+        <statusCode code="completed"/>
+        <effectiveTime xsi:type="IVL_TS">
+          <low <%= value_or_null_flavor(entry.start_time) %>/>
+          <high <%= value_or_null_flavor(entry.end_time) %>/>
+        </effectiveTime>
+        <%== render(:partial => 'medication_details', :locals => {:entry => entry, :route_oids=>field_oids["ROUTE"]}) %>
+        <consumable>
+          <manufacturedProduct classCode="MANU">
+            <!-- Immunization Information (consolidation) template -->
+            <templateId root="2.16.840.1.113883.10.20.22.4.54" extension="2014-06-09"/>
+            <id root="<%= UUID.generate %>"/>
+            <manufacturedMaterial>
+              <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['CVX', 'RxNorm', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+              <lotNumberText>1</lotNumberText>
+            </manufacturedMaterial>
+          </manufacturedProduct>
+        </consumable>
+      </substanceAdministration>
+    </entryRelationship>
+    <%== render(:partial => 'reason', :locals => {:entry => entry,:reason_oids=>field_oids["REASON"]}) %>
+  </act>
+</entry>

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

@@ -0,0 +1,23 @@
+<entry>
+  <observation classCode="OBS" moodCode="RQO" <%== negation_indicator(entry) %>>
+  <!-- Consolidated Plan of Care Activity Observation
+       templateId (Implied Template) -->
+  <templateId root="2.16.840.1.113883.10.20.22.4.44" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
+  <!-- Diagnostic Study, Order template -->
+  <templateId root="2.16.840.1.113883.10.20.24.3.17" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+  <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+  <%== code_display(entry, 'value_set_map' => filtered_vs_map,'preferred_code_sets' => ['LOINC'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+  <text><%= entry.description %></text>
+  <statusCode code="active"/>
+
+  <!-- Attribute: datetime -->
+  <author>
+    <templateId root="2.16.840.1.113883.10.20.22.4.119"/>
+    <time <%= value_or_null_flavor(entry.as_point_in_time) %>/>
+    <assignedAuthor>
+      <id nullFlavor="NA" root="<%= UUID.generate %>"/>
+    </assignedAuthor>
+  </author>
+  <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"], :r2_compatibility => r2_compatibility}) %>
+</observation>
+</entry>

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

@@ -0,0 +1,25 @@
+<% 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" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
+    <!-- Diagnostic Study, Performed template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.18" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <%== code_display(entry,'value_set_map' => filtered_vs_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>
+      <!-- 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 => [value], :result_oids=>result_oids}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"], :r2_compatibility => r2_compatibility}) %>
+  </observation>
+</entry>
+<% end %>

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

@@ -0,0 +1,29 @@
+<entry>
+  <act classCode="ACT" moodCode="EVN" <%== negation_indicator(entry) %>>
+    <!-- Communication from patient to provider -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.2" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>  
+    <%== code_display(entry, 'value_set_map' => filtered_vs_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.start_time) %>/>
+      <high <%= value_or_null_flavor(entry.end_time) %>/>
+    </effectiveTime>
+    
+    <participant typeCode="AUT">
+      <participantRole classCode="PAT">
+        <code code="116154003" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="Patient"/>
+      </participantRole>
+    </participant>
+
+    <participant typeCode="IRCP">
+      <participantRole classCode="ASSIGNED">
+        <code code="158965000" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="Medical Practitioner"/>
+      </participantRole>
+    </participant>
+
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"], :r2_compatibility => r2_compatibility}) %>
+
+  </act>
+</entry>

data/templates/cat1/{_2.16.840.1.113883.10.20.24.3.20.cat1.erb → r2/_2.16.840.1.113883.10.20.24.3.20.cat1.erb}

@@ -4,11 +4,11 @@
 <entry>
   <observation classCode="OBS" moodCode="EVN" <%== negation_indicator(entry) %>>
     <!-- Consolidated Result Observation templateId (Implied Template) -->
-    <templateId root="2.16.840.1.113883.10.20.22.4.2"/>
+    <templateId root="2.16.840.1.113883.10.20.22.4.2" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
     <!-- Diagnostic Study, Result template -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.20"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.20" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry,'value_set_map' => value_set_map, 'preferred_code_sets' => ['SNOMED-CT', 'LOINC'],
+    <%== code_display(entry,'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['SNOMED-CT', 'LOINC'],
                              'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\"") %>
     <text><%= entry.description %></text>  
     <statusCode code="completed"/>
@@ -18,7 +18,7 @@
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
     <%== render(:partial => 'result_value', :locals => {:values => [value], :result_oids=>result_oids}) %>
-    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"], :r2_compatibility => r2_compatibility}) %>
   </observation>
 </entry>
 <% end %>

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

@@ -0,0 +1,22 @@
+<entry>
+  <encounter classCode="ENC" moodCode="RQO">
+    <!--  Plan of Care Activity Encounter template -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.40" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
+    <!-- Encounter order template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.22" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+    <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', 'HCPCS', 'CDT'], 'value_set_map' => filtered_vs_map, 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <text><%= entry.description %></text>
+    <statusCode code="<%= r2_compatibility ? 'new' : 'active' %>"/>
+  
+    <!-- Attribute: datetime -->
+    <author>
+      <templateId root="2.16.840.1.113883.10.20.22.4.119"/>
+      <time <%= value_or_null_flavor(entry.start_time) %>/>
+      <assignedAuthor>
+        <id root="<%= UUID.generate %>"/>
+      </assignedAuthor>
+    </author>
+
+  </encounter>
+</entry>

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

@@ -0,0 +1,114 @@
+<entry>
+  <encounter classCode="ENC" moodCode="EVN">
+    <!--  Encounter activities template -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.49" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/> 
+    <!-- Encounter performed template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.23" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'CPT', 'HCPCS', 'CDT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <text><%= entry.description %></text>
+    <statusCode code="completed"/>
+    <effectiveTime>
+      <!-- We try to look for the admit/discharge times on the encounter if they are
+           there. If not, we fall back to the typical start/end date. -->
+      <low <%= value_or_null_flavor(entry.admit_time || entry.start_time) %>/>
+      <high <%= value_or_null_flavor(entry.discharge_time || entry.end_time) %>/>
+    </effectiveTime>
+      <% if entry.discharge_disposition.present?
+      vset = oid_for_code(entry.discharge_disposition,field_oids["DISCHARGE_STATUS"])
+      if vset %>  
+        <sdtc:dischargeDispositionCode code="<%= entry.discharge_disposition['code'] %>" 
+            codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.discharge_disposition['codeSystem'] || entry.discharge_disposition['code_system']) %>" sdtc:valueSet="<%= vset %>"/>
+      <% end %>
+    <% end -%>
+
+    <% if entry.respond_to?(:facility) && entry.facility.present? -%>
+    <participant typeCode="LOC">
+      <!-- Facility Location template -->
+      <templateId root="2.16.840.1.113883.10.20.24.3.100"/>
+      <time>
+        <!-- Attribute: facility location arrival datetime -->
+        <low <%= value_or_null_flavor(entry.facility.start_time) %>/>
+        <!-- Attribute: facility location departure datetime -->
+        <high <%= value_or_null_flavor(entry.facility.end_time) %>/>
+      </time>
+      <participantRole classCode="SDLOC">
+        <% if entry.facility.code.present? -%>
+          <% vset = oid_for_code(entry.facility.code,field_oids["FACILITY_LOCATION"]) %>
+          <% if vset %>
+            <code code="<%= entry.facility.code['code'] %>" 
+              codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.facility.code['codeSystem'] || entry.facility.code['code_system']) %>" sdtc:valueSet="<%= vset %>"/>
+          <% else %>
+            <code nullFlavor="UNK"/>
+          <% end %>
+        <% else -%>
+        <code nullFlavor="UNK"/>
+        <% end -%>
+        <% if entry.facility.addresses.present? -%>
+        <addr>
+          <streetAddressLine><%= entry.facility.addresses.first.street %></streetAddressLine>
+          <city><%= entry.facility.addresses.first.city %></city>
+          <state><%= entry.facility.addresses.first.state %></state>
+          <postalCode><%= entry.facility.addresses.first.zip %></postalCode>
+          <country><%= entry.facility.addresses.first.country %></country>
+        </addr>
+        <% end -%>
+        <telecom nullFlavor="UNK"/>
+        <playingEntity classCode="PLC">
+          <name><%= entry.facility.name %></name>
+        </playingEntity>
+      </participantRole>
+    </participant>
+    <% end -%>
+    <% if r2_compatibility %>
+    <% if entry.respond_to?(:transferFrom) && entry.transferFrom.present? -%>
+    <participant typeCode="ORG">
+      <!-- Transfer From (Destination) template --> 
+      <templateId root="2.16.840.1.113883.10.20.24.3.81"/> 
+      <time <%= value_or_null_flavor(entry.transferFrom.time) %>/>
+      <participantRole classCode="LOCE">
+        <% 
+           entry.transferFrom.codes[entry.transferFrom.code_system] = [entry.transferFrom.code]
+           transfer_vs_map = [{"set"=>entry.transferFrom.code_system, "values"=>[entry.transferFrom.code]}]
+           transfer_oid = (data_criteria.field_values || {})['TRANSFER_FROM'].try(:code_list_id)
+           options = {'value_set_map' => transfer_vs_map, 'preferred_code_sets' => ['SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'CPT']}
+           options['extra_content'] = "sdtc:valueSet=\"#{transfer_oid}\"" if transfer_oid
+        %>
+        <%== code_display(entry.transferFrom, options) %>
+      </participantRole> 
+    </participant>
+    <% end -%>
+
+    <% if entry.respond_to?(:transferTo) && entry.transferTo.present? -%>
+    <participant typeCode="DST">
+      <!-- Transfer To (Destination) template --> 
+      <templateId root="2.16.840.1.113883.10.20.24.3.82"/> 
+      <time <%= value_or_null_flavor(entry.transferTo.time) %>/>
+      <participantRole classCode="LOCE">
+        <% 
+           entry.transferTo.codes[entry.transferTo.code_system] = [entry.transferTo.code]
+           transfer_vs_map = [{"set"=>entry.transferTo.code_system, "values"=>[entry.transferTo.code]}]
+           transfer_oid = (data_criteria.field_values || {})['TRANSFER_TO'].try(:code_list_id)
+           options = {'value_set_map' => transfer_vs_map, 'preferred_code_sets' => ['SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'CPT']}
+           options['extra_content'] = "sdtc:valueSet=\"#{transfer_oid}\"" if transfer_oid
+        %>
+        <%== code_display(entry.transferTo, options) %>
+      </participantRole> 
+    </participant>
+    <% end -%>
+    <% end -%>
+
+    <% if entry.reason.present? -%>
+      <%== render(:partial => 'reason', :locals => {:entry => entry,:reason_oids=>field_oids["REASON"]}) %>
+    <% end -%>
+
+    <% if entry.principalDiagnosis && field_oids["PRINCIPAL_DIAGNOSIS"] -%>
+      <entryRelationship typeCode="REFR">
+          <observation classCode="OBS" moodCode="EVN">
+            <code code="8319008" codeSystem="2.16.840.1.113883.6.96" displayName="Principal Diagnosis" codeSystemName="SNOMED CT"/>
+            <%== code_display(entry.principal_diagnosis, 'tag_name' => 'value', 'preferred_code_sets' => ['SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'CPT'], 'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{field_oids["PRINCIPAL_DIAGNOSIS"].first}\"") %>
+          </observation>
+      </entryRelationship>
+    <% end -%>
+  </encounter>
+</entry>

data/templates/cat1/r2/_2.16.840.1.113883.10.20.24.3.26.cat1.erb

@@ -0,0 +1,20 @@
+ <entry>
+  <observation classCode="OBS" moodCode="EVN">
+    <!-- Conforms to C-CDA R2 Procedure Activity Observation (V2) -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.13" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
+    <!-- Functional Status, Performed template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.26" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <%== code_display(entry, 'value_set_map' => filtered_vs_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>
+
+    <!-- Result -->
+    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first], :result_oids=>result_oids}) %>
+  </observation>
+</entry>

data/templates/cat1/{_2.16.840.1.113883.10.20.24.3.28.cat1.erb → r2/_2.16.840.1.113883.10.20.24.3.28.cat1.erb}

@@ -6,9 +6,9 @@
     <!-- Functional Status Result Observation (consolidation) template -->
     <templateId root="2.16.840.1.113883.10.20.22.4.67"/>
     <!-- Functional Status, Result template -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.28"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.28" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== 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}\"") %>
+    <%== code_display(entry, 'value_set_map' => filtered_vs_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"/>
 

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

@@ -0,0 +1,25 @@
+<entry>
+  <act classCode="ACT" moodCode="EVN" <%== negation_indicator(entry) %>>
+    <templateId root="2.16.840.1.113883.10.20.24.3.3" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>  
+    <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['SNOMED-CT', 'LOINC'], '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">
+      <participantRole classCode="ASSIGNED">
+        <code code="158965000" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="Medical Practitioner"/>
+      </participantRole>
+    </participant>
+    
+    <participant typeCode="IRCP">
+      <participantRole classCode="PAT"/>
+    </participant>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"], :r2_compatibility => r2_compatibility}) %>
+  </act>
+</entry>

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

@@ -0,0 +1,23 @@
+<entry>
+  <act classCode="ACT" moodCode="RQO" <%== negation_indicator(entry) %>>
+    <!-- Plan of Care Activity Act template -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.39" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
+    <!-- Intervention Order template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.31" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <%== code_display(entry,'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'HCPCS'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <text><%= entry.description %></text>
+    <statusCode code="active"/>
+     <effectiveTime>
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+    </effectiveTime>
+    <author>
+      <templateId root="2.16.840.1.113883.10.20.22.4.119"/>
+      <time <%= value_or_null_flavor(entry.as_point_in_time) %>/>
+      <assignedAuthor>
+        <id root="<%= UUID.generate %>"/>
+      </assignedAuthor>
+    </author>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"], :r2_compatibility => r2_compatibility}) %>
+  </act>
+</entry>

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

@@ -0,0 +1,20 @@
+<entry>
+  <act classCode="ACT" moodCode="EVN" <%== negation_indicator(entry) %>>
+    <!-- Consolidation CDA: Procedure Activity Act template -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.12" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.32" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], '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 => 'reason', :locals => {:entry => entry ,:reason_oids=>field_oids["REASON"]}) %>
+    <%if !entry.values.empty? %>
+      <%== render(:partial=> 'result_value', :locals => {:values => entry.values}) %>
+    <% end %>
+
+  </act>
+</entry>

data/templates/cat1/{_2.16.840.1.113883.10.20.24.3.34.cat1.erb → r2/_2.16.840.1.113883.10.20.24.3.34.cat1.erb}

@@ -1,10 +1,10 @@
 <entry>
   <act classCode="ACT" moodCode="EVN">
     <!-- Consolidation CDA: Procedure Activity Act template -->
-    <templateId root="2.16.840.1.113883.10.20.22.4.12"/>
-    <templateId root="2.16.840.1.113883.10.20.24.3.34"/>
+    <templateId root="2.16.840.1.113883.10.20.22.4.12" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.34" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => filtered_vs_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) %>/>
@@ -13,11 +13,11 @@
     <entryRelationship typeCode="REFR">
       <observation classCode="OBS" moodCode="EVN">
         <!-- Result Observation template (consolidation) -->
-        <templateId root="2.16.840.1.113883.10.20.22.4.2"/>
+        <templateId root="2.16.840.1.113883.10.20.22.4.2" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
         <!-- Result template -->
-        <templateId root="2.16.840.1.113883.10.20.24.3.87"/>
+        <templateId root="2.16.840.1.113883.10.20.24.3.87" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
         <id root="<%= UUID.generate %>"/>
-        <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+        <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
         <text><%= entry.description %></text>
         <statusCode code="completed"/>
         <effectiveTime <%= value_or_null_flavor(entry.start_time) %>/>