cql_qdm_patientapi 1.1.4 → 1.2.0

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

@@ -44,6 +44,6 @@ class CQL_QDM.Symptom extends CQL_QDM.QDMDatatype
   ###
   severity: ->
     if @_severity?
-      new cql.Code(@_severity.code, @_severity.code_system)
+      new cql.Code(@_severity.code, @_severity.code_system, null, @_severity.title || null)
     else
       null

data/app/assets/javascripts/types/component.js.coffee

@@ -12,7 +12,8 @@ class CQL_QDM.Component
     @_result = CQL_QDM.Helpers.formatResult(component.result)
     code = component?.code?.code
     code_system = component?.code?.code_system
-    @_code = new cql.Code(code, code_system)
+    display = component?.result?.title
+    @_code = new cql.Code(code, code_system, null, display || null)
 
   exec: (ctx) ->
     @

data/app/assets/javascripts/types/id.js.coffee

@@ -8,4 +8,4 @@ their methods will be accessable through the CQL_QDM namespace)
 Represents the QDM.Id used in the execution engine.
 ###
 class CQL_QDM.Id
-  constructor: (@value, @namingSystem) ->
+  constructor: (@value, @namingSystem = null) ->

data/app/assets/javascripts/utils/helpers.js.coffee

@@ -51,17 +51,21 @@ class CQL_QDM.Helpers
       else if input.codes?
         code_system = Object.keys(input.codes)?[0]
         code = input.codes[code_system]?[0]
-        new cql.Code(code, code_system)
+        display = input.description
+        new cql.Code(code, code_system, null, display || null)
       else if input.code?
         code_system = input.code.code_system
         code = input.code.code
-        new cql.Code(code, code_system)
+        display = input.description
+        new cql.Code(code, code_system, null, display || null)
       # Check that the scalar portion is a number and the units are a non-zero length string.
       else if (input.scalar?.match(/^[-+]?[0-9]*\.?[0-9]+$/) != null)
         if input.units.length > 0
           new cql.Quantity({unit: input.units , value: parseFloat(input.scalar)})
         else
           parseFloat(input.scalar)
+      else if input.scalar?
+          input.scalar
     else
       null
 
@@ -73,7 +77,7 @@ class CQL_QDM.Helpers
     if relatedToInput?
       for relatedTo in relatedToInput
         if relatedTo?
-          relatedToArray.push new CQL_QDM.Id(relatedTo.referenced_id)
+          relatedToArray.push new CQL_QDM.Id(relatedTo.referenced_id, null)
     relatedToArray
 
   ###
@@ -95,7 +99,7 @@ class CQL_QDM.Helpers
     if diagnosesInput?
       for diagnosis in diagnosesInput.values
         if diagnosis?
-          diagnoses.push new cql.Code(diagnosis.code, diagnosis.code_system)
+          diagnoses.push new cql.Code(diagnosis.code, diagnosis.code_system, null, diagnosis.title || null)
     if principalDiagnosisInput?
-      diagnoses.push new cql.Code(principalDiagnosisInput.code, principalDiagnosisInput.code_system)
+      diagnoses.push new cql.Code(principalDiagnosisInput.code, principalDiagnosisInput.code_system, null, principalDiagnosisInput.title || null)
     diagnoses

data/lib/cql_qdm_patientapi/version.rb

@@ -1,3 +1,3 @@
 module CqlQdmPatientapi
-  VERSION = "1.1.4"
+  VERSION = "1.2.0"
 end

data/vendor/assets/javascripts/cql4browsers.js

@@ -1251,6 +1251,19 @@
       }
     });
 
+    Interval.prototype.copy = function() {
+      var newHigh, newLow;
+      newLow = this.low;
+      newHigh = this.high;
+      if (typeof this.low.copy === 'function') {
+        newLow = this.low.copy();
+      }
+      if (typeof this.high.copy === 'function') {
+        newHigh = this.high.copy();
+      }
+      return new Interval(newLow, newHigh, this.lowClosed, this.highClosed);
+    };
+
     Interval.prototype.contains = function(item, precision) {
       var closed;
       if (item instanceof Interval) {
@@ -1699,6 +1712,19 @@
       }
     }
 
+    Uncertainty.prototype.copy = function() {
+      var newHigh, newLow;
+      newLow = this.low;
+      newHigh = this.high;
+      if (typeof this.low.copy === 'function') {
+        newLow = this.low.copy();
+      }
+      if (typeof this.high.copy === 'function') {
+        newHigh = this.high.copy();
+      }
+      return new Uncertainty(newLow, newHigh);
+    };
+
     Uncertainty.prototype.isPoint = function() {
       var gte, lte;
       lte = function(a, b) {
@@ -4286,6 +4312,12 @@
         collapsedIntervals = [];
         a = intervals.shift();
         b = intervals.shift();
+        if (typeof a.copy === 'function') {
+          a = a.copy();
+        }
+        if (typeof b.copy === 'function') {
+          b = b.copy();
+        }
         while (b) {
           if (typeof b.low.sameOrBefore === 'function') {
             if (b.low.sameOrBefore(a.high)) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cql_qdm_patientapi
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - The MITRE Corporation
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-08-22 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.6.14
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: QDM CQL execution engine and HDS patient model interface