cqm-reports 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86b46847a0a68ecf86611dce268e5a12f6d01af6
-  data.tar.gz: 906d1984866e314876ca0d713f6b08a01a6ab8f5
+  metadata.gz: 4ab383c8a8cbc82410448739f891fc5c96cd0ae8
+  data.tar.gz: 62734f201648d065ea3bec1903f34d1c7005443b
 SHA512:
-  metadata.gz: cc1e458ec8496af2e20bec1068f7acf723976bdfa92610cd2f1b99f36692a5cb7ddb3c6d1648be17704d820d0002b8b32c78d52881ea1d78d71643909ae0499f
-  data.tar.gz: 9f4fa410245d83fbd1beb11183461a4cd8442859bfc391b7bffd90c5d9afeb2c91cd3ca83d54e9bc7c6a49f8ad9b6c9fe55230167161fd03cc4fc188066aec95
+  metadata.gz: 941d46cc062b4cb2d70a7f11438363b3af6a0ba7a21491ed451c37f61778445ad8e2375b055a5db54c8b90f365b7d52cd9fa7ce262eea8b20727ae42f7043310
+  data.tar.gz: 13c9d7aca7e2497f47e66919b54926f33bd6fd4d2714aadbde204d24072f23e95aa0fbad63458572e4c776c0dac9caa67fae2dc3efa063d7f340d618eea4cd3f

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

@@ -6,16 +6,7 @@
     {{> _codes}}
     <text>{{description}}</text>
     <statusCode code="completed"/>
-    {{#relevantDatetime}}
-      <!-- QDM Attribute: Relevant dateTime -->
-      {{{relevant_date_time_value}}}
-    {{/relevantDatetime}}
-    {{^relevantDatetime}}
-      {{#relevantPeriod}}
-        <!-- QDM Attribute: Relevant Period -->
-        {{{relevant_period}}}
-      {{/relevantPeriod}}
-    {{/relevantDatetime}}
+    {{{relevant_date_period_or_null_flavor}}}
     {{#result}}
     <!-- QDM Attribute: Result -->
     {{{result_value}}}

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

@@ -8,16 +8,7 @@
     <code code="360030002" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="application of device"/>
     <text>{{description}}</text>
     <statusCode code="completed"/>
-    {{#relevantDatetime}}
-      <!-- QDM Attribute: Relevant dateTime -->
-      {{{relevant_date_time_value}}}
-    {{/relevantDatetime}}
-    {{^relevantDatetime}}
-      {{#relevantPeriod}}
-        <!-- QDM Attribute: Relevant Period -->
-        {{{relevant_period}}}
-      {{/relevantPeriod}}
-    {{/relevantDatetime}}
+    {{{relevant_date_period_or_null_flavor}}}
     {{#anatomicalLocationSite}}
       <!-- QDM Attribute: Anatomical Location Site -->
       {{> qrda_templates/template_partials/_anatomical_location_site}}

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

@@ -1,7 +1,6 @@
 <entry>
   <act classCode="ACT" moodCode="RQO" {{{negation_ind}}}>
     <templateId root="2.16.840.1.113883.10.20.24.3.130" extension="2019-12-01"/>
-    <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <code code="SPLY" codeSystem="2.16.840.1.113883.5.6" displayName="Supply" codeSystemName="ActClass"/>
     <entryRelationship typeCode="SUBJ">
       <supply classCode="SPLY" moodCode="RQO">

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

@@ -9,16 +9,7 @@
     {{> _codes}}
     <text>{{description}}</text>
     <statusCode code="completed"/>
-    {{#relevantDatetime}}
-      <!-- QDM Attribute: Relevant dateTime -->
-      {{{relevant_date_time_value}}}
-    {{/relevantDatetime}}
-    {{^relevantDatetime}}
-      {{#relevantPeriod}}
-        <!-- QDM Attribute: Relevant Period -->
-        {{{relevant_period}}}
-      {{/relevantPeriod}}
-    {{/relevantDatetime}}
+    {{{relevant_date_period_or_null_flavor}}}
     <value nullFlavor="NA" xsi:type="CD" />
     {{#method}}
       <!-- QDM Attribute: Method -->

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

@@ -2,7 +2,6 @@
   <act classCode="ACT" moodCode="INT" {{{negation_ind}}}>
     <!--Encounter Recommended Act (V2) -->
     <templateId root="2.16.840.1.113883.10.20.24.3.134" extension="2019-12-01"/>
-    <id extension="{{object_id}}" root="1.3.6.1.4.1.115"/>
     <code code="ENC" codeSystem="2.16.840.1.113883.5.6" codeSystemName="ActClass" displayName="Encounter"/>
     <entryRelationship typeCode="SUBJ">
       <encounter classCode="ENC" moodCode="INT">

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

@@ -8,16 +8,7 @@
     {{> _codes}}
     <text>{{description}}</text>
     <statusCode code="completed"/>
-    {{#relevantDatetime}}
-      <!-- QDM Attribute: Relevant dateTime -->
-      {{{relevant_date_time_value}}}
-    {{/relevantDatetime}}
-    {{^relevantDatetime}}
-      {{#relevantPeriod}}
-        <!-- QDM Attribute: Relevant Period -->
-        {{{relevant_period}}}
-      {{/relevantPeriod}}
-    {{/relevantDatetime}}
+    {{{relevant_date_period_or_null_flavor}}}
     {{#authorDatetime}}
       <!-- QDM Attribute: Author dateTime -->
       {{> qrda_templates/template_partials/_author}}

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

@@ -6,16 +6,7 @@
     {{> _codes}}
     <text>{{description}}</text>
     <statusCode code="completed"/>
-    {{#relevantDatetime}}
-      <!-- QDM Attribute: Relevant dateTime -->
-      {{{relevant_date_time_value}}}
-    {{/relevantDatetime}}
-    {{^relevantDatetime}}
-      {{#relevantPeriod}}
-        <!-- QDM Attribute: Relevant Period -->
-        {{{relevant_period}}}
-      {{/relevantPeriod}}
-    {{/relevantDatetime}}
+    {{{relevant_date_period_or_null_flavor}}}
     {{#method}}
       <!-- QDM Attribute: Method -->
       {{> qrda_templates/template_partials/_method}}

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

@@ -2,7 +2,6 @@
   <act classCode="ACT" moodCode="RQO" {{{negation_ind}}}>
     <!-- Discharge Medication Entry -->
     <templateId root="2.16.840.1.113883.10.20.24.3.105" extension="2019-12-01"/>
-    <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <code code="75311-1" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="Discharge medications"/> 
     <statusCode code="active"/>
     {{#prescriber}}

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

@@ -2,7 +2,6 @@
   <act classCode="ACT" moodCode="EVN" {{{negation_ind}}}>
     <!-- Medication Dispensed Act -->
     <templateId root="2.16.840.1.113883.10.20.24.3.139" extension="2019-12-01"/>
-    <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <code code="SPLY" codeSystem="2.16.840.1.113883.5.6" displayName="supply" codeSystemName="ActClass"/>
     <entryRelationship typeCode="SUBJ">
       <!--Medication dispensed -->
@@ -23,6 +22,9 @@
             <!-- QDM Attribute: Relevant Period -->
             {{{medication_duration_effective_time}}}
           {{/relevantPeriod}}
+          {{^relevantPeriod}}
+            <effectiveTime xsi:type="IVL_TS" nullFlavor="UNK"/>
+          {{/relevantPeriod}}
         {{/relevantDatetime}}
         <product>
           <manufacturedProduct classCode="MANU">

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

@@ -9,16 +9,7 @@
     {{> _codes}}
     <text>{{description}}</text>
     <statusCode code="completed"/>
-    {{#relevantDatetime}}
-      <!-- QDM Attribute: Relevant dateTime -->
-      {{{relevant_date_time_value}}}
-    {{/relevantDatetime}}
-    {{^relevantDatetime}}
-      {{#relevantPeriod}}
-        <!-- QDM Attribute: Relevant Period -->
-        {{{relevant_period}}}
-      {{/relevantPeriod}}
-    {{/relevantDatetime}}
+    {{{relevant_date_period_or_null_flavor}}}
     {{#result}}
     <!-- QDM Attribute: Result -->
     {{{result_value}}}

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

@@ -8,16 +8,7 @@
     {{> _codes}}
     <text>{{description}}</text>
     <statusCode code="completed"/>
-    {{#relevantDatetime}}
-      <!-- QDM Attribute: Relevant dateTime -->
-      {{{relevant_date_time_value}}}
-    {{/relevantDatetime}}
-    {{^relevantDatetime}}
-      {{#relevantPeriod}}
-        <!-- QDM Attribute: Relevant Period -->
-        {{{relevant_period}}}
-      {{/relevantPeriod}}
-    {{/relevantDatetime}}
+    {{{relevant_date_period_or_null_flavor}}}
     {{#method}}
       <!-- QDM Attribute: Method -->
       {{> qrda_templates/template_partials/_method}}

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

@@ -6,6 +6,9 @@
     <templateId root="2.16.840.1.113883.10.20.24.3.75" extension="2019-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
     <statusCode code="active"/>
+    <effectiveTime xsi:type="IVL_TS">
+      <low nullFlavor="NA"/>
+    </effectiveTime>
     {{> qrda_templates/template_partials/_medication_details}}
     <consumable>
       <manufacturedProduct classCode="MANU">

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

@@ -3,7 +3,6 @@
     <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"/>
-    <statusCode code="completed"/>
     {{#relevantPeriod}}
     {{{relevant_period}}}
     {{/relevantPeriod}}

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

@@ -4,7 +4,7 @@
 <!-- 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) -->
-<templateId root="2.16.840.1.113883.10.20.27.1.2" extension="2019-05-01"/>
+<templateId root="2.16.840.1.113883.10.20.27.1.2" extension="2020-05-01"/>
 <!-- This is the globally unique identifier for this QRDA document -->
 <id root="{{random_id}}"/>
 <!-- QRDA III document type code -->

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

@@ -96,20 +96,16 @@ module Qrda
           "</effectiveTime>"
         end
 
-        def relevant_period_as_value
-          "<effectiveTime #{value_or_null_flavor(self['relevantPeriod']['low'])}/>"
-        end
-
-        def relevant_date_time_low
-          "<effectiveTime>"\
-          "<low #{value_or_null_flavor(self['relevantDatetime'])}/>"\
-          "</effectiveTime>"
-        end
-
         def relevant_date_time_value
           "<effectiveTime #{value_or_null_flavor(self['relevantDatetime'])}/>"
         end
 
+        def relevant_date_period_or_null_flavor
+          return relevant_period if self['relevantPeriod']
+          return relevant_date_time_value if self['relevantDatetime']
+          "<effectiveTime nullFlavor='UNK'/>"
+        end
+
         def medication_duration_effective_time
           "<effectiveTime xsi:type=\"IVL_TS\">"\
           "<low #{value_or_null_flavor(self['relevantPeriod']['low'])}/>"\

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

@@ -93,6 +93,7 @@ module QRDA
       end
 
       def extract_interval(parent_element, interval_xpath)
+        return nil unless parent_element.at_xpath(interval_xpath)
         if parent_element.at_xpath("#{interval_xpath}/@value")
           low_time = DateTime.parse(parent_element.at_xpath(interval_xpath)['value'])
           high_time = DateTime.parse(parent_element.at_xpath(interval_xpath)['value'])

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

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

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

@@ -3,7 +3,7 @@ module QRDA
     class EncounterRecommendedImporter < 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.134']"))
         super(entry_finder)
-        @id_xpath = './cda:id'
+        @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"
         @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']"

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

@@ -3,7 +3,7 @@ module QRDA
     class MedicationDischargeImporter < 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.105']"))
         super(entry_finder)
-        @id_xpath = './cda:id'
+        @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"
         @refills_xpath = "./cda:entryRelationship/cda:substanceAdministration[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.16']/cda:repeatNumber"

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

@@ -3,7 +3,7 @@ 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)
-        @id_xpath = './cda:id'
+        @id_xpath = './cda:entryRelationship/cda:supply/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"
         @relevant_date_time_xpath = "./cda:entryRelationship/cda:supply[cda:templateId/@root = '2.16.840.1.113883.10.20.22.4.18']/cda:effectiveTime"

data/lib/qrda-import/patient_importer.rb

@@ -112,8 +112,8 @@ module QRDA
 
       def key_elements_for_determining_encounter_uniqueness(encounter)
         codes = encounter.codes.collect { |dec| "#{dec.code}_#{dec.system}" }.sort.to_s
-        admission_date_time = encounter.relevantPeriod.low.to_s
-        discharge_date_time = encounter.relevantPeriod.high.to_s
+        admission_date_time = encounter&.relevantPeriod&.low.to_s
+        discharge_date_time = encounter&.relevantPeriod&.high.to_s
         "#{codes}#{admission_date_time}#{discharge_date_time}"
       end
 
@@ -131,7 +131,7 @@ module QRDA
 
           relations_to_add = []
           data_element.relatedTo.each do |related_to|
-            relations_to_add += entry_id_map["#{related_to.value}_#{related_to.namingSystem}"]
+            relations_to_add += entry_id_map["#{related_to['value']}_#{related_to['namingSystem']}"]
           end
           data_element.relatedTo = relations_to_add.map(&:to_s)
         end

metadata

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