cqm-reports 2.0.0 → 2.0.5

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

@@ -6,11 +6,13 @@ module QRDA
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
         @author_datetime_xpath = "./cda:author/cda:time"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::AssessmentOrder
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         assessment_order = super
+        assessment_order.reason = extract_reason(entry_element)
         assessment_order
       end
 

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

@@ -9,6 +9,7 @@ module QRDA
         @result_xpath = "./cda:value"
         @method_xpath = './cda:methodCode'
         @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"
         @entry_class = QDM::AssessmentPerformed
       end
 
@@ -16,6 +17,7 @@ module QRDA
         assessment_performed = super
         assessment_performed.method = code_if_present(entry_element.at_xpath(@method_xpath))
         assessment_performed.components = extract_components(entry_element)
+        assessment_performed.reason = extract_reason(entry_element)
         assessment_performed
       end
 

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

@@ -6,11 +6,13 @@ module QRDA
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
         @author_datetime_xpath = "./cda:author/cda:time"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::AssessmentRecommended
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         assessment_recommended = super
+        assessment_recommended.reason = extract_reason(entry_element)
         assessment_recommended
       end
 

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

@@ -3,9 +3,8 @@ module QRDA
     class CommunicationPerformedImporter < SectionImporter
       def initialize(entry_finder = QRDA::Cat1::EntryFinder.new("./cda:entry/cda:act[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.156']"))
         super(entry_finder)
-        @entry_does_not_have_reason = true
         @id_xpath = './cda:id'
-        @code_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
+        @code_xpath = "./cda:entryRelationship[@typeCode='REFR']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @author_datetime_xpath = "./cda:author/cda:time"
         @relevant_period_xpath = "./cda:effectiveTime"
         @related_to_xpath = "./sdtc:inFulfillmentOf1/sdtc:actReference"

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

@@ -8,12 +8,14 @@ module QRDA
         @author_datetime_xpath = "./cda:author/cda:time"
         @relevant_period_xpath = "./cda:effectiveTime"
         @anatomical_location_site_xpath = "./cda:targetSiteCode"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::DeviceApplied
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         device_applied = super
         device_applied.anatomicalLocationSite = code_if_present(entry_element.at_xpath(@anatomical_location_site_xpath))
+        device_applied.reason = extract_reason(entry_element)
         device_applied
       end
 

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

@@ -6,11 +6,13 @@ module QRDA
         @id_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.9']/cda:id"
         @code_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.9']/cda:participant/cda:participantRole/cda:playingDevice/cda:code"
         @author_datetime_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.9']/cda:author/cda:time"
+        @reason_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.9']/cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::DeviceOrder
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         device_order = super
+        device_order.reason = extract_reason(entry_element)
         device_order
       end
 

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

@@ -6,11 +6,13 @@ module QRDA
         @id_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.10']/cda:id"
         @code_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.10']/cda:participant/cda:participantRole/cda:playingDevice/cda:code"
         @author_datetime_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.10']/cda:author/cda:time"
+        @reason_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.10']/cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::DeviceRecommended
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         device_recommended = super
+        device_recommended.reason = extract_reason(entry_element)
         device_recommended
       end
 

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

@@ -6,11 +6,13 @@ module QRDA
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
         @author_datetime_xpath = "./cda:author/cda:time"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::DiagnosticStudyOrder
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         diagnostic_study_order = super
+        diagnostic_study_order.reason = extract_reason(entry_element)
         diagnostic_study_order
       end
 

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

@@ -13,6 +13,7 @@ module QRDA
         @method_xpath = './cda:methodCode'
         @facility_locations_xpath = "./cda:participant[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.100']"
         @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"
         @entry_class = QDM::DiagnosticStudyPerformed
       end
 
@@ -24,6 +25,7 @@ module QRDA
         diagnostic_study_performed.method = code_if_present(entry_element.at_xpath(@method_xpath))
         diagnostic_study_performed.facilityLocation = extract_facility_locations(entry_element)[0]
         diagnostic_study_performed.components = extract_components(entry_element)
+        diagnostic_study_performed.reason = extract_reason(entry_element)
         diagnostic_study_performed
       end
 

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

@@ -7,12 +7,14 @@ module QRDA
         @code_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.22']/cda:code"
         @author_datetime_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.22']/cda:author/cda:time"
         @facility_locations_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.22']/cda:participant[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.100']"
+        @reason_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.22']/cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::EncounterOrder
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         encounter_order = super
         encounter_order.facilityLocation = extract_facility_locations(entry_element)[0]
+        encounter_order.reason = extract_reason(entry_element)
         encounter_order
       end
 

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

@@ -7,12 +7,14 @@ module QRDA
         @code_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.24']/cda:code"
         @author_datetime_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.24']/cda:author/cda:time"
         @facility_locations_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.24']/cda:participant[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.100']"
+        @reason_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.24']/cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::EncounterRecommended
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         encounter_recommended = super
         encounter_recommended.facilityLocation = extract_facility_locations(entry_element)[0]
+        encounter_recommended.reason = extract_reason(entry_element)
         encounter_recommended
       end
 

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

@@ -8,6 +8,7 @@ module QRDA
         @author_datetime_xpath = "./cda:effectiveTime"
         @dosage_xpath = "./cda:doseQuantity"
         @route_xpath = "./cda:routeCode"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::ImmunizationAdministered
       end
 
@@ -15,6 +16,7 @@ module QRDA
         immunization_administered = super
         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
       end
 

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

@@ -10,6 +10,7 @@ module QRDA
         @dosage_xpath = "./cda:doseQuantity"
         @supply_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.99']/cda:quantity"
         @route_xpath = "./cda:routeCode"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::ImmunizationOrder
       end
 
@@ -19,6 +20,7 @@ module QRDA
         immunization_order.dosage = extract_scalar(entry_element, @dosage_xpath)
         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
       end
 

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

@@ -6,11 +6,13 @@ module QRDA
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
         @author_datetime_xpath = "./cda:author/cda:time"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::InterventionOrder
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         intervention_order = super
+        intervention_order.reason = extract_reason(entry_element)
         intervention_order
       end
 

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

@@ -9,12 +9,14 @@ module QRDA
         @author_datetime_xpath = "./cda:author/cda:time"
         @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"
         @entry_class = QDM::InterventionPerformed
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         intervention_performed = super
         intervention_performed.status = code_if_present(entry_element.at_xpath(@status_xpath))
+        intervention_performed.reason = extract_reason(entry_element)
         intervention_performed
       end
 

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

@@ -6,11 +6,13 @@ module QRDA
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
         @author_datetime_xpath = "./cda:author/cda:time"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::InterventionRecommended
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         intervention_recommended = super
+        intervention_recommended.reason = extract_reason(entry_element)
         intervention_recommended
       end
 

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

@@ -6,11 +6,13 @@ module QRDA
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
         @author_datetime_xpath = "./cda:author/cda:time"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::LaboratoryTestOrder
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         laboratory_test_order = super
+        laboratory_test_order.reason = extract_reason(entry_element)
         laboratory_test_order
       end
 

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

@@ -12,6 +12,7 @@ module QRDA
         @result_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.2']/cda:value"
         @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"
         @entry_class = QDM::LaboratoryTestPerformed
       end
 
@@ -21,6 +22,7 @@ module QRDA
         laboratory_test_performed.method = code_if_present(entry_element.at_xpath(@method_xpath))
         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
       end
 

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

@@ -6,11 +6,13 @@ module QRDA
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
         @author_datetime_xpath = "./cda:author/cda:time"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::LaboratoryTestRecommended
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         laboratory_test_recommended = super
+        laboratory_test_recommended.reason = extract_reason(entry_element)
         laboratory_test_recommended
       end
 

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

@@ -10,6 +10,7 @@ module QRDA
         @dosage_xpath = "./cda:doseQuantity"
         @frequency_xpath = "./cda:effectiveTime[@operator='A']/cda:period"
         @route_xpath = "./cda:routeCode"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::MedicationAdministered
       end
 
@@ -18,6 +19,7 @@ module QRDA
         medication_administered.dosage = extract_scalar(entry_element, @dosage_xpath)
         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
       end
 

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

@@ -3,7 +3,6 @@ module QRDA
     class MedicationDispensedImporter < SectionImporter
       def initialize(entry_finder = QRDA::Cat1::EntryFinder.new("./cda:entry/cda:act[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.139']"))
         super(entry_finder)
-        @entry_does_not_have_reason = true
         @id_xpath = './cda:id'
         @code_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.18']/cda:product/cda:manufacturedProduct/cda:manufacturedMaterial/cda:code"
         @relevant_period_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.18']/cda:effectiveTime"

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

@@ -15,6 +15,7 @@ module QRDA
         @setting_xpath = "./cda:participant/cda:participantRole/cda:code"
         @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"
         @entry_class = QDM::MedicationOrder
       end
 
@@ -28,6 +29,7 @@ module QRDA
         medication_order.setting = code_if_present(entry_element.at_xpath(@setting_xpath))
         medication_order.prescriberId = extract_id(entry_element, @prescriber_id_xpath)
         medication_order.daysSupplied = extract_scalar(entry_element, @days_supplied_xpath)&.value
+        medication_order.reason = extract_reason(entry_element)
         medication_order
       end
 

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

@@ -6,11 +6,13 @@ module QRDA
         @id_xpath = './cda:id'
         @code_xpath = './cda:value'
         @relevant_period_xpath = "./cda:effectiveTime"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::PatientCharacteristicClinicalTrialParticipant
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         patient_characteristic_clinical_trial_participant = super
+        patient_characteristic_clinical_trial_participant.reason = extract_reason(entry_element)
         patient_characteristic_clinical_trial_participant
       end
 

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

@@ -7,12 +7,14 @@ module QRDA
         @code_xpath = "./cda:value"
         @author_datetime_xpath = "./cda:author/cda:time"
         @anatomical_location_site_xpath = "./cda:targetSiteCode"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::PhysicalExamOrder
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         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
       end
 

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

@@ -11,6 +11,7 @@ module QRDA
         @result_xpath = "./cda:value"
         @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"
         @entry_class = QDM::PhysicalExamPerformed
       end
 
@@ -19,6 +20,7 @@ module QRDA
         physical_exam_performed.method = code_if_present(entry_element.at_xpath(@method_xpath))
         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
       end
 

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

@@ -7,12 +7,14 @@ module QRDA
         @code_xpath = "./cda:value"
         @author_datetime_xpath = "./cda:author/cda:time"
         @anatomical_location_site_xpath = "./cda:targetSiteCode"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::PhysicalExamRecommended
       end
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         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
       end
 

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

@@ -8,6 +8,7 @@ module QRDA
         @author_datetime_xpath = "./cda:author/cda:time"
         @anatomical_location_site_xpath = "./cda:targetSiteCode"
         @ordinality_xpath = "./cda:priorityCode"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::ProcedureOrder
       end
 
@@ -15,6 +16,7 @@ module QRDA
         procedure_order = super
         procedure_order.anatomicalLocationSite = code_if_present(entry_element.at_xpath(@anatomical_location_site_xpath))
         procedure_order.ordinality = code_if_present(entry_element.at_xpath(@ordinality_xpath))
+        procedure_order.reason = extract_reason(entry_element)
         procedure_order
       end
 

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

@@ -14,6 +14,7 @@ module QRDA
         @ordinality_xpath = "./cda:priorityCode"
         @incision_datetime_xpath = "./cda:entryRelationship/cda:procedure[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.89']/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"
         @entry_class = QDM::ProcedurePerformed
       end
 
@@ -25,6 +26,7 @@ module QRDA
         procedure_performed.ordinality = code_if_present(entry_element.at_xpath(@ordinality_xpath))
         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
       end
 

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

@@ -8,6 +8,7 @@ module QRDA
         @author_datetime_xpath = "./cda:author/cda:time"
         @anatomical_location_site_xpath = "./cda:targetSiteCode"
         @ordinality_xpath = "./cda:priorityCode"
+        @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value"
         @entry_class = QDM::ProcedureRecommended
       end
 
@@ -15,6 +16,7 @@ module QRDA
         procedure_recommended = super
         procedure_recommended.anatomicalLocationSite = code_if_present(entry_element.at_xpath(@anatomical_location_site_xpath))
         procedure_recommended.ordinality = code_if_present(entry_element.at_xpath(@ordinality_xpath))
+        procedure_recommended.reason = extract_reason(entry_element)
         procedure_recommended
       end
 

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

@@ -3,7 +3,6 @@ module QRDA
     class SubstanceAdministeredImporter < SectionImporter
       def initialize(entry_finder = QRDA::Cat1::EntryFinder.new("./cda:entry/cda:substanceAdministration[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.42']"))
         super(entry_finder)
-        @entry_does_not_have_reason = true
         @id_xpath = './cda:id'
         @code_xpath = "./cda:consumable/cda:manufacturedProduct/cda:manufacturedMaterial/cda:code"
         @author_datetime_xpath = "./cda:author/cda:time"