cql_qdm_patientapi 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22f5731f75487f42ff6bba1c933877d14246d907
-  data.tar.gz: da61edb92afdf06618c06c51473077e13e4daa5e
+  metadata.gz: 82e220cc46b50e492e5aa42d30e0f39bcdcd97a5
+  data.tar.gz: 9edcb09f9dae7e87f6c6b7318604d1de3eb06647
 SHA512:
-  metadata.gz: ad09b811319929d929f9d63248ca34c6483d29c967cf3ada905beb5058b8750ea592113ea04b7b798d8adb88a325ea8215fe909e29a5917e9998c930656ef230
-  data.tar.gz: 8ed424e626cf70a3ed1ecdebf31bf96339415bea40b568430253dc38a4abab1afac3340c12c6684886d7b363212376519640b63cf522e01980098d98c342da65
+  metadata.gz: e011b102242c10d1f2d1c0248269b35ff1b9a76d1c1b26f61664f52e86594c6061f2d1fe9729674e2b2cf5767b1c5437baadceb5103577790d1a4469b8b78325
+  data.tar.gz: e06636b05fe937be02a88a1d4f07e0818d0fcacc14e80cc16099d6cb2ecbacb7a1564d21a689b6c5a361d8b04e7262e74b40b0dfb8ae39cf16d913425899d737

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cql_qdm_patientapi (1.1.4)
+    cql_qdm_patientapi (1.2.0)
       coffee-rails (~> 4.1)
       rails (~> 4.2)
       sprockets-rails (~> 2.3)
@@ -71,7 +71,7 @@ GEM
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.10.3)
-    nokogiri (1.8.2)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     phantomjs (2.1.1.0)
     rack (1.6.8)

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

@@ -56,7 +56,7 @@ class CQL_QDM.AdverseEvent 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
 
@@ -65,6 +65,6 @@ class CQL_QDM.AdverseEvent extends CQL_QDM.QDMDatatype
   ###
   type: ->
     if @_type?
-      new cql.Code(@_type.code, @_type.code_system)
+      new cql.Code(@_type.code, @_type.code_system, null, @_type.title || null)
     else
       null

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

@@ -49,7 +49,7 @@ class CQL_QDM.AllergyIntolerance 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
 
@@ -58,6 +58,6 @@ class CQL_QDM.AllergyIntolerance extends CQL_QDM.QDMDatatype
   ###
   type: ->
     if @_type?
-      new cql.Code(@_type.code, @_type.code_system)
+      new cql.Code(@_type.code, @_type.code_system, null, @_type.title || null)
     else
       null

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

@@ -25,6 +25,7 @@ class CQL_QDM.AssessmentPerformed extends CQL_QDM.QDMDatatype
       @_result = @entry.values?[0]
     @_relatedTo = @entry.references
     @_components = @entry.components
+    delete @entry.end_time
 
   ###
   @returns {Date}
@@ -37,7 +38,7 @@ class CQL_QDM.AssessmentPerformed extends CQL_QDM.QDMDatatype
   ###
   method: ->
     if @_method?
-      new cql.Code(@_method.code, @_method.code_system)
+      new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
     else
       null
 
@@ -46,7 +47,7 @@ class CQL_QDM.AssessmentPerformed extends CQL_QDM.QDMDatatype
   ###
   negationRationale: ->
     if @_negationRationale?
-      new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
+      new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
     else
       null
 
@@ -55,7 +56,7 @@ class CQL_QDM.AssessmentPerformed extends CQL_QDM.QDMDatatype
   ###
   reason: ->
     if @_reason?
-      new cql.Code(@_reason.code, @_reason.code_system)
+      new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
     else
       null
 
@@ -115,6 +116,7 @@ class CQL_QDM.AssessmentRecommended extends CQL_QDM.QDMDatatype
     @_reason = @entry.reason
     if @entry.values? && @entry.values.length > 0
       @_result = @entry.values?[0]
+    delete @entry.end_time
 
   ###
   @returns {Date}
@@ -127,7 +129,7 @@ class CQL_QDM.AssessmentRecommended extends CQL_QDM.QDMDatatype
   ###
   method: ->
     if @_method?
-      new cql.Code(@_method.code, @_method.code_system)
+      new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
     else
       null
 
@@ -136,7 +138,7 @@ class CQL_QDM.AssessmentRecommended extends CQL_QDM.QDMDatatype
   ###
   negationRationale: ->
     if @_negationRationale?
-      new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
+      new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
     else
       null
 
@@ -145,7 +147,7 @@ class CQL_QDM.AssessmentRecommended extends CQL_QDM.QDMDatatype
   ###
   reason: ->
     if @_reason?
-      new cql.Code(@_reason.code, @_reason.code_system)
+      new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
     else
       null
 
@@ -154,6 +156,6 @@ class CQL_QDM.AssessmentRecommended extends CQL_QDM.QDMDatatype
   ###
   method: ->
     if @_method?
-      new cql.Code(@_method.code, @_method.code_system)
+      new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
     else
       null

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

@@ -17,6 +17,7 @@ class CQL_QDM.PatientCareExperience extends CQL_QDM.QDMDatatype
   constructor: (@entry) ->
     super @entry
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
+    delete @entry.end_time
 
   ###
   @returns {Date}

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

@@ -55,6 +55,6 @@ class CQL_QDM.CareGoal extends CQL_QDM.QDMDatatype
       if @_targetOutcome?['units']?
         new cql.Quantity({unit: @_targetOutcome['units'], value: @_targetOutcome['scalar']})
       else
-        new cql.Code(@_targetOutcome.code, @_targetOutcome.code_system)
+        new cql.Code(@_targetOutcome.code, @_targetOutcome.code_system, null, @_targetOutcome.title || null)
     else
       null

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

@@ -19,6 +19,7 @@ class CQL_QDM.CommunicationFromPatientToProvider extends CQL_QDM.QDMDatatype
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     @_negationRationale = @entry.negationReason
     @_relatedTo = @entry.references
+    delete @entry.end_time
 
   ###
   @returns {Date}
@@ -31,7 +32,7 @@ class CQL_QDM.CommunicationFromPatientToProvider extends CQL_QDM.QDMDatatype
   ###
   negationRationale: ->
     if @_negationRationale?
-      new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
+      new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
     else
       null
 
@@ -56,13 +57,14 @@ class CQL_QDM.CommunicationFromProviderToPatient extends CQL_QDM.QDMDatatype
     @_negationRationale = @entry.negationReason
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     @_relatedTo = @entry.references
+    delete @entry.end_time
 
   ###
   @returns {Code}
   ###
   negationRationale: ->
     if @_negationRationale?
-      new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
+      new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
     else
       null
 
@@ -93,13 +95,14 @@ class CQL_QDM.CommunicationFromProviderToProvider extends CQL_QDM.QDMDatatype
     @_negationRationale = @entry.negationReason
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     @_relatedTo = @entry.references
+    delete @entry.end_time
 
   ###
   @returns {Code}
   ###
   negationRationale: ->
     if @_negationRationale?
-      new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
+      new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
     else
       null
 

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

@@ -25,6 +25,7 @@ class CQL_QDM.QDMDatatype
   ###
   @returns {Array}
   ###
+  # TODO: This should be changed to getCodes, but it will involve changing the cql-execution engine.
   getCode: ->
     allCodes = []
     for system, codes of @_codes
@@ -72,8 +73,13 @@ class CQL_QDM.QDMDatatype
     # 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
+    # TODO: Refactor getCode()/code() so that this special logic is not necessary.
+    # If it is a patient characteristic (other than payer), use getCode() instead of code()
+    if /PatientCharacteristic/.test(this.constructor.name) and this.constructor.name != 'PatientCharacteristicPayer'
+      code = @getCode()
+    else if @_codes
+      # Get code if this datatype has any
+      code = @code()
     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/device.js.coffee

@@ -34,7 +34,7 @@ class CQL_QDM.DeviceApplied extends CQL_QDM.QDMDatatype
   ###
   anatomicalApproachSite: ->
     if @_anatomicalApproachSite?
-      new cql.Code(@_anatomicalApproachSite.code, @_anatomicalApproachSite.code_system)
+      new cql.Code(@_anatomicalApproachSite.code, @_anatomicalApproachSite.code_system, null, @_anatomicalApproachSite.title || null)
     else
       null
 
@@ -43,7 +43,7 @@ class CQL_QDM.DeviceApplied extends CQL_QDM.QDMDatatype
   ###
   anatomicalLocationSite: ->
     if @_anatomicalLocationSite?
-      new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system)
+      new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system, null, @_anatomicalLocationSite.title || null)
     else
       null
 
@@ -59,7 +59,7 @@ class CQL_QDM.DeviceApplied extends CQL_QDM.QDMDatatype
   ###
   negationRationale: ->
     if @_negationRationale?
-      new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
+      new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
     else
       null
 
@@ -68,7 +68,7 @@ class CQL_QDM.DeviceApplied extends CQL_QDM.QDMDatatype
   ###
   reason: ->
     if @_reason?
-      new cql.Code(@_reason.code, @_reason.code_system)
+      new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
     else
       null
 
@@ -97,13 +97,14 @@ class CQL_QDM.DeviceOrder extends CQL_QDM.QDMDatatype
     @_negationRationale = @entry.negationReason
     @_reason = @entry.reason
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
+    delete @entry.end_time
 
   ###
   @returns {Code}
   ###
   negationRationale: ->
     if @_negationRationale?
-      new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
+      new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
     else
       null
 
@@ -112,7 +113,7 @@ class CQL_QDM.DeviceOrder extends CQL_QDM.QDMDatatype
   ###
   reason: ->
     if @_reason?
-      new cql.Code(@_reason.code, @_reason.code_system)
+      new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
     else
       null
 
@@ -137,6 +138,7 @@ class CQL_QDM.DeviceRecommended extends CQL_QDM.QDMDatatype
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     @_negationRationale = @entry.negationReason
     @_reason = @entry.reason
+    delete @entry.end_time
 
   ###
   @returns {Date}
@@ -149,7 +151,7 @@ class CQL_QDM.DeviceRecommended extends CQL_QDM.QDMDatatype
   ###
   negationRationale: ->
     if @_negationRationale?
-      new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
+      new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
     else
       null
 
@@ -158,6 +160,6 @@ class CQL_QDM.DeviceRecommended extends CQL_QDM.QDMDatatype
   ###
   reason: ->
     if @_reason?
-      new cql.Code(@_reason.code, @_reason.code_system)
+      new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
     else
       null

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

@@ -36,7 +36,7 @@ class CQL_QDM.Diagnosis extends CQL_QDM.QDMDatatype
   ###
   anatomicalLocationSite: ->
     if @_anatomicalLocationSite?
-      new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system)
+      new cql.Code(@_anatomicalLocationSite.code, @_anatomicalLocationSite.code_system, null, @_anatomicalLocationSite.title || null)
     else
       null
 
@@ -56,7 +56,7 @@ class CQL_QDM.Diagnosis 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/datatypes/diagnosticstudy.js.coffee

@@ -25,6 +25,7 @@ class CQL_QDM.DiagnosticStudyOrder extends CQL_QDM.QDMDatatype
     @_method = @entry.method
     @_negationRationale = @entry.negationReason
     @_reason = @entry.reason
+    delete @entry.end_time
 
   ###
   @returns {Date}
@@ -37,7 +38,7 @@ class CQL_QDM.DiagnosticStudyOrder extends CQL_QDM.QDMDatatype
   ###
   method: ->
     if @_method?
-      new cql.Code(@_method.code, @_method.code_system)
+      new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
     else
       null
 
@@ -46,7 +47,7 @@ class CQL_QDM.DiagnosticStudyOrder extends CQL_QDM.QDMDatatype
   ###
   negationRationale: ->
     if @_negationRationale?
-      new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
+      new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
     else
       null
 
@@ -55,7 +56,7 @@ class CQL_QDM.DiagnosticStudyOrder extends CQL_QDM.QDMDatatype
   ###
   reason: ->
     if @_reason?
-      new cql.Code(@_reason.code, @_reason.code_system)
+      new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
     else
       null
 
@@ -110,7 +111,7 @@ class CQL_QDM.DiagnosticStudyPerformed extends CQL_QDM.QDMDatatype
   ###
   method: ->
     if @_method?
-      new cql.Code(@_method.code, @_method.code_system)
+      new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
     else
       null
 
@@ -119,7 +120,7 @@ class CQL_QDM.DiagnosticStudyPerformed extends CQL_QDM.QDMDatatype
   ###
   negationRationale: ->
     if @_negationRationale?
-      new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
+      new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
     else
       null
 
@@ -128,7 +129,7 @@ class CQL_QDM.DiagnosticStudyPerformed extends CQL_QDM.QDMDatatype
   ###
   reason: ->
     if @_reason?
-      new cql.Code(@_reason.code, @_reason.code_system)
+      new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
     else
       null
 
@@ -163,7 +164,7 @@ class CQL_QDM.DiagnosticStudyPerformed extends CQL_QDM.QDMDatatype
   ###
   status: ->
     if @_status?
-      new cql.Code(@_status.code, @_status.code_system)
+      new cql.Code(@_status.code, @_status.code_system, null, @_status.title || null)
     else
       null
 
@@ -189,6 +190,7 @@ class CQL_QDM.DiagnosticStudyRecommended extends CQL_QDM.QDMDatatype
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     @_method = @entry.method
     @_negationRationale = @entry.negationReason
+    delete @entry.end_time
 
   ###
   @returns {Date}
@@ -201,7 +203,7 @@ class CQL_QDM.DiagnosticStudyRecommended extends CQL_QDM.QDMDatatype
   ###
   method: ->
     if @_method?
-      new cql.Code(@_method.code, @_method.code_system)
+      new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
     else
       null
 
@@ -210,6 +212,6 @@ class CQL_QDM.DiagnosticStudyRecommended extends CQL_QDM.QDMDatatype
   ###
   negationRationale: ->
     if @_negationRationale?
-      new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
+      new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
     else
       null

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

@@ -19,6 +19,7 @@ class CQL_QDM.EncounterOrder extends CQL_QDM.QDMDatatype
     @_facilityLocation = @entry.facility
     @_negationRationale = @entry.negationReason
     @_reason = @entry.reason
+    delete @entry.end_time
 
   ###
   @returns {Date}
@@ -40,7 +41,7 @@ class CQL_QDM.EncounterOrder extends CQL_QDM.QDMDatatype
   ###
   negationRationale: ->
     if @_negationRationale?
-      new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
+      new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
     else
       null
 
@@ -49,7 +50,7 @@ class CQL_QDM.EncounterOrder extends CQL_QDM.QDMDatatype
   ###
   reason: ->
     if @_reason?
-      new cql.Code(@_reason.code, @_reason.code_system)
+      new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
     else
       null
 
@@ -84,7 +85,7 @@ class CQL_QDM.EncounterPerformed extends CQL_QDM.QDMDatatype
   ###
   admissionSource: ->
     if @_admissionSource?
-      new cql.Code(@_admissionSource.code, @_admissionSource.code_system)
+      new cql.Code(@_admissionSource.code, @_admissionSource.code_system, null, @_admissionSource.title || null)
     else
       null
 
@@ -106,7 +107,7 @@ class CQL_QDM.EncounterPerformed extends CQL_QDM.QDMDatatype
   ###
   dischargeDisposition: ->
     if @_dischargeDisposition?
-      new cql.Code(@_dischargeDisposition.code, @_dischargeDisposition.code_system)
+      new cql.Code(@_dischargeDisposition.code, @_dischargeDisposition.code_system, null, @_dischargeDisposition.title || null)
     else
       null
 
@@ -138,7 +139,7 @@ class CQL_QDM.EncounterPerformed extends CQL_QDM.QDMDatatype
   ###
   negationRationale: ->
     if @_negationRationale?
-      new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
+      new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
     else
       null
 
@@ -158,7 +159,7 @@ class CQL_QDM.EncounterPerformed extends CQL_QDM.QDMDatatype
   ###
   principalDiagnosis: ->
     if @_principalDiagnosis?
-      new cql.Code(@_principalDiagnosis.code, @_principalDiagnosis.code_system)
+      new cql.Code(@_principalDiagnosis.code, @_principalDiagnosis.code_system, null, @_principalDiagnosis.title || null)
     else
       null
 
@@ -178,6 +179,7 @@ class CQL_QDM.EncounterRecommended extends CQL_QDM.QDMDatatype
     @_facilityLocation = @entry.facility
     @_negationRationale = @entry.negationReason
     @_reason = @entry.reason
+    delete @entry.end_time
 
   ###
   @returns {Date}
@@ -199,7 +201,7 @@ class CQL_QDM.EncounterRecommended extends CQL_QDM.QDMDatatype
   ###
   negationRationale: ->
     if @_negationRationale?
-      new cql.Code(@_negationRationale.code, @_negationRationale.code_system)
+      new cql.Code(@_negationRationale.code, @_negationRationale.code_system, null, @_negationRationale.title || null)
     else
       null
 
@@ -208,6 +210,6 @@ class CQL_QDM.EncounterRecommended extends CQL_QDM.QDMDatatype
   ###
   reason: ->
     if @_reason?
-      new cql.Code(@_reason.code, @_reason.code_system)
+      new cql.Code(@_reason.code, @_reason.code_system, null, @_reason.title || null)
     else
       null