cqm-models 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f69ba79193a6df18a4a86fc508237fac9b1e9078
-  data.tar.gz: 6ddf65c325e26a91823a84ff3a1fdb2b75323110
+  metadata.gz: 1db6adc6a07fd19b2bbf444b8f4f8fc36c5c7e53
+  data.tar.gz: 6ea8d2a9a7d1034fec223e96786ddff12e3f0b1e
 SHA512:
-  metadata.gz: b2563e216ff73afed6947a86e68f7467c3091df0a8eb4846df375675e75e63923d353abe79b8304d588e164694e0c21cd53fee4efd6b97f3e174dbdea3622587
-  data.tar.gz: 7791447027060f7e426a71214b818877c44b15962f656789f64cffaea55a8a9ecf12be3cbb2975280cd78c3a1e483aceb4e15346ee8a65f296c073ad6fc4ff97
+  metadata.gz: 74b863976c88fd23d4e382f1e59ecf10381d0411a2145ca5bc48d140ade7e4190f562e431ae806b6b492d2a050c09e7f593ce19ab1f1c263a7538b65e753b979
+  data.tar.gz: 47cdb5c41f3e81735b0b8f7a6f3c2ba375444cd8be22d157a32d49a20b1a5f32a767f081b6eb893c405151ae551863fa7b489adf0aff9139f89f747c48edbe4d

data/app/assets/javascripts/Patient.js

@@ -81,6 +81,9 @@ PatientSchema.methods.getDataElements = function getDataElements(params) {
 
 // Returns an array of dataElements that exist on the patient, queried by
 // QDM profile
+// @param {string} profile - the data criteria requested by the execution engine
+// @param {boolean} isNegated - whether dataElements should be returned based on their negation status
+// @returns {DataElement[]}
 PatientSchema.methods.getByProfile = function getByProfile(profile, isNegated = null) {
   // If isNegated == true, only return data elements with a negationRationale that is not null.
   // If isNegated == false, only return data elements with a null negationRationale.
@@ -89,11 +92,13 @@ PatientSchema.methods.getByProfile = function getByProfile(profile, isNegated =
   return results.map((result) => {
     const getCodeFunction = Object.getPrototypeOf(result).getCode;
     const codeFunction = Object.getPrototypeOf(result).code;
+    const idField = result.id;
     const removedMongooseItems = AllDataElements[profile](result).toObject();
     // toObject() will remove all mongoose functions but also removed the getCode and code functions
     // the execution engine requires the code and getCode functions so we have to add them back
     removedMongooseItems.getCode = getCodeFunction;
     removedMongooseItems.code = codeFunction;
+    removedMongooseItems.id = idField;
     return removedMongooseItems;
   });
 };

data/app/models/qdm/basetypes/data_element.rb

@@ -61,6 +61,13 @@ module QDM
         if (send(field).is_a? Interval) || (send(field).is_a? DataElement)
           send(field + '=', send(field).shift_dates(seconds))
         end
+
+        # Special case for facility locations
+        next unless field == 'facilityLocations'
+        send(field).each do |facility_location|
+          facility_location['locationPeriod'][:low] = (facility_location['locationPeriod'][:low].to_time + seconds).to_datetime
+          facility_location['locationPeriod'][:high] = (facility_location['locationPeriod'][:high].to_time + seconds).to_datetime
+        end
       end
     end
 

data/app/models/qdm/encounter_performed.rb

@@ -7,7 +7,7 @@ module QDM
     field :admissionSource, type: QDM::Code
     field :relevantPeriod, type: QDM::Interval
     field :dischargeDisposition, type: QDM::Code
-    field :facilityLocations, type: Array
+    field :facilityLocations, type: Array, default: []
     field :diagnoses, type: Array
     field :principalDiagnosis, type: QDM::Code
     field :negationRationale, type: QDM::Code

data/cqm-models.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'cqm-models'
-  spec.version       = '0.8.1'
+  spec.version       = '0.8.2'
   spec.authors       = ['aholmes@mitre.org', 'mokeefe@mitre.org', 'lades@mitre.org']
 
   spec.summary       = 'Mongo models that correspond to the QDM specification.'

data/dist/index.js

@@ -1552,6 +1552,9 @@ PatientSchema.methods.getDataElements = function getDataElements(params) {
 
 // Returns an array of dataElements that exist on the patient, queried by
 // QDM profile
+// @param {string} profile - the data criteria requested by the execution engine
+// @param {boolean} isNegated - whether dataElements should be returned based on their negation status
+// @returns {DataElement[]}
 PatientSchema.methods.getByProfile = function getByProfile(profile, isNegated = null) {
   // If isNegated == true, only return data elements with a negationRationale that is not null.
   // If isNegated == false, only return data elements with a null negationRationale.
@@ -1560,11 +1563,13 @@ PatientSchema.methods.getByProfile = function getByProfile(profile, isNegated =
   return results.map((result) => {
     const getCodeFunction = Object.getPrototypeOf(result).getCode;
     const codeFunction = Object.getPrototypeOf(result).code;
+    const idField = result.id;
     const removedMongooseItems = AllDataElements[profile](result).toObject();
     // toObject() will remove all mongoose functions but also removed the getCode and code functions
     // the execution engine requires the code and getCode functions so we have to add them back
     removedMongooseItems.getCode = getCodeFunction;
     removedMongooseItems.code = codeFunction;
+    removedMongooseItems.id = idField;
     return removedMongooseItems;
   });
 };

data/lib/generate_models.rb

@@ -208,6 +208,9 @@ Dir.glob(ruby_models_path + '*.rb').each do |file_name|
   # Add QDM version
   contents.gsub!(/field :qdmVersion, type: String/, "field :qdmVersion, type: String, default: '#{qdm_version}'")
 
+  # Add default to [] for facilityLocations
+  contents.gsub!(/field :facilityLocations, type: Array/, 'field :facilityLocations, type: Array, default: []')
+
   # Add HQMF oid (if it exists in the given HQMF oid mapping file)
   dc_name = File.basename(file_name, '.*')
   if oids[dc_name].present? && oids[dc_name]['hqmf_oid'].present?

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cqm-models",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "This library contains auto generated Mongo (Mongoose.js) models that correspond to the QDM (Quality Data Model) specification.",
   "main": "app/assets/javascripts/index.js",
   "browser": {

data/templates/patient_template.js.erb

@@ -80,6 +80,9 @@ PatientSchema.methods.getDataElements = function getDataElements(params) {
 
 // Returns an array of dataElements that exist on the patient, queried by
 // QDM profile
+// @param {string} profile - the data criteria requested by the execution engine
+// @param {boolean} isNegated - whether dataElements should be returned based on their negation status
+// @returns {DataElement[]}
 PatientSchema.methods.getByProfile = function getByProfile(profile, isNegated = null) {
   // If isNegated == true, only return data elements with a negationRationale that is not null.
   // If isNegated == false, only return data elements with a null negationRationale.
@@ -88,11 +91,13 @@ PatientSchema.methods.getByProfile = function getByProfile(profile, isNegated =
   return results.map((result) => {
     const getCodeFunction = Object.getPrototypeOf(result).getCode;
     const codeFunction = Object.getPrototypeOf(result).code;
+    const idField = result.id;
     const removedMongooseItems = AllDataElements[profile](result).toObject();
     // toObject() will remove all mongoose functions but also removed the getCode and code functions
     // the execution engine requires the code and getCode functions so we have to add them back
     removedMongooseItems.getCode = getCodeFunction;
     removedMongooseItems.code = codeFunction;
+    removedMongooseItems.id = idField;
     return removedMongooseItems;
   });
 };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cqm-models
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - aholmes@mitre.org
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-18 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Mongo models that correspond to the QDM specification.