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

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="2017-08-01"/>
+  <templateId root="2.16.840.1.113883.10.20.24.3.17" extension="2019-12-01"/>
   <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
   {{> _codes}}
   <text>{{description}}</text>
@@ -13,6 +13,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/diagnostic_study_performed.mustache

@@ -4,15 +4,21 @@
        (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="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.18" extension="2019-12-01"/>
     <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}}
     <value nullFlavor="NA" xsi:type="CD" />
     {{#method}}
       <!-- QDM Attribute: Method -->
@@ -26,6 +32,12 @@
       <!-- QDM Attribute: Facility Location -->
       {{> qrda_templates/template_partials/_facility_location}}
     {{/facilityLocation}}
+    {{#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/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="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.19" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     {{> _codes}}
     <text>{{description}}</text>
@@ -13,6 +13,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}}
     {{#negationRationale}}
       <!-- QDM Attribute: Negation Rationale -->
       {{> qrda_templates/template_partials/_reason}}

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

@@ -1,18 +1,21 @@
 <entry>
   <act classCode="ACT" moodCode="RQO" {{{negation_ind}}}>
-    <templateId root="2.16.840.1.113883.10.20.24.3.132" extension="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.132" extension="2019-12-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="2017-08-01"/>
+        <templateId root="2.16.840.1.113883.10.20.24.3.22" 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="active"/>
+        {{#priority}}
+          <priorityCode {{> _code}}/>
+        {{/priority}}
         {{#authorDatetime}}
           <!-- QDM Attribute: Author dateTime -->
           {{> qrda_templates/template_partials/_author}}
@@ -21,6 +24,12 @@
           <!-- QDM Attribute: Facility Location -->
           {{> qrda_templates/template_partials/_facility_location}}
         {{/facilityLocation}}
+        {{#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/encounter_performed.mustache

@@ -1,14 +1,14 @@
 <entry>
   <act classCode="ACT" moodCode="EVN" {{{negation_ind}}}>
     <!--Encounter performed Act -->
-    <templateId extension="2017-08-01" root="2.16.840.1.113883.10.20.24.3.133"/>
+    <templateId extension="2019-12-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="2017-08-01" root="2.16.840.1.113883.10.20.24.3.23"/>
+        <templateId extension="2019-12-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}}
@@ -34,9 +34,15 @@
           <!-- QDM Attribute: Admission Source -->
           {{> qrda_templates/template_partials/_admission_source}}
         {{/admissionSource}}
+        {{#participant}}
+          <!-- QDM Attribute: Participant -->
+          <participant typeCode="PRF">
+            {{> qrda_templates/template_partials/_entity}}
+          </participant>
+        {{/participant}}
         {{#diagnoses}}
           <!-- QDM Attribute: Diagnoses -->
-          {{> qrda_templates/template_partials/_encounter_diagnosis}}
+          {{> qrda_templates/template_partials/_encounter_diagnosis_qdm}}
         {{/diagnoses}}
       </encounter>
     </entryRelationship>

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

@@ -1,7 +1,7 @@
 <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="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.134" extension="2019-12-01"/>
     <id extension="{{object_id}}" root="1.3.6.1.4.1.115"/>
     <code code="ENC" codeSystem="2.16.840.1.113883.5.6" codeSystemName="ActClass" displayName="Encounter"/>
     <entryRelationship typeCode="SUBJ">
@@ -9,7 +9,7 @@
         <!-- 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="2017-08-01"/>
+        <templateId root="2.16.840.1.113883.10.20.24.3.24" extension="2019-12-01"/>
         <id extension="{{object_id}}" root="1.3.6.1.4.1.115"/>
         <!-- QDM Attribute: Code -->
         {{> _codes}}
@@ -23,6 +23,12 @@
           <!-- QDM Attribute: Facility Location -->
           {{> qrda_templates/template_partials/_facility_location}}
         {{/facilityLocation}}
+        {{#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/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="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.12" extension="2019-12-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="2017-08-01"/>
+        <templateId root="2.16.840.1.113883.10.20.24.3.112" extension="2019-12-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"/>
@@ -31,6 +31,12 @@
           <!-- 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>
     </component>
   </organizer>

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

@@ -1,16 +1,21 @@
 <entry>
-  <substanceAdministration classCode="SBADM" moodCode="EVN" {{{negation_ind}}}>
+    {{#negated}}
+      <substanceAdministration classCode="SBADM" moodCode="EVN" {{{negation_ind}}}>
+    {{/negated}}
+    {{^negated}}
+      <substanceAdministration classCode="SBADM" moodCode="EVN" negationInd="false">
+    {{/negated}}
     <!-- C-CDA R2 Immunization Activity -->
-    <templateId root="2.16.840.1.113883.10.20.22.4.52" extension="2014-06-09"/>
+    <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="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.140" 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"/>
-    {{#authorDatetime}}
-      <!-- QDM Attribute: Author dateTime -->
-      {{{author_effective_time}}}
-    {{/authorDatetime}}
+    {{#relevantDatetime}}
+      <!-- QDM Attribute: Relevant dateTime -->
+      {{{relevant_date_time_value}}}
+    {{/relevantDatetime}}
     {{> qrda_templates/template_partials/_immunization_details}}
     <consumable>
       <manufacturedProduct classCode="MANU">
@@ -23,6 +28,16 @@
         </manufacturedMaterial>
       </manufacturedProduct>
     </consumable>
+    {{#authorDatetime}}
+      <!-- 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/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="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.143" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <text>{{description}}</text>
     <statusCode code="active"/>
@@ -28,6 +28,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}}
@@ -39,7 +45,7 @@
     {{#supply}}
       <!-- QDM Attribute: Supply -->
       <entryRelationship typeCode="REFR">
-          {{> qrda_templates/template_partials/_medication_supply_request}}
+          {{> qrda_templates/template_partials/_immunization_supply_request}}
       </entryRelationship>
     {{/supply}}
   </substanceAdministration>

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="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.31" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     {{> _codes}}
     <text>{{description}}</text>
@@ -12,6 +12,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/intervention_performed.mustache

@@ -3,19 +3,31 @@
     <!-- 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="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.32" extension="2019-12-01"/>
     <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}}
     {{#authorDatetime}}
       <!-- 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/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="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.33" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <!--  QDM Attribute: Code -->
     {{> _codes}}
@@ -13,6 +13,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/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="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.37" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     {{> _codes}}
     <text>{{description}}</text>
@@ -12,6 +12,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/laboratory_test_performed.mustache

@@ -1,15 +1,21 @@
 <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="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.38" extension="2019-12-01"/>
     <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}}
@@ -18,6 +24,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/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="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.39" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <!-- QDM Attribute: Code -->
     {{> _codes}}
@@ -13,6 +13,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}}