cqm-converter 0.3.6 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 877c904445ba40b62519fdcddb7509a4e440c2d1
-  data.tar.gz: ac4b3fda4196682999230c07ff66b02b9144ba0b
+SHA256:
+  metadata.gz: d4b52ce8b078c33be4f09b537689de46744fd01e072b846745a17a740a3434db
+  data.tar.gz: f72b044e4267d88a77b6b7210f2e393b54ca855cd2e87c1fe12681fb01e527a1
 SHA512:
-  metadata.gz: 3d105e8e44cb632a0a1cf57d3ed2722d02d72cf2df779e1e5a58d18432cf7c9d3323572c0929fc176f4c0d7bf5804a80ff8b09886176fcbc0ef7a24fe37fde04
-  data.tar.gz: b2ca77ebd8a042ad05c733414c7588fe0f2ae64877e9bc272d96c8f03355ebd69de80110f7358520a20765fe6316cddd559dc0a0b49eb0465bf26e574cb82f91
+  metadata.gz: b1ad6dfeaa002bc26315b12aa64804c98003cad0622cb9108070d1e287a96f4e17edb77daf7c47d895eaa37bfeeaab651bc31acf69cc08e2a33b15a195642053
+  data.tar.gz: 2cdf12d33a3bf335e802d8be8861144ced95144fbb70fb3b8725b100622a4d268898a942868facd406aec687d957bef6800655bbbe1d794df6f74f121755ea98

data/.rubocop.yml

@@ -44,4 +44,4 @@ Style/IfUnlessModifier:
 
 Lint/UnusedMethodArgument:
   Exclude:
-    - 'lib/ext/mongoid.rb'
+    - 'lib/ext/mongoid.rb'

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.6'
+  spec.version       = '1.0.2'
   spec.authors       = ['aholmes@mitre.org']
   spec.email         = ['aholmes@mitre.org']
 
@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'byebug'
   spec.add_runtime_dependency 'coffee-script'
-  spec.add_runtime_dependency 'cqm-models', '>= 0.8.4'
+  spec.add_runtime_dependency 'cqm-models', '>= 1.0.1'
   spec.add_runtime_dependency 'execjs'
-  spec.add_runtime_dependency 'health-data-standards', '>= 4.1.0'
+  spec.add_runtime_dependency 'health-data-standards', '>= 4.3.1'
   spec.add_runtime_dependency 'momentjs-rails'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

data/lib/cqm/converter/qdm_patient.rb

@@ -18,10 +18,10 @@ module CQM::Converter
       # Loop over the QDM Patient's data elements, and create the corresponding
       # HDS Record Entry models on the newly created record.
       patient.dataElements.each do |data_element|
-        category = data_element.category if data_element.fields.include? 'category'
+        category = data_element.qdmCategory if data_element.fields.include? 'qdmCategory'
         next unless category
         # Handle patient characteristics seperately.
-        next if data_element.category == 'patient_characteristic'
+        next if data_element.qdmCategory == 'patient_characteristic'
 
         # Grab the QDM datatype name of this data element.
         qdm_model_name = data_element.class.name.demodulize
@@ -57,6 +57,7 @@ module CQM::Converter
         hds_attrs = {}
         @qdm_to_hds_mappings[qdm_model_name].each do |qdm_attr, hds_attr|
           next if data_element[qdm_attr].nil?
+
           extracted_value = extractor(data_element[qdm_attr].as_json)
           if hds_attr.is_a?(Hash) && hds_attr[:low]
             # Handle something that has multiple parts.
@@ -202,7 +203,7 @@ module CQM::Converter
     def get_data_elements(patient, category, status = nil)
       matches = []
       patient.dataElements.each do |data_element|
-        matches << data_element if data_element[:category] == category && (data_element[:qdmStatus] == status || status.nil?)
+        matches << data_element if data_element[:qdmCategory] == category && (data_element[:qdmStatus] == status || status.nil?)
       end
       matches
     end
@@ -227,6 +228,7 @@ module CQM::Converter
     # Unpack components.
     def unpack_components(hds_attrs)
       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') if code_value.key?('Code')
@@ -259,12 +261,14 @@ module CQM::Converter
       # Remove diagnosis if principalDiagnosis is equivalent.
       return unless hds_attrs.key?('diagnosis') && hds_attrs.key?('principalDiagnosis')
       return unless hds_attrs['diagnosis']['values'] && Hash[hds_attrs['diagnosis']['values'].first.sort] == Hash[hds_attrs['principalDiagnosis'].sort]
+
       hds_attrs.delete('diagnosis')
     end
 
     # Unpack facility.
     def unpack_facility(hds_attrs)
       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') if value['Code']
@@ -278,6 +282,7 @@ module CQM::Converter
     # Unpack references.
     def unpack_references(hds_attrs)
       return unless hds_attrs.key?('references') && !hds_attrs['references'].empty?
+
       hds_attrs['references'] = hds_attrs['references'][:values].collect { |value| { referenced_id: value['value'], referenced_type: value['referencedType'], type: value['type'] } }
     end
 

data/lib/cqm/converter/utils.rb

@@ -38,19 +38,9 @@ module CQM::Converter
           qdm_model_attrs[model.to_s].concat(QDM.const_get(model).embedded_relations.keys.map! { |a| a.camelize(:lower) })
         end
       end
-      # TODO: These fields are currently not supported. See:
+      # TODO: This field is currently not supported. See:
       # https://github.com/projecttacoma/cql_qdm_patientapi/search?q=does+not+currently+support
-      qdm_model_attrs['SubstanceAdministered'].delete('frequency')
-      qdm_model_attrs['SubstanceOrder'].delete('refills')
       qdm_model_attrs['PatientCharacteristicExpired'].delete('cause')
-      qdm_model_attrs['MedicationDispensed'].delete('refills')
-      qdm_model_attrs['MedicationDispensed'].delete('frequency')
-      qdm_model_attrs['MedicationOrder'].delete('refills')
-      qdm_model_attrs['MedicationOrder'].delete('frequency')
-      qdm_model_attrs['MedicationActive'].delete('frequency')
-      qdm_model_attrs['MedicationAdministered'].delete('frequency')
-      qdm_model_attrs['MedicationDischarge'].delete('refills')
-      qdm_model_attrs['MedicationDischarge'].delete('frequency')
       qdm_model_attrs
     end
 
@@ -71,20 +61,22 @@ module CQM::Converter
       qdm_model_attrs.each do |datatype, attributes|
         datatype_pattern = /#{datatype} extends CQL_QDM.QDMDatatype.*?class/m
         next unless (dc_class = datatype_pattern.match(datatypes_contents))
+
         qdm_to_hds_mappings[datatype] = {}
         attributes.each do |attribute|
-          attribute_pattern = /@_#{attribute}(Low|High| ).*?@entry.*?$/
+          attribute_pattern = /@_#{attribute}(Low|High| ).*?$/
           dc_class.to_s.to_enum(:scan, attribute_pattern).map do
             dc_attr = Regexp.last_match
+            # TODO: adjust regexes used here to parse out the timing information
             # Handle possible mixed values.
             if dc_attr.to_s.include? 'Low'
               qdm_to_hds_mappings[datatype][attribute] = {} unless qdm_to_hds_mappings[datatype][attribute]
-              qdm_to_hds_mappings[datatype][attribute][:low] = dc_attr.to_s[/@entry.(.*?)(\)|$|\?)/m, 1]
+              qdm_to_hds_mappings[datatype][attribute][:low] = dc_attr.to_s[/(.*?)(\)|$|\?)/m, 1]
             elsif dc_attr.to_s.include? 'High'
               qdm_to_hds_mappings[datatype][attribute] = {} unless qdm_to_hds_mappings[datatype][attribute]
-              qdm_to_hds_mappings[datatype][attribute][:high] = dc_attr.to_s[/@entry.(.*?)(\)|$|\?)/m, 1]
+              qdm_to_hds_mappings[datatype][attribute][:high] = dc_attr.to_s[/(.*?)(\)|$|\?)/m, 1]
             else
-              qdm_to_hds_mappings[datatype][attribute] = dc_attr.to_s[/@entry.(.*?)(\)|$|\?)/m, 1]
+              qdm_to_hds_mappings[datatype][attribute] = dc_attr.to_s[/(.*?)(\)|$|\?)/m, 1]
             end
           end
         end
@@ -135,9 +127,9 @@ module CQM::Converter
             // Add codes to result.
             results['dataElementCodes'] = datatype['getCode']();
             // Add description to result.
-            results['description'] = datatype['entry']['description'];
+            results['description'] = datatype['_description'];
             // Add oid to result.
-            results['hqmfOid'] = datatype['entry']['oid'];
+            results['hqmfOid'] = datatype['_oid'];
 
             processed_datatypes[key].push(results);
           });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cqm-converter
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 1.0.2
 platform: ruby
 authors:
 - aholmes@mitre.org
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2018-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: momentjs-rails
   requirement: !ruby/object:Gem::Requirement
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: HDS <=> QDM Model Converter