cqm-reports 3.0.0.pre.alpha.2 → 3.0.0

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

@@ -3,15 +3,21 @@
     <!-- 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="2017-08-01"/>
+    <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"/>
-    {{#relevantPeriod}}
-      <!-- QDM Attribute: Relevant Period -->
-      {{{medication_duration_effective_time}}}
-    {{/relevantPeriod}}
+    {{#relevantDatetime}}
+      <!-- QDM Attribute: Relevant dateTime -->
+      {{{relevant_date_time_value}}}
+    {{/relevantDatetime}}
+    {{^relevantDatetime}}
+      {{#relevantPeriod}}
+        <!-- QDM Attribute: Relevant Period -->
+        {{{medication_duration_effective_time}}}
+      {{/relevantPeriod}}
+    {{/relevantDatetime}}
     {{> qrda_templates/template_partials/_medication_details}}
     <consumable>
       <manufacturedProduct classCode="MANU">
@@ -26,7 +32,11 @@
         </manufacturerOrganization>
       </manufacturedProduct>
     </consumable>
-
+    {{#recorder}}
+      <!-- QDM Attribute: Recorder -->
+      <participant typeCode="PRF">
+        {{> qrda_templates/template_partials/_entity}}
+      </participant>
+    {{/recorder}}
   </substanceAdministration>
-
 </entry>

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

@@ -3,14 +3,20 @@
     <!-- 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="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.42" extension="2019-12-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"/>
-    {{#relevantPeriod}}
-      <!-- QDM Attribute: Relevant Period -->
-      {{{medication_duration_effective_time}}}
-    {{/relevantPeriod}}
+    {{#relevantDatetime}}
+      <!-- QDM Attribute: Relevant dateTime -->
+      {{{relevant_date_time_value}}}
+    {{/relevantDatetime}}
+    {{^relevantDatetime}}
+      {{#relevantPeriod}}
+        <!-- QDM Attribute: Relevant Period -->
+        {{{medication_duration_effective_time}}}
+      {{/relevantPeriod}}
+    {{/relevantDatetime}}
     {{> qrda_templates/template_partials/_medication_details}}
     <consumable>
       <manufacturedProduct classCode="MANU">
@@ -27,6 +33,12 @@
       <!-- QDM Attribute: Author dateTime -->
       {{> qrda_templates/template_partials/_author}}
     {{/authorDatetime}}
+    {{#performer}}
+      <!-- QDM Attribute: Performer -->
+      <participant typeCode="PRF">
+        {{> qrda_templates/template_partials/_entity}}
+      </participant>
+    {{/performer}}
     {{#reason}}
       <!-- QDM Attribute: Reason -->
       {{> qrda_templates/template_partials/_reason}}

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

@@ -1,16 +1,28 @@
 <entry>
   <act classCode="ACT" moodCode="RQO" {{{negation_ind}}}>
     <!-- Discharge Medication Entry -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.105" extension="2018-10-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.105" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <code code="75311-1" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="Discharge medications"/> 
     <statusCode code="active"/>
+    {{#prescriber}}
+      <!-- QDM Attribute: Prescriber -->
+      <participant typeCode="PRF">
+        {{> qrda_templates/template_partials/_entity}}
+      </participant>
+    {{/prescriber}}
+    {{#recorder}}
+      <!-- QDM Attribute: Recorder -->
+      <participant typeCode="AUT">
+        {{> qrda_templates/template_partials/_entity}}
+      </participant>
+    {{/recorder}}
     <entryRelationship typeCode="SUBJ">
       <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="2016-02-01"/>
+        <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"/> 

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

@@ -1,23 +1,29 @@
 <entry>
   <act classCode="ACT" moodCode="EVN" {{{negation_ind}}}>
     <!-- Medication Dispensed Act -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.139" extension="2018-10-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.139" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <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="2018-10-01"/>
+        <templateId root="2.16.840.1.113883.10.20.24.3.45" extension="2019-12-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}}"/>
         <text>{{description}}</text>
         <statusCode code="completed"/>
-        {{#relevantPeriod}}
-          <!-- QDM Attribute: Relevant Period -->
-          {{{medication_duration_effective_time}}}
-        {{/relevantPeriod}}
+        {{#relevantDatetime}}
+          <!-- QDM Attribute: Relevant dateTime -->
+          {{{relevant_date_time_value}}}
+        {{/relevantDatetime}}
+        {{^relevantDatetime}}
+          {{#relevantPeriod}}
+            <!-- QDM Attribute: Relevant Period -->
+            {{{medication_duration_effective_time}}}
+          {{/relevantPeriod}}
+        {{/relevantDatetime}}
         <product>
           <manufacturedProduct classCode="MANU">
             <!-- Medication Information (consolidation) template -->
@@ -28,17 +34,22 @@
             </manufacturedMaterial>
           </manufacturedProduct>
         </product>
-        {{#authordatetime_or_dispenserid?}}
+        {{#authorDatetime}}
+          <!-- QDM Attribute: Author dateTime -->
           {{> qrda_templates/template_partials/_author}}
-        {{/authordatetime_or_dispenserid?}}
-        {{#prescriberId}}
-        <participant typeCode="PRF">
-          <participantRole>
-            <!-- QDM Attribute: Prescriber Id -->
-            {{{id_or_null_flavor}}}
-          </participantRole>
-        </participant>
-        {{/prescriberId}}
+        {{/authorDatetime}}
+        {{#dispenser}}
+          <!-- QDM Attribute: Dispenser -->
+          <participant typeCode="DIST">
+            {{> qrda_templates/template_partials/_entity}}
+          </participant>
+        {{/dispenser}}
+        {{#prescriber}}
+          <!-- QDM Attribute: Prescriber -->
+          <participant typeCode="PRF">
+            {{> qrda_templates/template_partials/_entity}}
+          </participant>
+        {{/prescriber}}
         {{#daysSupplied}}
           <entryRelationship typeCode="REFR">
               {{> qrda_templates/template_partials/_days_supplied}}

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="2018-10-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.47" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <text>{{description}}</text>
     <statusCode code="active"/>
@@ -41,6 +41,12 @@
       </participantRole>
     </participant>      
     {{/setting}}
+    {{#prescriber}}
+      <!-- QDM Attribute: Prescriber -->
+      <participant typeCode="PRF">
+        {{> qrda_templates/template_partials/_entity}}
+      </participant>
+    {{/prescriber}}
     {{#reason}}
       <!-- QDM Attribute: Reason -->
       {{> qrda_templates/template_partials/_reason}}

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

@@ -1,7 +1,7 @@
 <entry>
   <observation classCode="OBS" moodCode="EVN">
     <!-- Patient Care Experience (V4) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.48" extension="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.48" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <code code="77218-6" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="Patient satisfaction with healthcare delivery"/>
     <statusCode code="completed"/>
@@ -10,5 +10,11 @@
       <!-- QDM Attribute: Author dateTime -->
       {{> qrda_templates/template_partials/_author}}
     {{/authorDatetime}}
+    {{#recorder}}
+      <!-- QDM Attribute: Recorder -->
+      <participant typeCode="PRF">
+        {{> qrda_templates/template_partials/_entity}}
+      </participant>
+    {{/recorder}}
   </observation>
 </entry>

data/lib/qrda-export/catI-r5/qrda_templates/physical_exam_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"/>
     <!-- Physical Exam Order (V4) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.58" extension="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.58" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <code code="29545-1" codeSystem="2.16.840.1.113883.6.1" displayName="physical examination" codeSystemName="LOINC"/>
     <text>{{description}}</text>
@@ -18,6 +18,12 @@
       <!-- QDM Attribute: Author dateTime -->
       {{> qrda_templates/template_partials/_author}}
     {{/authorDatetime}}
+    {{#requester}}
+      <!-- QDM Attribute: Requester -->
+      <participant typeCode="PRF">
+        {{> qrda_templates/template_partials/_entity}}
+      </participant>
+    {{/requester}}
     {{#reason}}
       <!-- QDM Attribute: Reason -->
       {{> qrda_templates/template_partials/_reason}}

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

@@ -3,16 +3,22 @@
     <!-- Procedure Activity Procedure (Consolidation) template -->
     <templateId root="2.16.840.1.113883.10.20.22.4.13" extension="2014-06-09"/>
     <!-- Physical Exam, Performed template -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.59" extension="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.59" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <!-- QDM Attribute: Code -->
     {{> _codes}}
     <text>{{description}}</text>
     <statusCode code="completed"/>
-    {{#relevantPeriod}}
-      <!-- QDM Attribute: Relevant Period -->
-      {{{relevant_period}}}
-    {{/relevantPeriod}}
+    {{#relevantDatetime}}
+      <!-- QDM Attribute: Relevant dateTime -->
+      {{{relevant_date_time_value}}}
+    {{/relevantDatetime}}
+    {{^relevantDatetime}}
+      {{#relevantPeriod}}
+        <!-- QDM Attribute: Relevant Period -->
+        {{{relevant_period}}}
+      {{/relevantPeriod}}
+    {{/relevantDatetime}}
     {{#result}}
     <!-- QDM Attribute: Result -->
     {{{result_value}}}
@@ -33,6 +39,12 @@
       <!-- QDM Attribute: Author dateTime -->
       {{> qrda_templates/template_partials/_author}}
     {{/authorDatetime}}
+    {{#performer}}
+      <!-- QDM Attribute: Performer -->
+      <participant typeCode="PRF">
+        {{> qrda_templates/template_partials/_entity}}
+      </participant>
+    {{/performer}}
     {{#reason}}
       <!-- QDM Attribute: Reason -->
       {{> qrda_templates/template_partials/_reason}}

data/lib/qrda-export/catI-r5/qrda_templates/physical_exam_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"/>
     <!-- Physical Exam Recommeded (V4) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.60" extension="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.60" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <code code="29545-1" codeSystem="2.16.840.1.113883.6.1" displayName="physical examination" codeSystemName="LOINC"/>
     <text>{{description}}</text>
@@ -18,6 +18,12 @@
       <!-- QDM Attribute: Author dateTime -->
       {{> qrda_templates/template_partials/_author}}
     {{/authorDatetime}}
+    {{#requester}}
+      <!-- QDM Attribute: Requester -->
+      <participant typeCode="PRF">
+        {{> qrda_templates/template_partials/_entity}}
+      </participant>
+    {{/requester}}
     {{#reason}}
       <!-- QDM Attribute: Reason -->
       {{> qrda_templates/template_partials/_reason}}

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

@@ -3,7 +3,7 @@
     <!-- Consolidated Plan of Care Activity Procedure TemplateId (Implied Template) -->
     <templateId root="2.16.840.1.113883.10.20.22.4.41" extension="2014-06-09"/> 
     <!-- QRDA Procedure, Order TemplateId --> 
-    <templateId root="2.16.840.1.113883.10.20.24.3.63" extension="2018-10-01"/> 
+    <templateId root="2.16.840.1.113883.10.20.24.3.63" extension="2019-12-01"/> 
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     {{> _codes}}
     <text>{{description}}</text>
@@ -16,6 +16,12 @@
       <!-- QDM Attribute: Author dateTime -->
       {{> qrda_templates/template_partials/_author}}
     {{/authorDatetime}}
+    {{#requester}}
+      <!-- QDM Attribute: Requester -->
+      <participant typeCode="PRF">
+        {{> qrda_templates/template_partials/_entity}}
+      </participant>
+    {{/requester}}
     {{#reason}}
       <!-- QDM Attribute: Reason -->
       {{> qrda_templates/template_partials/_reason}}
@@ -24,5 +30,9 @@
       <!-- QDM Attribute: Negation Rationale -->
       {{> qrda_templates/template_partials/_reason}}
     {{/negationRationale}}
+    {{#rank}}
+      <!-- QDM Attribute: Rank -->
+      {{> qrda_templates/template_partials/_rank}}
+    {{/rank}}
   </procedure>
 </entry>

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

@@ -1,17 +1,23 @@
 <entry>
   <procedure classCode="PROC" moodCode="EVN" {{{negation_ind}}}>
     <!--  Procedure performed template -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.64" extension="2018-10-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.64" extension="2019-12-01"/>
     <!-- Procedure Activity Procedure-->
     <templateId root="2.16.840.1.113883.10.20.22.4.14" extension="2014-06-09"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     {{> _codes}}
     <text>{{description}}</text>
     <statusCode code="completed"/>
-    {{#relevantPeriod}}
-      <!-- QDM Attribute: Relevant Period -->
-      {{{relevant_period}}}
-    {{/relevantPeriod}}
+    {{#relevantDatetime}}
+      <!-- QDM Attribute: Relevant dateTime -->
+      {{{relevant_date_time_value}}}
+    {{/relevantDatetime}}
+    {{^relevantDatetime}}
+      {{#relevantPeriod}}
+        <!-- QDM Attribute: Relevant Period -->
+        {{{relevant_period}}}
+      {{/relevantPeriod}}
+    {{/relevantDatetime}}
     {{#method}}
       <!-- QDM Attribute: Method -->
       {{> qrda_templates/template_partials/_method}}
@@ -24,6 +30,16 @@
       <!-- QDM Attribute: Author dateTime -->
       {{> qrda_templates/template_partials/_author}}
     {{/authorDatetime}}
+    {{#performer}}
+      <!-- QDM Attribute: Performer -->
+      <participant typeCode="PRF">
+        {{> qrda_templates/template_partials/_entity}}
+      </participant>
+    {{/performer}}
+    {{#rank}}
+      <!-- QDM Attribute: Rank -->
+      {{> qrda_templates/template_partials/_rank}}
+    {{/rank}}
     {{#reason}}
       <!-- QDM Attribute: Reason -->
       {{> qrda_templates/template_partials/_reason}}

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

@@ -3,7 +3,7 @@
     <!-- Conforms to C-CDA R2.1 Planned Procedure (V2) -->
     <templateId root="2.16.840.1.113883.10.20.22.4.41" extension="2014-06-09"/>
     <!-- Procedure Recommended (V5) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.65" extension="2018-10-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.65" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <!-- QDM Attribute: Code -->
     {{> _codes}}
@@ -17,6 +17,12 @@
       <!-- QDM Attribute: Author dateTime -->
       {{> qrda_templates/template_partials/_author}}
     {{/authorDatetime}}
+    {{#requester}}
+      <!-- QDM Attribute: Requester -->
+      <participant typeCode="PRF">
+        {{> qrda_templates/template_partials/_entity}}
+      </participant>
+    {{/requester}}
     {{#reason}}
       <!-- QDM Attribute: Reason -->
       {{> qrda_templates/template_partials/_reason}}
@@ -25,6 +31,10 @@
       <!-- QDM Attribute: Negation Rationale -->
       {{> qrda_templates/template_partials/_reason}}
     {{/negationRationale}}
+    {{#rank}}
+      <!-- QDM Attribute: Rank -->
+      {{> qrda_templates/template_partials/_rank}}
+    {{/rank}}
   </procedure>
 </entry>
 

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

@@ -0,0 +1,21 @@
+<entry>
+  <observation classCode="OBS" moodCode="EVN">
+    <!-- Program Participation (V2) -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.154" extension="2019-12-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" />
+    {{#participationPeriod}}
+      <!-- QDM Attribute: Participation Period -->
+      {{{participation_period}}}
+    {{/participationPeriod}}
+    <!-- QDM Attribute: Code -->
+    {{> qrda_templates/template_partials/_data_element_codes_as_values}}
+    {{#recorder}}
+      <!-- QDM Attribute: Recorder -->
+      <participant typeCode="PRF">
+        {{> qrda_templates/template_partials/_entity}}
+      </participant>
+    {{/recorder}}
+  </observation>
+</entry>

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

@@ -1,7 +1,7 @@
 <entry>
   <observation classCode="OBS" moodCode="EVN">
     <!-- Provider Care Experience (V4) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.67" extension="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.67" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <code code="77219-4" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="Provider satisfaction with healthcare delivery"/>
     <statusCode code="completed" />
@@ -11,5 +11,11 @@
       <!-- QDM Attribute: Author dateTime -->
       {{> qrda_templates/template_partials/_author}}
     {{/authorDatetime}}
+    {{#recorder}}
+      <!-- QDM Attribute: Recorder -->
+      <participant typeCode="PRF">
+        {{> qrda_templates/template_partials/_entity}}
+      </participant>
+    {{/recorder}}
   </observation>
 </entry>