cqm-reports 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5442ec24e1213dc098625570800e5761aaf8fee
-  data.tar.gz: 5fe924ecc7052800191314ecefc420532fb6710c
+  metadata.gz: 8d2524cbacaae3fea93a3dca5545a113a25f1454
+  data.tar.gz: 77634976e41228b7dbdf43293f0596b481ed9eba
 SHA512:
-  metadata.gz: e4740c2904d068a1c425e8705273e32cf9fdb54f7b71ece2246d4ef2add7e2e9e3d03ac491a7a955d4b55045f1e473f58ea4d9bd734b0fedca46243b062f346c
-  data.tar.gz: 9a241907635504bafe476ef5c713101540d241b03de48b9e6aa5047c295a2763285ec8517594637b8dc68d526fa9b13e6f27fc22b4fc065500f3dfc0e9afc464
+  metadata.gz: 96c3f9a0fc48608c70790be92d6bf44781dd85acc012e004d31f1f3ecdfcf8b91b14ca98bf491d0ac2b08f6c56e371104ab7e9e37c8aeacf4d4fd1dcd811468b
+  data.tar.gz: 7030f81b37ddd6362c967a16fa166a6f2fac407dcc084ee2be739eade82ae2b54947bf3edc792fefeafd886b7fbd02ca9be8497edc6cef49951382cda984ec40

data/lib/qrda-export/catI-r5/qrda1_r5.rb

@@ -13,11 +13,33 @@ class Qrda1R5 < Mustache
     @qdmPatient = patient.qdmPatient
     @measures = measures
     @provider = options[:provider]
+    @patient_address_option = options[:patient_addresses]
+    @patient_telecom_option = options[:patient_telecoms]
     @performance_period_start = options[:start_time]
     @performance_period_end = options[:end_time]
     @submission_program = options[:submission_program]
   end
 
+  def patient_addresses
+    @patient_address_option ||= [CQM::Address.new(
+      use: 'HP',
+      street: ['202 Burlington Rd.'],
+      city: 'Bedford',
+      state: 'MA',
+      zip: '01730',
+      country: 'US'
+    )]
+    JSON.parse(@patient_address_option.to_json)
+  end
+
+  def patient_telecoms
+    @patient_telecom_option ||= [CQM::Telecom.new(
+      use: 'HP',
+      value: '555-555-2003'
+    )]
+    JSON.parse(@patient_telecom_option.to_json)
+  end
+
   def patient_characteristic_payer
     JSON.parse(@qdmPatient.get_data_elements('patient_characteristic', 'payer').to_json)
   end
@@ -173,7 +195,7 @@ class Qrda1R5 < Mustache
   def physical_exam_order
     JSON.parse(@qdmPatient.get_data_elements('physical_exam', 'order').to_json)
   end
-  
+
   def physical_exam_performed
     JSON.parse(@qdmPatient.get_data_elements('physical_exam', 'performed').to_json)
   end
@@ -213,7 +235,7 @@ class Qrda1R5 < Mustache
   def substance_recommended
     JSON.parse(@qdmPatient.get_data_elements('substance', 'recommended').to_json)
   end
-  
+
   def symptom
     JSON.parse(@qdmPatient.get_data_elements('symptom', nil).to_json)
   end

data/lib/qrda-export/catI-r5/qrda_header/_record_target.mustache

@@ -1,14 +1,20 @@
 <recordTarget>
   <patientRole>
     <id extension="{{mrn}}" root="1.3.6.1.4.1.115" />
-    <addr use="HP">
-      <streetAddressLine>202 Burlington Rd.</streetAddressLine>
-      <city>Bedford</city>
-      <state>MA</state>
-      <postalCode>01730</postalCode>
-      <country>US</country>
-    </addr>
-    <telecom use="WP" value="tel:+1-781-271-3000"/>
+    {{#patient_addresses}}
+      <addr use="{{use}}">
+        {{#street}}
+          <streetAddressLine>{{.}}</streetAddressLine>
+        {{/street}}
+        <city>{{city}}</city>
+        <state>{{state}}</state>
+        <postalCode>{{zip}}</postalCode>
+        <country>{{country}}</country>
+      </addr>
+    {{/patient_addresses}}
+    {{#patient_telecoms}}
+      <telecom use="{{use}}" value="tel:{{value}}"/>
+    {{/patient_telecoms}}
     <patient>
       {{#patient}}
         <name>
@@ -48,4 +54,4 @@
       </languageCommunication>
     </patient>
   </patientRole>
-</recordTarget>
+</recordTarget>

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

@@ -9,8 +9,6 @@
       <substanceAdministration moodCode="EVN" classCode="SBADM">
         <!-- Medication Activity (consolidation) template -->
         <templateId root="2.16.840.1.113883.10.20.22.4.16" extension="2014-06-09"/> 
-        <!-- Medication, Active template -->
-        <templateId root="2.16.840.1.113883.10.20.24.3.41" extension="2016-02-01"/>
         <id root="1.3.6.1.4.1.115" extension="{{object_id}}"/>
         <text>{{description}}</text>
         <statusCode code="active"/> 

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

@@ -67,6 +67,8 @@ module Qrda
                             result_value_as_string(self['result'][0])
                           elsif self['result'].is_a? Hash
                             result_value_as_string(self['result'])
+                          elsif self['result'].is_a? String
+                            "<value xsi:type=\"ST\">#{self['result']}</value>"
                           elsif !self['result'].nil?
                             "<value xsi:type=\"PQ\" value=\"#{self['result']}\" unit=\"1\"/>"
                           end

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

@@ -155,7 +155,6 @@ module QRDA
 
       def extract_result_value(value_element)
         return unless value_element && !value_element['nullFlavor']
-
         value = value_element['value']
         if value.present?
           return value.strip.to_f if (value_element['unit'] == "1" || value_element['unit'].nil?)
@@ -163,6 +162,8 @@ module QRDA
           return QDM::Quantity.new(value.strip.to_f, value_element['unit'])
         elsif value_element['code'].present?
           return code_if_present(value_element)
+        elsif value_element.text.present?
+          return value_element.text
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cqm-reports
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - The MITRE Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cqm-models