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

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

@@ -0,0 +1,18 @@
+<entry>
+  <observation classCode="OBS" moodCode="EVN">
+    <!-- Related Person -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.170" extension="2019-12-01"/>
+    <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
+    <code code="444018008" codeSystem="2.16.840.1.113883.6.96" displayName="Person with characteristic related to subject of record"/>
+    <!-- QDM Attribute: Code -->
+    {{> qrda_templates/template_partials/_data_element_codes_as_values}}
+    {{#identifier}}
+    <participant typeCode="PRF">
+      <participantRole classCode="PAT">
+        <!-- QDM Attribute: LinkedPatientId -->
+        <id root="{{{namingSystem}}}" extension="{{{value}}}"/>
+      </participantRole>
+    </participant>
+    {{/identifier}}
+  </observation>
+</entry>

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

@@ -3,7 +3,7 @@
     <!-- Conforms to C-CDA R2.1 Planned Medication Activity (V2) -->
     <templateId root="2.16.840.1.113883.10.20.22.4.42" extension="2014-06-09"/>
     <!-- Substance Recommended (V4) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.75" extension="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.75" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <statusCode code="active"/>
     {{> qrda_templates/template_partials/_medication_details}}
@@ -22,6 +22,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/symptom.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"/>
     <!-- Symptom Concern Act (V3) -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.138" extension="2017-08-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.138" extension="2019-12-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}}
@@ -13,6 +13,7 @@
     {{^completed_prevalence_period}}
     <statusCode code="active" />
     {{/completed_prevalence_period}}
+    <!-- QDM Attribute: Prevalence Period -->
     {{{prevalence_period}}}
     {{/prevalencePeriod}}
     <entryRelationship typeCode="SUBJ">
@@ -20,23 +21,24 @@
         <!-- 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"/>
         <!-- Symptom (V2) -->
-        <templateId root="2.16.840.1.113883.10.20.24.3.136" extension="2017-08-01"/>
+        <templateId root="2.16.840.1.113883.10.20.24.3.136" extension="2019-12-01"/>
         <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
         <code code="75325-1" codeSystem="2.16.840.1.113883.6.1">
           <translation code="418799008" displayName="Symptom" codeSystem="2.16.840.1.113883.6.96"/>
         </code>
-        {{#prevalencePeriod}}
-        {{#completed_prevalence_period}}
         <statusCode code="completed" />
-        {{/completed_prevalence_period}}
-        {{^completed_prevalence_period}}
-        <statusCode code="active" />
-        {{/completed_prevalence_period}}
+        {{#prevalencePeriod}}
         <!-- QDM Attribute: Prevalence Period -->
         {{{prevalence_period}}}
         {{/prevalencePeriod}}
         <!-- 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}}
         {{#severity}}
           <!-- QDM Attribute: Severity -->
           {{> qrda_templates/template_partials/_severity}}

data/lib/qrda-export/catI-r5/qrda_templates/template_partials/_author.mustache

@@ -1,5 +1,5 @@
 <author>
-  <templateId root="2.16.840.1.113883.10.20.24.3.155" extension="2017-08-01"/>
+  <templateId root="2.16.840.1.113883.10.20.24.3.155" extension="2019-12-01"/>
   {{#authorDatetime}}
   {{{author_time}}}
   {{/authorDatetime}}

data/lib/qrda-export/catI-r5/qrda_templates/template_partials/_encounter_diagnosis_qdm.mustache

@@ -0,0 +1,24 @@
+<entryRelationship typeCode="REFR">
+  <observation classCode="OBS" moodCode="EVN">
+    <!--  Encounter Diagnosis QDM  -->
+    <templateId extension="2019-12-01" root="2.16.840.1.113883.10.20.24.3.168"/>
+    <code code="29308-4" codeSystem="2.16.840.1.113883.6.1"/>
+    <statusCode code="completed"/>
+    {{#code}}
+      <value {{> _code}} xsi:type="CD"/>
+    {{/code}}
+    {{#rank}}
+      <!-- QDM Attribute: Rank -->
+      {{> qrda_templates/template_partials/_rank}}
+    {{/rank}}
+    {{#presentOnAdmissionIndicator}}
+      <entryRelationship typeCode="REFR">
+        <observation classCode="OBS" moodCode="EVN">
+          <templateId root="2.16.840.1.113883.10.20.24.3.169" extension="2019-12-01"/>
+          <code code="78026-2" displayName="Present on admission" codeSystem="2.16.840.1.113883.6.1"/>
+          <value {{> _code}} xsi:type="CD"/>
+        </observation>
+      </entryRelationship>
+    {{/presentOnAdmissionIndicator}}
+  </observation>
+</entryRelationship>

data/lib/qrda-export/catI-r5/qrda_templates/template_partials/_entity.mustache

@@ -0,0 +1,12 @@
+{{#care_partner_entity?}}
+	{{> qrda_templates/template_partials/_entity_care_partner}}
+{{/care_partner_entity?}}
+{{#patient_entity?}}
+	{{> qrda_templates/template_partials/_entity_patient}}
+{{/patient_entity?}}
+{{#practitioner_entity?}}
+	{{> qrda_templates/template_partials/_entity_practitioner}}
+{{/practitioner_entity?}}
+{{#organization_entity?}}
+	{{> qrda_templates/template_partials/_entity_organization}}
+{{/organization_entity?}}

data/lib/qrda-export/catI-r5/qrda_templates/template_partials/_entity_care_partner.mustache

@@ -0,0 +1,11 @@
+<participantRole>
+    <templateId root="2.16.840.1.113883.10.20.24.3.160" extension="2019-12-01" />
+    {{#identifier}}
+      <id root="{{{namingSystem}}}" extension="{{{value}}}"/>
+    {{/identifier}}
+    {{#relationship}}
+      <playingEntity>
+        <code {{> _code}}/>
+      </playingEntity>
+    {{/relationship}}
+</participantRole>

data/lib/qrda-export/catI-r5/qrda_templates/template_partials/_entity_organization.mustache

@@ -0,0 +1,11 @@
+<participantRole>
+    <templateId root="2.16.840.1.113883.10.20.24.3.163" extension="2019-12-01" />
+    {{#identifier}}
+      <id root="{{{namingSystem}}}" extension="{{{value}}}"/>
+    {{/identifier}}
+    {{#type}}
+      <playingEntity>
+        <code {{> _code}}/>
+      </playingEntity>
+    {{/type}}
+</participantRole>

data/lib/qrda-export/catI-r5/qrda_templates/template_partials/_entity_patient.mustache

@@ -0,0 +1,6 @@
+<participantRole>
+    <templateId root="2.16.840.1.113883.10.20.24.3.161" extension="2019-12-01" />
+    {{#identifier}}
+      <id root="{{{namingSystem}}}" extension="{{{value}}}"/>
+    {{/identifier}}
+</participantRole>

data/lib/qrda-export/catI-r5/qrda_templates/template_partials/_entity_practitioner.mustache

@@ -0,0 +1,19 @@
+<participantRole>
+    <templateId root="2.16.840.1.113883.10.20.24.3.162" extension="2019-12-01" />
+    {{#identifier}}
+      <id root="{{{namingSystem}}}" extension="{{{value}}}"/>
+    {{/identifier}}
+    {{#role}}
+      <code {{> _code}}/>
+    {{/role}}
+    {{#specialty}}
+      <playingEntity>
+        <code {{> _code}}/>
+      </playingEntity>
+    {{/specialty}}
+    {{#qualification}}
+      <scopingEntity>
+        <code {{> _code}}/>
+      </scopingEntity>
+    {{/qualification}}
+</participantRole>

data/lib/qrda-export/catI-r5/qrda_templates/template_partials/_immunization_supply_request.mustache

@@ -0,0 +1,29 @@
+<supply classCode="SPLY" moodCode="RQO">
+ <!-- Immunization Supply Request template -->
+  <templateId root="2.16.840.1.113883.10.20.24.3.167" extension="2019-12-01"/>
+  <!-- Conforms to C-CDA R2 Planned Supply (V2) template-->
+  <templateId root="2.16.840.1.113883.10.20.22.4.43" extension="2014-06-09" />
+  <id root="{{random_id}}"/>
+  <statusCode code="active"/>
+  {{#relevantPeriod}}
+  {{{medication_supply_request_period}}}
+  {{/relevantPeriod}}
+  {{^relevantPeriod}}
+    {{#authorDatetime}}
+    {{{author_effective_time}}}
+    {{/authorDatetime}}
+  {{/relevantPeriod}}
+  <quantity value="{{{value_as_float}}}"/>
+  <product>
+    <manufacturedProduct classCode="MANU">
+      <!-- Immunization Medication Information (consolidation) template -->
+      <templateId root="2.16.840.1.113883.10.20.22.4.54" extension="2014-06-09"/>
+      <id root="{{random_id}}"/>
+      <manufacturedMaterial>
+        <!--  QDM Attribute: Code -->
+        {{> _codes}}
+        <lotNumberText>1</lotNumberText>
+      </manufacturedMaterial>
+    </manufacturedProduct>
+  </product>
+</supply>

data/lib/qrda-export/catI-r5/qrda_templates/template_partials/_medication_supply_request.mustache

@@ -1,6 +1,6 @@
 <supply classCode="SPLY" moodCode="RQO">
  <!-- Medication Supply Request (V2) template -->
-  <templateId root="2.16.840.1.113883.10.20.24.3.99" extension="2014-04-05"/>
+  <templateId root="2.16.840.1.113883.10.20.24.3.99" extension="2019-12-01"/>
   <!-- Conforms to C-CDA R2 Planned Supply (V2) template-->
   <templateId root="2.16.840.1.113883.10.20.22.4.43" extension="2014-06-09" />
   <id root="{{random_id}}"/>
@@ -14,4 +14,15 @@
     {{/authorDatetime}}
   {{/relevantPeriod}}
   <quantity value="{{{value_as_float}}}"/>
+  <product>
+    <manufacturedProduct classCode="MANU">
+      <!-- Medication Information (consolidation) template -->
+      <templateId root="2.16.840.1.113883.10.20.22.4.23" extension="2014-06-09"/>
+      <id root="{{random_id}}"/>
+      <manufacturedMaterial>
+        <!--  QDM Attribute: Code -->
+        {{> _codes}}
+      </manufacturedMaterial>
+    </manufacturedProduct>
+  </product>
 </supply>

data/lib/qrda-export/catI-r5/qrda_templates/template_partials/_rank.mustache

@@ -0,0 +1,7 @@
+<entryRelationship typeCode="REFR">
+  <observation classCode="OBS" moodCode="EVN">
+    <templateId root="2.16.840.1.113883.10.20.24.3.166" extension="2019-12-01"/>
+    <code code="263486008" displayName="Rank" codeSystem="2.16.840.1.113883.6.96"/>
+    <value xsi:type="INT" value="{{{.}}}"/>
+  </observation>
+</entryRelationship>

data/lib/qrda-export/catI-r5/qrda_templates/template_partials/_related_to.mustache

@@ -1,6 +1,6 @@
 <sdtc:inFulfillmentOf1 typeCode="FLFS">
   <sdtc:templateId root="2.16.840.1.113883.10.20.24.3.150" extension="2017-08-01"/>
   <sdtc:actReference classCode="ACT" moodCode="EVN">
-    <sdtc:id root="1.3.6.1.4.1.115" extension="{{{as_id}}}"/>
+    <sdtc:id root="1.3.6.1.4.1.115" extension="{{{.}}}"/>
   </sdtc:actReference>
 </sdtc:inFulfillmentOf1>

data/lib/qrda-export/catI-r5/qrda_templates/template_partials/_results.mustache

@@ -2,10 +2,17 @@
  <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" extension="2015-08-01"/>
+    <!-- Conforms Result (V4) -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.87" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{random_id}}"/>
     {{> _codes}}
     <statusCode code="completed"/>
-    {{{result_date_time}}}
+    {{#result_date_time?}}
+      {{{result_date_time}}}
+    {{/result_date_time?}}
+    {{^result_date_time?}}
+      {{{author_effective_time}}}
+    {{/result_date_time?}}
     {{{result_value}}}
  </observation>
 </entryRelationship>

data/lib/qrda-export/catI-r5/qrda_templates/template_partials/_status.mustache

@@ -1,6 +1,6 @@
 <entryRelationship typeCode="REFR">
   <observation classCode="OBS" moodCode="EVN">
-    <templateId root="2.16.840.1.113883.10.20.24.3.93"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.93" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{random_id}}"/>
     <code code="33999-4" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="Status"/>
     <value xsi:type="CD" {{> _code}}/>

data/lib/qrda-export/helper/cat1_view_helper.rb

@@ -67,6 +67,8 @@ module Qrda
                             result_value_as_string(self['result'][0])
                           elsif self['result'].is_a? Hash
                             result_value_as_string(self['result'])
+                          elsif self['result'].is_a? String
+                            "<value xsi:type=\"ST\">#{self['result']}</value>"
                           elsif !self['result'].nil?
                             "<value xsi:type=\"PQ\" value=\"#{self['result']}\" unit=\"1\"/>"
                           end

data/lib/qrda-export/helper/date_helper.rb

@@ -23,10 +23,16 @@ module Qrda
           Time.now.utc.to_formatted_s(:number)
         end
 
+        def sent_date_time
+          "<low #{value_or_null_flavor(self['sentDatetime'])}/>"
+        end
+
+        def received_date_time
+          "<high #{value_or_null_flavor(self['receivedDatetime'])}/>"
+        end
+
         def active_date_time
-          "<effectiveTime xsi:type='IVL_TS'>"\
-          "<low #{value_or_null_flavor(self['activeDatetime'])}/>"\
-          "</effectiveTime>"
+          "<effectiveTime #{value_or_null_flavor(self['activeDatetime'])}/>"
         end
 
         def author_time
@@ -41,6 +47,10 @@ module Qrda
           "<birthTime #{value_or_null_flavor(self['birthDatetime'])}/>"
         end
 
+        def result_date_time?
+          !self['resultDatetime'].nil?
+        end
+
         def result_date_time
           "<effectiveTime #{value_or_null_flavor(self['resultDatetime'])}/>"
         end
@@ -79,11 +89,24 @@ module Qrda
           "</effectiveTime>"
         end
 
+        def participation_period
+          "<effectiveTime>"\
+          "<low #{value_or_null_flavor(self['participationPeriod']['low'])}/>"\
+          "<high #{value_or_null_flavor(self['participationPeriod']['high'])}/>"\
+          "</effectiveTime>"
+        end
+
         def relevant_period_as_value
           "<effectiveTime #{value_or_null_flavor(self['relevantPeriod']['low'])}/>"
         end
 
-        def relevant_date_time
+        def relevant_date_time_low
+          "<effectiveTime>"\
+          "<low #{value_or_null_flavor(self['relevantDatetime'])}/>"\
+          "</effectiveTime>"
+        end
+
+        def relevant_date_time_value
           "<effectiveTime #{value_or_null_flavor(self['relevantDatetime'])}/>"
         end
 

data/lib/qrda-import/base-importers/demographics_importer.rb

@@ -15,17 +15,17 @@ module QRDA
         pcs = QDM::PatientCharacteristicSex.new
         code_element = patient_element.at_xpath('cda:administrativeGenderCode')
         pcs.dataElementCodes = [code_if_present(code_element)]
-        patient.qdmPatient.dataElements << pcs
+        patient.qdmPatient.dataElements << pcs unless pcs.dataElementCodes.compact.blank?
 
         pcr = QDM::PatientCharacteristicRace.new
         code_element = patient_element.at_xpath('cda:raceCode')
         pcr.dataElementCodes = [code_if_present(code_element)]
-        patient.qdmPatient.dataElements << pcr
+        patient.qdmPatient.dataElements << pcr unless pcr.dataElementCodes.compact.blank?
 
         pce = QDM::PatientCharacteristicEthnicity.new
         code_element = patient_element.at_xpath('cda:ethnicGroupCode')
         pce.dataElementCodes = [code_if_present(code_element)]
-        patient.qdmPatient.dataElements << pce
+        patient.qdmPatient.dataElements << pce unless pce.dataElementCodes.compact.blank?
       end
 
       def code_if_present(code_element)

data/lib/qrda-import/base-importers/section_importer.rb

@@ -85,8 +85,11 @@ module QRDA
 
       def extract_dates(parent_element, entry)
         entry.authorDatetime = extract_time(parent_element, @author_datetime_xpath) if @author_datetime_xpath
-        entry.relevantPeriod = extract_interval(parent_element, @relevant_period_xpath) if @relevant_period_xpath
         entry.prevalencePeriod = extract_interval(parent_element, @prevalence_period_xpath) if @prevalence_period_xpath
+        entry.relevantDatetime = extract_time(parent_element, @relevant_date_time_xpath) if @relevant_date_time_xpath
+        # If there is a relevantDatetime, don't look for a relevantPeriod
+        return if entry.respond_to?(:relevantDatetime) && entry.relevantDatetime
+        entry.relevantPeriod = extract_interval(parent_element, @relevant_period_xpath) if @relevant_period_xpath
       end
 
       def extract_interval(parent_element, interval_xpath)
@@ -95,13 +98,13 @@ module QRDA
           high_time = DateTime.parse(parent_element.at_xpath(interval_xpath)['value'])
         end
         if parent_element.at_xpath("#{interval_xpath}/cda:low")
-          low_time = DateTime.parse(parent_element.at_xpath("#{interval_xpath}/cda:low")['value'])
+          low_time = if parent_element.at_xpath("#{interval_xpath}/cda:low")['value']
+                       DateTime.parse(parent_element.at_xpath("#{interval_xpath}/cda:low")['value'])
+                     end
         end
         if parent_element.at_xpath("#{interval_xpath}/cda:high")
           high_time = if parent_element.at_xpath("#{interval_xpath}/cda:high")['value']
                         DateTime.parse(parent_element.at_xpath("#{interval_xpath}/cda:high")['value'])
-                      else
-                        DateTime.new(9999,1,1)
                       end
         end
         if parent_element.at_xpath("#{interval_xpath}/cda:center")
@@ -155,7 +158,6 @@ module QRDA
 
       def extract_result_value(value_element)
         return unless value_element && !value_element['nullFlavor']
-
         value = value_element['value']
         if value.present?
           return value.strip.to_f if (value_element['unit'] == "1" || value_element['unit'].nil?)
@@ -163,6 +165,8 @@ module QRDA
           return QDM::Quantity.new(value.strip.to_f, value_element['unit'])
         elsif value_element['code'].present?
           return code_if_present(value_element)
+        elsif value_element.text.present?
+          return value_element.text
         end
       end
 
@@ -236,6 +240,45 @@ module QRDA
         related_ids
       end
 
+      def extract_entity(parent_element, entity_xpath)
+        care_partner_entity_element = parent_element.at_xpath(entity_xpath + "/cda:participantRole[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.160']")
+        patient_entity_element = parent_element.at_xpath(entity_xpath + "/cda:participantRole[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.161']")
+        practitioner_entity_element = parent_element.at_xpath(entity_xpath + "/cda:participantRole[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.162']")
+        organization_entity_element = parent_element.at_xpath(entity_xpath + "/cda:participantRole[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.163']")
+        return extract_care_partner_entity(care_partner_entity_element) if care_partner_entity_element
+        return extract_patient_entity(patient_entity_element) if patient_entity_element
+        return extract_practitioner_entity(practitioner_entity_element) if practitioner_entity_element
+        return extract_organization_entity(organization_entity_element) if organization_entity_element
+      end
+
+      def extract_care_partner_entity(care_partner_entity_element)
+        care_partner_entity = QDM::CarePartner.new
+        care_partner_entity.identifier = extract_id(care_partner_entity_element, './cda:id')
+        care_partner_entity.relationship = code_if_present(care_partner_entity_element.at_xpath('./cda:playingEntity/cda:code'))
+        care_partner_entity
+      end
+
+      def extract_patient_entity(patient_entity_element)
+        patient_entity = QDM::PatientEntity.new
+        patient_entity.identifier = extract_id(patient_entity_element, './cda:id')
+        patient_entity
+      end
+
+      def extract_practitioner_entity(practitioner_entity_element)
+        practitioner_entity = QDM::Practitioner.new
+        practitioner_entity.identifier = extract_id(practitioner_entity_element, './cda:id')
+        practitioner_entity.role = code_if_present(practitioner_entity_element.at_xpath('./cda:code'))
+        practitioner_entity.specialty = code_if_present(practitioner_entity_element.at_xpath('./cda:playingEntity/cda:code'))
+        practitioner_entity.qualification = code_if_present(practitioner_entity_element.at_xpath('./cda:scopingEntity/cda:code'))
+        practitioner_entity
+      end
+
+      def extract_organization_entity(organization_entity_element)
+        organization_entity = QDM::Organization.new
+        organization_entity.identifier = extract_id(organization_entity_element, './cda:id')
+        organization_entity.type = code_if_present(organization_entity_element.at_xpath('./cda:playingEntity/cda:code'))
+        organization_entity
+      end
     end
   end
 end