cqm-reports 1.0.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faad9a8a2c63b2c26bd1ed689be3cea13a54bc520e9fbcf95a56550b2646a095
-  data.tar.gz: cb7867e3555e19a454dc918ef7f018672f177cf3b3eeeef124aff46723693c56
+  metadata.gz: 9f52ee70f2be4c43ccf9c3d918ed805a323d942d1768d5621967c9232ea303c5
+  data.tar.gz: c866224aca04b6760a35a3fd0f8d78e03c5fe85d9bff0a4d41a8af907eebf995
 SHA512:
-  metadata.gz: 16ad11bbe2c9131f6977c8eac6b06150f6fb22f4a465364f40e65375e3271cbf241d4777b0ae3cad8fecd0bb0a8a1808957c9f813c761024851a44c05cc530ea
-  data.tar.gz: 5c2710035d5e2b6c56e3e25c974b5ecefc131fa5fb058c1b3ed2ad09825639a937f6a75811bd3286fb95364c69d64dcfa45d8778f2875c290d94c5609f46c852
+  metadata.gz: 42797a2e8c76511344a48f803034e6d5bc4bf1468b5fcd8853f53a10cea295413a96fea7299767dbfcef6b0cf7663e9f9e648715c3f3c7bb412e09391e08bb68
+  data.tar.gz: 94dc517b00e37117d00eea8ca516103bc3fa21af59457c7697e4299a4d2c92d8f46090fca4103cdfdbaede0aa6e130e3a52e3af1395564d447ccff712959cbd7

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

@@ -2,7 +2,7 @@
 <div class="div-table-body">
 {{#dataElementCodes}}
 <div class="div-head-row">
-	<div class="div-table-head--no-border"><span class="criteria-heading">{{codeSystem}}:</span>  {{code}}</div>
+	<div class="div-table-head--no-border"><span class="criteria-heading">{{{code_system_name}}}:</span>  {{code}}</div>
 </div>
 {{/dataElementCodes}}
 </div>

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

@@ -27,7 +27,11 @@ class QdmPatient < Mustache
   end
 
   def code_code_system_string
-    "#{self['code']} (#{self['codeSystem']})"
+    "#{self['code']} (#{HQMF::Util::CodeSystemHelper.code_system_for(self['codeSystemOid'])})"
+  end
+
+  def code_system_name
+    HQMF::Util::CodeSystemHelper.code_system_for(self['codeSystemOid'])
   end
 
   def result_string

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

@@ -3,6 +3,8 @@
 <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) -->
+<templateId root="2.16.840.1.113883.10.20.27.1.2" extension="2019-05-01"/>
 <!-- This is the globally unique identifier for this QRDA document -->
 <id root="{{random_id}}"/>
 <!-- QRDA III document type code -->
@@ -21,5 +23,10 @@
 </recordTarget>
 {{> qrda_header/_author}}
 {{> qrda_header/_custodian}}
+{{> qrda_header/_information_recipient}}
 {{> qrda_header/_legal_authenticator}}
+{{#cpcplus?}}
+  {{> qrda_header/_participant_location}}
+{{/cpcplus?}}
+{{> qrda_header/_participant_ehr}}
 {{> qrda_header/_documentation_of_service_event}}

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

@@ -5,6 +5,8 @@
   <observation classCode="OBS" moodCode="EVN">
     <!-- Measure Data template -->
     <templateId root="2.16.840.1.113883.10.20.27.3.5" extension="2016-09-01"/>
+    <!-- Measure Data - CMS (V4) -->
+    <templateId root="2.16.840.1.113883.10.20.27.3.16" extension="2019-05-01"/>
     <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4" displayName="Assertion" codeSystemName="ActCode"/>
     <statusCode code="completed"/>
     <value xsi:type="CD" code="{{population_type}}" codeSystem="2.16.840.1.113883.5.4" codeSystemName="ActCode"/>

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

@@ -10,6 +10,8 @@
     <!-- In this case the query is using an eMeasure -->
     <!-- QRDA Category III Measure Section template -->
     <templateId extension="2017-06-01" root="2.16.840.1.113883.10.20.27.2.1"/>
+    <!-- QRDA Category III Measure Section - CMS (V4) -->
+    <templateId extension="2019-05-01" root="2.16.840.1.113883.10.20.27.2.3"/>
     <code code="55186-1" codeSystem="2.16.840.1.113883.6.1"/>
     <title>Measure Section</title>
     <text>
@@ -39,6 +41,7 @@
         <templateId root="2.16.840.1.113883.10.20.24.3.98"/>
         <!-- SHALL 1..* (one for each referenced measure) Measure Reference and Results template -->
         <templateId extension="2016-09-01" root="2.16.840.1.113883.10.20.27.3.1"/>
+        <templateId extension="2019-05-01" root="2.16.840.1.113883.10.20.27.3.17"/>
         <id extension="{{random_id}}" root="1.3.6.1.4.1.115"/>
         <statusCode code="completed"/>
         <!-- Containing isBranch external references -->

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

@@ -13,7 +13,14 @@
     <value xsi:type="CD" nullFlavor="UNK" />
     {{/unknown_supplemental_value?}}
     {{^unknown_supplemental_value?}}
-    <value xsi:type="CD" code="{{code}}" codeSystem="{{supplemental_data_value_code_system}}"/>
+      {{#payer_code?}}
+        <value xsi:type="CD" nullFlavor="OTH">
+          <translation code="{{{cms_payer_code}}}" codeSystem="2.16.840.1.113883.3.249.12" codeSystemName="CMS Clinical Codes"/>
+        </value>
+      {{/payer_code?}}
+      {{^payer_code?}}
+        <value xsi:type="CD" code="{{code}}" codeSystem="{{supplemental_data_value_code_system}}"/>
+      {{/payer_code?}}
     {{/unknown_supplemental_value?}}
     <entryRelationship typeCode="SUBJ" inversionInd="true">
       <!-- Aggregate Count template -->

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

@@ -4,7 +4,6 @@
 {{> _header}}
   <component>
     <structuredBody>
-      {{> _reporting_period}}
       {{> _measure_section}}
     </structuredBody>
   </component>    	

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

@@ -6,6 +6,8 @@ class Qrda3R21 < Mustache
 
   self.template_path = __dir__
 
+  PAYER_MAP = { '1' => 'A', '2' => 'B', '3' => 'D', '4' => 'D', '5' => 'C', '6' => 'C', '7' => 'D', '8' => 'D', '9' => 'D' }.freeze
+
   def initialize(aggregate_results, measures, options = {})
     @aggregate_results = aggregate_results
     @measures = measures
@@ -75,10 +77,23 @@ class Qrda3R21 < Mustache
     when 'SEX'
       [{ tid: '2.16.840.1.113883.10.20.27.3.6', extension: '2016-09-01' }]
     when 'PAYER'
-      [{ tid: '2.16.840.1.113883.10.20.27.3.9', extension: '2016-02-01' }]
+      [{ tid: '2.16.840.1.113883.10.20.27.3.9', extension: '2016-02-01' },
+       { tid: '2.16.840.1.113883.10.20.27.3.18', extension: '2018-05-01' }]
     end
   end
 
+  def cms_payer_code
+    PAYER_MAP[self['code'][0]] || 'D'
+  end
+
+  def cpcplus?
+    @submission_program == 'CPCPLUS'
+  end
+
+  def payer_code?
+    self['type'] == 'PAYER'
+  end
+
   def supplemental_data_code
     case self['type']
     when 'RACE'

data/lib/qrda-export/catIII-r2-1/qrda_header/_information_recipient.mustache

@@ -0,0 +1,7 @@
+{{#submission_program}}
+<informationRecipient>
+  <intendedRecipient>
+    <id extension="{{submission_program}}" root="2.16.840.1.113883.3.249.7"/>
+  </intendedRecipient>
+</informationRecipient>
+{{/submission_program}}

data/lib/qrda-export/catIII-r2-1/qrda_header/_participant_ehr.mustache

@@ -0,0 +1,6 @@
+<participant typeCode="DEV">
+  <associatedEntity classCode="RGPR">
+    <id root="2.16.840.1.113883.3.2074.1" extension="12345abcde67890"/>
+    <code code="129465004" displayName="medical record, device" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED-CT"/>
+  </associatedEntity>
+</participant>

data/lib/qrda-export/catIII-r2-1/qrda_header/_participant_location.mustache

@@ -0,0 +1,13 @@
+<participant typeCode="LOC">
+  <associatedEntity classCode="SDLOC">
+    <id root="2.16.840.1.113883.3.249.5.1" extension="T2OR1234" assigningAuthorityName="CMS-CMMI"/>
+    <code code="394730007" displayName="healthcare related organization" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED-CT"/>
+    <addr>
+      <streetAddressLine>202 Burlington Rd.</streetAddressLine>
+      <city>Bedford</city>
+      <state>MA</state>
+      <postalCode>01730</postalCode>
+      <country>US</country>
+    </addr>
+  </associatedEntity>
+</participant>

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

@@ -27,28 +27,26 @@ module Qrda
           "<id nullFlavor=\"NA\"/>"
         end
 
-        def code_system_oid(data_element_code)
-          data_element_code['codeSystemOid'] || HQMF::Util::CodeSystemHelper.oid_for_code_system(data_element_code['codeSystem'])
-        end
-
         def code_and_codesystem
-          if self['codeSystem'] == 'NA_VALUESET'
+          oid = self['codeSystemOid'] || self['codeSystem']
+          if oid == '1.2.3.4.5.6.7.8.9.10'
             "nullFlavor=\"NA\" sdtc:valueSet=\"#{self['code']}\""
           else
-            "code=\"#{self['code']}\" codeSystem=\"#{code_system_oid(self)}\" codeSystemName=\"#{self['codeSystem']}\""
+            "code=\"#{self['code']}\" codeSystem=\"#{oid}\" codeSystemName=\"#{HQMF::Util::CodeSystemHelper.code_system_for(oid)}\""
           end
         end
 
         def primary_code_and_codesystem
-          "code=\"#{self[:dataElementCodes][0]['code']}\" codeSystem=\"#{code_system_oid(self[:dataElementCodes][0])}\" codeSystemName=\"#{self[:dataElementCodes][0]['codeSystem']}\""
+          oid = self[:dataElementCodes][0]['codeSystemOid'] || self[:dataElementCodes][0]['codeSystem']
+          "code=\"#{self[:dataElementCodes][0]['code']}\" codeSystem=\"#{oid}\" codeSystemName=\"#{HQMF::Util::CodeSystemHelper.code_system_for(oid)}\""
         end
 
         def translation_codes_and_codesystem_list
           translation_list = ""
           self[:dataElementCodes].each_with_index do |_dec, index|
             next if index.zero?
-
-            translation_list += "<translation code=\"#{self[:dataElementCodes][index]['code']}\" codeSystem=\"#{code_system_oid(self[:dataElementCodes][index])}\" codeSystemName=\"#{self[:dataElementCodes][index]['codeSystem']}\"/>"
+            oid = self[:dataElementCodes][index]['codeSystemOid'] || self[:dataElementCodes][index]['codeSystem']
+            translation_list += "<translation code=\"#{self[:dataElementCodes][index]['code']}\" codeSystem=\"#{oid}\" codeSystemName=\"#{HQMF::Util::CodeSystemHelper.code_system_for(oid)}\"/>"
           end
           translation_list
         end
@@ -68,7 +66,8 @@ module Qrda
 
         def result_value_as_string(result)
           return "<value xsi:type=\"CD\" nullFlavor=\"UNK\"/>" unless result
-          return "<value xsi:type=\"CD\" code=\"#{result['code']}\" codeSystem=\"#{code_system_oid(result)}\" codeSystemName=\"#{result['codeSystem']}\"/>" if result['code']
+          oid = result['codeSystemOid'] || result['codeSystem']
+          return "<value xsi:type=\"CD\" code=\"#{result['code']}\" codeSystem=\"#{oid}\" codeSystemName=\"#{HQMF::Util::CodeSystemHelper.code_system_for(oid)}\"/>" if result['code']
           return "<value xsi:type=\"PQ\" value=\"#{result['value']}\" unit=\"#{result['unit']}\"/>" if result['unit']
         end
 

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

@@ -9,7 +9,7 @@ module QRDA
         patient.qdmPatient.birthDatetime = DateTime.parse(patient_element.at_xpath('cda:birthTime')['value'])
         pcbd = QDM::PatientCharacteristicBirthdate.new
         pcbd.birthDatetime = patient.qdmPatient.birthDatetime
-        pcbd.dataElementCodes = [{ code: '21112-8', codeSystem: 'LOINC' }]
+        pcbd.dataElementCodes = [{ code: '21112-8', codeSystemOid: '2.16.840.1.113883.6.1' }]
         patient.qdmPatient.dataElements << pcbd
 
         pcs = QDM::PatientCharacteristicSex.new
@@ -29,9 +29,9 @@ module QRDA
       end
 
       def code_if_present(code_element)
-        return unless code_element && code_element['codeSystem'] && code_element['code']
+        return unless code_element && code_element['code'] && code_element['codeSystem']
 
-        QDM::Code.new(code_element['code'], HQMF::Util::CodeSystemHelper.code_system_for(code_element['codeSystem']))
+        QDM::Code.new(code_element['code'], code_element['codeSystem'])
       end
     end
   end

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

@@ -79,9 +79,8 @@ module QRDA
       end
 
       def code_if_present(code_element)
-        return unless code_element && code_element['codeSystem'] && code_element['code']
-
-        QDM::Code.new(code_element['code'], HQMF::Util::CodeSystemHelper.code_system_for(code_element['codeSystem']))
+        return unless code_element && code_element['code'] && code_element['codeSystem']
+        QDM::Code.new(code_element['code'], code_element['codeSystem'])
       end
 
       def extract_dates(parent_element, entry)
@@ -122,20 +121,21 @@ module QRDA
         # If a frequency interval is not found, return nil
         return nil unless frequency[:low]
         # If a frequency interval is found, search for a corresponding Direct Reference Code
-        key, value = Qrda::Export::Helper::FrequencyHelper::FREQUENCY_CODE_MAP.select { |_k,v| v[:low] == frequency['low'] && v[:high] == frequency['high'] && v[:institution_specified] == frequency['institution_specified'] && v[:unit] == frequency['unit'] }.first
+        key, value = Qrda::Export::Helper::FrequencyHelper::FREQUENCY_CODE_MAP.select { |_k,v| v[:low] == frequency[:low] && v[:high] == frequency[:high] && v[:institution_specified] == frequency[:institution_specified] && v[:unit] == frequency[:unit] }.first
         # If a Direct Reference Code isn't found, return nil
         return nil unless key
         # If a Direct Reference Code is found, return that code
-        QDM::Code.new(key, HQMF::Util::CodeSystemHelper.code_system_for(value[:codeSystem]))
+        oid = value[:codeSystem] || value[:codeSystemOid]
+        QDM::Code.new(key, oid)
       end
 
       def extract_frequency_in_hours(parent_element, frequency_xpath)
         # Need to go get low, high and institutionspecified
-        low = parent_element.at_xpath("#{frequency_xpath}/@value").value if parent_element.at_xpath("#{frequency_xpath}/@value")
-        low = parent_element.at_xpath("#{frequency_xpath}/cda:period/cda:low/@value").value if parent_element.at_xpath("#{frequency_xpath}/cda:period/cda:low/@value")
+        low = parent_element.at_xpath("#{frequency_xpath}/@value").value.to_i if parent_element.at_xpath("#{frequency_xpath}/@value")
+        low = parent_element.at_xpath("#{frequency_xpath}/cda:period/cda:low/@value").value.to_i if parent_element.at_xpath("#{frequency_xpath}/cda:period/cda:low/@value")
         unit = parent_element.at_xpath("#{frequency_xpath}/@unit").value if parent_element.at_xpath("#{frequency_xpath}/@unit")
         unit = parent_element.at_xpath("#{frequency_xpath}/cda:period/cda:low/@unit").value if parent_element.at_xpath("#{frequency_xpath}/cda:period/cda:low/@unit")
-        high = parent_element.at_xpath("#{frequency_xpath}/cda:period/cda:high/@value").value if parent_element.at_xpath("#{frequency_xpath}/cda:period/cda:high/@value")
+        high = parent_element.at_xpath("#{frequency_xpath}/cda:period/cda:high/@value").value.to_i if parent_element.at_xpath("#{frequency_xpath}/cda:period/cda:high/@value")
         institution_specified = parent_element.at_xpath("#{frequency_xpath}/@institutionSpecified") || false
         # Expected units are H (hours) and D (days)
         if unit && unit.upcase == 'D'
@@ -186,7 +186,7 @@ module QRDA
         code_elements = coded_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'], codeSystem: 'NA_VALUESET' }]
+            entry.dataElementCodes = [{ code: code_element['sdtc:valueSet'], codeSystemOid: '1.2.3.4.5.6.7.8.9.10' }]
           end
         end
       end

data/lib/util/code_system_helper.rb

@@ -6,7 +6,6 @@ module HQMF
         '2.16.840.1.113883.6.1' =>    'LOINC',
         '2.16.840.1.113883.6.96' =>   'SNOMEDCT',
         '2.16.840.1.113883.6.12' =>   'CPT',
-        #'2.16.840.1.113883.3.88.12.80.32' => 'CPT', # Encounter Type from C32, a subset of CPT
         '2.16.840.1.113883.6.88' =>   'RXNORM',
         '2.16.840.1.113883.6.103' =>  'ICD9CM',
         '2.16.840.1.113883.6.104' =>  'ICD9CM',
@@ -35,37 +34,17 @@ module HQMF
         '2.16.840.1.113883.3.221.5' => "Source of Payment Typology",
         '2.16.840.1.113883.6.13' => 'CDT',
         '2.16.840.1.113883.18.2' => 'AdministrativeSex',
-        '2.16.840.1.113883.5.1' => 'AdministrativeGender'
-      }
-
-      CODE_SYSTEM_ALIASES = {
-        'FDA SPL' => 'NCI Thesaurus',
-        'HSLOC' => 'HL7 Healthcare Service Location',
-        'SOP' => "Source of Payment Typology"
-      }
-
-      # Some old OID are still around in data, this hash maps retired OID values to
-      # the new value
-      OID_ALIASES = {
-        '2.16.840.1.113883.6.59' => '2.16.840.1.113883.12.292' # CVX
-      }
+        '2.16.840.1.113883.5.1' => 'AdministrativeGender',
+        '1.2.3.4.5.6.7.8.9.10' => 'NA_VALUESET'
+      }.freeze
 
       # Returns the name of a code system given an oid
       # @param [String] oid of a code system
       # @return [String] the name of the code system as described in the measure definition JSON
       def self.code_system_for(oid)
-        oid = OID_ALIASES[oid] if OID_ALIASES[oid]
         CODE_SYSTEMS[oid] || "Unknown"
       end
 
-      # Returns the oid for a code system given a codesystem name
-      # @param [String] the name of the code system
-      # @return [String] the oid of the code system
-      def self.oid_for_code_system(code_system)
-        code_system = CODE_SYSTEM_ALIASES[code_system] if CODE_SYSTEM_ALIASES[code_system]
-        CODE_SYSTEMS.invert[code_system]
-      end
-
       # Returns the whole map of OIDs to code systems
       # @terurn [Hash] oids as keys, code system names as values
       def self.code_systems

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cqm-reports
 version: !ruby/object:Gem::Version
-  version: 1.0.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - The MITRE Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cqm-models
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -248,7 +248,10 @@ files:
 - lib/qrda-export/catIII-r2-1/qrda_header/_author.mustache
 - lib/qrda-export/catIII-r2-1/qrda_header/_custodian.mustache
 - lib/qrda-export/catIII-r2-1/qrda_header/_documentation_of_service_event.mustache
+- lib/qrda-export/catIII-r2-1/qrda_header/_information_recipient.mustache
 - lib/qrda-export/catIII-r2-1/qrda_header/_legal_authenticator.mustache
+- lib/qrda-export/catIII-r2-1/qrda_header/_participant_ehr.mustache
+- lib/qrda-export/catIII-r2-1/qrda_header/_participant_location.mustache
 - lib/qrda-export/helper/aggregate_object_helper.rb
 - lib/qrda-export/helper/cat1_view_helper.rb
 - lib/qrda-export/helper/date_helper.rb
@@ -335,8 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A library for import and export of reports for use with electronic Clinical