cql_qdm_patientapi 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d90e0a82b8504ddfea9c98fcfe611dbb10d0844
-  data.tar.gz: 85e593400fcf1bdca7517af28db957767975b121
+  metadata.gz: 659f615743826808dbce1d1ec7dd5e1385426919
+  data.tar.gz: 5625c679daf1daee95e4342a0de2fb6eda0a93ea
 SHA512:
-  metadata.gz: 68b65eb813a96473005f003ece85a472bfd58516179e6f3d5d8fd7a2260761e65c31e4d32301bc717ad48c2be4e6d444f4cf2cbf45bd88bc5bf79b5669d47527
-  data.tar.gz: dfd69d85f7a52b462438b68c06329350d218db88562ad23f4716be95d62d367aaa0a0d37c442037ca98a8e3b32799e3d51381f42efa42b7fbb0aafaa153b87d2
+  metadata.gz: 4e9f06d1e02c62785c618bc02664dc3c09afd52d885b6bda4ef3b8d88c0fde2bef1411801d225d85d46cf7ed9e332ea3dcba4dae91ed5af5e298e3e5157315c4
+  data.tar.gz: c60010d6a24ffd6a08f84913692c50ddcb5f3422a7540792c7189573ff5d5b757cbfbc966e10d149099ee35c3a300c41fe586cfb858d170f4b83c43e8b457965

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cql_qdm_patientapi (1.1.1)
+    cql_qdm_patientapi (1.1.2)
       coffee-rails (~> 4.1)
       rails (~> 4.2)
       sprockets-rails (~> 2.3)

data/app/assets/javascripts/datatypes/caregoal.js.coffee

@@ -52,8 +52,8 @@ class CQL_QDM.CareGoal extends CQL_QDM.QDMDatatype
   ###
   targetOutcome: ->
     if @_targetOutcome?
-      if @_targetOutcome?['unit']?
-        new cql.Quantity({unit: @_targetOutcome['unit'], value: @_targetOutcome['scalar']})
+      if @_targetOutcome?['units']?
+        new cql.Quantity({unit: @_targetOutcome['units'], value: @_targetOutcome['scalar']})
       else
         new cql.Code(@_targetOutcome.code, @_targetOutcome.code_system)
     else

data/app/assets/javascripts/datatypes/datatype.js.coffee

@@ -11,7 +11,7 @@ QDM datatypes must support.
 ###
 class CQL_QDM.QDMDatatype
   constructor: (@entry) ->
-    @_codes = @entry.codes
+    @_codes = @entry?.codes
 
   ###
   Returns any instances of this attribute currently within this namespace.
@@ -55,3 +55,25 @@ class CQL_QDM.QDMDatatype
       break
     null
 
+  ###
+  Returns a human readable representation of this datatype.
+
+  An example looks like:
+   "Encounter, Performed: Outpatient Consultation
+    START: 09/30/2012 2:00 PM
+    STOP: 09/30/2012 2:15 PM
+    CODE: CPT 99241"
+
+  @returns {String}
+  ###
+  toString: ->
+    # Grab description from entry; if blank use classname
+    description = if @entry?.description then "#{@entry.description}\n" else "#{@constructor.name}\n"
+    # Grab start and end time, format for proper display
+    startTime = if @entry?.start_time then "START: #{moment.utc(@entry.start_time, 'X').format('MM/DD/YYYY h:mm A')}\n" else ""
+    endTime = if @entry?.end_time then "STOP: #{moment.utc(@entry.end_time, 'X').format('MM/DD/YYYY h:mm A')}\n" else ""
+    # Get code if this datatype has one
+    code = @code() if @_codes
+    codeDisplay = if code then "CODE: #{code['system']} #{code['code']}" else ""
+    # Return human readable representation of this datatype
+    "#{description}#{startTime}#{endTime}#{codeDisplay}".replace /\n$/, ''

data/app/assets/javascripts/datatypes/immunization.js.coffee

@@ -34,7 +34,7 @@ class CQL_QDM.ImmunizationAdministered extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
+      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -70,7 +70,7 @@ class CQL_QDM.ImmunizationAdministered extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
+      new cql.Quantity({unit: @_supply['units'], value: @_supply['scalar']})
     else
       null
 
@@ -111,7 +111,7 @@ class CQL_QDM.ImmunizationOrder extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
+      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -147,6 +147,6 @@ class CQL_QDM.ImmunizationOrder extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
+      new cql.Quantity({unit: @_supply['units'], value: @_supply['scalar']})
     else
       null

data/app/assets/javascripts/datatypes/laboratorytest.js.coffee

@@ -124,19 +124,19 @@ class CQL_QDM.LaboratoryTestPerformed extends CQL_QDM.QDMDatatype
     # According to documentation, this is assumed to be a 'Quantity'
     high = null
     low = null
-    if @_referenceRangeHigh?['unit']?
+    if @_referenceRangeHigh?['units']?
       high_obj =
         unit:
-          @_referenceRangeHigh['unit']
+          @_referenceRangeHigh['units']
         value:
-          @_referenceRangeHigh['value']
+          @_referenceRangeHigh['scalar']
       high = new cql.Quantity(high_obj)
-    if @_referenceRangeLow?['unit']?
+    if @_referenceRangeLow?['units']?
       low_obj =
         unit:
-          @_referenceRangeLow['unit']
+          @_referenceRangeLow['units']
         value:
-          @_referenceRangeLow['value']
+          @_referenceRangeLow['scalar']
       low = new cql.Quantity(low_obj)
     if low?
       new cql.Interval(low, high)

data/app/assets/javascripts/datatypes/medication.js.coffee

@@ -34,7 +34,7 @@ class CQL_QDM.MedicationActive extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
+      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -43,7 +43,7 @@ class CQL_QDM.MedicationActive extends CQL_QDM.QDMDatatype
   ###
   frequency: ->
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
+      new cql.Code(@_frequency.code, @_frequency.code_system)
     else
       null
 
@@ -72,7 +72,7 @@ class CQL_QDM.MedicationActive extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
+      new cql.Quantity({unit: @_supply['units'], value: @_supply['scalar']})
     else
       null
 
@@ -114,7 +114,7 @@ class CQL_QDM.MedicationAdministered extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
+      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -123,7 +123,7 @@ class CQL_QDM.MedicationAdministered extends CQL_QDM.QDMDatatype
   ###
   frequency: ->
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
+      new cql.Code(@_frequency.code, @_frequency.code_system)
     else
       null
 
@@ -170,7 +170,7 @@ class CQL_QDM.MedicationAdministered extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
+      new cql.Quantity({unit: @_supply['units'], value: @_supply['scalar']})
     else
       null
 
@@ -206,7 +206,7 @@ class CQL_QDM.MedicationDischarge extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
+      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -215,7 +215,7 @@ class CQL_QDM.MedicationDischarge extends CQL_QDM.QDMDatatype
   ###
   frequency: ->
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
+      new cql.Code(@_frequency.code, @_frequency.code_system)
     else
       null
 
@@ -251,7 +251,7 @@ class CQL_QDM.MedicationDischarge extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
+      new cql.Quantity({unit: @_supply['units'], value: @_supply['scalar']})
     else
       null
 
@@ -297,7 +297,7 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
+      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -306,7 +306,7 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
   ###
   frequency: ->
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
+      new cql.Code(@_frequency.code, @_frequency.code_system)
     else
       null
 
@@ -353,7 +353,7 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
+      new cql.Quantity({unit: @_supply['units'], value: @_supply['scalar']})
     else
       null
 
@@ -403,7 +403,7 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
+      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -412,7 +412,7 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
   ###
   frequency: ->
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
+      new cql.Code(@_frequency.code, @_frequency.code_system)
     else
       null
 
@@ -477,6 +477,6 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
+      new cql.Quantity({unit: @_supply['units'], value: @_supply['scalar']})
     else
       null

data/app/assets/javascripts/datatypes/substance.js.coffee

@@ -41,7 +41,7 @@ class CQL_QDM.SubstanceAdministered extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
+      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -88,7 +88,7 @@ class CQL_QDM.SubstanceAdministered extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
+      new cql.Quantity({unit: @_supply['units'], value: @_supply['scalar']})
     else
       null
 
@@ -124,7 +124,7 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
+      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -187,7 +187,7 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
+      new cql.Quantity({unit: @_supply['units'], value: @_supply['scalar']})
     else
       null
 
@@ -224,7 +224,7 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
+      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -287,6 +287,6 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
+      new cql.Quantity({unit: @_supply['units'], value: @_supply['scalar']})
     else
       null

data/lib/cql_qdm_patientapi/version.rb

@@ -1,3 +1,3 @@
 module CqlQdmPatientapi
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/vendor/assets/javascripts/cql4browsers.js

@@ -551,7 +551,7 @@
 },{"./clinical":5,"./datetime":7,"./interval":9,"./logic":10,"./uncertainty":11}],7:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var DateTime, Uncertainty, moment;
+  var DateTime, Uncertainty, convertTimezoneOffset, cqlFormatStringToMomentFormatString, getTimezoneSeparatorFromString, isValidDateTimeStringFormat, moment, normalizeMillisecondsField, normalizeMillisecondsFieldInString;
 
   Uncertainty = require('./uncertainty').Uncertainty;
 
@@ -572,36 +572,51 @@
     DateTime.FIELDS = [DateTime.Unit.YEAR, DateTime.Unit.MONTH, DateTime.Unit.DAY, DateTime.Unit.HOUR, DateTime.Unit.MINUTE, DateTime.Unit.SECOND, DateTime.Unit.MILLISECOND];
 
     DateTime.parse = function(string) {
-      var arg, args, match, num, regex;
-      match = regex = /(\d{4})(-(\d{2}))?(-(\d{2}))?(T((\d{2})(\:(\d{2})(\:(\d{2})(\.(\d+))?)?)?)?(Z|(([+-])(\d{2})(\:?(\d{2}))?))?)?/.exec(string);
-      if ((match != null ? match[0] : void 0) === string) {
-        args = [match[1], match[3], match[5], match[8], match[10], match[12], match[14]];
-        if (args[6] != null) {
-          args[6] = (args[6] + "00").substring(0, 3);
-        }
-        args = (function() {
-          var i, len, results;
-          results = [];
-          for (i = 0, len = args.length; i < len; i++) {
-            arg = args[i];
-            results.push(arg != null ? parseInt(arg, 10) : void 0);
-          }
-          return results;
-        })();
-        if (match[18] != null) {
-          num = parseInt(match[18], 10) + (match[20] != null ? parseInt(match[20], 10) / 60 : 0);
-          args.push(match[17] === '+' ? num : num * -1);
-        } else if (match[15] === 'Z') {
-          args.push(0);
-        }
-        return (function(func, args, ctor) {
-          ctor.prototype = func.prototype;
-          var child = new ctor, result = func.apply(child, args);
-          return Object(result) === result ? result : child;
-        })(DateTime, args, function(){});
-      } else {
+      var arg, args, days, hours, matches, milliseconds, minutes, months, num, seconds, years;
+      if (string === null) {
         return null;
       }
+      matches = /(\d{4})(-(\d{2}))?(-(\d{2}))?(T((\d{2})(\:(\d{2})(\:(\d{2})(\.(\d+))?)?)?)?(Z|(([+-])(\d{2})(\:?(\d{2}))?))?)?/.exec(string);
+      if (matches == null) {
+        throw new Error('Invalid DateTime String: ' + string);
+      }
+      years = matches[1];
+      months = matches[3];
+      days = matches[5];
+      hours = matches[8];
+      minutes = matches[10];
+      seconds = matches[12];
+      milliseconds = matches[14];
+      if (milliseconds != null) {
+        milliseconds = normalizeMillisecondsField(milliseconds);
+      }
+      if (milliseconds != null) {
+        string = normalizeMillisecondsFieldInString(string, matches);
+      }
+      if (!isValidDateTimeStringFormat(string)) {
+        throw new Error('Invalid DateTime String: ' + string);
+      }
+      args = [years, months, days, hours, minutes, seconds, milliseconds];
+      args = (function() {
+        var i, len, results;
+        results = [];
+        for (i = 0, len = args.length; i < len; i++) {
+          arg = args[i];
+          results.push(arg != null ? parseInt(arg, 10) : void 0);
+        }
+        return results;
+      })();
+      if (matches[18] != null) {
+        num = parseInt(matches[18], 10) + (matches[20] != null ? parseInt(matches[20], 10) / 60 : 0);
+        args.push(matches[17] === '+' ? num : num * -1);
+      } else if (matches[15] === 'Z') {
+        args.push(0);
+      }
+      return (function(func, args, ctor) {
+        ctor.prototype = func.prototype;
+        var child = new ctor, result = func.apply(child, args);
+        return Object(result) === result ? result : child;
+      })(DateTime, args, function(){});
     };
 
     DateTime.fromDate = function(date, timezoneOffset) {
@@ -1114,6 +1129,82 @@
 
   })();
 
+  normalizeMillisecondsFieldInString = function(string, matches) {
+    var beforeMs, msAndAfter, msString, ref, timezoneField, timezoneSeparator;
+    msString = matches[14];
+    msString = normalizeMillisecondsField(msString);
+    ref = string.split('.'), beforeMs = ref[0], msAndAfter = ref[1];
+    timezoneSeparator = getTimezoneSeparatorFromString(msAndAfter);
+    if (!!timezoneSeparator) {
+      timezoneField = msAndAfter != null ? msAndAfter.split(timezoneSeparator)[1] : void 0;
+    }
+    if (timezoneField == null) {
+      timezoneField = '';
+    }
+    return string = beforeMs + '.' + msString + timezoneSeparator + timezoneField;
+  };
+
+  normalizeMillisecondsField = function(msString) {
+    return msString = (msString + "00").substring(0, 3);
+  };
+
+  isValidDateTimeStringFormat = function(string) {
+    var cqlFormatStringWithLength, cqlFormats, format, i, len, strict;
+    if (typeof string !== 'string') {
+      return false;
+    }
+    cqlFormats = ['YYYY', 'YYYY-MM', 'YYYY-MM-DD', 'YYYY-MM-DDTZ', 'YYYY-MM-DDT+hh', 'YYYY-MM-DDT+hh:mm', 'YYYY-MM-DDT-hh', 'YYYY-MM-DDT-hh:mm', 'YYYY-MM-DDThh', 'YYYY-MM-DDThhZ', 'YYYY-MM-DDThh+hh', 'YYYY-MM-DDThh+hh:mm', 'YYYY-MM-DDThh-hh', 'YYYY-MM-DDThh-hh:mm', 'YYYY-MM-DDThh:mm', 'YYYY-MM-DDThh:mmZ', 'YYYY-MM-DDThh:mm+hh', 'YYYY-MM-DDThh:mm+hh:mm', 'YYYY-MM-DDThh:mm-hh', 'YYYY-MM-DDThh:mm-hh:mm', 'YYYY-MM-DDThh:mm:ss', 'YYYY-MM-DDThh:mm:ssZ', 'YYYY-MM-DDThh:mm:ss+hh', 'YYYY-MM-DDThh:mm:ss+hh:mm', 'YYYY-MM-DDThh:mm:ss-hh', 'YYYY-MM-DDThh:mm:ss-hh:mm', 'YYYY-MM-DDThh:mm:ss.fff', 'YYYY-MM-DDThh:mm:ss.fffZ', 'YYYY-MM-DDThh:mm:ss.fff+hh', 'YYYY-MM-DDThh:mm:ss.fff+hh:mm', 'YYYY-MM-DDThh:mm:ss.fff-hh', 'YYYY-MM-DDThh:mm:ss.fff-hh:mm'];
+    cqlFormatStringWithLength = {};
+    for (i = 0, len = cqlFormats.length; i < len; i++) {
+      format = cqlFormats[i];
+      cqlFormatStringWithLength[format.length] = format;
+    }
+    if (cqlFormatStringWithLength[string.length] == null) {
+      return false;
+    }
+    strict = false;
+    return moment(string, cqlFormatStringToMomentFormatString(cqlFormatStringWithLength[string.length]), strict).isValid();
+  };
+
+  cqlFormatStringToMomentFormatString = function(string) {
+    var momentString, ref, timeAndTimeZoneOffset, timezoneSeparator, yearMonthDay;
+    ref = string.split('T'), yearMonthDay = ref[0], timeAndTimeZoneOffset = ref[1];
+    if (timeAndTimeZoneOffset != null) {
+      timezoneSeparator = getTimezoneSeparatorFromString(timeAndTimeZoneOffset);
+    }
+    momentString = yearMonthDay;
+    if (string.match(/T/) != null) {
+      momentString += '[T]';
+    }
+    if (!!timezoneSeparator) {
+      momentString += timeAndTimeZoneOffset.substring(0, timeAndTimeZoneOffset.search(timezoneSeparator)) + '[Z]';
+    } else {
+      momentString += timeAndTimeZoneOffset;
+    }
+    return momentString = momentString.replace(/f/g, 'S');
+  };
+
+  convertTimezoneOffset = function(matches) {
+    var num;
+    num = parseInt(matches[17], 10) + (matches[19] != null ? parseInt(matches[19], 10) / 60 : 0);
+    if (matches[16] === '+') {
+      return num;
+    } else {
+      return num * -1;
+    }
+  };
+
+  getTimezoneSeparatorFromString = function(string) {
+    var ref, ref1, timezoneSeparator;
+    if ((typeof msAndAfter !== "undefined" && msAndAfter !== null ? (ref = msAndAfter.match(/-/)) != null ? ref.length : void 0 : void 0) === 1) {
+      return timezoneSeparator = '-';
+    } else if ((typeof msAndAfter !== "undefined" && msAndAfter !== null ? (ref1 = msAndAfter.match(/\+/)) != null ? ref1.length : void 0 : void 0) === 1) {
+      return timezoneSeparator = '+';
+    } else {
+      return timezoneSeparator = '';
+    }
+  };
+
 }).call(this);
 
 
@@ -2931,20 +3022,14 @@
     }
 
     Less.prototype.exec = function(ctx) {
-      var args, error;
+      var args;
       args = this.execArgs(ctx).map(function(x) {
         return Uncertainty.from(x);
       });
-      try {
-        return args[0].lessThan(args[1]);
-      } catch (error1) {
-        error = error1;
-        if (error instanceof IncompatibleTypesException) {
-          return null;
-        } else {
-          throw error;
-        }
+      if (!((args[0] != null) && (args[1] != null))) {
+        return null;
       }
+      return args[0].lessThan(args[1]);
     };
 
     return Less;
@@ -2959,20 +3044,14 @@
     }
 
     LessOrEqual.prototype.exec = function(ctx) {
-      var args, error;
+      var args;
       args = this.execArgs(ctx).map(function(x) {
         return Uncertainty.from(x);
       });
-      try {
-        return args[0].lessThanOrEquals(args[1]);
-      } catch (error1) {
-        error = error1;
-        if (error instanceof IncompatibleTypesException) {
-          return null;
-        } else {
-          throw error;
-        }
+      if (!((args[0] != null) && (args[1] != null))) {
+        return null;
       }
+      return args[0].lessThanOrEquals(args[1]);
     };
 
     return LessOrEqual;
@@ -2987,20 +3066,14 @@
     }
 
     Greater.prototype.exec = function(ctx) {
-      var args, error;
+      var args;
       args = this.execArgs(ctx).map(function(x) {
         return Uncertainty.from(x);
       });
-      try {
-        return args[0].greaterThan(args[1]);
-      } catch (error1) {
-        error = error1;
-        if (error instanceof IncompatibleTypesException) {
-          return null;
-        } else {
-          throw error;
-        }
+      if (!((args[0] != null) && (args[1] != null))) {
+        return null;
       }
+      return args[0].greaterThan(args[1]);
     };
 
     return Greater;
@@ -3015,20 +3088,14 @@
     }
 
     GreaterOrEqual.prototype.exec = function(ctx) {
-      var args, error;
+      var args;
       args = this.execArgs(ctx).map(function(x) {
         return Uncertainty.from(x);
       });
-      try {
-        return args[0].greaterThanOrEquals(args[1]);
-      } catch (error1) {
-        error = error1;
-        if (error instanceof IncompatibleTypesException) {
-          return null;
-        } else {
-          throw error;
-        }
+      if (!((args[0] != null) && (args[1] != null))) {
+        return null;
       }
+      return args[0].greaterThanOrEquals(args[1]);
     };
 
     return GreaterOrEqual;
@@ -5065,17 +5132,12 @@
     }
 
     Equal.prototype.exec = function(ctx) {
-      var error;
-      try {
-        return equals.apply(null, this.execArgs(ctx));
-      } catch (error1) {
-        error = error1;
-        if (error instanceof IncompatibleTypesException) {
-          return null;
-        } else {
-          throw error;
-        }
+      var args;
+      args = this.execArgs(ctx);
+      if (!((args[0] != null) && (args[1] != null))) {
+        return null;
       }
+      return equals.apply(null, this.execArgs(ctx));
     };
 
     return Equal;
@@ -5113,17 +5175,12 @@
     }
 
     NotEqual.prototype.exec = function(ctx) {
-      var error;
-      try {
-        return ThreeValuedLogic.not(equals.apply(null, this.execArgs(ctx)));
-      } catch (error1) {
-        error = error1;
-        if (error instanceof IncompatibleTypesException) {
-          return null;
-        } else {
-          throw error;
-        }
+      var args;
+      args = this.execArgs(ctx);
+      if (!((args[0] != null) && (args[1] != null))) {
+        return null;
       }
+      return ThreeValuedLogic.not(equals.apply(null, this.execArgs(ctx)));
     };
 
     return NotEqual;
@@ -5564,7 +5621,7 @@
 },{"./builder":14,"./expression":20}],32:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Code, Exception, Expression, FunctionRef, IncompatibleTypesException, Quantity, ValueSet, build, clean_unit, convert_value, createQuantity, decimalAdjust, is_valid_ucum_unit, ref, ucum, ucum_multiply, ucum_time_units, ucum_to_cql_units, ucum_unit, unitValidityCache, units_to_string,
+  var Code, Exception, Expression, FunctionRef, IncompatibleTypesException, Quantity, ValueSet, build, clean_unit, convert_value, createQuantity, decimalAdjust, isValidDecimal, is_valid_ucum_unit, ref, ref1, ucum, ucum_multiply, ucum_time_units, ucum_to_cql_units, ucum_unit, unitValidityCache, units_to_string,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
@@ -5572,9 +5629,9 @@
 
   FunctionRef = require('./reusable').FunctionRef;
 
-  decimalAdjust = require('../util/math').decimalAdjust;
+  ref = require('../util/math'), decimalAdjust = ref.decimalAdjust, isValidDecimal = ref.isValidDecimal;
 
-  ref = require('../datatypes/datatypes'), ValueSet = ref.ValueSet, Code = ref.Code;
+  ref1 = require('../datatypes/datatypes'), ValueSet = ref1.ValueSet, Code = ref1.Code;
 
   Exception = require('../datatypes/exception').Exception;
 
@@ -5602,7 +5659,7 @@
       Quantity.__super__.constructor.apply(this, arguments);
       this.unit = json.unit;
       this.value = parseFloat(json.value);
-      if (!is_valid_ucum_unit(this.unit)) {
+      if ((this.unit != null) && !is_valid_ucum_unit(this.unit)) {
         throw new Error("\'" + this.unit + "\' is not a valid UCUM unit.");
       }
     }
@@ -5820,15 +5877,15 @@
   module.exports.convert_value = convert_value;
 
   units_to_string = function(units) {
-    var denom, i, key, len, numer, pow, ref1, str, unit_string, v;
+    var denom, i, key, len, numer, pow, ref2, str, unit_string, v;
     if (units == null) {
       units = {};
     }
     numer = [];
     denom = [];
-    ref1 = Object.keys(units);
-    for (i = 0, len = ref1.length; i < len; i++) {
-      key = ref1[i];
+    ref2 = Object.keys(units);
+    for (i = 0, len = ref2.length; i < len; i++) {
+      key = ref2[i];
       v = units[key];
       pow = Math.abs(v);
       str = pow === 1 ? key : key + pow;
@@ -5851,7 +5908,7 @@
   };
 
   ucum_multiply = function(t, ms) {
-    var b, i, k, len, mterm, ref1, ret, sign, v;
+    var b, i, k, len, mterm, ref2, ret, sign, v;
     if (ms == null) {
       ms = [];
     }
@@ -5864,9 +5921,9 @@
       sign = mterm[0] === '.' ? 1 : -1;
       b = mterm[1];
       ret.value *= Math.pow(b.value, sign);
-      ref1 = b.units;
-      for (k in ref1) {
-        v = ref1[k];
+      ref2 = b.units;
+      for (k in ref2) {
+        v = ref2[k];
         ret.units[k] = ret.units[k] || 0;
         ret.units[k] = ret.units[k] + sign * v;
         if (ret.units[k] === 0) {
@@ -5886,16 +5943,23 @@
 
   module.exports.parseQuantity = function(str) {
     var components, unit, value;
-    components = /([+|-]?\d+\.?\d*)\s*'(.+)'/.exec(str);
-    if ((components != null) && (components[1] != null) && (components[2] != null)) {
+    components = /([+|-]?\d+\.?\d*)\s*('(.+)')?/.exec(str);
+    if ((components != null) && (components[1] != null)) {
       value = parseFloat(components[1]);
-      unit = components[2].trim();
+      if (!isValidDecimal(value)) {
+        return null;
+      }
+      if (components[3] != null) {
+        unit = components[3].trim();
+      } else {
+        unit = "";
+      }
       return new Quantity({
         value: value,
         unit: unit
       });
     } else {
-      return null;
+      throw new Error("Unable to parse Quantity");
     }
   };
 
@@ -6848,7 +6912,7 @@
 },{"./builder":14,"./expression":20}],37:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var As, Concept, Convert, DateTime, Expression, FunctionRef, IntervalTypeSpecifier, Is, ListTypeSpecifier, NamedTypeSpecifier, ToBoolean, ToConcept, ToDateTime, ToDecimal, ToInteger, ToQuantity, ToString, ToTime, TupleTypeSpecifier, UnimplementedExpression, parseQuantity, ref,
+  var As, Concept, Convert, DateTime, Expression, FunctionRef, IntervalTypeSpecifier, Is, ListTypeSpecifier, NamedTypeSpecifier, ToBoolean, ToConcept, ToDateTime, ToDecimal, ToInteger, ToQuantity, ToString, ToTime, TupleTypeSpecifier, UnimplementedExpression, isValidDecimal, isValidInteger, limitDecimalPrecision, parseQuantity, ref, ref1,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
@@ -6862,15 +6926,17 @@
 
   parseQuantity = require('./quantity').parseQuantity;
 
+  ref1 = require('../util/math'), isValidDecimal = ref1.isValidDecimal, isValidInteger = ref1.isValidInteger, limitDecimalPrecision = ref1.limitDecimalPrecision;
+
   module.exports.As = As = (function(superClass) {
     extend(As, superClass);
 
     function As(json) {
-      var ref1;
+      var ref2;
       As.__super__.constructor.apply(this, arguments);
       this.asType = json.asType;
       this.asTypeSpecifier = json.asTypeSpecifier;
-      this.strict = (ref1 = json.strict) != null ? ref1 : false;
+      this.strict = (ref2 = json.strict) != null ? ref2 : false;
     }
 
     As.prototype.exec = function(ctx) {
@@ -6959,10 +7025,14 @@
     }
 
     ToDecimal.prototype.exec = function(ctx) {
-      var arg;
+      var arg, decimal;
       arg = this.execArgs(ctx);
       if ((arg != null) && typeof arg !== 'undefined') {
-        return parseFloat(arg.toString());
+        decimal = parseFloat(arg.toString());
+        decimal = limitDecimalPrecision(decimal);
+        if (isValidDecimal(decimal)) {
+          return decimal;
+        }
       } else {
         return null;
       }
@@ -6980,10 +7050,13 @@
     }
 
     ToInteger.prototype.exec = function(ctx) {
-      var arg;
+      var arg, integer;
       arg = this.execArgs(ctx);
       if ((arg != null) && typeof arg !== 'undefined') {
-        return parseInt(arg.toString());
+        integer = parseInt(arg.toString());
+        if (isValidInteger(integer)) {
+          return integer;
+        }
       } else {
         return null;
       }
@@ -7001,10 +7074,11 @@
     }
 
     ToQuantity.prototype.exec = function(ctx) {
-      var arg;
+      var arg, quantity;
       arg = this.execArgs(ctx);
       if ((arg != null) && typeof arg !== 'undefined') {
-        return parseQuantity(arg.toString());
+        quantity = parseQuantity(arg.toString());
+        return quantity;
       } else {
         return null;
       }
@@ -7180,7 +7254,7 @@
 
 
 
-},{"../datatypes/clinical":5,"../datatypes/datetime":7,"./expression":20,"./quantity":32,"./reusable":34}],38:[function(require,module,exports){
+},{"../datatypes/clinical":5,"../datatypes/datetime":7,"../util/math":134,"./expression":20,"./quantity":32,"./reusable":34}],38:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   window.cql = require('../../cql');
@@ -44099,7 +44173,7 @@
 },{"../datatypes/datetime":7,"../datatypes/uncertainty":11}],134:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var DateTime, Exception, MAX_DATE_VALUE, MAX_FLOAT_VALUE, MAX_INT_VALUE, MAX_TIME_VALUE, MIN_DATE_VALUE, MIN_FLOAT_PRECISION_VALUE, MIN_FLOAT_VALUE, MIN_INT_VALUE, OverFlowException, Uncertainty, predecessor, successor,
+  var DateTime, Exception, MAX_DATE_VALUE, MAX_FLOAT_VALUE, MAX_INT_VALUE, MAX_TIME_VALUE, MIN_DATE_VALUE, MIN_FLOAT_PRECISION_VALUE, MIN_FLOAT_VALUE, MIN_INT_VALUE, OverFlowException, Uncertainty, isValidDecimal, isValidInteger, predecessor, successor,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
@@ -44127,6 +44201,46 @@
 
   module.exports.MAX_TIME_VALUE = MAX_TIME_VALUE = DateTime.parse("0000-01-01T23:59:59.999");
 
+  module.exports.isValidInteger = isValidInteger = function(integer) {
+    if (isNaN(integer)) {
+      throw new Error("Unable to parse Integer");
+    }
+    if (integer > MAX_INT_VALUE) {
+      throw new Error("Maximum Integer value exceeded");
+    }
+    if (integer < MIN_INT_VALUE) {
+      throw new Error("Minimum Integer value exceeded");
+    }
+    return true;
+  };
+
+  module.exports.isValidDecimal = isValidDecimal = function(decimal) {
+    if (isNaN(decimal)) {
+      throw new Error("Unable to parse Decimal");
+    }
+    if (decimal > MAX_FLOAT_VALUE) {
+      throw new Error("Maximum Decimal value exceeded");
+    }
+    if (decimal < MIN_FLOAT_VALUE) {
+      throw new Error("Minimum Decimal value exceeded");
+    }
+    return true;
+  };
+
+  module.exports.limitDecimalPrecision = function(decimal) {
+    var decimalPoints, decimalString, splitDecimalString;
+    decimalString = decimal.toString();
+    if (decimalString.indexOf('e') !== -1) {
+      return decimal;
+    }
+    splitDecimalString = decimalString.split('.');
+    decimalPoints = splitDecimalString[1];
+    if ((decimalPoints != null) && decimalPoints.length > 8) {
+      decimalString = splitDecimalString[0] + '.' + splitDecimalString[1].substring(0, 8);
+    }
+    return parseFloat(decimalString);
+  };
+
   module.exports.OverFlowException = OverFlowException = OverFlowException = (function(superClass) {
     extend(OverFlowException, superClass);
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cql_qdm_patientapi
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - The MITRE Corporation
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: QDM CQL execution engine and HDS patient model interface