cqm-reports 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f52ee70f2be4c43ccf9c3d918ed805a323d942d1768d5621967c9232ea303c5
-  data.tar.gz: c866224aca04b6760a35a3fd0f8d78e03c5fe85d9bff0a4d41a8af907eebf995
+  metadata.gz: 5d0f8e468a6248c0e952e97d698928a88bc09e4f94703c1164eb4790486c4212
+  data.tar.gz: 898c341927cc169c1efae8dd643eefa8d865e84c59d9bb7336e8ed2bfbfae9ff
 SHA512:
-  metadata.gz: 42797a2e8c76511344a48f803034e6d5bc4bf1468b5fcd8853f53a10cea295413a96fea7299767dbfcef6b0cf7663e9f9e648715c3f3c7bb412e09391e08bb68
-  data.tar.gz: 94dc517b00e37117d00eea8ca516103bc3fa21af59457c7697e4299a4d2c92d8f46090fca4103cdfdbaede0aa6e130e3a52e3af1395564d447ccff712959cbd7
+  metadata.gz: 486c5a39e5d9612999c4f33fe7254d61e39a349f770fbee3bf0a02fba1072a08c62cdb4033099460e4d4e1426fbb929eae12c2e718ef398c2dcf40beb982f6ca
+  data.tar.gz: 0b3c3e5c9eb6a4d0022bdd1c8590779f3b52711de8b758fbc8fb6256214ba8a592f25e94fe25af3f4b77385f7f34fa9ef96a9d73b83e702c50ec0a8914404691

data/Gemfile

@@ -28,6 +28,6 @@ group :test do
   gem 'minitest', '~> 5.3'
   gem 'minitest-reporters'
   gem 'awesome_print', :require => 'ap'
-  gem 'cqm-validators', git: 'https://github.com/projecttacoma/cqm-validators.git', branch: 'master'
+  gem 'cqm-validators'
   gem 'nokogiri-diff'
 end

data/README.md

@@ -4,15 +4,17 @@ A library for import and export of reports for use with electronic Clinical Qual
 Versioning
 ==========
 
-Starting with version **1.0.0.0** released on 5/22/2019, cqm-reports versioning has the format **W.X.Y.Z**, where:
+Starting with version **2.0.0** released on 6/20/2019, cqm-reports versioning has the format **X.Y.Z**, where:
 
-* **W** maps to a version of QRDA Category 1 and QRDA Category 3. See the table below to see the existing mapping to QRDA versions.
+* **X** maps to a version of QRDA. See the table below to see the existing mapping to QRDA versions.
 
-  | W | QRDA Cat 1 | QRDA Cat 3 |
+  | X | QRDA Cat 1 | QRDA Cat 3 |
   | --- | --- | --- |
-  | 1 | R1 STU5.1 | R1 STU2.1 |
+  | 2 | R1 STU5.1 | R1 STU2.1 |
 
-* **X.Y.Z** uses [SemVer](http://semver.org/) for versioning. **X.Y.Z** starts at 0.0.0 when **W** is incremented.
+* **Y** indicates major changes (incompatible API changes)
+
+* **Z** indicates minor changes (added functionality in a backwards-compatible manner) and patch changes (backwards-compatible bug fixes)
 
 For the versions available, see [tags on this repository](https://github.com/projecttacoma/cqm-validators/tags).
 
@@ -24,4 +26,4 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use
 
 http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

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

@@ -6,6 +6,10 @@
           <!-- QDM Attribute: Category -->
           <code {{> _code}}/>
         {{/category}}
+        {{^category}}
+          <!-- QDM Attribute: Category -->
+          <code nullFlavor="UNK"/>
+        {{/category}}
         <statusCode code="completed"/>
         {{#relevantPeriod}}
           <!-- QDM Attribute: Relevant Period -->
@@ -42,8 +46,7 @@
           <!-- QDM Attribute: Negation Rationale -->
           {{> qrda_templates/template_partials/_reason}}
         {{/negationRationale}}
-        {{^negationRationale}}
-        <entryRelationship typeCode="RSON">
+        <entryRelationship typeCode="REFR">
           <observation classCode="OBS" moodCode="EVN">
             <templateId root="2.16.840.1.113883.10.20.24.3.88" extension="2014-12-01"/>
             <id root="1.3.6.1.4.1.115" extension="{{object_id}}" />
@@ -53,7 +56,6 @@
             {{> qrda_templates/template_partials/_data_element_codes_as_values}}
           </observation>
         </entryRelationship>
-        {{/negationRationale}}
         {{#relatedTo}}
           <!-- QDM Attribute: relatedTo -->
           {{> qrda_templates/template_partials/_related_to}}

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

@@ -28,11 +28,11 @@
           <!-- QDM Attribute: Reason -->
           {{> qrda_templates/template_partials/_reason}}
         {{/reason}}
-        {{#negationRationale}}
-          <!-- QDM Attribute: Negation Rationale -->
-          {{> qrda_templates/template_partials/_reason}}
-        {{/negationRationale}}
       </supply>
     </entryRelationship>
+    {{#negationRationale}}
+      <!-- QDM Attribute: Negation Rationale -->
+      {{> qrda_templates/template_partials/_reason}}
+    {{/negationRationale}}
   </act>
 </entry>

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

@@ -27,11 +27,11 @@
           <!-- QDM Attribute: Reason -->
           {{> qrda_templates/template_partials/_reason}}
         {{/reason}}
-        {{#negationRationale}}
-          <!-- QDM Attribute: Negation Rationale -->
-          {{> qrda_templates/template_partials/_reason}}
-        {{/negationRationale}}
       </supply>
     </entryRelationship>
+    {{#negationRationale}}
+      <!-- QDM Attribute: Negation Rationale -->
+      {{> qrda_templates/template_partials/_reason}}
+    {{/negationRationale}}
   </act>
 </entry>

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

@@ -25,11 +25,11 @@
           <!-- QDM Attribute: Reason -->
           {{> qrda_templates/template_partials/_reason}}
         {{/reason}}
-        {{#negationRationale}}
-          <!-- QDM Attribute: Negation Rationale -->
-          {{> qrda_templates/template_partials/_reason}}
-        {{/negationRationale}}
       </encounter>
     </entryRelationship>
+    {{#negationRationale}}
+      <!-- QDM Attribute: Negation Rationale -->
+      {{> qrda_templates/template_partials/_reason}}
+    {{/negationRationale}}
   </act>
 </entry>

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

@@ -42,11 +42,11 @@
           <!-- QDM Attribute: Diagnoses -->
           {{> qrda_templates/template_partials/_encounter_diagnosis}}
         {{/diagnoses}}
-        {{#negationRationale}}
-          <!-- QDM Attribute: Negation Rationale -->
-          {{> qrda_templates/template_partials/_reason}}
-        {{/negationRationale}}
       </encounter>
     </entryRelationship>
+    {{#negationRationale}}
+      <!-- QDM Attribute: Negation Rationale -->
+      {{> qrda_templates/template_partials/_reason}}
+    {{/negationRationale}}
   </act>
 </entry>

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

@@ -27,11 +27,11 @@
           <!-- QDM Attribute: Reason -->
           {{> qrda_templates/template_partials/_reason}}
         {{/reason}}
-        {{#negationRationale}}
-          <!-- QDM Attribute: Negation Rationale -->
-          {{> qrda_templates/template_partials/_reason}}
-        {{/negationRationale}}
       </encounter>
     </entryRelationship>
+    {{#negationRationale}}
+      <!-- QDM Attribute: Negation Rationale -->
+      {{> qrda_templates/template_partials/_reason}}
+    {{/negationRationale}}
   </act>
 </entry>

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

@@ -35,9 +35,6 @@
         {{#authorDatetime}}
           {{> qrda_templates/template_partials/_author_participation}}
         {{/authorDatetime}}
-        {{#negationRationale}}
-          {{> qrda_templates/template_partials/_reason}}
-        {{/negationRationale}} 
       </substanceAdministration>
     </entryRelationship>
     {{#reason}}

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

@@ -60,11 +60,11 @@
               {{> qrda_templates/template_partials/_medication_supply_request}}
           </entryRelationship>
         {{/supply}}
-        {{#negationRationale}}
-          <!-- QDM Attribute: Negation Rationale -->
-          {{> qrda_templates/template_partials/_reason}}
-        {{/negationRationale}}
       </supply>
     </entryRelationship>
+    {{#negationRationale}}
+      <!-- QDM Attribute: Negation Rationale -->
+      {{> qrda_templates/template_partials/_reason}}
+    {{/negationRationale}}
   </act>
 </entry>

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

@@ -17,6 +17,10 @@
     <!-- QDM Attribute: Result -->
     {{{result_value}}}
     {{/result}}
+    {{^result}}
+    <!-- QDM Attribute: Result -->
+    <value xsi:type="CD" nullFlavor="UNK"/>
+    {{/result}}
     {{#method}}
       <!-- QDM Attribute: Method -->
       {{> qrda_templates/template_partials/_method}}

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

@@ -8,7 +8,7 @@
 {{/negated}}
 {{^negated}}
 {{#dosage}}
-<!--  QDM Attribute: Dosage -->
-<doseQuantity value="{{value}}" unit="{{unit}}"/>
+  <!--  QDM Attribute: Dosage -->
+  {{{dose_quantity_value}}}
 {{/dosage}}
 {{/negated}}

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

@@ -30,7 +30,11 @@
 {{/negated}}
 {{^negated}}
 {{#dosage}}
+  <!--  QDM Attribute: Dosage -->
+  {{{dose_quantity_value}}}
+{{/dosage}}
+{{^dosage}}
 <!--  QDM Attribute: Dosage -->
-<doseQuantity value="{{value}}" unit="{{unit}}"/>
+<doseQuantity nullFlavor="UNK"/>
 {{/dosage}}
 {{/negated}}

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

@@ -13,5 +13,5 @@
     {{{author_effective_time}}}
     {{/authorDatetime}}
   {{/relevantPeriod}}
-  <quantity value="{{value}}"/>
+  <quantity value="{{{value_as_float}}}"/>
 </supply>

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

@@ -120,7 +120,7 @@ module Qrda
             end
             entry_populations << population if population
           end
-          return if population_groups.find {|pg| pg.populations.collect(&:id).sort == entry_populations.collect(&:id).sort }
+          return if population_groups.find {|pg| pg.populations.collect(&:id).compact.sort == entry_populations.collect(&:id).compact.sort }
 
           pg = PopulationGroup.new
           pg.populations = entry_populations

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

@@ -51,6 +51,15 @@ module Qrda
           translation_list
         end
 
+        def value_as_float
+          self['value'].to_f
+        end
+
+        def dose_quantity_value
+          return "<doseQuantity value=\"#{value_as_float}\" unit=\"#{self['unit']}\"/>" if self['unit']
+          "<doseQuantity value=\"#{value_as_float}\" />"
+        end
+
         def result_value
           return "<value xsi:type=\"CD\" nullFlavor=\"UNK\"/>" unless self['result']
 

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

@@ -49,7 +49,7 @@ module QRDA
         if @result_xpath
           entry.result = extract_result_values(entry_element)
         end
-        extract_reason_or_negation(entry_element, entry)
+        extract_negation(entry_element, entry)
         entry
       end
 
@@ -125,8 +125,7 @@ module QRDA
         # If a Direct Reference Code isn't found, return nil
         return nil unless key
         # If a Direct Reference Code is found, return that code
-        oid = value[:codeSystem] || value[:codeSystemOid]
-        QDM::Code.new(key, oid)
+        QDM::Code.new(key, value[:code_system])
       end
 
       def extract_frequency_in_hours(parent_element, frequency_xpath)
@@ -158,32 +157,36 @@ module QRDA
 
         value = value_element['value']
         if value.present?
-          return value.strip.to_i if (value_element['unit'] == "1" || value_element['unit'].nil?)
+          return value.strip.to_f if (value_element['unit'] == "1" || value_element['unit'].nil?)
 
-          return QDM::Quantity.new(value.strip.to_i, value_element['unit'])
+          return QDM::Quantity.new(value.strip.to_f, value_element['unit'])
         elsif value_element['code'].present?
           return code_if_present(value_element)
         end
       end
 
-      # extracts the reason or negation data. if an element is negated and the code has a null flavor, a random code is assigned for calculation
-      # coded_parent_element is the 'parent' element when the coded is nested (e.g., medication order)
-      def extract_reason_or_negation(parent_element, entry, coded_parent_element = nil)
-        coded_parent_element ||= parent_element
-        reason_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 | .//cda:entryRelationship[@typeCode='RSON']/cda:act[cda:templateId/@root='2.16.840.1.113883.10.20.1.27']/cda:code")
+      def extract_reason(parent_element)
+        return unless @reason_xpath
+        reason_element = parent_element.xpath(@reason_xpath)
         negation_indicator = parent_element['negationInd']
-        unless reason_element.blank?
-          if negation_indicator.eql?('true')
-            entry.negationRationale = code_if_present(reason_element.first)
-          else
-            entry.reason = code_if_present(reason_element.first) unless @entry_does_not_have_reason
-          end
-        end
-        extract_negated_code(coded_parent_element, entry)
+        # 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) 
+      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') 
+        
+        entry.negationRationale = code_if_present(negation_element.first) unless negation_element.blank?
+        extract_negated_code(parent_element, entry)
       end
 
-      def extract_negated_code(coded_parent_element, entry)
-        code_elements = coded_parent_element.xpath(@code_xpath)
+      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' && code_element['sdtc:valueSet']
             entry.dataElementCodes = [{ code: code_element['sdtc:valueSet'], codeSystemOid: '1.2.3.4.5.6.7.8.9.10' }]
@@ -193,9 +196,9 @@ module QRDA
 
       def extract_scalar(parent_element, scalar_xpath)
         scalar_element = parent_element.at_xpath(scalar_xpath)
-        return unless scalar_element
+        return unless scalar_element && scalar_element['value'].present?
 
-        QDM::Quantity.new(scalar_element['value'].to_i, scalar_element['unit'])
+        QDM::Quantity.new(scalar_element['value'].to_f, scalar_element['unit'])
       end
 
       def extract_components(parent_element)

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"

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

@@ -11,6 +11,7 @@ module QRDA
         @frequency_xpath = "./cda:effectiveTime[@operator='A']/cda:period"
         @refills_xpath = "./cda:repeatNumber"
         @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::SubstanceOrder
       end
 
@@ -21,6 +22,7 @@ module QRDA
         substance_order.frequency = frequency_as_coded_value(entry_element, @frequency_xpath)
         substance_order.refills = extract_scalar(entry_element, @refills_xpath)&.value
         substance_order.route = code_if_present(entry_element.at_xpath(@route_xpath))
+        substance_order.reason = extract_reason(entry_element)
         substance_order
       end
 

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

@@ -10,6 +10,7 @@ module QRDA
         @frequency_xpath = "./cda:effectiveTime[@operator='A']/cda:period"
         @refills_xpath = "./cda:repeatNumber"
         @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::SubstanceRecommended
       end
 
@@ -19,6 +20,7 @@ module QRDA
         substance_recommended.frequency = frequency_as_coded_value(entry_element, @frequency_xpath)
         substance_recommended.refills = extract_scalar(entry_element, @refills_xpath)&.value
         substance_recommended.route = code_if_present(entry_element.at_xpath(@route_xpath))
+        substance_recommended.reason = extract_reason(entry_element)
         substance_recommended
       end
 

data/lib/qrda-import/patient_importer.rb

@@ -109,7 +109,7 @@ module QRDA
 
           relations_to_add = []
           data_element.relatedTo.each do |related_to|
-            relations_to_add << entry_id_map[related_to.value]
+            relations_to_add << entry_id_map["#{related_to.value}_#{related_to.namingSystem}"]
           end
           data_element.relatedTo.destroy
           relations_to_add.each do |relation_to_add|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cqm-reports
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - The MITRE Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cqm-models
@@ -44,56 +44,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: mongoid-tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.3
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.3
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: zip-zip
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.10
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.10
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: memoist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.9'
 description: A library for import and export of reports for use with electronic Clinical
   Quality Measures (eCQMs).
 email: tacoma-list@lists.mitre.org