cqm-reports 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f221e687f62214c36812fd10c6f805bd4c8318d0
-  data.tar.gz: 8ced778300575e57e368770bc705f8e5cc4f4d3d
+  metadata.gz: 5affd6fd4135b0c208f5fd5e5299eeb38569fd2a
+  data.tar.gz: dfe623571f807df1af633a4733ddfffb4cd74b67
 SHA512:
-  metadata.gz: d4056e6d8f4e26ad6247fa558511d5ce0aad9bc61ca0ecd7c31ec69f160b4c555ced11b5fdfc3ce0e518165de92b2efbd2538bde2d73128035a84e7fa06ddc8e
-  data.tar.gz: 33d50e677dcb99de986b9d0a9e4423530fdbed178b99bb0a6512eedf41d4bcf0e8a0eeeb9a936a6035419914f0089fa7de8c1435bdd40971bdbc6861666bcd32
+  metadata.gz: 0fa02e86800587983fbc7f772c119c8ccebaf1d34a06f4071186a99f9dba9306fef48d3ee124137a9e3bd8ef17a3d2187e49932d93b3beb5542e95480d0c7475
+  data.tar.gz: bba89a9e7d92bcbadee80cb27354cc4cd7a25e2c7cb004cfb2feee8f6c13a237dac833f0f008b073cb4f2de27901301cecb2d5f6cea0b73493f42da51b23216e

data/README.md

@@ -11,6 +11,7 @@ Starting with version **2.0.0** released on 6/20/2019, cqm-reports versioning ha
   | X | QRDA Cat 1 | QRDA Cat 3 |
   | --- | --- | --- |
   | 2 | R1 STU5.1 | R1 STU2.1 |
+  | 3 | R1 STU5.2 | R1 STU2.1 |
 
 * **Y** indicates major changes (incompatible API changes)
 

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

@@ -42,7 +42,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)
@@ -115,15 +115,17 @@ module QRDA
         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_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} and id: #{id_attr['root']&.value}(root), #{id_attr['extension']&.value}(extension).",
+          @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_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} and id: #{id_attr['root']&.value}(root), #{id_attr['extension']&.value if id_attr['extension']}(extension).",
+          @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)
@@ -168,7 +170,7 @@ 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)
@@ -181,9 +183,10 @@ module QRDA
         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_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} and id: #{id_attr['root']&.value}(root), #{id_attr['extension']&.value}(extension).",
+          @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
@@ -195,16 +198,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
@@ -218,9 +221,10 @@ module QRDA
             else
               # negated code is nullFlavored with no valueset
               entry.dataElementCodes = [{ code: "NA", system: '1.2.3.4.5.6.7.8.9.10' }]
-              id_attr = parent_element.at_xpath(".//cda:id").attributes
+              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} and id: #{id_attr['root']&.value}(root), #{id_attr['extension']&.value}(extension).",
+              @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
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cqm-reports
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - The MITRE Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cqm-models