health-data-standards 3.6.1 → 3.7.0

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

@@ -0,0 +1,21 @@
+<entry>
+  <procedure classCode="PROC" moodCode="RQO" <%== negation_indicator(entry) %>>
+    <!-- Consolidated Plan of Care Activity Procedure TemplateId (Implied Template) -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.41" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/> 
+    <!-- QRDA Procedure, Order TemplateId --> 
+    <templateId root="2.16.840.1.113883.10.20.24.3.63" <% 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-PCS', 'ICD-10-PCS'], '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 nullFlavor="NA"/>
+      </assignedAuthor>
+    </author>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"], :r2_compatibility => r2_compatibility}) %>
+  </procedure>
+</entry>

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

@@ -0,0 +1,52 @@
+<entry>
+  <procedure classCode="PROC" moodCode="EVN" <%== negation_indicator(entry) %>>
+    <!--  Procedure performed template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.64" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+    <!-- Procedure Activity Procedure-->
+    <templateId root="2.16.840.1.113883.10.20.22.4.14" <% if !r2_compatibility %>extension="2014-06-09"<%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', 'CPT', 'ICD-9-PCS', 'ICD-10-PCS'], '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 => 'ordinality', :locals => {:entry => entry, :ordinality_oids=>field_oids["ORDINAL"]}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"], :r2_compatibility => r2_compatibility}) %>
+    <% if entry.respond_to?(:incision_time) && entry.incision_time.present? -%>
+    <entryRelationship typeCode="REFR">
+      <procedure classCode="PROC" moodCode="EVN">
+        <templateId root="2.16.840.1.113883.10.20.24.3.89"/>
+        <id root="1.3.6.1.4.1.115" extension="<%= identifier_for([entry.id, entry.incision_time]) %>" />
+        <code code="34896006" 
+              codeSystem="2.16.840.1.113883.6.96"
+              codeSystemName="SNOMED CT" 
+              displayName="incision"/>
+              <effectiveTime <%= value_or_null_flavor(entry.incision_time) %>/>
+      </procedure>
+    </entryRelationship>
+    <% end -%>
+
+    <% entry.values.each do |value| %>
+      <entryRelationship typeCode="REFR">
+       <observation classCode="OBS" moodCode="EVN">
+         <!-- Conforms to C-CDA R2 Result Observation (V2) -->
+         <templateId root="2.16.840.1.113883.10.20.22.4.2" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
+         <!-- Result (QRDA I R3) -->
+         <templateId root="2.16.840.1.113883.10.20.24.3.87" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+         <id root="1.3.6.1.4.1.115" extension="<%= identifier_for(value) %>"/>
+          <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'CPT', 'ICD-9-PCS', 'ICD-10-PCS'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+          <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 => {:values => [value]}) %>
+        
+       </observation>
+     </entryRelationship>
+   <% end %>
+  </procedure>
+</entry>
+

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

@@ -5,11 +5,11 @@
   <procedure classCode="PROC" moodCode="EVN">
     <!-- Consolidated Procedure Activity Procedure TemplateId 
          (Implied Template) -->
-    <templateId root="2.16.840.1.113883.10.20.22.4.14"/>
+    <templateId root="2.16.840.1.113883.10.20.22.4.14" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
     <!-- QRDA Procedure, Result TemplateId -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.66"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.66" <% 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', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <text><%= entry.description %></text>
     <statusCode code="completed"/>
     <effectiveTime>
@@ -23,11 +23,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', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+        <%== code_display(entry, 'value_set_map' => filtered_vs_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 => {:values => [value], :result_oids=>result_oids} ) %>

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

@@ -0,0 +1,23 @@
+<% vals = entry.values.empty? ? [nil] : entry.values 
+   vals.each do |value| 
+ %>   
+<entry>
+  <observation classCode="OBS" moodCode="EVN" <%== negation_indicator(entry) %>>
+    <!-- Consolidation Assessment Scale Observation templateId -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.69"/>
+    <!-- Risk Category Assessment -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.69" <% 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 => '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.7.cat1.erb

@@ -0,0 +1,33 @@
+<entry>
+  <procedure classCode="PROC" moodCode="EVN" <%== negation_indicator(entry) %>>
+    <!-- Procedure Activity Procedure -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.14" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
+    <!-- Device Applied -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.7" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <code code="360030002" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="application of device"/>
+    <text><%= entry.description %></text>
+    <statusCode code="completed"/>
+    
+    <effectiveTime>
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+      <high <%= value_or_null_flavor(entry.removal_time || entry.end_time) %>/>
+    </effectiveTime>
+    
+    <% if entry.respond_to?(:anatomical_target) && entry.anatomical_target.present? -%>
+      <% vset = oid_for_code(entry.anatomical_target.code,field_oids["LATERALITY"]) %>
+      <% if vset %>
+        <targetSiteCode code="<%= entry.anatomical_target['code'] %>" 
+          codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.anatomical_target['code_system']) %>" sdtc:valueSet="<%= vset %>"/>
+      <% end %>
+    <% end -%>
+    <participant typeCode="DEV">
+      <participantRole classCode="MANU">
+        <playingDevice classCode="DEV">
+          <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-PCS', 'ICD-10-PCS', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+        </playingDevice>
+      </participantRole>
+    </participant>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"], :r2_compatibility => r2_compatibility}) %>
+  </procedure>
+</entry>

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

@@ -1,9 +1,9 @@
 <entry>
   <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%>/>
     <!-- Symptom, active template -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.76"/>  
+    <templateId root="2.16.840.1.113883.10.20.24.3.76" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>  
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
     <code code="418799008" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="Symptom"/>
     <text><%= entry.description %></text>
@@ -15,7 +15,8 @@
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
     
-     <%== 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}\"") %>
+     <%== code_display(entry, 'value_set_map' => filtered_vs_map,'preferred_code_sets' => ['SNOMED-CT'], 'tag_name' => 'value', 'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\"") %>
+     <% if r2_compatibility %>
     <!-- Status -->
     <entryRelationship typeCode="REFR">
       <observation classCode="OBS" moodCode="EVN">
@@ -29,5 +30,6 @@
         <value code="55561003" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="active" xsi:type="CD"/>
       </observation>
     </entryRelationship>
+    <% end %>
   </observation>
 </entry>

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

@@ -0,0 +1,23 @@
+<entry>
+	<encounter classCode="ENC" moodCode="EVN">
+		<templateId root="2.16.840.1.113883.10.20.24.3.81" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+		<id root="1.3.6.1.4.1.115" extension="<%= "#{entry.transferFrom.id}#{entry.id}".hash.abs.to_s(16) %>"/>
+		<code code="77305-1" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="transferred from"/>
+		<statusCode code="completed"/>
+		<participant typeCode="ORG">
+	    <time>
+        <low <%= value_or_null_flavor(entry.transferFrom.time) %>/>
+      </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>
+	</encounter>
+</entry>

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

@@ -0,0 +1,23 @@
+<entry>
+  <encounter classCode="ENC" moodCode="EVN">
+  	<templateId root="2.16.840.1.113883.10.20.24.3.82" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+    <id root="1.3.6.1.4.1.115" extension="<%= "#{entry.transferTo.id}#{entry.id}".hash.abs.to_s(16) %>"/>
+  	<code code="77306-9" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="Discharge disposition"/>
+  	<statusCode code="completed"/>
+  	<participant typeCode="DST">
+      <time>
+        <low <%= value_or_null_flavor(entry.transferTo.time) %>/>
+      </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>
+  </encounter>
+</entry>

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

@@ -0,0 +1,64 @@
+<entry>
+  <% if !negation_indicator(entry) %>
+  <supply classCode="SPLY" moodCode="RQO">
+    <!-- Plan of Care Activity Supply -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.43" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
+    <!-- Device, Order -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.9" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <text><%= entry.description %></text>
+    <statusCode code="active"/>
+
+    <effectiveTime xsi:type="IVL_TS">
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+      <high <%= value_or_null_flavor(entry.removal_time || entry.end_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 nullFlavor="NA" root="<%= UUID.generate %>"/>
+      </assignedAuthor>
+    </author>
+    <participant typeCode="DEV">
+      <participantRole classCode="MANU">
+        <playingDevice classCode="DEV">
+          <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-PCS', 'ICD-10-PCS', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+        </playingDevice>
+      </participantRole>
+    </participant>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"], :r2_compatibility => r2_compatibility}) %>
+  </supply>
+  <% else %>
+  <act classCode="SPLY" moodCode="RQO" <%== negation_indicator(entry) %>>
+    <!-- Plan of Care Activity Supply -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.43" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
+    <!-- Device, Order -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.9" <% if !r2_compatibility %>extension="2014-12-01"<%end%>/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <code code="SPLY" codeSystem="2.16.840.1.113883.5.6"/>
+    <text><%= entry.description %></text>
+    <statusCode code="active"/>
+
+    <effectiveTime xsi:type="IVL_TS">
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+      <high <%= value_or_null_flavor(entry.removal_time || entry.end_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 nullFlavor="NA" root="<%= UUID.generate %>"/>
+      </assignedAuthor>
+    </author>
+    <participant typeCode="DEV">
+      <participantRole classCode="MANU">
+        <playingDevice classCode="DEV">
+          <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-PCS', 'ICD-10-PCS', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+        </playingDevice>
+      </participantRole>
+    </participant>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"], :r2_compatibility => r2_compatibility}) %>
+  </act>
+<% end %>
+</entry>

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

@@ -0,0 +1,17 @@
+<entry>
+  <observation classCode="OBS" moodCode="EVN">
+    <templateId root="2.16.840.1.113883.10.20.24.3.51" <% if !r2_compatibility %>extension="2016-02-01"<%end%>/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4" />
+    <statusCode code="active" />
+    <effectiveTime>
+      <!-- Attribute: Start Datetime -->
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+      <!-- Attribute: Stop Datetime -->
+      <high <%= value_or_null_flavor(entry.end_time) %>/>
+    </effectiveTime>
+    <%== code_display(entry, 'preferred_code_sets' => ['*'],
+                             'tag_name' => 'value','value_set_map' => filtered_vs_map,
+                             'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\"") %>
+  </observation>
+</entry>

data/templates/cat1/r2/_fulfills.cat1.erb

@@ -0,0 +1,14 @@
+<% if entry.references.present? 
+  -%>
+  <% entry.references.each do |reference| 
+    resolved_reference = reference.resolve_reference %>
+  <% if reference.type == "fulfills" %>
+  <sdtc:inFulfillmentOf1 typeCode="FLFS">
+    <sdtc:templateId root="2.16.840.1.113883.10.20.24.3.126" <% if !r2_compatibility %>extension="2014-12-01"<%end%> />
+      <sdtc:actReference classCode="ACT" moodCode="<%= resolved_reference.mood_code %>">
+        <sdtc:id root="1.3.6.1.4.1.115" extension="<%= reference.referenced_id %>"/>
+      </sdtc:actReference>
+    </sdtc:inFulfillmentOf1>
+    <% end %>
+  <% end %>
+<% end -%>

data/templates/cat1/{_measures.cat1.erb → r2/_measures.cat1.erb}

@@ -43,7 +43,7 @@
               <templateId root="2.16.840.1.113883.10.20.24.3.98"/>
               <!-- This is the templateId for eMeasure Reference QDM -->
               <templateId root="2.16.840.1.113883.10.20.24.3.97"/>
-              <id extension="<%= measure['id'] %>"/>
+              <id root="1.3.6.1.4.1.115" extension="<%= measure['id'] %>"/>
               <statusCode code="completed"/>
               <!-- Containing isBranch external references -->
               <reference typeCode="REFR">

data/templates/cat1/{_medication_details.cat1.erb → r2/_medication_details.cat1.erb}

@@ -9,7 +9,8 @@
             <% end -%>
            />
 <% end -%>
-
-<% if entry.respond_to?(:dose) && entry.dose.present? -%>
+<% if entry.negationInd %>
+	<doseQuantity nullFlavor="NA"/>
+<% elsif entry.respond_to?(:dose) && entry.dose.present? -%>
 <doseQuantity <%= dose_quantity(entry.codes, entry.dose) %>/>
 <% end -%>

data/templates/cat1/r2/_medication_dispense.cat1.erb

@@ -0,0 +1,22 @@
+
+<entryRelationship typeCode="REFR">
+  <supply classCode="SPLY" moodCode="EVN">
+    <!-- Medication Dispense template -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.18" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
+    <id root="1.3.6.1.4.1.115" extension="<%= UUID.generate %>"/>
+    <statusCode code="completed"/>
+    <effectiveTime <%= value_or_null_flavor(medication_dispense.dispense_date) %>/>
+    <repeatNumber value="1"/>
+    <quantity <%= fulfillment_quantity(entry.codes, medication_dispense, entry.dose) %>/>
+    <product>
+      <manufacturedProduct classCode="MANU">
+        <!-- Medication Information (consolidation) template -->
+        <templateId root="2.16.840.1.113883.10.20.22.4.23" <% if !r2_compatibility %>extension="2014-06-09"<%end%>/>
+        <id root="<%= UUID.generate %>"/>
+        <manufacturedMaterial>
+          <%== code_display(entry, 'preferred_code_sets' =>["RxNorm"], 'value_set_map' => filtered_vs_map, 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+        </manufacturedMaterial>
+      </manufacturedProduct>
+    </product>
+  </supply>
+</entryRelationship>

data/templates/cat1/{_patient_data.cat1.erb → r2/_patient_data.cat1.erb}

@@ -4,11 +4,14 @@
           <templateId root="2.16.840.1.113883.10.20.17.2.4"/>
           <!-- This is the templateId for Patient Data QDM section -->
 	  <templateId root="2.16.840.1.113883.10.20.24.2.1" <% if !r2_compatibility %>extension="2014-12-01"<%end%> />
+          <% if cms_compatibility %>
+            <templateId root="2.16.840.1.113883.10.20.24.2.1" extension="2015-07-01"/>
+          <% end %>
           <code code="55188-7" codeSystem="2.16.840.1.113883.6.1"/>
           <title>Patient Data</title>
           <text>
 
           </text>
-          <%== render_patient_data(patient, measures) %>
+          <%== render_patient_data(patient, measures, r2_compatibility, qrda_version) %>
         </section>
       </component>

data/templates/cat1/r2/_patient_data_r3_1.cat1.erb

@@ -0,0 +1,17 @@
+      <component>
+        <section>
+          <!-- This is the templateId for Patient Data section -->
+          <templateId root="2.16.840.1.113883.10.20.17.2.4"/>
+          <!-- This is the templateId for Patient Data QDM section -->
+	  <templateId root="2.16.840.1.113883.10.20.24.2.1" <% if !r2_compatibility %>extension="2016-02-01"<%end%> />
+          <% if cms_compatibility %>
+            <templateId root="2.16.840.1.113883.10.20.24.2.1" extension="2015-07-01"/>
+          <% end %>
+          <code code="55188-7" codeSystem="2.16.840.1.113883.6.1"/>
+          <title>Patient Data</title>
+          <text>
+
+          </text>
+          <%== render_patient_data(patient, measures, r2_compatibility, qrda_version) %>
+        </section>
+      </component>

data/templates/cat1/r2/_providers.cat1.erb

@@ -0,0 +1,76 @@
+<documentationOf typeCode="DOC">
+  <serviceEvent classCode="PCPR"> <!-- care provision -->
+  <% if patient.provider_performances.empty? -%>
+    <!-- No provider data found in the patient record
+         putting in a fake provider -->
+    <effectiveTime>
+      <low value="20020716"/>
+      <high value="<%= Time.now.utc.to_formatted_s(:number) %>"/>
+    </effectiveTime>
+    <!-- You can include multiple performers, each with an NPI, TIN, CCN. -->
+    <performer typeCode="PRF"> 
+      <time>
+        <low value="20020716"/>
+        <high value="<%= Time.now.utc.to_formatted_s(:number) %>"/>
+      </time>
+      <assignedEntity>
+        <!-- This is the provider NPI -->
+        <id root="2.16.840.1.113883.4.6" extension="111111111" /> 
+        <representedOrganization>
+          <!-- This is the organization TIN -->
+          <id root="2.16.840.1.113883.4.2" extension="1234567" /> 
+          <!-- This is the organization CCN -->
+          <id root="2.16.840.1.113883.4.336" extension="54321" /> 
+        </representedOrganization>
+      </assignedEntity>
+    </performer>
+  <% else -%>
+    <% patient.provider_performances.each do |pp| -%>
+      <effectiveTime>
+        <low <%= value_or_null_flavor(pp.start_date) %>/>
+        <high <%= value_or_null_flavor(pp.end_date) %>/>
+      </effectiveTime>
+      <!-- You can include multiple performers, each with an NPI, TIN, CCN. -->
+      <performer typeCode="PRF"> 
+        <time>
+          <low <%= value_or_null_flavor(pp.start_date) %>/>
+          <high <%= value_or_null_flavor(pp.end_date) %>/>
+        </time>
+        <assignedEntity>
+          <% pp.provider.cda_identifiers.each do |cda_id| -%>
+            <% unless cda_id.root.eql? '2.16.840.1.113883.4.2' -%>
+          <id root="<%= cda_id.root %>" extension="<%= cda_id.extension %>" />
+            <% end -%>
+          <% end -%>
+          <% if pp.provider.specialty %>
+          <code code="<%= pp.provider.specialty %>" codeSystemName="Healthcare Provider Taxonomy (HIPAA)" codeSystem="2.16.840.1.113883.6.101"/>
+          <% end %>
+          <%== render :partial=>"address" , :collection=>pp.provider.addresses %>
+          <%== render :partial=>"telecom", :collection=>pp.provider.telecoms %>
+          <assignedPerson>
+          <name>
+             <given><%= pp.provider.given_name %></given>
+             <family><%= pp.provider.family_name %></family>
+          </name>
+          </assignedPerson>
+          <representedOrganization>
+            <% pp.provider.cda_identifiers.each do |cda_id| -%>
+            <% if cda_id.root.eql?('2.16.840.1.113883.4.2') -%>
+            <id root="2.16.840.1.113883.4.2" extension="<%= cda_id.extension %>" />
+            <% end -%>
+            <% end -%>
+            <%if pp.provider.organization %>
+              <name><%= pp.provider.organization.name %></name>
+              <%== render :partial=>"address" , :collection=>pp.provider.organization.addresses %>
+              <%== render :partial=>"telecom", :collection=>pp.provider.organization.telecoms %>
+            <% else %>
+              <%== render :partial=>"address" , :collection=>pp.provider.addresses %>
+              <%== render :partial=>"telecom", :collection=>pp.provider.telecoms %>
+            <% end %>
+          </representedOrganization>
+        </assignedEntity>
+      </performer>
+    <% end -%>
+  <% end -%>
+  </serviceEvent>
+</documentationOf>