health-data-standards 3.6.1 → 3.7.0

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

@@ -0,0 +1,39 @@
+<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" extension="2014-06-09"/>
+    <!-- Diagnosis, resolved template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.14" extension="2014-12-01"/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <code code="29308-4" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="diagnosis"/>
+    
+    <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>
+    <%== render(:partial => 'ordinality', :locals => {:entry => entry, :ordinality_oids=>field_oids["ORDINAL"]}) %>
+
+    <%== 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}\"") %>
+  </observation>
+  </entryRelationship>
+  </act>
+</entry>

data/templates/cat1/r3/_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" extension="2014-06-09"/>
+  <!-- Diagnostic Study, Order template -->
+  <templateId root="2.16.840.1.113883.10.20.24.3.17" extension="2014-12-01"/>
+  <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"]}) %>
+</observation>
+</entry>

data/templates/cat1/r3/_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" extension="2014-06-09"/>
+    <!-- Diagnostic Study, Performed template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.18" extension="2014-12-01"/>
+    <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"]}) %>
+  </observation>
+</entry>
+<% end %>

data/templates/cat1/r3/_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" extension="2014-12-01"/>
+    <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"]}) %>
+
+  </act>
+</entry>

data/templates/cat1/{_2.16.840.1.113883.10.20.24.3.22.cat1.erb → r3/_2.16.840.1.113883.10.20.24.3.22.cat1.erb}

@@ -1,16 +1,17 @@
 <entry>
   <encounter classCode="ENC" moodCode="RQO">
     <!--  Plan of Care Activity Encounter template -->
-    <templateId root="2.16.840.1.113883.10.20.22.4.40"/>
+    <templateId root="2.16.840.1.113883.10.20.22.4.40" extension="2014-06-09"/>
     <!-- Encounter order template -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.22"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.22" extension="2014-12-01"/>
     <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'], 'value_set_map' => value_set_map, 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== 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="new"/>
+    <statusCode code="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 %>"/>
@@ -18,4 +19,4 @@
     </author>
 
   </encounter>
-</entry>
+</entry>

data/templates/cat1/{_2.16.840.1.113883.10.20.24.3.23.cat1.erb → r3/_2.16.840.1.113883.10.20.24.3.23.cat1.erb}

@@ -1,11 +1,11 @@
 <entry>
   <encounter classCode="ENC" moodCode="EVN">
     <!--  Encounter activities template -->
-    <templateId root="2.16.840.1.113883.10.20.22.4.49"/>
+    <templateId root="2.16.840.1.113883.10.20.22.4.49" extension="2014-06-09"/> 
     <!-- Encounter performed template -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.23"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.23" extension="2014-12-01"/>
     <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', 'ICD-9-CM', 'ICD-10-CM', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== 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>
@@ -14,9 +14,12 @@
       <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? -%>
-    <sdtc:dischargeDispositionCode code="<%= entry.discharge_disposition['code'] %>" 
-            codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.discharge_disposition['codeSystem'] || entry.discharge_disposition['code_system']) %>"/>
+      <% if entry.discharge_disposition.present?
+      vset = oid_for_code(entry.discharge_disposition,field_oids["DISCHARGE_STATUS"], entry.record["bundle_id"])
+      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? -%>
@@ -31,8 +34,13 @@
       </time>
       <participantRole classCode="SDLOC">
         <% if entry.facility.code.present? -%>
-        <code code="<%= entry.facility.code['code'] %>" 
-            codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.facility.code['codeSystem'] || entry.facility.code['code_system']) %>"/>
+          <% vset = oid_for_code(entry.facility.code,field_oids["FACILITY_LOCATION"], entry.record["bundle_id"]) %>
+          <% 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 -%>
@@ -53,29 +61,17 @@
     </participant>
     <% end -%>
 
-    <% if entry.respond_to?(:transferFrom) && entry.transferFrom.present? -%>
-    <participant typeCode="ORG">
-      <time value="<%= entry.transferFrom.time %>"/> 
-      <participantRole classCode="LOCE">
-        <templateId root="2.16.840.1.113883.10.20.24.3.81"/> 
-        <%== code_display(entry.transferFrom, '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}\"") %>
-      </participantRole> 
-    </participant>
-    <% end -%>
-
-    <% if entry.respond_to?(:transferTo) && entry.transferTo.present? -%>
-    <participant typeCode="DST">
-      <time value="<%= entry.transferTo.time %>"/> 
-      <participantRole classCode="LOCE">
-        <!-- Transfer To (Destination) template --> 
-        <templateId root="2.16.840.1.113883.10.20.24.3.82"/> 
-        <%== code_display(entry.transferTo, '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}\"") %>
-      </participantRole> 
-    </participant>
+    <% if entry.reason.present? -%>
+      <%== render(:partial => 'reason', :locals => {:entry => entry,:reason_oids=>field_oids["REASON"]}) %>
     <% end -%>
 
-    <% if entry.reason.present? -%>
-      <%= render partial: "reason", locals: {entry: entry} %>
+    <% 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>
+</entry>

data/templates/cat1/r3/_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" extension="2014-06-09"/>
+    <!-- Functional Status, Performed template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.26" extension="2014-12-01"/>
+    <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/r3/_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" extension="2014-12-01"/>
+    <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"]}) %>
+  </act>
+</entry>

data/templates/cat1/r3/_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" extension="2014-06-09"/>
+    <!-- Intervention Order template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.31" extension="2014-12-01"/>
+    <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"]}) %>
+  </act>
+</entry>

data/templates/cat1/{_2.16.840.1.113883.10.20.24.3.32.cat1.erb → r3/_2.16.840.1.113883.10.20.24.3.32.cat1.erb}

@@ -1,10 +1,10 @@
 <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"/>
-    <templateId root="2.16.840.1.113883.10.20.24.3.32"/>
+    <templateId root="2.16.840.1.113883.10.20.22.4.12" extension="2014-06-09"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.32" extension="2014-12-01"/>
     <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}\"") %>
     <text><%= entry.description %></text>
     <statusCode code="completed"/>
     <effectiveTime>
@@ -17,4 +17,4 @@
     <% end %>
 
   </act>
-</entry>
+</entry>

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

@@ -0,0 +1,22 @@
+<entry>
+  <observation classCode="OBS" moodCode="RQO" <%== negation_indicator(entry) %>>
+    <!-- Consolidation Plan of Care Activity Observation -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.44" extension="2014-06-09"/>
+    <!-- Lab Test Order -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.37" extension="2014-12-01"/>
+    <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"]}) %>
+  </observation>
+</entry>

data/templates/cat1/{_2.16.840.1.113883.10.20.24.3.38.cat1.erb → r3/_2.16.840.1.113883.10.20.24.3.38.cat1.erb}

@@ -1,9 +1,9 @@
 <entry>
   <observation classCode="OBS" moodCode="EVN" <%== negation_indicator(entry) %>>
     <!-- Lab test performed -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.38"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.38" extension="2014-12-01"/>
     <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}\"") %>
     <text><%= entry.description %></text>
     <statusCode code="completed"/>
 
@@ -17,4 +17,4 @@
       <%== render(:partial=> 'result_value', :locals => {:values => entry.values}) %>
     <% end %>
     </observation>
-</entry>
+</entry>

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

@@ -0,0 +1,29 @@
+<entry>
+  <act classCode="ACT" moodCode="EVN" <%== negation_indicator(entry) %>>
+    <!-- Communication from provider to provider -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.4" extension="2014-12-01"/>
+    <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>
+
+    <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="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"]}) %>
+    <%== render(:partial => 'fulfills', :locals => {:entry => entry}) %>
+  </act>
+</entry>

data/templates/cat1/{_2.16.840.1.113883.10.20.24.3.41.cat1.erb → r3/_2.16.840.1.113883.10.20.24.3.41.cat1.erb}

@@ -1,25 +1,23 @@
 <entry>
   <substanceAdministration classCode="SBADM" moodCode="EVN" <%== negation_indicator(entry) %>>
     <!-- Medication Activity (consolidation) template -->
-    <templateId root="2.16.840.1.113883.10.20.22.4.16"/> 
+    <templateId root="2.16.840.1.113883.10.20.22.4.16" extension="2014-06-09"/>
     <!-- Medication, Active template -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.41"/>
-    
+    <templateId root="2.16.840.1.113883.10.20.24.3.41" extension="2014-12-01"/>
+
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
     <text><%= entry.description %></text>
-    <statusCode code="active"/> 
+    <statusCode code="active"/>
     <effectiveTime xsi:type="IVL_TS">
         <low <%= value_or_null_flavor(entry.start_time) %>/>
         <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-
     <% if entry.administrationTiming.present?
       period = entry.administrationTiming['period'] %>
       <effectiveTime xsi:type="PIVL_TS" institutionSpecified="true" operator="A">
         <period value="<%= period['value']%>" unit="<%= period['unit']%>"/>
       </effectiveTime>
     <% end %>
-    
     <%== render(:partial => 'medication_details', :locals => {:entry => entry, :route_oids=>field_oids["ROUTE"]}) %>
 
     <% if entry.product_form.present? -%>
@@ -28,11 +26,11 @@
 
     <consumable>
       <manufacturedProduct classCode="MANU">
-        <!-- Medication Information (consolidation) template --> 
-        <templateId root="2.16.840.1.113883.10.20.22.4.23"/>
+        <!-- Medication Information (consolidation) template -->
+        <templateId root="2.16.840.1.113883.10.20.22.4.23" extension="2014-06-09"/>
         <id root="<%= UUID.generate %>"/>
         <manufacturedMaterial>
-          <%== 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}\"") %>
+          <%== code_display(entry, 'value_set_map' => filtered_vs_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>
@@ -45,4 +43,4 @@
 
   </substanceAdministration>
 
-</entry>
+</entry>