cqm-models 0.8.0 → 0.8.1

data/app/assets/javascripts/PatientCharacteristicRace.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/PatientCharacteristicSex.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/PhysicalExamOrder.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/PhysicalExamPerformed.js

@@ -5,6 +5,7 @@ const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/PhysicalExamRecommended.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/ProcedureOrder.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/ProcedurePerformed.js

@@ -4,9 +4,9 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
-const Any = require('./basetypes/Any');
-
 const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
+const Any = require('./basetypes/Any');
 
 const [Number, String] = [
   mongoose.Schema.Types.Number,

data/app/assets/javascripts/ProcedureRecommended.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/ProviderCareExperience.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/ProviderCharacteristic.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/Ratio.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/ResultComponent.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/SubstanceAdministered.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/SubstanceOrder.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/SubstanceRecommended.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/Symptom.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/basetypes/Any.js

@@ -10,6 +10,21 @@ function RecursiveCast(any) {
   if (any && any.value && any.unit) {
     return new cql.Quantity(any);
   }
+  if (any && any.code && any.codeSystem) {
+    if (typeof any.code === 'undefined') {
+      throw new Error(`Code: ${any} does not have a code`);
+    } else if (typeof any.codeSystem === 'undefined') {
+      throw new Error(`Code: ${any} does not have a codeSystem`);
+    }
+
+    const val = { code: any.code, codeSystem: any.codeSystem };
+
+    val.descriptor = (typeof any.descriptor !== 'undefined') ? any.descriptor : null;
+    val.codeSystemOid = (typeof any.codeSystemOid !== 'undefined') ? any.codeSystemOid : null;
+    val.version = (typeof any.version !== 'undefined') ? any.version : null;
+
+    return new cql.Code(val.code, val.codeSystem, val.version, val.descriptor);
+  }
   if (any && any.low) {
     const casted = new cql.Interval(any.low, any.high, any.lowClosed, any.highClosed);
 

data/app/assets/javascripts/basetypes/Code.js

@@ -1,4 +1,5 @@
 const mongoose = require('mongoose');
+const cql = require('cql-execution');
 
 function Code(key, options) {
   mongoose.SchemaType.call(this, key, options, 'Code');
@@ -6,19 +7,28 @@ function Code(key, options) {
 Code.prototype = Object.create(mongoose.SchemaType.prototype);
 
 Code.prototype.cast = (code) => {
-  if (typeof code.code === 'undefined') {
-    throw new Error(`Code: ${code} does not have a code`);
-  } else if (typeof code.codeSystem === 'undefined') {
-    throw new Error(`Code: ${code} does not have a codeSystem`);
-  }
+  if (code != null) {
+    // handles codes that have not yet been cast to a code and those that have already been cast to a code
+    if (code.code && (code.codeSystem || code.system)) {
+      if (typeof code.code === 'undefined') {
+        throw new Error(`Code: ${code} does not have a code`);
+      } else if (typeof code.codeSystem === 'undefined' && typeof code.system === 'undefined') {
+        throw new Error(`Code: ${code} does not have a system`);
+      }
 
-  const val = { code: code.code, codeSystem: code.codeSystem };
+      const val = { code: code.code, codeSystem: code.codeSystem || code.system };
 
-  val.descriptor = (typeof code.descriptor !== 'undefined') ? code.descriptor : null;
-  val.codeSystemOid = (typeof code.codeSystemOid !== 'undefined') ? code.codeSystemOid : null;
-  val.version = (typeof code.version !== 'undefined') ? code.version : null;
+      val.descriptor = (typeof code.descriptor !== 'undefined') ? code.descriptor : null;
+      val.codeSystemOid = (typeof code.codeSystemOid !== 'undefined') ? code.codeSystemOid : null;
+      val.version = (typeof code.version !== 'undefined') ? code.version : null;
 
-  return val;
+      return new cql.Code(val.code, val.codeSystem, val.version, val.descriptor);
+    }
+    throw new Error(`Expected a code. Received ${code}.`);
+  } else {
+    // returns a null or undefined if what is passed in is null or undefined
+    return code;
+  }
 };
 
 mongoose.Schema.Types.Code = Code;

data/app/assets/javascripts/basetypes/DataElement.js

@@ -1,11 +1,12 @@
 const mongoose = require('mongoose');
 const Code = require('./Code.js');
+const cql = require('cql-execution');
 
 const [Schema] = [mongoose.Schema];
 
 function DataElementSchema(add, options) {
   const extended = new Schema({
-    dataElementCodes: { type: [Code] },
+    dataElementCodes: { type: [] },
     description: { type: String },
   }, options);
 
@@ -13,21 +14,20 @@ function DataElementSchema(add, options) {
     extended.add(add);
   }
 
-  // Returns all of the codes on this data element
-  // in a format usable by the cql-execution framework
+  // Returns all of the codes on this data element in a format usable by
+  // the cql-execution framework.
   extended.methods.getCode = function getCode() {
-    return this.dataElementCodes.map((code) => {
-      const result = {};
-      result.code = code.code;
-      result.system = code.code_system;
-      return result;
-    });
+    return this.dataElementCodes.map(code => new cql.Code(code.code, code.codeSystem, code.version, code.descriptor));
   };
 
-  // Returns all of the codes on this data element
-  // in their normal form.
-  extended.methods.codes = function getCodes() {
-    return this.dataElementCodes;
+  // Return the first code on this data element in a format usable by
+  // the cql-execution framework.
+  extended.methods.code = function code() {
+    if (this.dataElementCodes && this.dataElementCodes[0]) {
+      const qdmCode = this.dataElementCodes[0];
+      return new cql.Code(qdmCode.code, qdmCode.codeSystem, qdmCode.version, qdmCode.descriptor);
+    }
+    return null;
   };
 
   return extended;

data/app/models/qdm/patient.rb

@@ -36,7 +36,7 @@ module QDM
     # Note: This will shift dates of the birthdate and
     # dates on the data elements that exist on the patient.
     def shift_dates(seconds)
-      self.birthDatetime = (birthDatetime.utc.to_time + seconds.seconds).to_datetime.new_offset(0)
+      self.birthDatetime = (birthDatetime.utc.to_time + seconds.seconds).to_datetime
       dataElements.each { |element| element.shift_dates(seconds) }
     end
 

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.0'
+  spec.version       = '0.8.1'
   spec.authors       = ['aholmes@mitre.org', 'mokeefe@mitre.org', 'lades@mitre.org']
 
   spec.summary       = 'Mongo models that correspond to the QDM specification.'