cqm-reports 2.1.1 → 3.0.0.pre.alpha.1

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

@@ -6,7 +6,6 @@
     <templateId root="2.16.840.1.113883.10.20.24.3.75" extension="2017-08-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <statusCode code="active"/>
-    {{{author_effective_time}}}
     {{> qrda_templates/template_partials/_medication_details}}
     <consumable>
       <manufacturedProduct classCode="MANU">

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

@@ -25,8 +25,13 @@
         <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>
-        <statusCode code="completed" />
         {{#prevalencePeriod}}
+        {{#completed_prevalence_period}}
+        <statusCode code="completed" />
+        {{/completed_prevalence_period}}
+        {{^completed_prevalence_period}}
+        <statusCode code="active" />
+        {{/completed_prevalence_period}}
         <!-- QDM Attribute: Prevalence Period -->
         {{{prevalence_period}}}
         {{/prevalencePeriod}}

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

@@ -14,7 +14,9 @@
         {{#relevantPeriod}}
         {{{relevant_period}}}
         {{/relevantPeriod}}
-        <value {{> _code}} xsi:type="CD"/>
+        {{#code}}
+          <value {{> _code}} xsi:type="CD"/>
+        {{/code}}
       </observation>
     </entryRelationship>
   </act>

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="2015-04-05"/>
+  <templateId root="2.16.840.1.113883.10.20.24.3.99" extension="2014-04-05"/>
   <!-- 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}}"/>

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

@@ -5,7 +5,19 @@
     <id root="1.3.6.1.4.1.115" extension="{{random_id}}"/>
     {{> _codes}}
     <statusCode code="completed"/>
+    {{#resultDatetime}}
     {{{result_date_time}}}
+    {{/resultDatetime}}
+    {{^resultDatetime}}
+      {{#relevantPeriod}}
+      {{{relevant_period_as_value}}}
+      {{/relevantPeriod}}
+      {{^relevantPeriod}}
+        {{#authorDatetime}}
+        {{{author_effective_time}}}
+        {{/authorDatetime}}
+      {{/relevantPeriod}}
+    {{/resultDatetime}}
     {{{result_value}}}
  </observation>
 </entryRelationship>

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

@@ -28,7 +28,7 @@ module Qrda
         end
 
         def code_and_codesystem
-          oid = self['codeSystemOid'] || self['codeSystem']
+          oid = self['system'] || self['codeSystem']
           if oid == '1.2.3.4.5.6.7.8.9.10'
             "nullFlavor=\"NA\" sdtc:valueSet=\"#{self['code']}\""
           else
@@ -37,7 +37,7 @@ module Qrda
         end
 
         def primary_code_and_codesystem
-          oid = self[:dataElementCodes][0]['codeSystemOid'] || self[:dataElementCodes][0]['codeSystem']
+          oid = self[:dataElementCodes][0]['system'] || self[:dataElementCodes][0]['codeSystem']
           "code=\"#{self[:dataElementCodes][0]['code']}\" codeSystem=\"#{oid}\" codeSystemName=\"#{HQMF::Util::CodeSystemHelper.code_system_for(oid)}\""
         end
 
@@ -45,7 +45,7 @@ module Qrda
           translation_list = ""
           self[:dataElementCodes].each_with_index do |_dec, index|
             next if index.zero?
-            oid = self[:dataElementCodes][index]['codeSystemOid'] || self[:dataElementCodes][index]['codeSystem']
+            oid = self[:dataElementCodes][index]['system'] || self[:dataElementCodes][index]['codeSystem']
             translation_list += "<translation code=\"#{self[:dataElementCodes][index]['code']}\" codeSystem=\"#{oid}\" codeSystemName=\"#{HQMF::Util::CodeSystemHelper.code_system_for(oid)}\"/>"
           end
           translation_list
@@ -67,8 +67,6 @@ 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
@@ -77,7 +75,7 @@ module Qrda
 
         def result_value_as_string(result)
           return "<value xsi:type=\"CD\" nullFlavor=\"UNK\"/>" unless result
-          oid = result['codeSystemOid'] || result['codeSystem']
+          oid = result['system'] || result['codeSystem']
           return "<value xsi:type=\"CD\" code=\"#{result['code']}\" codeSystem=\"#{oid}\" codeSystemName=\"#{HQMF::Util::CodeSystemHelper.code_system_for(oid)}\"/>" if result['code']
           return "<value xsi:type=\"PQ\" value=\"#{result['value']}\" unit=\"#{result['unit']}\"/>" if result['unit']
         end

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

@@ -83,6 +83,10 @@ module Qrda
           "<effectiveTime #{value_or_null_flavor(self['relevantPeriod']['low'])}/>"
         end
 
+        def relevant_date_time
+          "<effectiveTime #{value_or_null_flavor(self['relevantDatetime'])}/>"
+        end
+
         def medication_duration_effective_time
           "<effectiveTime xsi:type=\"IVL_TS\">"\
           "<low #{value_or_null_flavor(self['relevantPeriod']['low'])}/>"\

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

@@ -9,23 +9,23 @@ module QRDA
         patient.qdmPatient.birthDatetime = DateTime.parse(patient_element.at_xpath('cda:birthTime')['value'])
         pcbd = QDM::PatientCharacteristicBirthdate.new
         pcbd.birthDatetime = patient.qdmPatient.birthDatetime
-        pcbd.dataElementCodes = [{ code: '21112-8', codeSystemOid: '2.16.840.1.113883.6.1' }]
+        pcbd.dataElementCodes = [{ code: '21112-8', system: '2.16.840.1.113883.6.1' }]
         patient.qdmPatient.dataElements << pcbd
 
         pcs = QDM::PatientCharacteristicSex.new
         code_element = patient_element.at_xpath('cda:administrativeGenderCode')
         pcs.dataElementCodes = [code_if_present(code_element)]
-        patient.qdmPatient.dataElements << pcs unless pcs.dataElementCodes.compact.blank?
+        patient.qdmPatient.dataElements << pcs
 
         pcr = QDM::PatientCharacteristicRace.new
         code_element = patient_element.at_xpath('cda:raceCode')
         pcr.dataElementCodes = [code_if_present(code_element)]
-        patient.qdmPatient.dataElements << pcr unless pcr.dataElementCodes.compact.blank?
+        patient.qdmPatient.dataElements << pcr
 
         pce = QDM::PatientCharacteristicEthnicity.new
         code_element = patient_element.at_xpath('cda:ethnicGroupCode')
         pce.dataElementCodes = [code_if_present(code_element)]
-        patient.qdmPatient.dataElements << pce unless pce.dataElementCodes.compact.blank?
+        patient.qdmPatient.dataElements << pce
       end
 
       def code_if_present(code_element)

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

@@ -1,7 +1,7 @@
 module QRDA
   module Cat1
     class SectionImporter
-      attr_accessor :check_for_usable, :status_xpath, :code_xpath, :warnings, :codes_modifiers
+      attr_accessor :check_for_usable, :status_xpath, :code_xpath
 
       def initialize(entry_finder)
         @entry_finder = entry_finder
@@ -9,8 +9,6 @@ module QRDA
         @entry_id_map = {}
         @check_for_usable = true
         @entry_class = QDM::DataElement
-        @warnings = []
-        @codes_modifiers = {}
       end
 
       # Traverses an HL7 CDA document passed in and creates an Array of Entry
@@ -43,7 +41,7 @@ module QRDA
         # This is the id found in the QRDA file
         entry_qrda_id = extract_id(entry_element, @id_xpath)
         # Create a hash to map all of entry.ids to the same QRDA ids. This will be used to merge QRDA entries
-        # that represent the same event.
+        # that represent the same event. 
         @entry_id_map["#{entry_qrda_id.value}_#{entry_qrda_id.namingSystem}"] ||= []
         @entry_id_map["#{entry_qrda_id.value}_#{entry_qrda_id.namingSystem}"] << entry.id
         entry.dataElementCodes = extract_codes(entry_element, @code_xpath)
@@ -63,7 +61,7 @@ module QRDA
 
         # If an extension is not included, use the root as the value.  Other wise use the extension
         value = id_element['extension'] || id_element['root']
-        identifier = QDM::Id.new(value: value, namingSystem: id_element['root'])
+        identifier = QDM::Identifier.new(value: value, namingSystem: id_element['root'])
         identifier
       end
 
@@ -92,53 +90,27 @@ module QRDA
       end
 
       def extract_interval(parent_element, interval_xpath)
-        # nil if the time interval does not exist
-        return nil unless time_interval_exists(parent_element, interval_xpath)
-
         if parent_element.at_xpath("#{interval_xpath}/@value")
           low_time = DateTime.parse(parent_element.at_xpath(interval_xpath)['value'])
           high_time = DateTime.parse(parent_element.at_xpath(interval_xpath)['value'])
         end
         if parent_element.at_xpath("#{interval_xpath}/cda:low")
-          low_time = if parent_element.at_xpath("#{interval_xpath}/cda:low")['value']
-                       DateTime.parse(parent_element.at_xpath("#{interval_xpath}/cda:low")['value'])
-                     end
+          low_time = DateTime.parse(parent_element.at_xpath("#{interval_xpath}/cda:low")['value'])
         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")
           low_time = Time.parse(parent_element.at_xpath("#{interval_xpath}/cda:center")['value'])
           high_time = Time.parse(parent_element.at_xpath("#{interval_xpath}/cda:center")['value'])
         end
-        if low_time && high_time && low_time > high_time
-          # pass warning: current code continues as expected, but adds warning
-          id_attr = parent_element.at_xpath(".//cda:id")&.attributes
-          id_str = id_attr ? "and id: #{id_attr['root']&.value}(root), #{id_attr['extension']&.value}(extension)" : ""
-          qrda_type = @entry_class.to_s.split("::")[1]
-          @warnings << ValidationError.new(message: "Interval with low time after high time. Located in element with QRDA type: #{qrda_type} #{id_str}",
-                                           location: parent_element.path)
-        end
-        if low_time.nil? && high_time.nil?
-          id_attr = parent_element.at_xpath(".//cda:id")&.attributes
-          id_str = id_attr ? "and id: #{id_attr['root']&.value}(root), #{id_attr['extension']&.value}(extension)" : ""
-          qrda_type = @entry_class.to_s.split("::")[1]
-          @warnings << ValidationError.new(message: "Interval with nullFlavor low time and nullFlavor high time. Located in element with QRDA type: #{qrda_type} #{id_str}",
-                                           location: parent_element.path)
-        end
         QDM::Interval.new(low_time, high_time).shift_dates(0)
       end
 
-      def time_interval_exists(parent_element, interval_xpath)
-        # false if the time interval does not exist
-        return false unless parent_element.at_xpath(interval_xpath)
-        # false if the time element exists but has a null Flavor
-        return false if parent_element.at_xpath(interval_xpath)['nullFlavor']
-        true
-      end
-
       def extract_time(parent_element, datetime_xpath)
         DateTime.parse(parent_element.at_xpath(datetime_xpath)['value']) if parent_element.at_xpath("#{datetime_xpath}/@value")
       end
@@ -178,11 +150,12 @@ module QRDA
         parent_element.xpath(@result_xpath).each do |elem|
           result << extract_result_value(elem)
         end
-        result.size > 1 ? result : result.first
+        result.size > 1 ? result : result.first 
       end
 
       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?)
@@ -190,13 +163,6 @@ 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?
-          id_attr = value_element.parent.at_xpath(".//cda:id")&.attributes
-          id_str = id_attr ? "and id: #{id_attr['root']&.value}(root), #{id_attr['extension']&.value}(extension)" : ""
-          qrda_type = @entry_class.to_s.split("::")[1]
-          @warnings << ValidationError.new(message: "Value with string type found. When possible, it's best practice to use a coded value or scalar. Located in element with QRDA type: #{qrda_type} #{id_str}",
-                                           location: value_element.path)
-          return value_element.text
         end
       end
 
@@ -206,16 +172,16 @@ module QRDA
         negation_indicator = parent_element['negationInd']
         # Return and do not set reason attribute if the entry is negated
         return nil if negation_indicator.eql?('true')
-
-        reason_element.blank? ? nil : code_if_present(reason_element.first)
+        
+        reason_element.blank? ? nil : code_if_present(reason_element.first) 
       end
 
       def extract_negation(parent_element, entry)
         negation_element = parent_element.xpath("./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.88']/cda:value")
         negation_indicator = parent_element['negationInd']
         # Return and do not set negationRationale attribute if the entry is not negated
-        return unless negation_indicator.eql?('true')
-
+        return unless negation_indicator.eql?('true') 
+        
         entry.negationRationale = code_if_present(negation_element.first) unless negation_element.blank?
         extract_negated_code(parent_element, entry)
       end
@@ -223,18 +189,8 @@ module QRDA
       def extract_negated_code(parent_element, entry)
         code_elements = parent_element.xpath(@code_xpath)
         code_elements.each do |code_element|
-          if code_element['nullFlavor'] == 'NA'
-            if code_element['sdtc:valueSet']
-              entry.dataElementCodes = [{ code: code_element['sdtc:valueSet'], codeSystemOid: '1.2.3.4.5.6.7.8.9.10' }]
-            else
-              # negated code is nullFlavored with no valueset
-              entry.dataElementCodes = [{ code: "NA", codeSystemOid: '1.2.3.4.5.6.7.8.9.10' }]
-              id_attr = parent_element.at_xpath(".//cda:id")&.attributes
-              id_str = id_attr ? "and id: #{id_attr['root']&.value}(root), #{id_attr['extension']&.value}(extension)" : ""
-              qrda_type = @entry_class.to_s.split("::")[1]
-              @warnings << ValidationError.new(message: "Negated code element contains nullFlavor code but no valueset. Located in element with QRDA type: #{qrda_type} #{id_str}.",
-                                               location: parent_element.path)
-            end
+          if code_element['nullFlavor'] == 'NA' && code_element['sdtc:valueSet']
+            entry.dataElementCodes = [{ code: code_element['sdtc:valueSet'], system: '1.2.3.4.5.6.7.8.9.10' }]
           end
         end
       end

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

@@ -6,7 +6,7 @@ module QRDA
         @id_xpath = './cda:id'
         @code_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.148']/cda:value"
         @author_datetime_xpath = './cda:author/cda:time'
-        @relevant_period_xpath = './cda:effectiveTime'
+        @relevant_date_time_xpath = './cda:effectiveTime'
         @facility_locations_xpath = "./cda:participant[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.100']"
         @severity_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.8']/cda:value"
         @type_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.9']/cda:value"

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

@@ -6,7 +6,7 @@ module QRDA
         @id_xpath = './cda:id'
         @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"
+        # @relevant_period_xpath = "./cda:effectiveTime"
         @related_to_xpath = "./sdtc:inFulfillmentOf1/sdtc:actReference"
         @category_xpath = './cda:code'
         @medium_xpath = "./cda:participant[@typeCode='VIA']/cda:participantRole/cda:code"
@@ -19,9 +19,9 @@ module QRDA
         communication_performed = super
         communication_performed.category = code_if_present(entry_element.at_xpath(@category_xpath))
         communication_performed.medium = code_if_present(entry_element.at_xpath(@medium_xpath))
-        communication_performed.sender = code_if_present(entry_element.at_xpath(@sender_xpath))
-        communication_performed.recipient = code_if_present(entry_element.at_xpath(@recipient_xpath))
-        communication_performed.relatedTo = extract_related_to(entry_element)
+        # communication_performed.sender = code_if_present(entry_element.at_xpath(@sender_xpath))
+        # communication_performed.recipient = code_if_present(entry_element.at_xpath(@recipient_xpath))
+        # communication_performed.relatedTo = extract_related_to(entry_element)
         communication_performed
       end
     end

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

@@ -20,7 +20,7 @@ module QRDA
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         diagnostic_study_performed = super
         diagnostic_study_performed.resultDatetime = extract_time(entry_element, @result_datetime_xpath)
-        diagnostic_study_performed.resultDatetime ||= extract_interval(entry_element, @result_datetime_xpath)&.low
+        diagnostic_study_performed.resultDatetime ||= extract_interval(entry_element, @result_datetime_xpath).low
         diagnostic_study_performed.status = code_if_present(entry_element.at_xpath(@status_xpath))
         diagnostic_study_performed.method = code_if_present(entry_element.at_xpath(@method_xpath))
         diagnostic_study_performed.facilityLocation = extract_facility_locations(entry_element)[0]

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

@@ -10,7 +10,6 @@ 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']"
-        @principal_diagnosis_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.23']/cda:entryRelationship/cda:observation[cda:code/@code='8319008']/cda:value"
         @diagnosis_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.23']/cda:entryRelationship/cda:act/cda:entryRelationship/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.4']"
         @entry_class = QDM::EncounterPerformed
       end
@@ -20,27 +19,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.principalDiagnosis = code_if_present(entry_element.at_xpath(@principal_diagnosis_xpath))
         encounter_performed.diagnoses = extract_diagnoses(entry_element)
         if encounter_performed&.relevantPeriod&.low && encounter_performed&.relevantPeriod&.high
           los = encounter_performed.relevantPeriod.high - encounter_performed.relevantPeriod.low
           encounter_performed.lengthOfStay = QDM::Quantity.new(los.to_i, 'd')
         end
-        extract_modifier_code(encounter_performed, entry_element)
         encounter_performed
       end
 
       private
 
-      def extract_modifier_code(encounter_performed, entry_element)
-        code_element = entry_element.at_xpath(@code_xpath)
-        return unless code_element
-
-        qualifier_name = code_element.at_xpath('./cda:qualifier/cda:name')
-        qualifier_value = code_element.at_xpath('./cda:qualifier/cda:value')
-        codes_modifiers[encounter_performed.id] = { name: code_if_present(qualifier_name), value: code_if_present(qualifier_value), xpath_location: entry_element.path } if qualifier_value || qualifier_name
-      end
-
       def extract_diagnoses(parent_element)
         diagnosis_elements = parent_element.xpath(@diagnosis_xpath)
         diagnosis_list = []

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

@@ -16,7 +16,7 @@ module QRDA
 
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         immunization_order = super
-        immunization_order.activeDatetime = extract_interval(entry_element, @active_datetime_xpath)&.low
+        immunization_order.activeDatetime = extract_interval(entry_element, @active_datetime_xpath).low
         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))

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

@@ -26,8 +26,8 @@ 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.prescriberId = extract_id(entry_element, @prescriber_id_xpath)
-        medication_dispensed.dispenserId = extract_id(entry_element, @dispenser_id_xpath)
+        # medication_dispensed.prescriberId = extract_id(entry_element, @prescriber_id_xpath)
+        # medication_dispensed.dispenserId = extract_id(entry_element, @dispenser_id_xpath)
         medication_dispensed
       end
 

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

@@ -27,7 +27,7 @@ module QRDA
         medication_order.refills = extract_scalar(entry_element, @refills_xpath)&.value
         medication_order.route = code_if_present(entry_element.at_xpath(@route_xpath))
         medication_order.setting = code_if_present(entry_element.at_xpath(@setting_xpath))
-        medication_order.prescriberId = extract_id(entry_element, @prescriber_id_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

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

@@ -7,7 +7,6 @@ module QRDA
         @code_xpath = './cda:code'
         @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,7 +14,6 @@ module QRDA
       def create_entry(entry_element, nrh = NarrativeReferenceHandler.new)
         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

@@ -11,7 +11,6 @@ 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"
         @anatomical_location_site_xpath = "./cda:targetSiteCode"
-        @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"
@@ -23,7 +22,6 @@ module QRDA
         procedure_performed.method = code_if_present(entry_element.at_xpath(@method_xpath))
         procedure_performed.status = code_if_present(entry_element.at_xpath(@status_xpath))
         procedure_performed.anatomicalLocationSite = code_if_present(entry_element.at_xpath(@anatomical_location_site_xpath))
-        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)