cqm-reports 3.1.3 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9895c3e39093e4e3b01d4ab490bd91db2b881b5ff9870b8de0c6369fc792601
-  data.tar.gz: ff99962ce100bd5f73bb5bc73299d55bd4b2ed1185de971996292b713baf8060
+  metadata.gz: 3b65355fa4446a36d60caff6f3559456d3ebfda2df62f198bf450d11fe70635d
+  data.tar.gz: 45e084d13f5374d5907347834aff760b05eb54a005c63f622e0e60b9eb5766bb
 SHA512:
-  metadata.gz: b2b306d0fc7131de73ebad247d9bdb6d1032fb18d25397e55ddf0926c53002f141bed46facc8e37926b38b27a57f3d2e8d11d6071403502a4eeca751e2839e20
-  data.tar.gz: 27b7e2a699c9f3c897ecbeda9a06cba45dd21e87fc5ddb5315fa07acddd659e6ef9654d9fc4bdf89d28d784ffdecfb1cc907902c228635ffcd94a1971b499acc
+  metadata.gz: 29b96f43e5fda1ef716f2911bafda2bd5c159bc2eafcaea494cbc2aa9456658e150d9a3e4c874b081bac4d0db7cf1e0e63c5a8291f583bd9c416e4a1c9e58af0
+  data.tar.gz: edc8457f39385fc95f0db0e9b89fe09f46f2cd25790fdc11d1b22f111910b6c027d7f8042f6492ea37803774d0bd83a597b3c2a7ac74216edcd5f233e3acfeef

data/Gemfile

@@ -17,7 +17,7 @@ group :development do
 end
 
 group :test do
-  gem 'cqm-models', '~> 3.0.3'
+  gem 'cqm-models', '~> 3.0'
   gem 'factory_girl', '~> 4.1.0'
   gem 'tailor', '~> 1.1.2'
   gem 'cane', '~> 2.3.0'

data/lib/html-export/qdm-patient/data_element/_data_element_other_fields.mustache

@@ -44,7 +44,7 @@
 {{/daysSupplied}}
 {{#diagnoses}}
 	<div class="div-head-row">
-		<div class="div-table-head--no-border"><span class="criteria-heading">Diagnosis:</span>  {{{nested_code_string}}}</div>
+		<div class="div-table-head--no-border"><span class="criteria-heading">Diagnosis{{{diagnosis_rank_string}}}:</span>  {{{nested_code_string}}}</div>
 	</div>
 {{/diagnoses}}
 {{#dischargeDisposition}}

data/lib/html-export/qdm-patient/qdm_patient.rb

@@ -127,6 +127,10 @@ class QdmPatient < Mustache
     code_for_element(self['code'])
   end
 
+  def diagnosis_rank_string
+    " (rank: #{self['rank']})" if self['rank']
+  end
+
   def end_time?
     self['high'] && DateTime.parse(self['high']).year < 3000
   end

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

@@ -48,7 +48,6 @@
         <entryRelationship typeCode="REFR">
           <observation classCode="OBS" moodCode="EVN">
             <templateId root="2.16.840.1.113883.10.20.24.3.88" extension="2017-08-01"/>
-            <id root="1.3.6.1.4.1.115" extension="{{object_id}}" />
             <code code="77301-0" codeSystem="2.16.840.1.113883.6.1" displayName="reason" codeSystemName="LOINC"/>
             <statusCode code="completed"/>
             <!-- QDM Attribute: Code -->

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

@@ -4,6 +4,6 @@
       <id root="4adc1020-7b14-11db-9fe1-0800200c9a64" />
       <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4" />
       <statusCode code="completed" />
-      {{> qrda_templates/template_partials/_data_element_codes_as_values}}
+      <value xsi:type="CD" {{> _code}}/>
     </observation>
   </entryRelationship>

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

@@ -1,7 +1,6 @@
 <entryRelationship typeCode="RSON">
   <observation classCode="OBS" moodCode="EVN">
     <templateId root="2.16.840.1.113883.10.20.24.3.88" extension="2017-08-01"/>
-    <id root="1.3.6.1.4.1.115" extension="{{random_id}}" />
     <code code="77301-0" codeSystem="2.16.840.1.113883.6.1" displayName="reason" codeSystemName="LOINC"/>
     {{#relevantPeriod}}
     {{{relevant_period}}}

data/lib/qrda-export/catIII-r2-1/_continuous_variable_value.mustache

@@ -2,16 +2,16 @@
   <observation classCode="OBS" moodCode="EVN">
     <templateId root="2.16.840.1.113883.10.20.27.3.2"/>
     <code nullFlavor="OTH">
-      <originalText>Time Difference</originalText>
+      <originalText>Other</originalText>
     </code>
     <statusCode code="completed"/>
-    <value xsi:type="PQ" value="{{value}}" unit="min"/>
-    <methodCode code="MEDIAN" displayName="Median" codeSystem="2.16.840.1.113883.5.84" codeSystemName="ObservationMethod"/>
+    <value xsi:type="REAL" value="{{value}}"/>
+    <methodCode code="{{method}}" displayName="{{method}}" codeSystem="2.16.840.1.113883.5.84" codeSystemName="ObservationMethod"/>
     <reference typeCode="REFR">
       <!-- reference to the relevant measure observation in the eMeasure -->
       <externalObservation classCode="OBS" moodCode="EVN">
-        <id root="{{id}}"/>
+        <id root="{{hqmf_id}}"/>
       </externalObservation>
     </reference>
   </observation>
-</entryRelationship>  
+</entryRelationship>

data/lib/qrda-export/catIII-r2-1/_header.mustache

@@ -3,8 +3,14 @@
 <typeId root="2.16.840.1.113883.1.3" extension="POCD_HD000040"/>
 <!-- US Realm Header Template Id -->
 <templateId root="2.16.840.1.113883.10.20.27.1.1" extension="2017-06-01"/>
-<!-- QRDA Category III Report - CMS (V4) -->
+{{#ry2022_submission?}}
+<!-- QRDA Category III Report - CMS (V6) -->
+<templateId root="2.16.840.1.113883.10.20.27.1.2" extension="2021-07-01"/>
+{{/ry2022_submission?}}
+{{^ry2022_submission?}}
+<!-- QRDA Category III Report - CMS (V5) -->
 <templateId root="2.16.840.1.113883.10.20.27.1.2" extension="2020-05-01"/>
+{{/ry2022_submission?}}
 <!-- This is the globally unique identifier for this QRDA document -->
 <id root="{{random_id}}"/>
 <!-- QRDA III document type code -->

data/lib/qrda-export/catIII-r2-1/_measure_data.mustache

@@ -27,11 +27,9 @@
         {{> _supplemental_data}}
       {{/population_supplemental_data}}
     {{/supplemental_data}}
-    {{#msrpopl?}}
       {{#population_observation}}
         {{> _continuous_variable_value}}
       {{/population_observation}}
-    {{/msrpopl?}}
     <reference typeCode="REFR">
        <externalObservation classCode="OBS" moodCode="EVN">
           <id root="{{id}}"/>

data/lib/qrda-export/catIII-r2-1/_stratification.mustache

@@ -15,11 +15,9 @@
         <methodCode code="COUNT" displayName="Count" codeSystem="2.16.840.1.113883.5.84" codeSystemName="ObservationMethod"/>
       </observation>
     </entryRelationship>
-    {{#msrpopl?}}
-      {{#stratification_observation}}
-        {{> _continuous_variable_value}}
-      {{/stratification_observation}}
-    {{/msrpopl?}}
+    {{#stratification_observation}}
+      {{> _continuous_variable_value}}
+    {{/stratification_observation}}
     <reference typeCode="REFR">
       <externalObservation classCode="OBS" moodCode="EVN">
         <id root="{{id}}"/>

data/lib/qrda-export/catIII-r2-1/qrda3_r21.rb

@@ -27,6 +27,7 @@ class Qrda3R21 < Mustache
     @performance_period_start = options[:start_time]
     @performance_period_end = options[:end_time]
     @submission_program = options[:submission_program]
+    @ry2022_submission = options[:ry2022_submission]
   end
 
   def agg_results(measure_id, cache_entries, population_sets)
@@ -58,14 +59,11 @@ class Qrda3R21 < Mustache
   end
 
   def stratification_observation
-    observation = @measure_result_hash[self['measure_id']].aggregate_count.populations.find {|p| p.type == "OBSERV"}
-    stratification_observation = @measure_result_hash[self['measure_id']].aggregate_count.populations.find {|p| p.type == "OBSERV"}.stratifications.find {|s| s.id == self['id'] }
-    stratification_observation.id = observation.id
-    stratification_observation
+    self['observation']
   end
 
   def population_observation
-    @measure_result_hash[self['measure_id']].aggregate_count.populations.find {|p| p.type == "OBSERV"}
+    self['observation']
   end
 
   def supplemental_template_ids
@@ -90,6 +88,10 @@ class Qrda3R21 < Mustache
     @submission_program == 'CPCPLUS'
   end
 
+  def ry2022_submission?
+    @ry2022_submission
+  end
+
   def payer_code?
     self['type'] == 'PAYER'
   end

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

@@ -57,23 +57,24 @@ module Qrda
         end
       end
       class Population
-        attr_accessor :type, :value, :id, :stratifications, :supplemental_data
+        attr_accessor :type, :value, :id, :stratifications, :supplemental_data, :observation
 
         def initialize
           @stratifications = []
         end
 
-        def add_stratification(id,value)
-          stratifications << Stratification.new(id,value) unless stratifications.find {|st| st.id == id}
+        def add_stratification(id,value,observation)
+          stratifications << Stratification.new(id,value,observation) unless stratifications.find {|st| st.id == id}
         end
 
       end
 
       class Stratification
-        attr_accessor :id, :value
-        def initialize(id,value)
+        attr_accessor :id, :value, :observation
+        def initialize(id,value, observation)
           @id = id
           @value = value
+          @observation = observation
         end
 
       end
@@ -107,15 +108,17 @@ module Qrda
         def add_entry(cache_entry, population_sets)
           population_set = population_sets.where(population_set_id: cache_entry.pop_set_hash[:population_set_id]).first
           entry_populations = []
-          %w[IPP DENOM NUMER NUMEX DENEX DENEXCEP MSRPOPL MSRPOPLEX OBSERV].each do |pop_code|
-            next unless population_set.populations[pop_code] || pop_code == 'OBSERV'
+          %w[IPP DENOM NUMER NUMEX DENEX DENEXCEP MSRPOPL MSRPOPLEX].each do |pop_code|
+            next unless population_set.populations[pop_code]
 
             population = create_population_from_population_set(pop_code, population_set, cache_entry)
             if cache_entry.pop_set_hash[:stratification_id]
               strat_id = population_set.stratifications.where(stratification_id: cache_entry.pop_set_hash[:stratification_id]).first&.hqmf_id
-              population.add_stratification(strat_id,cache_entry[pop_code])
+              observation = cache_entry['observations'][pop_code] if cache_entry['observations'] && cache_entry['observations'][pop_code]
+              population.add_stratification(strat_id,cache_entry[pop_code], observation)
             else
               population.value = cache_entry[pop_code]
+              population.observation = cache_entry['observations'][pop_code] if cache_entry['observations'] && cache_entry['observations'][pop_code]
               population.supplemental_data = cache_entry.supplemental_data[pop_code]
             end
             entry_populations << population if population
@@ -128,19 +131,12 @@ module Qrda
         end
 
         def create_population_from_population_set(pop_code, population_set, cache_entry)
-          population = if pop_code == 'OBSERV'
-                         populations.find { |pop| pop.id == population_set.observations&.first&.hqmf_id }
-                       elsif pop_code != 'STRAT'
-                         populations.find { |pop| pop.id == population_set.populations[pop_code]&.hqmf_id }
-                       end
+          population = populations.find { |pop| pop.id == population_set.populations[pop_code]&.hqmf_id } if pop_code != 'STRAT'
           return population unless population.nil? && !cache_entry.pop_set_hash[:stratification_id]
+
           population = Population.new
           population.type = pop_code
-          population.id = if pop_code == 'OBSERV'
-                            population_set.observations&.first&.hqmf_id
-                          else
-                            population_set.populations[pop_code]&.hqmf_id
-                          end
+          population.id = population_set.populations[pop_code]&.hqmf_id
           populations << population
           population
         end

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

@@ -101,7 +101,7 @@ module Qrda
         end
 
         def relevant_date_period_or_null_flavor
-          return relevant_period if self['relevantPeriod']
+          return relevant_period if self['relevantPeriod'] && (self['relevantPeriod']['low'] || self['relevantPeriod']['high'])
           return relevant_date_time_value if self['relevantDatetime']
           "<effectiveTime nullFlavor='UNK'/>"
         end
@@ -128,4 +128,4 @@ module Qrda
       end
     end
   end
-end
+end

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @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'
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @relevant_date_time_xpath = './cda:effectiveTime[@value]'
         @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"

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = "./cda:participant[@typeCode='CSM']/cda:participantRole/cda:playingEntity/cda:code"
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @prevalence_period_xpath = "./cda:effectiveTime"
         @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/assessment_order_importer.rb

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @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']"

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @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"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @sent_datetime_xpath = "./cda:effectiveTime/cda:low"
         @received_datetime_xpath = "./cda:effectiveTime/cda:high"
         @related_to_xpath = "./sdtc:inFulfillmentOf1/sdtc:actReference"

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = './cda:participant/cda:participantRole/cda:playingDevice/cda:code'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @relevant_period_xpath = "./cda:effectiveTime"
         @relevant_date_time_xpath = './cda:effectiveTime[@value]'
         @anatomical_location_site_xpath = "./cda:targetSiteCode"

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @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"
+        @author_datetime_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.9']/cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @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"
+        @author_datetime_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.10']/cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:entryRelationship/cda:observation/cda:id'
         @code_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.135']/cda:value"
-        @author_datetime_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.135']/cda:author/cda:time"
+        @author_datetime_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.135']/cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @prevalence_period_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.135']/cda:effectiveTime"
         @anatomical_location_site_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.135']/cda:targetSiteCode"
         @severity_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.135']/cda:entryRelationship/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.8']/cda:value"

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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

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

@@ -7,7 +7,7 @@ module QRDA
         @code_xpath = './cda:code'
         @relevant_period_xpath = "./cda:effectiveTime"
         @relevant_date_time_xpath = './cda:effectiveTime[@value]'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @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/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.2']/cda:effectiveTime"
         @status_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.93']/cda:value"

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @entry_class = QDM::DiagnosticStudyRecommended
       end
 

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:entryRelationship/cda:encounter/cda:id'
         @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"
+        @author_datetime_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.22']/cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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"
         @priority_xpath = './cda:entryRelationship/cda:encounter/cda:priorityCode'

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

@@ -6,7 +6,7 @@ module QRDA
         @id_xpath = './cda:entryRelationship/cda:encounter/cda:id'
         @code_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.23']/cda:code"
         @relevant_period_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.23']/cda:effectiveTime"
-        @author_datetime_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.23']/cda:author/cda:time"
+        @author_datetime_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.23']/cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @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']"

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:entryRelationship/cda:encounter/cda:id'
         @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"
+        @author_datetime_xpath = "./cda:entryRelationship/cda:encounter[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.24']/cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = "./cda:component/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.112']/cda:value"
-        @author_datetime_xpath = "./cda:component/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.112']/cda:author/cda:time"
+        @author_datetime_xpath = "./cda:component/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.112']/cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @relationship_xpath = './cda:subject/cda:relatedSubject/cda:code'
         @entry_class = QDM::FamilyHistory
       end

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = "./cda:consumable/cda:manufacturedProduct/cda:manufacturedMaterial/cda:code"
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @relevant_date_time_xpath = './cda:effectiveTime'
         @dosage_xpath = "./cda:doseQuantity"
         @route_xpath = "./cda:routeCode"

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

@@ -6,7 +6,7 @@ module QRDA
         @id_xpath = './cda:id'
         @code_xpath = "./cda:consumable/cda:manufacturedProduct/cda:manufacturedMaterial/cda:code"
         @active_datetime_xpath = "./cda:effectiveTime[@value]"
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @dosage_xpath = "./cda:doseQuantity"
         @supply_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.167']/cda:quantity"
         @route_xpath = "./cda:routeCode"

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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

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

@@ -7,7 +7,7 @@ module QRDA
         @code_xpath = './cda:code'
         @relevant_period_xpath = "./cda:effectiveTime"
         @relevant_date_time_xpath = './cda:effectiveTime'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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"

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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

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

@@ -7,7 +7,7 @@ module QRDA
         @code_xpath = './cda:code'
         @relevant_period_xpath = "./cda:effectiveTime"
         @relevant_date_time_xpath = './cda:effectiveTime[@value]'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @status_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.93']/cda:value"
         @method_xpath = './cda:methodCode'
         @result_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.2']/cda:value"

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = "./cda:consumable/cda:manufacturedProduct/cda:manufacturedMaterial/cda:code"
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @relevant_period_xpath = "./cda:effectiveTime"
         @relevant_date_time_xpath = './cda:effectiveTime'
         @dosage_xpath = "./cda:doseQuantity"

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: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.22.4.119']/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"

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

@@ -7,7 +7,7 @@ module QRDA
         @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"
         @relevant_date_time_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.18']/cda:effectiveTime"
-        @author_datetime_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.18']/cda:author/cda:time"
+        @author_datetime_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.18']/cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @refills_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.18']/cda:entryRelationship/cda:substanceAdministration/cda:repeatNumber"
         @dosage_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.18']/cda:entryRelationship/cda:substanceAdministration/cda:doseQuantity"
         @supply_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.18']/cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.99']/cda:quantity"

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

@@ -6,7 +6,7 @@ module QRDA
         @id_xpath = './cda:id'
         @code_xpath = "./cda:consumable/cda:manufacturedProduct/cda:manufacturedMaterial/cda:code"
         @relevant_period_xpath = "./cda:effectiveTime"
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @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"
         @frequency_xpath = "./cda:effectiveTime[@operator='A']/cda:period"

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = './cda:value'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @entry_class = QDM::PatientCareExperience
       end
 

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = "./cda:value"
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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

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

@@ -7,7 +7,7 @@ module QRDA
         @code_xpath = "./cda:code"
         @relevant_period_xpath = "./cda:effectiveTime"
         @relevant_date_time_xpath = './cda:effectiveTime'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @method_xpath = './cda:methodCode'
         @result_xpath = "./cda:value"
         @anatomical_location_site_xpath = "./cda:targetSiteCode"

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = "./cda:value"
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = './cda:code'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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"
         @rank_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.166']/cda:value/@value"

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

@@ -7,7 +7,7 @@ module QRDA
         @code_xpath = "./cda:code"
         @relevant_period_xpath = "./cda:effectiveTime"
         @relevant_date_time_xpath = './cda:effectiveTime'
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @method_xpath = './cda:methodCode'
         @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"

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = "./cda:code"
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/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"
         @rank_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.166']/cda:value/@value"

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = "./cda:value"
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @entry_class = QDM::ProviderCareExperience
       end
 

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = "./cda:consumable/cda:manufacturedProduct/cda:manufacturedMaterial/cda:code"
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @relevant_period_xpath = "./cda:effectiveTime"
         @relevant_date_time_xpath = './cda:effectiveTime'
         @dosage_xpath = "./cda:doseQuantity"

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

@@ -6,7 +6,7 @@ module QRDA
         @id_xpath = './cda:id'
         @code_xpath = "./cda:consumable/cda:manufacturedProduct/cda:manufacturedMaterial/cda:code"
         @relevant_period_xpath = "./cda:effectiveTime"
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @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"
         @frequency_xpath = "./cda:effectiveTime[@operator='A']/cda:period"

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

@@ -5,7 +5,7 @@ module QRDA
         super(entry_finder)
         @id_xpath = './cda:id'
         @code_xpath = "./cda:consumable/cda:manufacturedProduct/cda:manufacturedMaterial/cda:code"
-        @author_datetime_xpath = "./cda:author/cda:time"
+        @author_datetime_xpath = "./cda:author[cda:templateId/@root='2.16.840.1.113883.10.20.24.3.155']/cda:time"
         @dosage_xpath = "./cda:doseQuantity"
         @frequency_xpath = "./cda:effectiveTime[@operator='A']/cda:period"
         @refills_xpath = "./cda:repeatNumber"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cqm-reports
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.7
 platform: ruby
 authors:
 - The MITRE Corporation
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2021-10-01 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.3
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: cqm-validators
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,22 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.5
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.5
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement