cqm-converter 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3b311d95023502b8fffba804fa922bc8b822fed027715efeb8428f9fa3c3ad5e
-  data.tar.gz: 1037ec6ad816da379559dc6e0040892020ba0363fa18c76f2f1dfca28bdb9a97
+SHA1:
+  metadata.gz: b9bf0ffa8c1e7ccaee1c1e195bd7496c68478816
+  data.tar.gz: b3a1e58694bd32ad2ec739f209a977ea5debd746
 SHA512:
-  metadata.gz: ed7862338bac4803ded5a20b807dc26224b6415270ad8111051c364d00060d63b96523219b7888bb6797d79c5c5582812541e0d8544ed64b5b02885da9d04d96
-  data.tar.gz: 74f6d733a343b15ab6b5fcb05a603fec4fe9fd70c06f52dc3410eafc00b1b4076b15f5ae171160857f26a9f02649a2926e26c4cb3f4083df2254bba5f7886e6c
+  metadata.gz: c9bca3f3ff73d4af8ca2500427a74bcee811e8c913583832920ecf894d07c4c9e2e83b5e321f719dd8f45d65a6671e30f5447f7d51469960918ccdabb0dae0fb
+  data.tar.gz: cd0c029021db2240019391ab35d4681e04fd3255ec7b21c4fcba10966eec871db1b30d5af88afe86b436a2855d7dbb7b4e91a98556f41ef877b68d7cf776fedc

data/cqm-converter.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'cqm-converter'
-  spec.version       = '0.3.2'
+  spec.version       = '0.3.3'
   spec.authors       = ['aholmes@mitre.org']
   spec.email         = ['aholmes@mitre.org']
 

data/lib/cqm/converter/hds_record.rb

@@ -43,7 +43,7 @@ module CQM::Converter
       cql_qdm_patient.keys.each do |dc_type|
         cql_qdm_patient[dc_type].each do |dc|
           # Convert snake_case to camelCase
-          dc_fixed_keys = dc.deep_transform_keys { |key| key.to_s.camelize(:lower) }
+          dc_fixed_keys = dc.deep_transform_keys { |key| key.to_s.gsub(/^_/, '').camelize(:lower) }
 
           # Our Code model uses 'codeSystem' to describe the code system (since system is
           # a reserved keyword). The cql.Code calls this 'system', so make sure the proper
@@ -51,7 +51,7 @@ module CQM::Converter
           dc_fixed_keys = dc_fixed_keys.deep_transform_keys { |key| key.to_s == 'system' ? :codeSystem : key }
           dc_fixed_keys = dc_fixed_keys.deep_transform_keys { |key| key.to_s == 'display' ? :descriptor : key }
 
-          patient.dataElements << QDM.const_get(dc_type).new.from_json(dc_fixed_keys.to_json)
+          patient.dataElements << generate_qdm_data_element(dc_fixed_keys, dc_type)
         end
       end
 
@@ -125,5 +125,20 @@ module CQM::Converter
 
       patient
     end
+
+    def generate_qdm_data_element(dc_fixed_keys, dc_type)
+      data_element = QDM.const_get(dc_type).new.from_json(dc_fixed_keys.to_json)
+
+      # Any nested QDM types that need initialization should be handled here
+      # when converting from the QDM models to the HDS models.
+      # For now, that should just be FacilityLocation objects
+      if data_element.is_a?(QDM::EncounterPerformed)
+        data_element.facilityLocations = data_element.facilityLocations.map do |facility|
+          QDM::FacilityLocation.new.from_json(facility.to_json)
+        end
+      end
+
+      data_element
+    end
   end
 end

data/lib/cqm/converter/qdm_patient.rb

@@ -62,7 +62,7 @@ module CQM::Converter
             # Handle something that has multiple parts.
             hds_attrs[hds_attr[:low]] = extracted_value.first
             hds_attrs[hds_attr[:high]] = extracted_value.last if hds_attr[:high]
-          elsif extracted_value.is_a?(Array) && extracted_value.any? && extracted_value.first.is_a?(Hash) && extracted_value.first[:code]
+          elsif extracted_value.is_a?(Array) && extracted_value.any? && extracted_value.first.is_a?(Hash) && extracted_value.first[:code] && hds_attr != 'facility' && hds_attr != 'components'
             # Handle a result that is returning multiple codes.
             hds_attrs[hds_attr] = [CodedResultValue.new(codes: Utils.qdm_codes_to_hds_codes(extracted_value), description: extracted_value.first[:title])]
           elsif extracted_value.is_a?(Array)
@@ -139,15 +139,19 @@ module CQM::Converter
         date_time_converter(qdm_thing)
       elsif qdm_thing.is_a?(Hash) && keys.include?(:low) # Is a QDM::Interval.
         interval_extractor(qdm_thing.symbolize_keys)
+      elsif qdm_thing.is_a?(Hash) && keys.include?(:locationPeriod)
+        location_extractor(qdm_thing.symbolize_keys)
+      elsif qdm_thing.is_a?(Hash) && keys.include?(:result) # is a QDM::CodedResultValue
+        component_extractor(qdm_thing.symbolize_keys)
       elsif qdm_thing.is_a?(Hash) && keys.include?(:code) # Is a QDM::Code.
         code_extractor(qdm_thing.symbolize_keys)
       elsif qdm_thing.is_a?(Hash) && keys.include?(:unit) # Is a QDM::Quantity.
         quantity_extractor(qdm_thing.symbolize_keys)
       elsif qdm_thing.is_a?(Array) # Is an Array.
         qdm_thing.collect { |item| extractor(item) }
-      elsif qdm_thing.is_a?(Numeric) # Is an Number.
+      elsif qdm_thing.is_a?(Numeric) # Is a Number.
         { units: '', scalar: qdm_thing.to_s }
-      elsif qdm_thing.is_a?(String) # Is an String.
+      elsif qdm_thing.is_a?(String) # Is a String.
         qdm_thing
       elsif qdm_thing.is_a?(Hash)
         qdm_thing.each { |k, v| qdm_thing[k] = extractor(v) }
@@ -156,6 +160,15 @@ module CQM::Converter
       end
     end
 
+    def location_extractor(facility)
+      interval = interval_extractor(facility[:locationPeriod].as_json.symbolize_keys)
+      { 'code' => code_extractor(facility[:code].as_json.symbolize_keys), 'locationPeriod' => interval }
+    end
+
+    def component_extractor(component)
+      { code: code_extractor(component[:code].symbolize_keys), result: code_extractor(component[:result].symbolize_keys) }
+    end
+
     # Extract a QDM::Code to something usable in HDS.
     def code_extractor(code)
       { code: code[:code], code_system: code[:codeSystem], title: code[:descriptor] }
@@ -216,10 +229,14 @@ module CQM::Converter
       return unless hds_attrs.key?('components') && !hds_attrs['components'].nil?
       hds_attrs['components']['type'] = 'COL'
       hds_attrs['components'][:values]&.collect do |code_value|
-        code_value['code'] = code_value.delete('Code')
-        code_value['result'] = { code: code_value.delete('Result'), title: code_value['code'][:title] }
-        code_value['code'].delete(:title)
-        code_value['result'][:code].delete(:title)
+        code_value[:code] = code_value.delete('Code') if code_value.key?('Code')
+        code_value[:result] = if code_value.key?('Result')
+                                { code: code_value.delete('Result'), title: code_value['code'][:title] }
+                              else
+                                { code: code_value.delete(:result), title: code_value[:code][:title] }
+                              end
+        code_value[:code].delete(:title)
+        code_value[:result][:code].delete(:title)
         { code: code_value }
       end
     end
@@ -250,11 +267,11 @@ module CQM::Converter
       return unless hds_attrs.key?('facility') && !hds_attrs['facility'].empty?
       hds_attrs['facility']['type'] = 'COL'
       hds_attrs['facility'][:values]&.each do |value|
-        value['code'] = value.delete('Code')
+        value['code'] = value.delete('Code') if value['Code']
         value[:display] = value['code'].delete(:title) if value['code']
-        value[:locationPeriodHigh] = Time.at(value['Locationperiod'].last).utc.strftime('%m/%d/%Y %l:%M %p').split.join(' ')
-        value[:locationPeriodLow] = Time.at(value['Locationperiod'].first).utc.strftime('%m/%d/%Y %l:%M %p').split.join(' ')
-        value.delete('Locationperiod')
+        value[:locationPeriodHigh] = Time.at(value['locationPeriod'].last).utc.strftime('%m/%d/%Y %l:%M %p').split.join(' ')
+        value[:locationPeriodLow] = Time.at(value['locationPeriod'].first).utc.strftime('%m/%d/%Y %l:%M %p').split.join(' ')
+        value.delete('locationPeriod')
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cqm-converter
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - aholmes@mitre.org
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: HDS <=> QDM Model Converter