cqm-reports 3.1.10 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 189b0fb1eea44b69983a9e7254bcb3fc328bc1b98d3b22f020bd984d6118d415
-  data.tar.gz: 10f89503bdf5af98f065ce348c0e32220dffd5db99e06d7f8eed88c73f593f1f
+  metadata.gz: cda8f93792d0efa4c3e4347bd922e32396791952a09ea37d35b2e00daa3284bf
+  data.tar.gz: 062b473dc79d294fa478b50c132c090ad0e4305679d7e834abce9f6f2ca0e0a2
 SHA512:
-  metadata.gz: e1dba82c4a1b8689bd57a3d714242b8a9eac60ffe95b427e949e361529a03858465adf62196ff4b6886ea6bb0f06312278bd4e12ce1552305846f5d36dc33e0f
-  data.tar.gz: e315238f7f2b9aa85b0d84d9a4e1a6e8190bebc6e1a5b847ba1b40d767ea29eb8f2d87d6ce911b9ae22ae8523e6d43c213d91e5fc7c51fdad14b5474d6337b0d
+  metadata.gz: e67430b3bcb829fc2561a6afb33b2621e727d21fdb388663de0b9d145bed201c39ab5e42385676c918897f88164e13644a869bdd04f23c0a2d64c179a99f5455
+  data.tar.gz: ebfb491113755df26743265723641db1775ce7d53642e455c0d50a91d512974eb53bcd1f0c111284e80641cf5917e7b875f9be6877fd5728ebae9d00fd93d0e3

data/Gemfile

@@ -17,7 +17,7 @@ group :development do
 end
 
 group :test do
-  gem 'cqm-models', '~> 3.0'
+  gem 'cqm-models', '~> 4.0'
   gem 'factory_girl', '~> 4.1.0'
   gem 'tailor', '~> 1.1.2'
   gem 'cane', '~> 2.3.0'

data/lib/cqm-reports.rb

@@ -17,7 +17,7 @@ require_relative 'qrda-export/helper/cat1_view_helper.rb'
 require_relative 'html-export/qdm-patient/qdm_patient.rb'
 
 require_relative 'qrda-export/catI-r5/qrda1_r5.rb'
-require_relative 'qrda-export/catIII-r2-1/qrda3_r21.rb'
+require_relative 'qrda-export/catIII/qrda3.rb'
 
 require_relative 'qrda-import/cda_identifier.rb'
 require_relative 'qrda-import/narrative_reference_handler.rb'
@@ -36,7 +36,6 @@ require_relative 'qrda-import/data-element-importers/diagnosis_importer.rb'
 require_relative 'qrda-import/data-element-importers/diagnostic_study_order_importer.rb'
 require_relative 'qrda-import/data-element-importers/diagnostic_study_performed_importer.rb'
 require_relative 'qrda-import/data-element-importers/diagnostic_study_recommended_importer.rb'
-require_relative 'qrda-import/data-element-importers/device_applied_importer.rb'
 require_relative 'qrda-import/data-element-importers/device_order_importer.rb'
 require_relative 'qrda-import/data-element-importers/device_recommended_importer.rb'
 require_relative 'qrda-import/data-element-importers/encounter_order_importer.rb'

data/lib/html-export/qdm-patient/data_element/_data_element_other_fields.mustache

@@ -25,6 +25,11 @@
 		<div class="div-table-head--no-border"><span class="criteria-heading">Category:</span>  {{{code_code_system_string}}}</div>
 	</div>
 {{/category}}
+{{#clazz}}
+	<div class="div-head-row">
+		<div class="div-table-head--no-border"><span class="criteria-heading">Class:</span>  {{{code_code_system_string}}}</div>
+	</div>
+{{/clazz}}
 {{#components}}
 	{{#code}}
 		<div class="div-head-row">
@@ -82,6 +87,11 @@
 		<div class="div-table-head--no-border"><span class="criteria-heading">Identifier:</span>  {{{identifier_string}}}</div>
 	</div>
 {{/identifier}}
+{{#interpretation}}
+	<div class="div-head-row">
+		<div class="div-table-head--no-border"><span class="criteria-heading">Interpretation:</span>  {{{code_code_system_string}}}</div>
+	</div>
+{{/interpretation}}
 {{#lengthOfStay}}
 	<div class="div-head-row">
 		<div class="div-table-head--no-border"><span class="criteria-heading">Length Of Stay:</span>  {{{unit_string}}}</div>

data/lib/html-export/qdm-patient/qdm_patient.rb

@@ -33,10 +33,7 @@ class QdmPatient < Mustache
   end
 
   def patient_telecoms
-    @patient_telecoms ||= [CQM::Telecom.new(
-      use: 'HP',
-      value: '555-555-2003'
-    )]
+    @patient_telecoms ||= [CQM::Telecom.new(use: 'HP', value: '555-555-2003')]
     # create formatted telecoms
     @patient_telecoms.map { |telecom| "(#{telecom['use']}) #{telecom['value']}" }.join("<br>")
   end
@@ -65,7 +62,10 @@ class QdmPatient < Mustache
       </br>&nbsp; Care Partner Relationship: #{code_for_element(self['relationship'])}"
     elsif organization_entity?
       "</br>&nbsp; Organization: #{identifier_for_element(self['identifier'])}
-      </br>&nbsp; Organization Type: #{code_for_element(self['type'])}"
+      </br>&nbsp; Organization Type: #{code_for_element(self['organizationType'])}"
+    elsif location_entity?
+      "</br>&nbsp; Location: #{identifier_for_element(self['identifier'])}
+      </br>&nbsp; Location Type: #{code_for_element(self['locationType'])}"
     elsif patient_entity?
       "</br>&nbsp; Patient: #{identifier_for_element(self['identifier'])}"
     elsif practitioner_entity?
@@ -83,7 +83,7 @@ class QdmPatient < Mustache
   end
 
   def identifier_for_element(identifier)
-    identifier ? "#{identifier['value']} (#{identifier['namingSystem']})" : ''
+    "#{identifier['value']} (#{identifier['namingSystem']})"
   end
 
   def code_code_system_string
@@ -91,7 +91,7 @@ class QdmPatient < Mustache
   end
 
   def code_for_element(element)
-    element ? "#{element['code']} (#{HQMF::Util::CodeSystemHelper.code_system_for(element['system'])})#{code_description(element)}" : ''
+    "#{element['code']} (#{HQMF::Util::CodeSystemHelper.code_system_for(element['system'])})#{code_description(element)}"
   end
 
   def code_system_name

data/lib/qrda-export/catI-r5/_header.mustache

@@ -6,8 +6,9 @@
 <!-- QRDA templateId -->
 <templateId root="2.16.840.1.113883.10.20.24.1.1" extension="2017-08-01"/>
 <!-- QDM-based QRDA templateId -->
-<templateId root="2.16.840.1.113883.10.20.24.1.2" extension="2019-12-01"/>
+<templateId root="2.16.840.1.113883.10.20.24.1.2" extension="2021-08-01"/>
 <!-- CMS QRDA templateId -->
+<!-- TODO: THIS will also change -->
 <templateId root="2.16.840.1.113883.10.20.24.1.3" extension="2020-02-01"/>
 <!-- This is the globally unique identifier for this QRDA document -->
 <id root="{{random_id}}"/>

data/lib/qrda-export/catI-r5/qrda1_r5.mustache

@@ -12,7 +12,8 @@
           <!-- 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 extension="2019-12-01" root="2.16.840.1.113883.10.20.24.2.1"/>
+          <templateId extension="2021-08-01" root="2.16.840.1.113883.10.20.24.2.1"/>
+          <!-- TODO: This will also change -->
           <templateId extension="2020-02-01" root="2.16.840.1.113883.10.20.24.2.1.1"/>
           <code code="55188-7" codeSystem="2.16.840.1.113883.6.1"/>
           <title>Patient Data</title>
@@ -46,10 +47,6 @@
             {{> qrda_templates/diagnosis}}
           {{/diagnosis}}
 
-          {{#device_applied}}
-            {{> qrda_templates/device_applied}}
-          {{/device_applied}}
-
           {{#device_order}}
             {{> qrda_templates/device_order}}
           {{/device_order}}

data/lib/qrda-export/catI-r5/qrda_templates/adverse_event.mustache

@@ -1,7 +1,7 @@
 <entry>
   <observation classCode="OBS" moodCode="EVN">
     <!-- Adverse Event -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.146" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.146" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"/>
     <statusCode code="completed"/>

data/lib/qrda-export/catI-r5/qrda_templates/allergy_intolerance.mustache

@@ -3,7 +3,7 @@
     <!-- Conforms to C-CDA R2.1 Substance or Device Allergy - Intolerance Observation (V2) -->
     <templateId root="2.16.840.1.113883.10.20.24.3.90" extension="2014-06-09"/>
     <!-- Allergy Intolerance -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.147" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.147" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"/>
     <statusCode code="completed" />

data/lib/qrda-export/catI-r5/qrda_templates/assessment_order.mustache

@@ -3,7 +3,7 @@
     <!-- Conforms to C-CDA R2.1 Planned Observation (V2) -->
     <templateId root="2.16.840.1.113883.10.20.22.4.44" extension="2014-06-09" />
     <!-- Assessment Order -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.158" extension="2019-12-01" />
+    <templateId root="2.16.840.1.113883.10.20.24.3.158" extension="2021-08-01" />
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <!-- QDM Attribute: Code -->
     {{> _codes}}

data/lib/qrda-export/catI-r5/qrda_templates/assessment_performed.mustache

@@ -1,7 +1,7 @@
 <entry>
   <observation classCode="OBS" moodCode="EVN" {{{negation_ind}}}>
     <!-- Assessment Performed -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.144" extension="2019-12-01" />
+    <templateId root="2.16.840.1.113883.10.20.24.3.144" extension="2021-08-01" />
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     {{> _codes}}
     <text>{{description}}</text>
@@ -11,6 +11,10 @@
     <!-- QDM Attribute: Result -->
     {{{result_value}}}
     {{/result}}
+    {{#interpretation}}
+      <!-- QDM Attribute: Interpretation -->
+      {{> qrda_templates/template_partials/_interpretation}}
+    {{/interpretation}}
     {{#method}}
       <!-- QDM Attribute: Method -->
       {{> qrda_templates/template_partials/_method}}
@@ -38,8 +42,8 @@
       {{> qrda_templates/template_partials/_component}}
     {{/components}}
     {{#relatedTo}}
-        <!-- QDM Attribute: Related To -->
-        {{> qrda_templates/template_partials/_related_to}}
+      <!-- QDM Attribute: Related To -->
+      {{> qrda_templates/template_partials/_related_to}}
     {{/relatedTo}}
   </observation>
 </entry>

data/lib/qrda-export/catI-r5/qrda_templates/assessment_recommended.mustache

@@ -3,7 +3,7 @@
     <!-- Conforms to C-CDA R2.1 Planned Observation (V2) -->
     <templateId root="2.16.840.1.113883.10.20.22.4.44" extension="2014-06-09" />
     <!-- Assessment Recommended (V2) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.145" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.145" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <!-- QDM Attribute: Code -->
     {{> _codes}}

data/lib/qrda-export/catI-r5/qrda_templates/communication_performed.mustache

@@ -1,6 +1,6 @@
 <entry>
     <act classCode="ACT" moodCode="EVN" {{{negation_ind}}}>
-        <templateId root="2.16.840.1.113883.10.20.24.3.156" extension="2019-12-01"/>
+        <templateId root="2.16.840.1.113883.10.20.24.3.156" extension="2021-08-01"/>
         <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
         {{#category}}
           <!-- QDM Attribute: Category -->

data/lib/qrda-export/catI-r5/qrda_templates/device_order.mustache

@@ -1,13 +1,13 @@
 <entry>
   <act classCode="ACT" moodCode="RQO" {{{negation_ind}}}>
-    <templateId root="2.16.840.1.113883.10.20.24.3.130" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.130" extension="2021-08-01"/>
     <code code="SPLY" codeSystem="2.16.840.1.113883.5.6" displayName="Supply" codeSystemName="ActClass"/>
     <entryRelationship typeCode="SUBJ">
       <supply classCode="SPLY" moodCode="RQO">
         <!-- Plan of Care Activity Supply -->
         <templateId root="2.16.840.1.113883.10.20.22.4.43" extension="2014-06-09"/>
         <!-- Device, Order -->
-        <templateId root="2.16.840.1.113883.10.20.24.3.9" extension="2019-12-01"/>
+        <templateId root="2.16.840.1.113883.10.20.24.3.9" extension="2021-08-01"/>
         <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
         <text>{{description}}</text>
         <statusCode code="active"/>

data/lib/qrda-export/catI-r5/qrda_templates/device_recommended.mustache

@@ -1,13 +1,13 @@
 <entry>
   <act classCode="ACT" moodCode="INT" {{{negation_ind}}}>
-    <templateId root="2.16.840.1.113883.10.20.24.3.131" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.131" extension="2021-08-01"/>
     <code code="SPLY" codeSystem="2.16.840.1.113883.5.6" displayName="Supply" codeSystemName="ActClass"/>
     <entryRelationship typeCode="SUBJ">
       <supply classCode="SPLY" moodCode="INT">
         <!-- C-CDA R2.1 : Planned Supply (V2) -->
         <templateId root="2.16.840.1.113883.10.20.22.4.43" extension="2014-06-09"/>
         <!-- Device Recommended (V4) -->
-        <templateId root="2.16.840.1.113883.10.20.24.3.10" extension="2019-12-01"/>
+        <templateId root="2.16.840.1.113883.10.20.24.3.10" extension="2021-08-01"/>
         <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
         <text>{{description}}</text>
         <statusCode code="active"/>

data/lib/qrda-export/catI-r5/qrda_templates/diagnosis.mustache

@@ -3,7 +3,7 @@
     <!-- Conforms to C-CDA 2.1 Problem Concern Act (V3) -->
     <templateId root="2.16.840.1.113883.10.20.22.4.3" extension="2015-08-01" />
     <!-- Diagnosis Concern Act -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.137" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.137" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <code code="CONC" codeSystem="2.16.840.1.113883.5.6" displayName="Concern" />
     {{#prevalencePeriod}}
@@ -20,7 +20,7 @@
         <!-- Conforms to C-CDA R2.1 Problem Observation (V3) -->
         <templateId root="2.16.840.1.113883.10.20.22.4.4" extension="2015-08-01" />
         <!-- Diagnosis template -->
-        <templateId root="2.16.840.1.113883.10.20.24.3.135" extension="2019-12-01" />
+        <templateId root="2.16.840.1.113883.10.20.24.3.135" extension="2021-08-01" />
         <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
         <code code="29308-4" codeSystem="2.16.840.1.113883.6.1">
           <translation code="282291009" codeSystem="2.16.840.1.113883.6.96"/>

data/lib/qrda-export/catI-r5/qrda_templates/diagnostic_study_order.mustache

@@ -4,7 +4,7 @@
        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="2019-12-01"/>
+  <templateId root="2.16.840.1.113883.10.20.24.3.17" extension="2021-08-01"/>
   <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
   {{> _codes}}
   <text>{{description}}</text>

data/lib/qrda-export/catI-r5/qrda_templates/diagnostic_study_performed.mustache

@@ -4,13 +4,17 @@
        (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="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.18" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     {{> _codes}}
     <text>{{description}}</text>
     <statusCode code="completed"/>
     {{{relevant_date_period_or_null_flavor}}}
     <value nullFlavor="NA" xsi:type="CD" />
+    {{#interpretation}}
+      <!-- QDM Attribute: Interpretation -->
+      {{> qrda_templates/template_partials/_interpretation}}
+    {{/interpretation}}
     {{#method}}
       <!-- QDM Attribute: Method -->
       {{> qrda_templates/template_partials/_method}}
@@ -49,5 +53,9 @@
       <!-- QDM Attribute: Components -->
       {{> qrda_templates/template_partials/_component}}
     {{/components}}
+    {{#relatedTo}}
+      <!-- QDM Attribute: relatedTo -->
+      {{> qrda_templates/template_partials/_related_to}}
+    {{/relatedTo}}
   </observation>
 </entry>

data/lib/qrda-export/catI-r5/qrda_templates/diagnostic_study_recommended.mustache

@@ -3,7 +3,7 @@
     <!-- Conforms to C-CDA R2.1 Planned Observation (V2) -->
     <templateId root="2.16.840.1.113883.10.20.22.4.44" extension="2014-06-09"/>
     <!-- Diagnostic Study Recommended (V4) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.19" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.19" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     {{> _codes}}
     <text>{{description}}</text>

data/lib/qrda-export/catI-r5/qrda_templates/encounter_order.mustache

@@ -1,13 +1,13 @@
 <entry>
   <act classCode="ACT" moodCode="RQO" {{{negation_ind}}}>
-    <templateId root="2.16.840.1.113883.10.20.24.3.132" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.132" extension="2021-08-01"/>
     <code code="ENC" codeSystem="2.16.840.1.113883.5.6" displayName="Encounter" codeSystemName="ActClass"/>
     <entryRelationship typeCode="SUBJ">
       <encounter classCode="ENC" moodCode="RQO">
         <!--  Plan of Care Activity Encounter template -->
         <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" extension="2019-12-01"/>
+        <templateId root="2.16.840.1.113883.10.20.24.3.22" extension="2021-08-01"/>
         <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
         <!-- QDM Attribute: Code -->
         {{> _codes}}

data/lib/qrda-export/catI-r5/qrda_templates/encounter_performed.mustache

@@ -1,14 +1,14 @@
 <entry>
-  <act classCode="ACT" moodCode="EVN" {{{negation_ind}}}>
+  <act classCode="ACT" moodCode="EVN">
     <!--Encounter performed Act -->
-    <templateId extension="2019-12-01" root="2.16.840.1.113883.10.20.24.3.133"/>
+    <templateId extension="2021-08-01" root="2.16.840.1.113883.10.20.24.3.133"/>
     <code code="ENC" codeSystem="2.16.840.1.113883.5.6" codeSystemName="ActClass" displayName="Encounter"/>
     <entryRelationship typeCode="SUBJ">
       <encounter classCode="ENC" moodCode="EVN">
         <!--  Encounter activities template -->
         <templateId extension="2015-08-01" root="2.16.840.1.113883.10.20.22.4.49"/>
         <!-- Encounter performed template -->
-        <templateId extension="2019-12-01" root="2.16.840.1.113883.10.20.24.3.23"/>
+        <templateId extension="2021-08-01" root="2.16.840.1.113883.10.20.24.3.23"/>
         <id extension="{{object_id}}" root="1.3.6.1.4.1.115"/>
         <!-- QDM Attribute: Code -->
         {{> _codes}}
@@ -40,15 +40,19 @@
             {{> qrda_templates/template_partials/_entity}}
           </participant>
         {{/participant}}
+        {{#clazz}}
+          <!-- QDM Attribute: Class -->
+          {{> qrda_templates/template_partials/_encounter_class}}
+        {{/clazz}}
         {{#diagnoses}}
           <!-- QDM Attribute: Diagnoses -->
           {{> qrda_templates/template_partials/_encounter_diagnosis_qdm}}
         {{/diagnoses}}
+        {{#relatedTo}}
+          <!-- QDM Attribute: relatedTo -->
+          {{> qrda_templates/template_partials/_related_to}}
+        {{/relatedTo}}
       </encounter>
     </entryRelationship>
-    {{#negationRationale}}
-      <!-- QDM Attribute: Negation Rationale -->
-      {{> qrda_templates/template_partials/_reason}}
-    {{/negationRationale}}
   </act>
 </entry>

data/lib/qrda-export/catI-r5/qrda_templates/encounter_recommended.mustache

@@ -1,14 +1,14 @@
 <entry>
   <act classCode="ACT" moodCode="INT" {{{negation_ind}}}>
     <!--Encounter Recommended Act (V2) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.134" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.134" extension="2021-08-01"/>
     <code code="ENC" codeSystem="2.16.840.1.113883.5.6" codeSystemName="ActClass" displayName="Encounter"/>
     <entryRelationship typeCode="SUBJ">
       <encounter classCode="ENC" moodCode="INT">
         <!-- Conforms to C-CDA R2.1 Planned Encounter (V2) template -->
         <templateId root="2.16.840.1.113883.10.20.22.4.40" extension="2014-06-09"/>
         <!-- Encounter Recommended (V4) template -->
-        <templateId root="2.16.840.1.113883.10.20.24.3.24" extension="2019-12-01"/>
+        <templateId root="2.16.840.1.113883.10.20.24.3.24" extension="2021-08-01"/>
         <id extension="{{object_id}}" root="1.3.6.1.4.1.115"/>
         <!-- QDM Attribute: Code -->
         {{> _codes}}

data/lib/qrda-export/catI-r5/qrda_templates/family_history.mustache

@@ -3,7 +3,7 @@
     <!-- C-CDA R2.1 Family History Organizer (V3) -->
     <templateId root="2.16.840.1.113883.10.20.22.4.45" extension="2015-08-01"/>
     <!-- Family History Organizer QDM (V4) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.12" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.12" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <statusCode code="completed" />
     {{#relationship}}
@@ -19,7 +19,7 @@
         <!-- Conforms to C-CDA R2.1 Family History Observation (V3) -->
         <templateId root="2.16.840.1.113883.10.20.22.4.46" extension="2015-08-01"/>
         <!-- Family History QDM (V3) -->
-        <templateId root="2.16.840.1.113883.10.20.24.3.112" extension="2019-12-01"/>
+        <templateId root="2.16.840.1.113883.10.20.24.3.112" extension="2021-08-01"/>
         <id root="1.3.6.1.4.1.115" extension="{{random_id}}"/>
         <code code="75323-6" displayName="Condition" codeSystemName="LOINC" codeSystem="2.16.840.1.113883.6.1">
           <translation code="64572001" displayName="Condition" codeSystemName="SNOMED CT" codeSystem="2.16.840.1.113883.6.96"/>

data/lib/qrda-export/catI-r5/qrda_templates/immunization_administered.mustache

@@ -8,7 +8,7 @@
     <!-- C-CDA R2 Immunization Activity -->
     <templateId root="2.16.840.1.113883.10.20.22.4.52" extension="2015-08-01"/>
     <!-- Immunization Administered -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.140" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.140" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <code code="416118004" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="Administration"/>
     <statusCode code="completed"/>

data/lib/qrda-export/catI-r5/qrda_templates/immunization_order.mustache

@@ -3,7 +3,7 @@
     <!-- Conforms to C-CDA R2.1 Planned Immunization Activity -->
     <templateId root="2.16.840.1.113883.10.20.22.4.120"/>
     <!-- Immunization Order (V2) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.143" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.143" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <text>{{description}}</text>
     <statusCode code="active"/>

data/lib/qrda-export/catI-r5/qrda_templates/intervention_order.mustache

@@ -3,7 +3,7 @@
     <!-- Conforms to C-CDA R2 Planned Act (V2) template -->
     <templateId root="2.16.840.1.113883.10.20.22.4.39" extension="2014-06-09"/>
     <!-- Intervention Order (V4) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.31" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.31" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     {{> _codes}}
     <text>{{description}}</text>

data/lib/qrda-export/catI-r5/qrda_templates/intervention_performed.mustache

@@ -3,7 +3,7 @@
     <!-- Consolidation CDA: Procedure Activity Act template -->
     <templateId root="2.16.840.1.113883.10.20.22.4.12" extension="2014-06-09"/>
     <!-- Intervention Performed Template -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.32" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.32" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     {{> _codes}}
     <text>{{description}}</text>
@@ -35,5 +35,9 @@
       <!-- QDM Attribute: Status -->
       {{> qrda_templates/template_partials/_status}}
     {{/status}}
+    {{#relatedTo}}
+      <!-- QDM Attribute: relatedTo -->
+      {{> qrda_templates/template_partials/_related_to}}
+    {{/relatedTo}}
   </act>
 </entry>

data/lib/qrda-export/catI-r5/qrda_templates/intervention_recommended.mustache

@@ -3,7 +3,7 @@
     <!-- Conforms to C-CDA R2.1 Planned Act (V2) template -->
     <templateId root="2.16.840.1.113883.10.20.22.4.39" extension="2014-06-09"/>
     <!-- Intervention Recommended (V4) template -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.33" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.33" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <!--  QDM Attribute: Code -->
     {{> _codes}}

data/lib/qrda-export/catI-r5/qrda_templates/laboratory_test_order.mustache

@@ -3,7 +3,7 @@
     <!-- Consolidation Plan of Care Activity Observation -->
     <templateId root="2.16.840.1.113883.10.20.22.4.44" extension="2014-06-09"/>
     <!-- Laboratory Test, Order (V4) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.37" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.37" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     {{> _codes}}
     <text>{{description}}</text>

data/lib/qrda-export/catI-r5/qrda_templates/laboratory_test_performed.mustache

@@ -1,7 +1,7 @@
 <entry>
   <observation classCode="OBS" moodCode="EVN" {{{negation_ind}}}>
     <!-- Laboratory Test Performed (V4) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.38" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.38" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     {{> _codes}}
     <text>{{description}}</text>
@@ -41,9 +41,9 @@
       <!-- QDM Attribute: Components -->
       {{> qrda_templates/template_partials/_component}}
     {{/components}}
-    {{#encounter_id}}
+    {{#relatedTo}}
       <!-- QDM Attribute: relatedTo -->
       {{> qrda_templates/template_partials/_related_to}}
-    {{/encounter_id}}
+    {{/relatedTo}}
     </observation>
 </entry>

data/lib/qrda-export/catI-r5/qrda_templates/laboratory_test_recommended.mustache

@@ -3,7 +3,7 @@
     <!-- Conforms to C-CDA R2.1 Planned Observation (V2) -->
     <templateId root="2.16.840.1.113883.10.20.22.4.44" extension="2014-06-09"/>
     <!-- Laboratory Test, Recommended (V4) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.39" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.39" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <!-- QDM Attribute: Code -->
     {{> _codes}}

data/lib/qrda-export/catI-r5/qrda_templates/medication_active.mustache

@@ -3,7 +3,7 @@
     <!-- Medication Activity (consolidation) template -->
     <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" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.41" extension="2021-08-01"/>
 
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <text>{{description}}</text>

data/lib/qrda-export/catI-r5/qrda_templates/medication_administered.mustache

@@ -3,7 +3,7 @@
     <!-- Medication Activity (consolidation) template -->
     <templateId root="2.16.840.1.113883.10.20.22.4.16" extension="2014-06-09"/>
     <!-- Medication, Administered template -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.42" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.42" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <code code="416118004" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="Administration"/>
     <statusCode code="completed"/>

data/lib/qrda-export/catI-r5/qrda_templates/medication_discharge.mustache

@@ -1,7 +1,7 @@
 <entry>
   <act classCode="ACT" moodCode="RQO" {{{negation_ind}}}>
     <!-- Discharge Medication Entry -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.105" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.105" extension="2021-08-01"/>
     <code code="75311-1" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="Discharge medications"/> 
     <statusCode code="active"/>
     {{#prescriber}}
@@ -20,8 +20,6 @@
       <substanceAdministration moodCode="EVN" classCode="SBADM">
         <!-- Medication Activity (consolidation) template -->
         <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" extension="2019-12-01"/>
         <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
         <text>{{description}}</text>
         <statusCode code="active"/> 
@@ -44,7 +42,7 @@
           </manufacturedProduct>
         </consumable>
         {{#authorDatetime}}
-          {{> qrda_templates/template_partials/_author_participation}}
+          {{> qrda_templates/template_partials/_author}}
         {{/authorDatetime}}
       </substanceAdministration>
     </entryRelationship>

data/lib/qrda-export/catI-r5/qrda_templates/medication_dispensed.mustache

@@ -1,13 +1,13 @@
 <entry>
   <act classCode="ACT" moodCode="EVN" {{{negation_ind}}}>
     <!-- Medication Dispensed Act -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.139" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.139" extension="2021-08-01"/>
     <code code="SPLY" codeSystem="2.16.840.1.113883.5.6" displayName="supply" codeSystemName="ActClass"/>
     <entryRelationship typeCode="SUBJ">
       <!--Medication dispensed -->
       <supply classCode="SPLY" moodCode="EVN">
         <!--  Medication Dispensed template -->
-        <templateId root="2.16.840.1.113883.10.20.24.3.45" extension="2019-12-01"/>
+        <templateId root="2.16.840.1.113883.10.20.24.3.45" extension="2021-08-01"/>
         <!-- Medication Dispense template -->
         <templateId root="2.16.840.1.113883.10.20.22.4.18" extension="2014-06-09"/>
         <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>

data/lib/qrda-export/catI-r5/qrda_templates/medication_order.mustache

@@ -3,7 +3,7 @@
   <substanceAdministration classCode="SBADM" moodCode="RQO" {{{negation_ind}}}>
     <templateId root="2.16.840.1.113883.10.20.22.4.42" extension="2014-06-09"/>
     <!-- Medication, Order template -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.47" extension="2019-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.47" extension="2021-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <text>{{description}}</text>
     <statusCode code="active"/>
@@ -66,5 +66,9 @@
           {{> qrda_templates/template_partials/_medication_supply_request}}
       </entryRelationship>
     {{/supply}}
+    {{#relatedTo}}
+      <!-- QDM Attribute: relatedTo -->
+      {{> qrda_templates/template_partials/_related_to}}
+    {{/relatedTo}}
   </substanceAdministration>
 </entry>