cql_qdm_patientapi 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 33a7aa24e0f645f52b49e64975b73379aa01bb57
-  data.tar.gz: b9bf894f8de2a0ec6fd91f525dbc71c599ca7034
+SHA256:
+  metadata.gz: 902ccf42281d43b55bcd6cc3fc25b75123a661cf0e19b9b2f8708ee0acc25fc2
+  data.tar.gz: e511c3345200b15f699fba2eb370d110992b22207fc8479a75c3a534d4ae8ed1
 SHA512:
-  metadata.gz: e713fa97645076726e6e4e42cc8e760fe8d2601239c3c7c3071d535f898b35d1b78dd5bb5d7fe32421ffcc328482fbb4cee2c2e24b01298fe95e583cacf9cf45
-  data.tar.gz: c3ed8e6b125f80e01240adb029dce4fbd54f04c2a62a490215ba1a1a6c2269f36ddf22761b507e9e8853c02980bfb87ae7aad7d7dbf0b9fc9f8b2ed40e1daaba
+  metadata.gz: 16d8748d7888b29b0ef3ab4dc88ee2d43d5532698b00bf4bb900a020f7052cde8cf3be9e122b2e2146b21dac26116385225dc646f6e64be40681786b8bf4d9b7
+  data.tar.gz: fe44b4d76fc8e7dfa0b3fd4b5d2e69b7de7c2b3f3cf58a9a325db05d324e8f04682e44c914c3d218eb92fbd10fe5f1230f05aea97a84eb7e7e495df912b2bae3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cql_qdm_patientapi (1.3.1)
+    cql_qdm_patientapi (1.3.2)
       coffee-rails (~> 4.1)
       rails (>= 4.2, < 6.0)
       sprockets-rails (~> 2.3)
@@ -9,43 +9,43 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.1.1)
-      actionpack (= 5.2.1.1)
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.1.1)
-      actionpack (= 5.2.1.1)
-      actionview (= 5.2.1.1)
-      activejob (= 5.2.1.1)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.1.1)
-      actionview (= 5.2.1.1)
-      activesupport (= 5.2.1.1)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.1.1)
-      activesupport (= 5.2.1.1)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.1.1)
-      activesupport (= 5.2.1.1)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
       globalid (>= 0.3.6)
-    activemodel (5.2.1.1)
-      activesupport (= 5.2.1.1)
-    activerecord (5.2.1.1)
-      activemodel (= 5.2.1.1)
-      activesupport (= 5.2.1.1)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
       arel (>= 9.0)
-    activestorage (5.2.1.1)
-      actionpack (= 5.2.1.1)
-      activerecord (= 5.2.1.1)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
       marcel (~> 0.3.1)
-    activesupport (5.2.1.1)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -62,13 +62,13 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.5)
     crass (1.0.4)
-    erubi (1.7.1)
+    erubi (1.8.0)
     execjs (2.7.0)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.1.1)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     loofah (2.2.3)
       crass (~> 1.0.2)
@@ -78,42 +78,42 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.2)
+    mimemagic (0.3.3)
     mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     nio4r (2.3.1)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
     phantomjs (2.1.1.0)
-    rack (2.0.6)
+    rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.1.1)
-      actioncable (= 5.2.1.1)
-      actionmailer (= 5.2.1.1)
-      actionpack (= 5.2.1.1)
-      actionview (= 5.2.1.1)
-      activejob (= 5.2.1.1)
-      activemodel (= 5.2.1.1)
-      activerecord (= 5.2.1.1)
-      activestorage (= 5.2.1.1)
-      activesupport (= 5.2.1.1)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
       bundler (>= 1.3.0)
-      railties (= 5.2.1.1)
+      railties (= 5.2.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.1.1)
-      actionpack (= 5.2.1.1)
-      activesupport (= 5.2.1.1)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rake (12.3.1)
+    rake (12.3.2)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -143,4 +143,4 @@ DEPENDENCIES
   teaspoon-jasmine (= 2.3.4)
 
 BUNDLED WITH
-   1.16.6
+   1.17.3

data/app/assets/javascripts/cqlpatient.js.coffee

@@ -194,7 +194,7 @@ class CQL_QDM.CQLPatient
           # e.g. "Encounter, Performed: Face-to-Face Interaction" becomes
           # EncounterPerformed
           # TODO: this needs to be modified to look at the HQMF template OID instead of the description
-          classname = dc.description.substr(0, dc.description.lastIndexOf(':'))
+          classname = dc.description.substr(0, dc.description.indexOf(':'))
           # remove commas, slashes, and colons
           classname = classname.replace(/,/g, '').replace(/\//g, '').replace(/:/g, '')
           # make all words start upper case

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

@@ -14,7 +14,7 @@ class CQL_QDM.AdverseEvent extends CQL_QDM.QDMDatatype
   ###
   constructor: (entry) ->
     super entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_facilityLocation = entry.facility
     @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)
     if entry.end_time

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

@@ -17,7 +17,7 @@ class CQL_QDM.AllergyIntolerance extends CQL_QDM.QDMDatatype
   ###
   constructor: (entry) ->
     super entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_prevalencePeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)
     if entry.end_time
       @_prevalencePeriodHigh = CQL_QDM.Helpers.convertDateTime(entry.end_time)

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

@@ -17,7 +17,7 @@ class CQL_QDM.CareGoal extends CQL_QDM.QDMDatatype
   ###
   constructor: (entry) ->
     super entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)
     if entry.end_time
       @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(entry.end_time)

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

@@ -22,7 +22,7 @@ class CQL_QDM.CommunicationPerformed extends CQL_QDM.QDMDatatype
   ###
   constructor: (entry) ->
     super entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = if entry.negationReason? then CQL_QDM.Helpers.convertDateTime(entry.start_time) else CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_negationRationale = entry.negationReason
     @_relatedTo = entry.references
     @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)

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

@@ -18,7 +18,7 @@ class CQL_QDM.DeviceApplied extends CQL_QDM.QDMDatatype
   constructor: (entry) ->
     super entry
     @_anatomicalLocationSite = entry.anatomical_location
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = if entry.negationReason? then CQL_QDM.Helpers.convertDateTime(entry.start_time) else CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_negationRationale = entry.negationReason
     @_reason = entry.reason
     @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)

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

@@ -21,7 +21,7 @@ class CQL_QDM.Diagnosis extends CQL_QDM.QDMDatatype
   ###
   constructor: (entry) ->
     super entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_prevalencePeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)
     if entry.end_time
       @_prevalencePeriodHigh = CQL_QDM.Helpers.convertDateTime(entry.end_time)

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

@@ -62,7 +62,7 @@ class CQL_QDM.DiagnosticStudyPerformed extends CQL_QDM.QDMDatatype
   ###
   constructor: (entry) ->
     super entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = if entry.negationReason? then CQL_QDM.Helpers.convertDateTime(entry.start_time) else CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_facilityLocation = entry.facility
     @_method = entry.method
     @_negationRationale = entry.negationReason

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

@@ -67,7 +67,7 @@ class CQL_QDM.EncounterPerformed extends CQL_QDM.QDMDatatype
   constructor: (entry) ->
     super entry
     @_admissionSource = entry.admission_source
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = if entry.negationReason? then CQL_QDM.Helpers.convertDateTime(entry.start_time) else CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_diagnoses = entry.diagnosis
     @_dischargeDisposition = entry.dischargeDisposition
     @_facilityLocations = entry.facility

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

@@ -57,7 +57,7 @@ class CQL_QDM.InterventionPerformed extends CQL_QDM.QDMDatatype
   ###
   constructor: (entry) ->
     super entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = if entry.negationReason? then CQL_QDM.Helpers.convertDateTime(entry.start_time) else CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_negationRationale = entry.negationReason
     @_reason = entry.reason
     @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)

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

@@ -55,7 +55,7 @@ class CQL_QDM.LaboratoryTestPerformed extends CQL_QDM.QDMDatatype
   ###
   constructor: (entry) ->
     super entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = if entry.negationReason? then CQL_QDM.Helpers.convertDateTime(entry.start_time) else CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_method = entry.method
     @_negationRationale = entry.negationReason
     @_reason = entry.reason

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

@@ -81,7 +81,7 @@ class CQL_QDM.MedicationAdministered extends CQL_QDM.QDMDatatype
   ###
   constructor: (entry) ->
     super entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = if entry.negationReason? then CQL_QDM.Helpers.convertDateTime(entry.start_time) else CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_dosage = entry.dose
     @_frequency = entry.administrationTiming
     @_negationRationale = entry.negationReason
@@ -282,7 +282,7 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
   ###
   constructor: (entry) ->
     super entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = if entry.negationReason? then CQL_QDM.Helpers.convertDateTime(entry.start_time) else CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_dispenserIdentifier = entry.dispenserIdentifier
     @_daysSupplied = entry.daysSupplied
     @_dosage = entry.dose
@@ -412,7 +412,7 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
   ###
   constructor: (entry) ->
     super entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = if entry.negationReason? then CQL_QDM.Helpers.convertDateTime(entry.start_time) else CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_daysSupplied = entry.daysSupplied
     @_dosage = entry.dose
     @_frequency = entry.administrationTiming

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

@@ -70,7 +70,7 @@ class CQL_QDM.PhysicalExamPerformed extends CQL_QDM.QDMDatatype
   constructor: (entry) ->
     super entry
     @_anatomicalLocationSite = entry.anatomicalLocation
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = if entry.negationReason? then CQL_QDM.Helpers.convertDateTime(entry.start_time) else CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_method = entry.method
     @_negationRationale = entry.negationReason
     @_reason = entry.reason

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

@@ -76,7 +76,7 @@ class CQL_QDM.ProcedurePerformed extends CQL_QDM.QDMDatatype
   constructor: (entry) ->
     super entry
     @_anatomicalLocationSite = entry.anatomical_location
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = if entry.negationReason? then CQL_QDM.Helpers.convertDateTime(entry.start_time) else CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_incisionDatetime = CQL_QDM.Helpers.convertDateTime(entry.incisionTime)
     @_method = entry.method
     @_negationRationale = entry.negationReason

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

@@ -16,7 +16,7 @@ class CQL_QDM.SubstanceAdministered extends CQL_QDM.QDMDatatype
   ###
   constructor: (entry) ->
     super entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_authorDatetime = if entry.negationReason? then CQL_QDM.Helpers.convertDateTime(entry.start_time) else CQL_QDM.Helpers.convertDateTime(entry.author_datetime)
     @_dosage = entry.dose
     @_frequency = entry.administrationTiming
     @_negationRationale = entry.negationReason

data/lib/cql_qdm_patientapi/version.rb

@@ -1,3 +1,3 @@
 module CqlQdmPatientapi
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/vendor/assets/javascripts/cql4browsers.js

@@ -1,7 +1,7 @@
 /**
 * no_asset_compression
 **/
-(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Code, CodeService, ValueSet, ref;
@@ -425,6 +425,14 @@
       this.display = display;
     }
 
+    Object.defineProperties(Code.prototype, {
+      isCode: {
+        get: function() {
+          return true;
+        }
+      }
+    });
+
     Code.prototype.hasMatch = function(code) {
       if (typeof code === 'string') {
         return code === this.code;
@@ -917,15 +925,23 @@
     };
 
     DateTime.prototype.toJSDate = function(ignoreTimezone) {
-      var d, h, mi, mo, ms, ref1, ref2, ref3, ref4, ref5, ref6, s, y;
+      var d, date, h, mi, mo, ms, ref1, ref2, ref3, ref4, ref5, ref6, s, y;
       if (ignoreTimezone == null) {
         ignoreTimezone = false;
       }
       ref6 = [this.year, (this.month != null ? this.month - 1 : 0), (ref1 = this.day) != null ? ref1 : 1, (ref2 = this.hour) != null ? ref2 : 0, (ref3 = this.minute) != null ? ref3 : 0, (ref4 = this.second) != null ? ref4 : 0, (ref5 = this.millisecond) != null ? ref5 : 0], y = ref6[0], mo = ref6[1], d = ref6[2], h = ref6[3], mi = ref6[4], s = ref6[5], ms = ref6[6];
       if ((this.timezoneOffset != null) && !ignoreTimezone) {
-        return new jsDate(jsDate.UTC(y, mo, d, h, mi, s, ms) - (this.timezoneOffset * 60 * 60 * 1000));
+        date = new jsDate(jsDate.UTC(y, mo, d, h, mi, s, ms) - (this.timezoneOffset * 60 * 60 * 1000));
+        if (y < 100) {
+          date.setUTCFullYear(y);
+        }
+        return date;
       } else {
-        return new jsDate(y, mo, d, h, mi, s, ms);
+        date = new jsDate(y, mo, d, h, mi, s, ms);
+        if (y < 100) {
+          date.setFullYear(y);
+        }
+        return date;
       }
     };
 
@@ -1734,7 +1750,7 @@
 
 
 
-},{"../util/util":136,"./uncertainty":11,"moment":137}],8:[function(require,module,exports){
+},{"../util/util":136,"./uncertainty":11,"moment":138}],8:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Exception;
@@ -1927,7 +1943,7 @@
               return [this.high, this.highClosed];
             case !cmp.lessThanOrEquals(a.high, b.high):
               return [other.high, other.highClosed];
-            case !areNumeric(a.low, b.low):
+            case !areNumeric(a.high, b.high):
               return [highestNumericUncertainty(a.high, b.high), true];
             case !(areDateTimes(a.high, b.high) && a.high.isMorePrecise(b.high)):
               return [other.high, other.highClosed];
@@ -1968,7 +1984,7 @@
               return [this.high, this.highClosed];
             case !cmp.greaterThanOrEquals(a.high, b.high):
               return [other.high, other.highClosed];
-            case !areNumeric(a.low, b.low):
+            case !areNumeric(a.high, b.high):
               return [lowestNumericUncertainty(a.high, b.high), true];
             case !(areDateTimes(a.high, b.high) && b.high.isMorePrecise(a.high)):
               return [other.high, other.highClosed];
@@ -2008,6 +2024,44 @@
       }
     };
 
+    Interval.prototype.sameAs = function(other, precision) {
+      if (((this.low != null) && (other.low != null) && (this.high == null) && (other.high != null) && !this.highClosed) || ((this.low != null) && (other.low != null) && (this.high != null) && (other.high == null) && !other.highClosed) || ((this.low != null) && (other.low != null) && (this.high == null) && (other.high == null) && !other.highClosed && !this.highClosed)) {
+        if (typeof this.low === 'number') {
+          if (!(this.start() === other.start())) {
+            return false;
+          }
+        } else {
+          if (!(this.start().sameAs(other.start(), precision))) {
+            return false;
+          }
+        }
+      } else if (((this.low != null) && (other.low == null) && (this.high != null) && (other.high != null)) || ((this.low == null) && (other.low != null) && (this.high != null) && (other.high != null)) || ((this.low == null) && (other.low == null) && (this.high != null) && (other.high != null))) {
+        if (typeof this.high === 'number') {
+          if (!(this.end() === other.end())) {
+            return false;
+          }
+        } else {
+          if (!(this.end().sameAs(other.end(), precision))) {
+            return false;
+          }
+        }
+      }
+      if (((this.low == null) && !this.lowClosed) || ((this.high == null) && !this.highClosed) || ((other.low == null) && !other.lowClosed) || ((other.high == null) && !other.highClosed)) {
+        return null;
+      }
+      if (this.lowClosed && (this.low == null) && this.highClosed && (this.high == null)) {
+        return other.lowClosed && (other.low == null) && other.highClosed && (other.high == null);
+      }
+      if (other.lowClosed && (other.low == null) && other.highClosed && (other.high == null)) {
+        return false;
+      }
+      if (typeof this.low === 'number') {
+        return this.start() === other.start() && this.end() === other.end();
+      } else {
+        return this.start().sameAs(other.start(), precision) && this.end().sameAs(other.end(), precision);
+      }
+    };
+
     Interval.prototype.equals = function(other) {
       var a, b, ref1;
       if (other instanceof Interval) {
@@ -2068,6 +2122,28 @@
       }
     };
 
+    Interval.prototype.start = function() {
+      if (this.low == null) {
+        if (this.lowClosed) {
+          return minValueForInstance(this.high);
+        } else {
+          return this.low;
+        }
+      }
+      return this.toClosed().low;
+    };
+
+    Interval.prototype.end = function() {
+      if (this.high == null) {
+        if (this.highClosed) {
+          return maxValueForInstance(this.low);
+        } else {
+          return this.high;
+        }
+      }
+      return this.toClosed().high;
+    };
+
     Interval.prototype.starts = function(other, precision) {
       var endLessThanOrEqual, startEqual;
       if ((precision != null) && this.low instanceof DateTime) {
@@ -2107,7 +2183,7 @@
     Interval.prototype.toClosed = function() {
       var high, low, point, ref1;
       point = (ref1 = this.low) != null ? ref1 : this.high;
-      if (typeof point === 'number' || point instanceof DateTime || (point != null ? point.isQuantity : void 0)) {
+      if (typeof point === 'number' || point instanceof DateTime || (point != null ? point.isQuantity : void 0) || (point != null ? point.isDate : void 0)) {
         low = (function() {
           switch (false) {
             case !(this.lowClosed && (this.low == null)):
@@ -2234,7 +2310,7 @@
     };
 
     function Uncertainty(low, high) {
-      var gt, ref;
+      var gt, isNonEnumerable, ref;
       this.low = low != null ? low : null;
       this.high = high;
       gt = function(a, b) {
@@ -2247,9 +2323,15 @@
           return a > b;
         }
       };
+      isNonEnumerable = function(val) {
+        return (val != null) && (val.isCode || val.isConcept || val.isValueSet);
+      };
       if (typeof this.high === 'undefined') {
         this.high = this.low;
       }
+      if (isNonEnumerable(this.low) || isNonEnumerable(this.high)) {
+        this.low = this.high = null;
+      }
       if ((this.low != null) && (this.high != null) && gt(this.low, this.high)) {
         ref = [this.high, this.low], this.low = ref[0], this.high = ref[1];
       }
@@ -2346,24 +2428,26 @@
 },{"./logic":10}],12:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var AggregateExpression, AllTrue, AnyTrue, Avg, Count, Exception, Expression, GeometricMean, Max, Median, Min, Mode, PopulationStdDev, PopulationVariance, Product, Quantity, StdDev, Sum, Variance, allTrue, anyTrue, build, compact, numerical_sort, productValue, quantitiesOrArg, quantityOrValue, ref, typeIsArray,
+  var AggregateExpression, AllTrue, AnyTrue, Avg, Count, Exception, Expression, GeometricMean, Max, Median, Min, Mode, PopulationStdDev, PopulationVariance, Product, Quantity, StdDev, Sum, Variance, allTrue, anyTrue, build, greaterThan, lessThan, numerical_sort, productValue, quantitiesOrArg, quantityOrValue, ref, ref1, removeNulls, typeIsArray,
     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,
     indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
   Expression = require('./expression').Expression;
 
-  ref = require('../util/util'), typeIsArray = ref.typeIsArray, allTrue = ref.allTrue, anyTrue = ref.anyTrue, compact = ref.compact, numerical_sort = ref.numerical_sort;
+  ref = require('../util/util'), typeIsArray = ref.typeIsArray, allTrue = ref.allTrue, anyTrue = ref.anyTrue, removeNulls = ref.removeNulls, numerical_sort = ref.numerical_sort;
 
   build = require('./builder').build;
 
   Exception = require('../datatypes/exception').Exception;
 
+  ref1 = require('../util/comparison'), greaterThan = ref1.greaterThan, lessThan = ref1.lessThan;
+
   Quantity = require('./quantity');
 
   quantitiesOrArg = function(arr) {
     var allQs, i, j, len, someQs, unit, values;
-    arr = compact(arr);
+    arr = removeNulls(arr);
     if (arr.length === 0) {
       return arr;
     }
@@ -2389,8 +2473,8 @@
   };
 
   quantityOrValue = function(value, arr) {
-    var ref1;
-    if (arr != null ? (ref1 = arr[0]) != null ? ref1.unit : void 0 : void 0) {
+    var ref2;
+    if (arr != null ? (ref2 = arr[0]) != null ? ref2.unit : void 0 : void 0) {
       return Quantity.createQuantity(value, arr[0].unit);
     } else {
       return value;
@@ -2420,7 +2504,7 @@
       var arg;
       arg = this.source.execute(ctx);
       if (typeIsArray(arg)) {
-        return compact(arg).length;
+        return removeNulls(arg).length;
       }
     };
 
@@ -2459,12 +2543,23 @@
     }
 
     Min.prototype.exec = function(ctx) {
-      var arg, filtered;
-      arg = this.source.execute(ctx);
-      if (typeIsArray(arg)) {
-        filtered = numerical_sort(quantitiesOrArg(arg), "asc");
-        return quantityOrValue(filtered[0], arg);
+      var element, j, len, list, listWithoutNulls, minimum;
+      list = this.source.execute(ctx);
+      if (list == null) {
+        return null;
+      }
+      listWithoutNulls = removeNulls(list);
+      if (!(listWithoutNulls.length > 0)) {
+        return null;
       }
+      minimum = listWithoutNulls[0];
+      for (j = 0, len = listWithoutNulls.length; j < len; j++) {
+        element = listWithoutNulls[j];
+        if (lessThan(element, minimum)) {
+          minimum = element;
+        }
+      }
+      return minimum;
     };
 
     return Min;
@@ -2479,12 +2574,23 @@
     }
 
     Max.prototype.exec = function(ctx) {
-      var arg, filtered;
-      arg = this.source.execute(ctx);
-      if (typeIsArray(arg)) {
-        filtered = numerical_sort(quantitiesOrArg(arg), "desc");
-        return quantityOrValue(filtered[0], arg);
+      var element, j, len, list, listWithoutNulls, maximum;
+      list = this.source.execute(ctx);
+      if (list == null) {
+        return null;
       }
+      listWithoutNulls = removeNulls(list);
+      if (!(listWithoutNulls.length > 0)) {
+        return null;
+      }
+      maximum = listWithoutNulls[0];
+      for (j = 0, len = listWithoutNulls.length; j < len; j++) {
+        element = listWithoutNulls[j];
+        if (greaterThan(element, maximum)) {
+          maximum = element;
+        }
+      }
+      return maximum;
     };
 
     return Max;
@@ -2555,7 +2661,7 @@
       var arg, filtered, mode;
       arg = this.source.execute(ctx);
       if (typeIsArray(arg)) {
-        filtered = compact(arg);
+        filtered = removeNulls(arg);
         mode = this.mode(filtered);
         if (mode.length === 1) {
           return mode[0];
@@ -2566,13 +2672,13 @@
     };
 
     Mode.prototype.mode = function(arr) {
-      var cnt, counts, elem, j, len, max, ref1, results;
+      var cnt, counts, elem, j, len, max, ref2, results;
       max = 0;
       counts = {};
       results = [];
       for (j = 0, len = arr.length; j < len; j++) {
         elem = arr[j];
-        cnt = counts[elem] = ((ref1 = counts[elem]) != null ? ref1 : 0) + 1;
+        cnt = counts[elem] = ((ref2 = counts[elem]) != null ? ref2 : 0) + 1;
         if (cnt === max && indexOf.call(results, elem) < 0) {
           results.push(elem);
         } else if (cnt > max) {
@@ -2651,12 +2757,12 @@
     }
 
     Product.prototype.exec = function(ctx) {
-      var filtered, listOfValues, product, ref1;
+      var filtered, listOfValues, product, ref2;
       listOfValues = this.source.execute(ctx);
       if (listOfValues === null) {
         return null;
       }
-      ref1 = productValue(listOfValues), product = ref1[0], filtered = ref1[1];
+      ref2 = productValue(listOfValues), product = ref2[0], filtered = ref2[1];
       if (product === null) {
         return null;
       }
@@ -2675,12 +2781,12 @@
     }
 
     GeometricMean.prototype.exec = function(ctx) {
-      var filtered, geoMean, listOfValues, product, ref1;
+      var filtered, geoMean, listOfValues, product, ref2;
       listOfValues = this.source.execute(ctx);
       if (listOfValues === null) {
         return null;
       }
-      ref1 = productValue(listOfValues), product = ref1[0], filtered = ref1[1];
+      ref2 = productValue(listOfValues), product = ref2[0], filtered = ref2[1];
       if (product === null) {
         return null;
       }
@@ -2696,7 +2802,7 @@
     var filtered, item, j, len, product;
     product = 1;
     if (typeIsArray(list)) {
-      filtered = compact(list);
+      filtered = removeNulls(list);
       if (filtered.length === 0) {
         return [null, null];
       }
@@ -2788,7 +2894,7 @@
 
 
 
-},{"../datatypes/exception":8,"../util/util":136,"./builder":14,"./expression":20,"./quantity":32}],13:[function(require,module,exports){
+},{"../datatypes/exception":8,"../util/comparison":134,"../util/util":136,"./builder":14,"./expression":20,"./quantity":32}],13:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Abs, Add, Ceiling, Divide, Exp, Expression, Floor, Ln, Log, MathUtil, MaxValue, MinValue, Modulo, Multiply, Negate, Power, Predecessor, Quantity, Round, Subtract, Successor, Truncate, TruncatedDivide, allTrue, anyTrue, build, ref, typeIsArray,
@@ -3206,8 +3312,15 @@
     }
 
     MinValue.prototype.exec = function(ctx) {
+      var minDateTime;
       if (MIN_VALUES[this.valueType]) {
-        return MIN_VALUES[this.valueType];
+        if (this.valueType === '{urn:hl7-org:elm-types:r1}DateTime') {
+          minDateTime = MIN_VALUES[this.valueType].copy();
+          minDateTime.timezoneOffset = ctx.getTimezoneOffset();
+          return minDateTime;
+        } else {
+          return MIN_VALUES[this.valueType];
+        }
       } else {
         throw new Error("Minimum not supported for " + this.valueType);
       }
@@ -3238,8 +3351,15 @@
     }
 
     MaxValue.prototype.exec = function(ctx) {
+      var maxDateTime;
       if (MAX_VALUES[this.valueType] != null) {
-        return MAX_VALUES[this.valueType];
+        if (this.valueType === '{urn:hl7-org:elm-types:r1}DateTime') {
+          maxDateTime = MAX_VALUES[this.valueType].copy();
+          maxDateTime.timezoneOffset = ctx.getTimezoneOffset();
+          return maxDateTime;
+        } else {
+          return MAX_VALUES[this.valueType];
+        }
       } else {
         throw new Error("Maximum not supported for " + this.valueType);
       }
@@ -3875,7 +3995,7 @@
 },{"../util/comparison":134,"./builder":14,"./expression":20}],18:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var DT, Date, DateFrom, DateTime, DateTimeComponentFrom, DifferenceBetween, DurationBetween, Expression, Literal, Now, SameAs, SameOrAfter, SameOrBefore, Time, TimeFrom, TimeOfDay, TimezoneFrom, Today, build,
+  var DT, Date, DateFrom, DateTime, DateTimeComponentFrom, DifferenceBetween, DurationBetween, Expression, Literal, Now, SameOrAfter, SameOrBefore, Time, TimeFrom, TimeOfDay, TimezoneFrom, Today, build,
     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,
     slice = [].slice;
@@ -4168,28 +4288,6 @@
 
   })(Expression);
 
-  module.exports.SameAs = SameAs = (function(superClass) {
-    extend(SameAs, superClass);
-
-    function SameAs(json) {
-      SameAs.__super__.constructor.apply(this, arguments);
-      this.precision = json.precision;
-    }
-
-    SameAs.prototype.exec = function(ctx) {
-      var d1, d2, ref, ref1;
-      ref = this.execArgs(ctx), d1 = ref[0], d2 = ref[1];
-      if ((d1 != null) && (d2 != null)) {
-        return d1.sameAs(d2, (ref1 = this.precision) != null ? ref1.toLowerCase() : void 0);
-      } else {
-        return null;
-      }
-    };
-
-    return SameAs;
-
-  })(Expression);
-
   module.exports.SameOrAfter = SameOrAfter = (function(superClass) {
     extend(SameOrAfter, superClass);
 
@@ -4901,8 +4999,12 @@
     }
 
     Start.prototype.exec = function(ctx) {
-      var ref3;
-      return (ref3 = this.arg.execute(ctx)) != null ? ref3.low : void 0;
+      var interval;
+      interval = this.arg.execute(ctx);
+      if (interval == null) {
+        return null;
+      }
+      return interval.start();
     };
 
     return Start;
@@ -4917,8 +5019,12 @@
     }
 
     End.prototype.exec = function(ctx) {
-      var ref3;
-      return (ref3 = this.arg.execute(ctx)) != null ? ref3.high : void 0;
+      var interval;
+      interval = this.arg.execute(ctx);
+      if (interval == null) {
+        return null;
+      }
+      return interval.end();
     };
 
     return End;
@@ -6164,7 +6270,7 @@
 },{"./expression":20}],30:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var After, Contains, DT, DateTime, Equal, Equivalent, Except, Exception, Expression, IVL, In, IncludedIn, Includes, Indexer, Intersect, LIST, Length, NotEqual, ProperIncludedIn, ProperIncludes, STRING, ThreeValuedLogic, Union, build, equals, equivalent, ref, typeIsArray,
+  var After, Contains, DT, DateTime, Equal, Equivalent, Except, Exception, Expression, IVL, In, IncludedIn, Includes, Indexer, Intersect, LIST, Length, NotEqual, ProperIncludedIn, ProperIncludes, STRING, SameAs, ThreeValuedLogic, Union, build, equals, equivalent, ref, typeIsArray,
     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;
 
@@ -6621,6 +6727,28 @@
 
   })(Expression);
 
+  module.exports.SameAs = SameAs = (function(superClass) {
+    extend(SameAs, superClass);
+
+    function SameAs(json) {
+      SameAs.__super__.constructor.apply(this, arguments);
+      this.precision = json.precision;
+    }
+
+    SameAs.prototype.exec = function(ctx) {
+      var a, b, ref1, ref2;
+      ref1 = this.execArgs(ctx), a = ref1[0], b = ref1[1];
+      if ((a != null) && (b != null)) {
+        return a.sameAs(b, (ref2 = this.precision) != null ? ref2.toLowerCase() : void 0);
+      } else {
+        return null;
+      }
+    };
+
+    return SameAs;
+
+  })(Expression);
+
 }).call(this);
 
 
@@ -7124,7 +7252,7 @@
 
 
 
-},{"../datatypes/datatypes":6,"../datatypes/exception":8,"../util/math":135,"./builder":14,"./expression":20,"./reusable":35,"ucum":146}],33:[function(require,module,exports){
+},{"../datatypes/datatypes":6,"../datatypes/exception":8,"../util/math":135,"./builder":14,"./expression":20,"./reusable":35,"ucum":147}],33:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var AliasRef, AliasedQuerySource, ByColumn, ByDirection, ByExpression, Context, Expression, LetClause, MultiSource, Query, QueryLetRef, ReturnClause, Sort, SortClause, UnimplementedExpression, With, Without, allTrue, build, equals, ref, ref1, toDistinctList, typeIsArray,
@@ -7767,7 +7895,7 @@
 },{"./builder":14,"./expression":20}],36:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Combine, Concatenate, EndsWith, Expression, Lower, PositionOf, Split, SplitOnMatches, StartsWith, Substring, UnimplementedExpression, Upper, build, ref,
+  var Combine, Concatenate, EndsWith, Expression, Lower, Matches, PositionOf, Split, SplitOnMatches, StartsWith, Substring, UnimplementedExpression, Upper, build, ref,
     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;
 
@@ -7853,13 +7981,26 @@
   module.exports.SplitOnMatches = SplitOnMatches = (function(superClass) {
     extend(SplitOnMatches, superClass);
 
-    function SplitOnMatches() {
-      return SplitOnMatches.__super__.constructor.apply(this, arguments);
+    function SplitOnMatches(json) {
+      SplitOnMatches.__super__.constructor.apply(this, arguments);
+      this.stringToSplit = build(json.stringToSplit);
+      this.separatorPattern = build(json.separatorPattern);
     }
 
+    SplitOnMatches.prototype.exec = function(ctx) {
+      var separatorPattern, stringToSplit;
+      stringToSplit = this.stringToSplit.execute(ctx);
+      separatorPattern = this.separatorPattern.execute(ctx);
+      if (!((stringToSplit != null) && (separatorPattern != null))) {
+        return null;
+      } else {
+        return stringToSplit.split(new RegExp(separatorPattern));
+      }
+    };
+
     return SplitOnMatches;
 
-  })(UnimplementedExpression);
+  })(Expression);
 
   module.exports.Upper = Upper = (function(superClass) {
     extend(Upper, superClass);
@@ -7927,6 +8068,30 @@
 
   })(Expression);
 
+  module.exports.Matches = Matches = (function(superClass) {
+    extend(Matches, superClass);
+
+    function Matches(json) {
+      Matches.__super__.constructor.apply(this, arguments);
+    }
+
+    Matches.prototype.exec = function(ctx) {
+      var pattern, ref1, string;
+      ref1 = this.execArgs(ctx), string = ref1[0], pattern = ref1[1];
+      if (!((string != null) && (pattern != null))) {
+        return null;
+      }
+      if (string.match(new RegExp(pattern))) {
+        return true;
+      } else {
+        return false;
+      }
+    };
+
+    return Matches;
+
+  })(Expression);
+
   module.exports.Substring = Substring = (function(superClass) {
     extend(Substring, superClass);
 
@@ -8128,7 +8293,7 @@
 },{"./builder":14,"./expression":20}],38:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var As, Concept, Convert, ConvertsToBoolean, ConvertsToDate, ConvertsToDateTime, ConvertsToDecimal, ConvertsToInteger, ConvertsToQuantity, ConvertsToString, ConvertsToTime, Date, DateTime, Expression, FunctionRef, IntervalTypeSpecifier, Is, ListTypeSpecifier, NamedTypeSpecifier, ToBoolean, ToConcept, ToDate, ToDateTime, ToDecimal, ToInteger, ToQuantity, ToString, ToTime, TupleTypeSpecifier, UnimplementedExpression, isValidDecimal, isValidInteger, limitDecimalPrecision, normalizeMillisecondsField, parseQuantity, ref, ref1, ref2,
+  var As, Concept, Convert, ConvertsToBoolean, ConvertsToDate, ConvertsToDateTime, ConvertsToDecimal, ConvertsToInteger, ConvertsToQuantity, ConvertsToRatio, ConvertsToString, ConvertsToTime, Date, DateTime, Expression, FunctionRef, IntervalTypeSpecifier, Is, ListTypeSpecifier, NamedTypeSpecifier, Ratio, ToBoolean, ToConcept, ToDate, ToDateTime, ToDecimal, ToInteger, ToQuantity, ToRatio, ToString, ToTime, TupleTypeSpecifier, UnimplementedExpression, canConvertToType, isValidDecimal, isValidInteger, limitDecimalPrecision, normalizeMillisecondsField, parseQuantity, ref, ref1, ref2,
     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;
 
@@ -8146,6 +8311,8 @@
 
   normalizeMillisecondsField = require('../util/util').normalizeMillisecondsField;
 
+  Ratio = require('./ratio').Ratio;
+
   module.exports.As = As = (function(superClass) {
     extend(As, superClass);
 
@@ -8182,7 +8349,7 @@
         } else if (strArg === "false" || strArg === "f" || strArg === "no" || strArg === "n" || strArg === "0") {
           return false;
         } else {
-          throw new Error("cannot convert " + strArg + " to Boolean");
+          return null;
         }
       } else {
         return null;
@@ -8329,6 +8496,43 @@
 
   })(Expression);
 
+  module.exports.ToRatio = ToRatio = (function(superClass) {
+    extend(ToRatio, superClass);
+
+    function ToRatio(json) {
+      ToRatio.__super__.constructor.apply(this, arguments);
+    }
+
+    ToRatio.prototype.exec = function(ctx) {
+      var arg, denominator, numerator, splitRatioString;
+      arg = this.execArgs(ctx);
+      if (arg != null) {
+        try {
+          splitRatioString = arg.toString().match(/^(\d+(\.\d+)?\s*('.+')?)\s*:\s*(\d+(\.\d+)?\s*('.+')?)$/);
+          if (splitRatioString == null) {
+            return null;
+          }
+          numerator = parseQuantity(splitRatioString[1]);
+          denominator = parseQuantity(splitRatioString[4]);
+        } catch (error) {
+          return null;
+        }
+        if (!((numerator != null) && (denominator != null))) {
+          return null;
+        }
+        return new Ratio({
+          numerator: numerator,
+          denominator: denominator
+        });
+      } else {
+        return null;
+      }
+    };
+
+    return ToRatio;
+
+  })(Expression);
+
   module.exports.ToString = ToString = (function(superClass) {
     extend(ToString, superClass);
 
@@ -8472,103 +8676,230 @@
 
   })(Expression);
 
-  module.exports.Is = Is = (function(superClass) {
-    extend(Is, superClass);
-
-    function Is() {
-      return Is.__super__.constructor.apply(this, arguments);
-    }
-
-    return Is;
-
-  })(UnimplementedExpression);
-
   module.exports.ConvertsToBoolean = ConvertsToBoolean = (function(superClass) {
     extend(ConvertsToBoolean, superClass);
 
-    function ConvertsToBoolean() {
-      return ConvertsToBoolean.__super__.constructor.apply(this, arguments);
+    function ConvertsToBoolean(json) {
+      ConvertsToBoolean.__super__.constructor.apply(this, arguments);
+      this.operand = json.operand;
     }
 
+    ConvertsToBoolean.prototype.exec = function(ctx) {
+      var operatorValue;
+      operatorValue = this.execArgs(ctx);
+      if (operatorValue === null) {
+        return null;
+      } else {
+        return canConvertToType(ToBoolean, this.operand, ctx);
+      }
+    };
+
     return ConvertsToBoolean;
 
-  })(UnimplementedExpression);
+  })(Expression);
 
   module.exports.ConvertsToDate = ConvertsToDate = (function(superClass) {
     extend(ConvertsToDate, superClass);
 
-    function ConvertsToDate() {
-      return ConvertsToDate.__super__.constructor.apply(this, arguments);
+    function ConvertsToDate(json) {
+      ConvertsToDate.__super__.constructor.apply(this, arguments);
+      this.operand = json.operand;
     }
 
+    ConvertsToDate.prototype.exec = function(ctx) {
+      var operatorValue;
+      operatorValue = this.execArgs(ctx);
+      if (operatorValue === null) {
+        return null;
+      } else {
+        return canConvertToType(ToDate, this.operand, ctx);
+      }
+    };
+
     return ConvertsToDate;
 
-  })(UnimplementedExpression);
+  })(Expression);
 
   module.exports.ConvertsToDateTime = ConvertsToDateTime = (function(superClass) {
     extend(ConvertsToDateTime, superClass);
 
-    function ConvertsToDateTime() {
-      return ConvertsToDateTime.__super__.constructor.apply(this, arguments);
+    function ConvertsToDateTime(json) {
+      ConvertsToDateTime.__super__.constructor.apply(this, arguments);
+      this.operand = json.operand;
     }
 
+    ConvertsToDateTime.prototype.exec = function(ctx) {
+      var operatorValue;
+      operatorValue = this.execArgs(ctx);
+      if (operatorValue === null) {
+        return null;
+      } else {
+        return canConvertToType(ToDateTime, this.operand, ctx);
+      }
+    };
+
     return ConvertsToDateTime;
 
-  })(UnimplementedExpression);
+  })(Expression);
 
   module.exports.ConvertsToDecimal = ConvertsToDecimal = (function(superClass) {
     extend(ConvertsToDecimal, superClass);
 
-    function ConvertsToDecimal() {
-      return ConvertsToDecimal.__super__.constructor.apply(this, arguments);
+    function ConvertsToDecimal(json) {
+      ConvertsToDecimal.__super__.constructor.apply(this, arguments);
+      this.operand = json.operand;
     }
 
+    ConvertsToDecimal.prototype.exec = function(ctx) {
+      var operatorValue;
+      operatorValue = this.execArgs(ctx);
+      if (operatorValue === null) {
+        return null;
+      } else {
+        return canConvertToType(ToDecimal, this.operand, ctx);
+      }
+    };
+
     return ConvertsToDecimal;
 
-  })(UnimplementedExpression);
+  })(Expression);
 
   module.exports.ConvertsToInteger = ConvertsToInteger = (function(superClass) {
     extend(ConvertsToInteger, superClass);
 
-    function ConvertsToInteger() {
-      return ConvertsToInteger.__super__.constructor.apply(this, arguments);
+    function ConvertsToInteger(json) {
+      ConvertsToInteger.__super__.constructor.apply(this, arguments);
+      this.operand = json.operand;
     }
 
+    ConvertsToInteger.prototype.exec = function(ctx) {
+      var operatorValue;
+      operatorValue = this.execArgs(ctx);
+      if (operatorValue === null) {
+        return null;
+      } else {
+        return canConvertToType(ToInteger, this.operand, ctx);
+      }
+    };
+
     return ConvertsToInteger;
 
-  })(UnimplementedExpression);
+  })(Expression);
 
   module.exports.ConvertsToQuantity = ConvertsToQuantity = (function(superClass) {
     extend(ConvertsToQuantity, superClass);
 
-    function ConvertsToQuantity() {
-      return ConvertsToQuantity.__super__.constructor.apply(this, arguments);
+    function ConvertsToQuantity(json) {
+      ConvertsToQuantity.__super__.constructor.apply(this, arguments);
+      this.operand = json.operand;
     }
 
+    ConvertsToQuantity.prototype.exec = function(ctx) {
+      var operatorValue;
+      operatorValue = this.execArgs(ctx);
+      if (operatorValue === null) {
+        return null;
+      } else {
+        return canConvertToType(ToQuantity, this.operand, ctx);
+      }
+    };
+
     return ConvertsToQuantity;
 
-  })(UnimplementedExpression);
+  })(Expression);
+
+  module.exports.ConvertsToRatio = ConvertsToRatio = (function(superClass) {
+    extend(ConvertsToRatio, superClass);
+
+    function ConvertsToRatio(json) {
+      ConvertsToRatio.__super__.constructor.apply(this, arguments);
+      this.operand = json.operand;
+    }
+
+    ConvertsToRatio.prototype.exec = function(ctx) {
+      var operatorValue;
+      operatorValue = this.execArgs(ctx);
+      if (operatorValue === null) {
+        return null;
+      } else {
+        return canConvertToType(ToRatio, this.operand, ctx);
+      }
+    };
+
+    return ConvertsToRatio;
+
+  })(Expression);
 
   module.exports.ConvertsToString = ConvertsToString = (function(superClass) {
     extend(ConvertsToString, superClass);
 
-    function ConvertsToString() {
-      return ConvertsToString.__super__.constructor.apply(this, arguments);
+    function ConvertsToString(json) {
+      ConvertsToString.__super__.constructor.apply(this, arguments);
+      this.operand = json.operand;
     }
 
+    ConvertsToString.prototype.exec = function(ctx) {
+      var operatorValue;
+      operatorValue = this.execArgs(ctx);
+      if (operatorValue === null) {
+        return null;
+      } else {
+        return canConvertToType(ToString, this.operand, ctx);
+      }
+    };
+
     return ConvertsToString;
 
-  })(UnimplementedExpression);
+  })(Expression);
 
   module.exports.ConvertsToTime = ConvertsToTime = (function(superClass) {
     extend(ConvertsToTime, superClass);
 
-    function ConvertsToTime() {
-      return ConvertsToTime.__super__.constructor.apply(this, arguments);
+    function ConvertsToTime(json) {
+      ConvertsToTime.__super__.constructor.apply(this, arguments);
+      this.operand = json.operand;
     }
 
+    ConvertsToTime.prototype.exec = function(ctx) {
+      var operatorValue;
+      operatorValue = this.execArgs(ctx);
+      if (operatorValue === null) {
+        return null;
+      } else {
+        return canConvertToType(ToTime, this.operand, ctx);
+      }
+    };
+
     return ConvertsToTime;
 
+  })(Expression);
+
+  canConvertToType = function(toFunction, operand, ctx) {
+    var value;
+    try {
+      value = new toFunction({
+        "type": toFunction.name,
+        "operand": operand
+      }).execute(ctx);
+      if (value != null) {
+        return true;
+      } else {
+        return false;
+      }
+    } catch (error) {
+      return false;
+    }
+  };
+
+  module.exports.Is = Is = (function(superClass) {
+    extend(Is, superClass);
+
+    function Is() {
+      return Is.__super__.constructor.apply(this, arguments);
+    }
+
+    return Is;
+
   })(UnimplementedExpression);
 
   module.exports.IntervalTypeSpecifier = IntervalTypeSpecifier = (function(superClass) {
@@ -8619,7 +8950,7 @@
 
 
 
-},{"../datatypes/clinical":5,"../datatypes/datetime":7,"../util/math":135,"../util/util":136,"./expression":20,"./quantity":32,"./reusable":35}],39:[function(require,module,exports){
+},{"../datatypes/clinical":5,"../datatypes/datetime":7,"../util/math":135,"../util/util":136,"./expression":20,"./quantity":32,"./ratio":34,"./reusable":35}],39:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   window.cql = require('../../cql');
@@ -45330,7 +45661,7 @@
   };
 
   areDateTimesOrQuantities = function(a, b) {
-    return (a instanceof DateTime && b instanceof DateTime) || ((a != null ? a.isQuantity : void 0) && (b != null ? b.isQuantity : void 0));
+    return (a != null ? a.isDateTime : void 0) && (b != null ? b.isDateTime : void 0) || (a != null ? a.isDate : void 0) && (b != null ? b.isDate : void 0) || (a != null ? a.isTime : void 0) && (b != null ? b.isTime : void 0) || (a != null ? a.isQuantity : void 0) && (b != null ? b.isQuantity : void 0);
   };
 
   isUncertainty = function(x) {
@@ -45556,7 +45887,7 @@
       case '[object Object]':
         return compareObjects(a, b, equals);
       case '[object Function]':
-        return a === b;
+        return a.toString() === b.toString();
     }
     return false;
   };
@@ -45665,6 +45996,12 @@
       } else {
         return val.successor();
       }
+    } else if (val != null ? val.isDate : void 0) {
+      if (val.sameAs(MAX_DATE_VALUE.getDate())) {
+        throw new OverFlowException();
+      } else {
+        return val.successor();
+      }
     } else if (val instanceof Uncertainty) {
       high = (function() {
         try {
@@ -45702,6 +46039,12 @@
       } else {
         return val.predecessor();
       }
+    } else if (val != null ? val.isDate : void 0) {
+      if (val.sameAs(MIN_DATE_VALUE.getDate())) {
+        throw new OverFlowException();
+      } else {
+        return val.predecessor();
+      }
     } else if (val instanceof Uncertainty) {
       low = (function() {
         try {
@@ -45731,6 +46074,8 @@
       }
     } else if (val instanceof DateTime) {
       return MAX_DATE_VALUE;
+    } else if (val != null ? val.isDate : void 0) {
+      return MAX_DATE_VALUE.getDate();
     } else if (val != null ? val.isQuantity : void 0) {
       val2 = val.clone();
       val2.value = maxValueForInstance(val2.value);
@@ -45750,6 +46095,8 @@
       }
     } else if (val instanceof DateTime) {
       return MIN_DATE_VALUE;
+    } else if (val != null ? val.isDate : void 0) {
+      return MIN_DATE_VALUE.getDate();
     } else if (val != null ? val.isQuantity : void 0) {
       val2 = val.clone();
       val2.value = minValueForInstance(val2.value);
@@ -45786,7 +46133,7 @@
 (function() {
   var getTimezoneSeparatorFromString, normalizeMillisecondsField, normalizeMillisecondsFieldInString, typeIsArray;
 
-  module.exports.compact = function(things) {
+  module.exports.removeNulls = function(things) {
     return things.filter(function(x) {
       return x != null;
     });
@@ -45869,6 +46216,31 @@
 
 
 },{}],137:[function(require,module,exports){
+if (typeof Object.create === 'function') {
+  // implementation from standard node.js 'util' module
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    ctor.prototype = Object.create(superCtor.prototype, {
+      constructor: {
+        value: ctor,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      }
+    });
+  };
+} else {
+  // old school shim for old browsers
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    var TempCtor = function () {}
+    TempCtor.prototype = superCtor.prototype
+    ctor.prototype = new TempCtor()
+    ctor.prototype.constructor = ctor
+  }
+}
+
+},{}],138:[function(require,module,exports){
 //! moment.js
 //! version : 2.20.1
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
@@ -50405,7 +50777,7 @@ return hooks;
 
 })));
 
-},{}],138:[function(require,module,exports){
+},{}],139:[function(require,module,exports){
 // shim for using process in browser
 var process = module.exports = {};
 
@@ -50591,7 +50963,7 @@ process.chdir = function (dir) {
 };
 process.umask = function() { return 0; };
 
-},{}],139:[function(require,module,exports){
+},{}],140:[function(require,module,exports){
 module.exports={
   "10*": {
     "value": 10,
@@ -51795,10 +52167,10 @@ module.exports={
   }
 }
 
-},{}],140:[function(require,module,exports){
+},{}],141:[function(require,module,exports){
 module.exports={"mol":true,"sr":true,"Hz":true,"N":true,"Pa":true,"J":true,"W":true,"A":true,"V":true,"F":true,"Ohm":true,"S":true,"Wb":true,"Cel":true,"T":true,"H":true,"lm":true,"lx":true,"Bq":true,"Gy":true,"Sv":true,"l":true,"L":true,"ar":true,"t":true,"bar":true,"u":true,"eV":true,"pc":true,"[c]":true,"[h]":true,"[k]":true,"[eps_0]":true,"[mu_0]":true,"[e]":true,"[m_e]":true,"[m_p]":true,"[G]":true,"[g]":true,"[ly]":true,"gf":true,"Ky":true,"Gal":true,"dyn":true,"erg":true,"P":true,"Bi":true,"St":true,"Mx":true,"G":true,"Oe":true,"Gb":true,"sb":true,"Lmb":true,"ph":true,"Ci":true,"R":true,"RAD":true,"REM":true,"cal_[15]":true,"cal_[20]":true,"cal_m":true,"cal_IT":true,"cal_th":true,"cal":true,"tex":true,"m[H2O]":true,"m[Hg]":true,"eq":true,"osm":true,"g%":true,"kat":true,"U":true,"[iU]":true,"[IU]":true,"Np":true,"B":true,"B[SPL]":true,"B[V]":true,"B[mV]":true,"B[uV]":true,"B[10.nV]":true,"B[W]":true,"B[kW]":true,"st":true,"mho":true,"bit":true,"By":true,"Bd":true,"m":true,"s":true,"g":true,"rad":true,"K":true,"C":true,"cd":true}
 
-},{}],141:[function(require,module,exports){
+},{}],142:[function(require,module,exports){
 module.exports={
   "Y": {
     "CODE": "YA",
@@ -52162,7 +52534,7 @@ module.exports={
   }
 }
 
-},{}],142:[function(require,module,exports){
+},{}],143:[function(require,module,exports){
 module.exports={
   "Y": 1e+24,
   "Z": 1e+21,
@@ -52190,7 +52562,7 @@ module.exports={
   "Ti": 1099511627776
 }
 
-},{}],143:[function(require,module,exports){
+},{}],144:[function(require,module,exports){
 module.exports = function () {
   /*
    * Generated by PEG.js 0.8.0.
@@ -53347,7 +53719,7 @@ module.exports = function () {
   };
 }();
 
-},{"../lib/helpers":145,"./metrics.json":140,"./prefixMetadata.json":141,"./prefixes.json":142,"./unitMetadata.json":144}],144:[function(require,module,exports){
+},{"../lib/helpers":146,"./metrics.json":141,"./prefixMetadata.json":142,"./prefixes.json":143,"./unitMetadata.json":145}],145:[function(require,module,exports){
 module.exports={
   "10*": {
     "isBase": false,
@@ -59534,7 +59906,7 @@ module.exports={
   }
 }
 
-},{}],145:[function(require,module,exports){
+},{}],146:[function(require,module,exports){
 module.exports = {
 
   multiply: function multiply(t, ms) {
@@ -59604,7 +59976,7 @@ module.exports = {
   }
 };
 
-},{}],146:[function(require,module,exports){
+},{}],147:[function(require,module,exports){
 parser = require('./generated/ucum-parser.js');
 equivalents = require('./generated/equivalents.json');
 helpers = require('./lib/helpers.js');
@@ -59825,32 +60197,7 @@ function unitQuery(criteria, resultFields) {
   });
 }
 
-},{"./generated/equivalents.json":139,"./generated/ucum-parser.js":143,"./generated/unitMetadata.json":144,"./lib/helpers.js":145}],147:[function(require,module,exports){
-if (typeof Object.create === 'function') {
-  // implementation from standard node.js 'util' module
-  module.exports = function inherits(ctor, superCtor) {
-    ctor.super_ = superCtor
-    ctor.prototype = Object.create(superCtor.prototype, {
-      constructor: {
-        value: ctor,
-        enumerable: false,
-        writable: true,
-        configurable: true
-      }
-    });
-  };
-} else {
-  // old school shim for old browsers
-  module.exports = function inherits(ctor, superCtor) {
-    ctor.super_ = superCtor
-    var TempCtor = function () {}
-    TempCtor.prototype = superCtor.prototype
-    ctor.prototype = new TempCtor()
-    ctor.prototype.constructor = ctor
-  }
-}
-
-},{}],148:[function(require,module,exports){
+},{"./generated/equivalents.json":140,"./generated/ucum-parser.js":144,"./generated/unitMetadata.json":145,"./lib/helpers.js":146}],148:[function(require,module,exports){
 module.exports = function isBuffer(arg) {
   return arg && typeof arg === 'object'
     && typeof arg.copy === 'function'
@@ -60447,4 +60794,4 @@ function hasOwnProperty(obj, prop) {
 }
 
 }).call(this,require('_process'),typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"./support/isBuffer":148,"_process":138,"inherits":147}]},{},[39]);
+},{"./support/isBuffer":148,"_process":139,"inherits":137}]},{},[39]);