cqm-reports 3.1.10 → 4.0.0

data/lib/qrda-import/data-element-importers/encounter_performed_importer.rb

@@ -10,7 +10,9 @@ module QRDA
         @admission_source_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.23']/cda:participant/cda:participantRole[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.151']/cda:code"
         @discharge_disposition_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.23']/sdtc:dischargeDispositionCode"
         @facility_locations_xpath = "./cda:entryRelationship/cda:encounter/cda:participant[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.100']"
+        @clazz_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.23']/cda:entryRelationship/cda:act[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.171']/cda:code"
         @diagnosis_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.23']/cda:entryRelationship/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.168']"
+        @related_to_xpath = "./cda:entryRelationship/cda:encounter/sdtc:inFulfillmentOf1/sdtc:actReference"
         @entry_class = QDM::EncounterPerformed
       end
 
@@ -19,13 +21,16 @@ module QRDA
         encounter_performed.admissionSource = code_if_present(entry_element.at_xpath(@admission_source_xpath))
         encounter_performed.dischargeDisposition = code_if_present(entry_element.at_xpath(@discharge_disposition_xpath))
         encounter_performed.facilityLocations = extract_facility_locations(entry_element)
+        encounter_performed.clazz = code_if_present(entry_element.at_xpath(@clazz_xpath))
         encounter_performed.diagnoses = extract_diagnoses(entry_element)
         if encounter_performed&.relevantPeriod&.low && encounter_performed&.relevantPeriod&.high
           los = encounter_performed.relevantPeriod.high.to_date - encounter_performed.relevantPeriod.low.to_date
           encounter_performed.lengthOfStay = QDM::Quantity.new(los.to_i, 'd')
         end
-        encounter_performed.participant = extract_entity(entry_element, "./cda:entryRelationship/cda:encounter//cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:entryRelationship/cda:encounter//cda:participant[@typeCode='PRF']")
+        encounter_performed.participant.concat(entity) if entity
         extract_modifier_code(encounter_performed, entry_element)
+        encounter_performed.relatedTo = extract_related_to(entry_element)
         encounter_performed
       end
 

data/lib/qrda-import/data-element-importers/encounter_recommended_importer.rb

@@ -15,7 +15,8 @@ module QRDA
         encounter_recommended = super
         encounter_recommended.facilityLocation = extract_facility_locations(entry_element)[0]
         encounter_recommended.reason = extract_reason(entry_element)
-        encounter_recommended.requester = extract_entity(entry_element, "./cda:entryRelationship/cda:encounter//cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:entryRelationship/cda:encounter//cda:participant[@typeCode='PRF']")
+        encounter_recommended.requester.concat(entity) if entity
         encounter_recommended
       end
 

data/lib/qrda-import/data-element-importers/family_history_importer.rb

@@ -13,7 +13,8 @@ module QRDA
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         family_history = super
         family_history.relationship = code_if_present(entry_element.at_xpath(@relationship_xpath))
-        family_history.recorder = extract_entity(entry_element, "./cda:component/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.112']//cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:component/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.112']//cda:participant[@typeCode='PRF']")
+        family_history.recorder.concat(entity) if entity
         family_history
       end
 

data/lib/qrda-import/data-element-importers/immunization_administered_importer.rb

@@ -18,7 +18,8 @@ module QRDA
         immunization_administered.dosage = extract_scalar(entry_element, @dosage_xpath)
         immunization_administered.route = code_if_present(entry_element.at_xpath(@route_xpath))
         immunization_administered.reason = extract_reason(entry_element)
-        immunization_administered.performer = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        immunization_administered.performer.concat(entity) if entity
         immunization_administered
       end
 

data/lib/qrda-import/data-element-importers/immunization_order_importer.rb

@@ -21,7 +21,8 @@ module QRDA
         immunization_order.supply = extract_scalar(entry_element, @supply_xpath)
         immunization_order.route = code_if_present(entry_element.at_xpath(@route_xpath))
         immunization_order.reason = extract_reason(entry_element)
-        immunization_order.requester = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        immunization_order.requester.concat(entity) if entity
         immunization_order
       end
 

data/lib/qrda-import/data-element-importers/intervention_order_importer.rb

@@ -13,7 +13,8 @@ module QRDA
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         intervention_order = super
         intervention_order.reason = extract_reason(entry_element)
-        intervention_order.requester = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        intervention_order.requester.concat(entity) if entity
         intervention_order
       end
 

data/lib/qrda-import/data-element-importers/intervention_performed_importer.rb

@@ -11,6 +11,7 @@ module QRDA
         @result_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.2']/cda:value"
         @status_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.93']/cda:value"
         @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
+        @related_to_xpath = "./sdtc:inFulfillmentOf1/sdtc:actReference"
         @entry_class = QDM::InterventionPerformed
       end
 
@@ -18,7 +19,9 @@ module QRDA
         intervention_performed = super
         intervention_performed.status = code_if_present(entry_element.at_xpath(@status_xpath))
         intervention_performed.reason = extract_reason(entry_element)
-        intervention_performed.performer = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        intervention_performed.performer.concat(entity) if entity
+        intervention_performed.relatedTo = extract_related_to(entry_element)
         intervention_performed
       end
 

data/lib/qrda-import/data-element-importers/intervention_recommended_importer.rb

@@ -13,7 +13,8 @@ module QRDA
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         intervention_recommended = super
         intervention_recommended.reason = extract_reason(entry_element)
-        intervention_recommended.requester = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        intervention_recommended.requester.concat(entity) if entity
         intervention_recommended
       end
 

data/lib/qrda-import/data-element-importers/laboratory_test_order_importer.rb

@@ -13,7 +13,8 @@ module QRDA
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         laboratory_test_order = super
         laboratory_test_order.reason = extract_reason(entry_element)
-        laboratory_test_order.requester = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        laboratory_test_order.requester.concat(entity) if entity
         laboratory_test_order
       end
 

data/lib/qrda-import/data-element-importers/laboratory_test_performed_importer.rb

@@ -14,6 +14,7 @@ module QRDA
         @result_datetime_xpath = "./cda:entryRelationship[@typeCode='REFR']/cda:observation/cda:effectiveTime"
         @components_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.149']"
         @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
+        @related_to_xpath = "./sdtc:inFulfillmentOf1/sdtc:actReference"
         @entry_class = QDM::LaboratoryTestPerformed
       end
 
@@ -24,7 +25,9 @@ module QRDA
         laboratory_test_performed.resultDatetime = extract_time(entry_element, @result_datetime_xpath)
         laboratory_test_performed.components = extract_components(entry_element)
         laboratory_test_performed.reason = extract_reason(entry_element)
-        laboratory_test_performed.performer = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        laboratory_test_performed.performer.concat(entity) if entity
+        laboratory_test_performed.relatedTo = extract_related_to(entry_element)
         laboratory_test_performed
       end
 

data/lib/qrda-import/data-element-importers/laboratory_test_recommended_importer.rb

@@ -13,7 +13,8 @@ module QRDA
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         laboratory_test_recommended = super
         laboratory_test_recommended.reason = extract_reason(entry_element)
-        laboratory_test_recommended.requester = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        laboratory_test_recommended.requester.concat(entity) if entity
         laboratory_test_recommended
       end
 

data/lib/qrda-import/data-element-importers/medication_active_importer.rb

@@ -18,7 +18,8 @@ module QRDA
         medication_active.dosage = extract_scalar(entry_element, @dosage_xpath)
         medication_active.frequency = frequency_as_coded_value(entry_element, @frequency_xpath)
         medication_active.route = code_if_present(entry_element.at_xpath(@route_xpath))
-        medication_active.recorder = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        medication_active.recorder.concat(entity) if entity
         medication_active
       end
 

data/lib/qrda-import/data-element-importers/medication_administered_importer.rb

@@ -21,7 +21,8 @@ module QRDA
         medication_administered.frequency = frequency_as_coded_value(entry_element, @frequency_xpath)
         medication_administered.route = code_if_present(entry_element.at_xpath(@route_xpath))
         medication_administered.reason = extract_reason(entry_element)
-        medication_administered.performer = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        medication_administered.performer.concat(entity) if entity
         medication_administered
       end
 

data/lib/qrda-import/data-element-importers/medication_discharge_importer.rb

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:entryRelationship/cda:substanceAdministration/cda:id'
         @code_xpath = "./cda:entryRelationship/cda:substanceAdministration[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.16']/cda:consumable/cda:manufacturedProduct/cda:manufacturedMaterial/cda:code"
-        @author_datetime_xpath = "./cda:entryRelationship/cda:substanceAdministration[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.16']/cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.119']/cda:time"
+        @author_datetime_xpath = "./cda:entryRelationship/cda:substanceAdministration[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.16']/cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @refills_xpath = "./cda:entryRelationship/cda:substanceAdministration[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.16']/cda:repeatNumber"
         @dosage_xpath = "./cda:entryRelationship/cda:substanceAdministration[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.16']/cda:doseQuantity"
         @supply_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.99']/cda:quantity"
@@ -24,8 +24,10 @@ module QRDA
         medication_discharge.frequency = frequency_as_coded_value(entry_element, @frequency_xpath)
         medication_discharge.daysSupplied = extract_scalar(entry_element, @days_supplied_xpath)&.value
         medication_discharge.route = code_if_present(entry_element.at_xpath(@route_xpath))
-        medication_discharge.prescriber = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
-        medication_discharge.recorder = extract_entity(entry_element, "./cda:participant[@typeCode='AUT']")
+        entity1 = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        medication_discharge.prescriber.concat(entity1) if entity1
+        entity2 = extract_entity(entry_element, "./cda:participant[@typeCode='AUT']")
+        medication_discharge.recorder.concat(entity2) if entity2
         medication_discharge
       end
 

data/lib/qrda-import/data-element-importers/medication_dispensed_importer.rb

@@ -25,8 +25,10 @@ module QRDA
         medication_dispensed.frequency = frequency_as_coded_value(entry_element, @frequency_xpath)
         medication_dispensed.daysSupplied = extract_scalar(entry_element, @days_supplied_xpath)&.value
         medication_dispensed.route = code_if_present(entry_element.at_xpath(@route_xpath))
-        medication_dispensed.prescriber = extract_entity(entry_element, "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.18']//cda:participant[@typeCode='PRF']")
-        medication_dispensed.dispenser = extract_entity(entry_element, "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.18']/cda:participant[@typeCode='DIST']")
+        entity1 = extract_entity(entry_element, "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.18']//cda:participant[@typeCode='PRF']")
+        medication_dispensed.prescriber.concat(entity1) if entity1
+        entity2 = extract_entity(entry_element, "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.18']/cda:participant[@typeCode='DIST']")
+        medication_dispensed.dispenser.concat(entity2) if entity2
         medication_dispensed
       end
 

data/lib/qrda-import/data-element-importers/medication_order_importer.rb

@@ -16,6 +16,7 @@ module QRDA
         @prescriber_id_xpath = "./cda:author/cda:assignedAuthor/cda:id"
         @days_supplied_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.157']/cda:quantity"
         @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
+        @related_to_xpath = "./sdtc:inFulfillmentOf1/sdtc:actReference"
         @entry_class = QDM::MedicationOrder
       end
 
@@ -29,7 +30,9 @@ module QRDA
         medication_order.setting = code_if_present(entry_element.at_xpath(@setting_xpath))
         medication_order.daysSupplied = extract_scalar(entry_element, @days_supplied_xpath)&.value
         medication_order.reason = extract_reason(entry_element)
-        medication_order.prescriber = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        medication_order.prescriber.concat(entity) if entity
+        medication_order.relatedTo = extract_related_to(entry_element)
         medication_order
       end
 

data/lib/qrda-import/data-element-importers/patient_care_experience_importer.rb

@@ -11,7 +11,8 @@ module QRDA
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         patient_care_experience = super
-        patient_care_experience.recorder = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        patient_care_experience.recorder.concat(entity) if entity
         patient_care_experience
       end
 

data/lib/qrda-import/data-element-importers/physical_exam_order_importer.rb

@@ -15,7 +15,8 @@ module QRDA
         physical_exam_order = super
         physical_exam_order.anatomicalLocationSite = code_if_present(entry_element.at_xpath(@anatomical_location_site_xpath))
         physical_exam_order.reason = extract_reason(entry_element)
-        physical_exam_order.requester = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        physical_exam_order.requester.concat(entity) if entity
         physical_exam_order
       end
 

data/lib/qrda-import/data-element-importers/physical_exam_performed_importer.rb

@@ -13,6 +13,7 @@ module QRDA
         @anatomical_location_site_xpath = "./cda:targetSiteCode"
         @components_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.149']"
         @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
+        @related_to_xpath = "./sdtc:inFulfillmentOf1/sdtc:actReference"
         @entry_class = QDM::PhysicalExamPerformed
       end
 
@@ -22,7 +23,9 @@ module QRDA
         physical_exam_performed.anatomicalLocationSite = code_if_present(entry_element.at_xpath(@anatomical_location_site_xpath))
         physical_exam_performed.components = extract_components(entry_element)
         physical_exam_performed.reason = extract_reason(entry_element)
-        physical_exam_performed.performer = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        physical_exam_performed.performer.concat(entity) if entity
+        physical_exam_performed.relatedTo = extract_related_to(entry_element)
         physical_exam_performed
       end
 

data/lib/qrda-import/data-element-importers/physical_exam_recommended_importer.rb

@@ -15,7 +15,8 @@ module QRDA
         physical_exam_recommended = super
         physical_exam_recommended.anatomicalLocationSite = code_if_present(entry_element.at_xpath(@anatomical_location_site_xpath))
         physical_exam_recommended.reason = extract_reason(entry_element)
-        physical_exam_recommended.requester = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        physical_exam_recommended.requester.concat(entity) if entity
         physical_exam_recommended
       end
 

data/lib/qrda-import/data-element-importers/procedure_order_importer.rb

@@ -16,7 +16,8 @@ module QRDA
         procedure_order = super
         procedure_order.anatomicalLocationSite = code_if_present(entry_element.at_xpath(@anatomical_location_site_xpath))
         procedure_order.reason = extract_reason(entry_element)
-        procedure_order.requester = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        procedure_order.requester.concat(entity) if entity
         procedure_order.rank = entry_element.at_xpath(@rank_xpath)&.value&.strip.to_i if entry_element.at_xpath(@rank_xpath)&.value
         procedure_order
       end

data/lib/qrda-import/data-element-importers/procedure_performed_importer.rb

@@ -16,6 +16,7 @@ module QRDA
         @components_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.149']"
         @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @rank_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.166']/cda:value/@value"
+        @related_to_xpath = "./sdtc:inFulfillmentOf1/sdtc:actReference"
         @entry_class = QDM::ProcedurePerformed
       end
 
@@ -27,8 +28,10 @@ module QRDA
         procedure_performed.incisionDatetime = extract_time(entry_element, @incision_datetime_xpath)
         procedure_performed.components = extract_components(entry_element)
         procedure_performed.reason = extract_reason(entry_element)
-        procedure_performed.performer = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        procedure_performed.performer.concat(entity) if entity
         procedure_performed.rank = entry_element.at_xpath(@rank_xpath)&.value&.strip.to_i if entry_element.at_xpath(@rank_xpath)&.value
+        procedure_performed.relatedTo = extract_related_to(entry_element)
         procedure_performed
       end
 

data/lib/qrda-import/data-element-importers/procedure_recommended_importer.rb

@@ -16,7 +16,8 @@ module QRDA
         procedure_recommended = super
         procedure_recommended.anatomicalLocationSite = code_if_present(entry_element.at_xpath(@anatomical_location_site_xpath))
         procedure_recommended.reason = extract_reason(entry_element)
-        procedure_recommended.requester = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        procedure_recommended.requester.concat(entity) if entity
         procedure_recommended.rank = entry_element.at_xpath(@rank_xpath)&.value&.strip.to_i if entry_element.at_xpath(@rank_xpath)&.value
         procedure_recommended
       end

data/lib/qrda-import/data-element-importers/program_participation_importer.rb

@@ -12,7 +12,6 @@ module QRDA
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         program_participation = super
         program_participation.participationPeriod = extract_interval(entry_element, @participation_period_xpath)
-        program_participation.recorder = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
         program_participation
       end
 

data/lib/qrda-import/data-element-importers/provider_care_experience_importer.rb

@@ -11,7 +11,8 @@ module QRDA
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         provider_care_experience = super
-        provider_care_experience.recorder = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        provider_care_experience.recorder.concat(entity) if entity
         provider_care_experience
       end
 

data/lib/qrda-import/data-element-importers/substance_administered_importer.rb

@@ -19,7 +19,8 @@ module QRDA
         substance_administered.dosage = extract_scalar(entry_element, @dosage_xpath)
         substance_administered.frequency = frequency_as_coded_value(entry_element, @frequency_xpath)
         substance_administered.route = code_if_present(entry_element.at_xpath(@route_xpath))
-        substance_administered.performer = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        substance_administered.performer.concat(entity) if entity
         substance_administered
       end
 

data/lib/qrda-import/data-element-importers/substance_recommended_importer.rb

@@ -21,7 +21,8 @@ module QRDA
         substance_recommended.refills = extract_scalar(entry_element, @refills_xpath)&.value
         substance_recommended.route = code_if_present(entry_element.at_xpath(@route_xpath))
         substance_recommended.reason = extract_reason(entry_element)
-        substance_recommended.requester = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:participant[@typeCode='PRF']")
+        substance_recommended.requester.concat(entity) if entity
         substance_recommended
       end
 

data/lib/qrda-import/data-element-importers/symptom_importer.rb

@@ -13,7 +13,8 @@ module QRDA
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         symptom = super
         symptom.severity = code_if_present(entry_element.at_xpath(@severity_xpath))
-        symptom.recorder = extract_entity(entry_element, "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.136']//cda:participant[@typeCode='PRF']")
+        entity = extract_entity(entry_element, "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.136']//cda:participant[@typeCode='PRF']")
+        symptom.recorder.concat(entity) if entity
         symptom
       end
 

data/lib/qrda-import/patient_importer.rb

@@ -18,7 +18,6 @@ module QRDA
         @data_element_importers << AssessmentPerformedImporter.new
         @data_element_importers << AssessmentRecommendedImporter.new
         @data_element_importers << CommunicationPerformedImporter.new
-        @data_element_importers << DeviceAppliedImporter.new
         @data_element_importers << DeviceOrderImporter.new
         @data_element_importers << DeviceRecommendedImporter.new
         @data_element_importers << DiagnosisImporter.new

data/lib/util/entity_helper.rb

@@ -10,6 +10,10 @@ module HQMF
         self[:hqmfOid] == '2.16.840.1.113883.10.20.28.4.134'
       end
 
+      def location_entity?
+        self[:hqmfOid] == '2.16.840.1.113883.10.20.28.4.142'
+      end
+
       def organization_entity?
         self[:hqmfOid] == '2.16.840.1.113883.10.20.28.4.135'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cqm-reports
 version: !ruby/object:Gem::Version
-  version: 3.1.10
+  version: 4.0.0
 platform: ruby
 authors:
 - The MITRE Corporation
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cqm-models
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: cqm-validators
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ dependencies:
         version: 1.8.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
         version: 1.8.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +195,6 @@ files:
 - lib/qrda-export/catI-r5/qrda_templates/assessment_performed.mustache
 - lib/qrda-export/catI-r5/qrda_templates/assessment_recommended.mustache
 - lib/qrda-export/catI-r5/qrda_templates/communication_performed.mustache
-- lib/qrda-export/catI-r5/qrda_templates/device_applied.mustache
 - lib/qrda-export/catI-r5/qrda_templates/device_order.mustache
 - lib/qrda-export/catI-r5/qrda_templates/device_recommended.mustache
 - lib/qrda-export/catI-r5/qrda_templates/diagnosis.mustache
@@ -241,15 +240,18 @@ files:
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_component.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_data_element_codes_as_values.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_days_supplied.mustache
+- lib/qrda-export/catI-r5/qrda_templates/template_partials/_encounter_class.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_encounter_diagnosis_qdm.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_entity.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_entity_care_partner.mustache
+- lib/qrda-export/catI-r5/qrda_templates/template_partials/_entity_location.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_entity_organization.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_entity_patient.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_entity_practitioner.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_facility_location.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_immunization_details.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_immunization_supply_request.mustache
+- lib/qrda-export/catI-r5/qrda_templates/template_partials/_interpretation.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_medication_details.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_medication_supply_request.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_method.mustache
@@ -261,22 +263,22 @@ files:
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_results.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_severity.mustache
 - lib/qrda-export/catI-r5/qrda_templates/template_partials/_status.mustache
-- lib/qrda-export/catIII-r2-1/_continuous_variable_value.mustache
-- lib/qrda-export/catIII-r2-1/_header.mustache
-- lib/qrda-export/catIII-r2-1/_measure_data.mustache
-- lib/qrda-export/catIII-r2-1/_measure_section.mustache
-- lib/qrda-export/catIII-r2-1/_reporting_period.mustache
-- lib/qrda-export/catIII-r2-1/_stratification.mustache
-- lib/qrda-export/catIII-r2-1/_supplemental_data.mustache
-- lib/qrda-export/catIII-r2-1/qrda3_r21.mustache
-- lib/qrda-export/catIII-r2-1/qrda3_r21.rb
-- lib/qrda-export/catIII-r2-1/qrda_header/_author.mustache
-- lib/qrda-export/catIII-r2-1/qrda_header/_custodian.mustache
-- lib/qrda-export/catIII-r2-1/qrda_header/_documentation_of_service_event.mustache
-- lib/qrda-export/catIII-r2-1/qrda_header/_information_recipient.mustache
-- lib/qrda-export/catIII-r2-1/qrda_header/_legal_authenticator.mustache
-- lib/qrda-export/catIII-r2-1/qrda_header/_participant_ehr.mustache
-- lib/qrda-export/catIII-r2-1/qrda_header/_participant_location.mustache
+- lib/qrda-export/catIII/_continuous_variable_value.mustache
+- lib/qrda-export/catIII/_header.mustache
+- lib/qrda-export/catIII/_measure_data.mustache
+- lib/qrda-export/catIII/_measure_section.mustache
+- lib/qrda-export/catIII/_reporting_period.mustache
+- lib/qrda-export/catIII/_stratification.mustache
+- lib/qrda-export/catIII/_supplemental_data.mustache
+- lib/qrda-export/catIII/qrda3.mustache
+- lib/qrda-export/catIII/qrda3.rb
+- lib/qrda-export/catIII/qrda_header/_author.mustache
+- lib/qrda-export/catIII/qrda_header/_custodian.mustache
+- lib/qrda-export/catIII/qrda_header/_documentation_of_service_event.mustache
+- lib/qrda-export/catIII/qrda_header/_information_recipient.mustache
+- lib/qrda-export/catIII/qrda_header/_legal_authenticator.mustache
+- lib/qrda-export/catIII/qrda_header/_participant_ehr.mustache
+- lib/qrda-export/catIII/qrda_header/_participant_location.mustache
 - lib/qrda-export/helper/aggregate_object_helper.rb
 - lib/qrda-export/helper/cat1_view_helper.rb
 - lib/qrda-export/helper/date_helper.rb
@@ -292,7 +294,6 @@ files:
 - lib/qrda-import/data-element-importers/assessment_performed_importer.rb
 - lib/qrda-import/data-element-importers/assessment_recommended_importer.rb
 - lib/qrda-import/data-element-importers/communication_performed_importer.rb
-- lib/qrda-import/data-element-importers/device_applied_importer.rb
 - lib/qrda-import/data-element-importers/device_order_importer.rb
 - lib/qrda-import/data-element-importers/device_recommended_importer.rb
 - lib/qrda-import/data-element-importers/diagnosis_importer.rb
@@ -364,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.0.2
 signing_key:
 specification_version: 4
 summary: A library for import and export of reports for use with electronic Clinical

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

@@ -1,44 +0,0 @@
-<entry>
-  <procedure classCode="PROC" moodCode="EVN" {{{negation_ind}}}>
-    <!-- Procedure Activity Procedure -->
-    <templateId root="2.16.840.1.113883.10.20.22.4.14" extension="2014-06-09"/>
-    <!-- Device Applied -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.7" extension="2019-12-01"/>
-    <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
-    <code code="360030002" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="application of device"/>
-    <text>{{description}}</text>
-    <statusCode code="completed"/>
-    {{{relevant_date_period_or_null_flavor}}}
-    {{#anatomicalLocationSite}}
-      <!-- QDM Attribute: Anatomical Location Site -->
-      {{> qrda_templates/template_partials/_anatomical_location_site}}
-    {{/anatomicalLocationSite}}
-    {{#authorDatetime}}
-      <!-- QDM Attribute: Author dateTime -->
-      {{> qrda_templates/template_partials/_author}}
-    {{/authorDatetime}}
-    <participant typeCode="DEV">
-      <participantRole classCode="MANU">
-        <playingDevice classCode="DEV">
-          <!-- QDM Attribute: Code -->
-          {{> _codes}}
-        </playingDevice>
-      </participantRole>
-    </participant>
-    {{#performer}}
-      <!-- QDM Attribute: Performer -->
-      <participant typeCode="PRF">
-        {{> qrda_templates/template_partials/_entity}}
-      </participant>
-    {{/performer}}
-    {{#reason}}
-      <!-- QDM Attribute: Reason -->
-      {{> qrda_templates/template_partials/_reason}}
-    {{/reason}}
-    {{#negationRationale}}
-      <!-- QDM Attribute: Negation Rationale -->
-      {{> qrda_templates/template_partials/_reason}}
-    {{/negationRationale}}
-  </procedure>
-</entry>
-