cql_qdm_patientapi 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78a519d96f971f10c752b78e5045705cd55a24ed
-  data.tar.gz: c750783a753736e31ca697992efeea99b611110a
+  metadata.gz: 7165133cf3ab4dae98bf3eab64cccc6089511bf6
+  data.tar.gz: a7cbfc4c6c410ebb76e5c130dad3a45fe1b8a4b4
 SHA512:
-  metadata.gz: 31d54a169065908c624074e4c0a6670e7b92a36f3a6d5965de187b760ae4d81db308531ecbe3b8489f22230bb8d71eb80226cb611a8dc25317af178de6a7feef
-  data.tar.gz: 45d104049eb25549b7447de2556fe57bdd627172b4f4776cb995554427bf53a2ea42f4916a0cb51ac3a413e2c08f650c25c6fd2d0801d68277b9f7e57c5a383c
+  metadata.gz: 976d559eaa8d4826df046fd72a5458b071cfbd8c868c005e6baea02d3b2e07997ad1542b5e9a02a9401ed8c013d8fabd76a5635c682ee6b9414d676a289fab45
+  data.tar.gz: 6bb7d9a35ca76bb041d86b8cf7058482b249d2cb2d5ec316e35c2cb502bbe320283d8619585a24ec493ff7062e4790742c4bda29d78e794abc85dadb1725aaae

data/Gemfile.lock

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

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

@@ -180,7 +180,8 @@ class CQL_QDM.CQLPatient
       'provider_characteristics',
       'substances',
       'system_characteristics',
-      'transfers'
+      'transfers',
+      'participations'
     ]
     data_types = {}
     for type in types

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

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

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

@@ -19,7 +19,9 @@ class CQL_QDM.PatientCharacteristicBirthdate extends CQL_QDM.QDMDatatype
   @returns {Object}
   ###
   getCode: ->
-    '21112-8' # LOINC code for birthdate
+    # NOTE: hard coding the code system. this will be removed when we switch
+    # to the QDM patient model
+    new cql.Code('21112-8', 'LOINC')
 
   ###
   @returns {DateTime}

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['value']})
+      new cql.Quantity({unit: @_dosage['unit'], 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['value']})
+      new cql.Quantity({unit: @_supply['unit'], 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['value']})
+      new cql.Quantity({unit: @_dosage['unit'], 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['value']})
+      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
     else
       null

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

@@ -19,7 +19,7 @@ class CQL_QDM.MedicationActive extends CQL_QDM.QDMDatatype
   constructor: (@entry) ->
     super @entry
     @_dosage = @entry.dose
-    @_frequency = @entry.frequency
+    @_frequency = @entry.administrationTiming
     @_route = @entry.route
     @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     if @entry.end_time
@@ -34,7 +34,7 @@ class CQL_QDM.MedicationActive extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
+      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
     else
       null
 
@@ -42,10 +42,8 @@ class CQL_QDM.MedicationActive extends CQL_QDM.QDMDatatype
   @returns {Code}
   ###
   frequency: ->
-    # TODO: Frequency currently not in HDS model.  Can probably add by calculating based off of dose & regimen
-    throw new Error('Bonnie does not currently support MedicationActive.frequency')
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system)
+      new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
     else
       null
 
@@ -74,7 +72,7 @@ class CQL_QDM.MedicationActive extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['value']})
+      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
     else
       null
 
@@ -92,7 +90,7 @@ class CQL_QDM.MedicationAdministered extends CQL_QDM.QDMDatatype
     super @entry
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     @_dosage = @entry.dose
-    @_frequency = @entry.frequency
+    @_frequency = @entry.administrationTiming
     @_negationRationale = @entry.negationReason
     @_reason = @entry.reason
     @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
@@ -116,7 +114,7 @@ class CQL_QDM.MedicationAdministered extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
+      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
     else
       null
 
@@ -124,10 +122,8 @@ class CQL_QDM.MedicationAdministered extends CQL_QDM.QDMDatatype
   @returns {code}
   ###
   frequency: ->
-    # TODO: Frequency currently not in HDS model.  Can probably add by calculating based off of dose & regimen
-    throw new Error('Bonnie does not currently support MedicationAdministered.frequency')
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system)
+      new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
     else
       null
 
@@ -174,7 +170,7 @@ class CQL_QDM.MedicationAdministered extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['value']})
+      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
     else
       null
 
@@ -193,7 +189,7 @@ class CQL_QDM.MedicationDischarge extends CQL_QDM.QDMDatatype
     super @entry
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     @_dosage = @entry.dose
-    @_frequency = @entry.frequency
+    @_frequency = @entry.administrationTiming
     @_negationRationale = @entry.negationReason
     @_refills = @entry.refills
     @_route = @entry.route
@@ -210,7 +206,7 @@ class CQL_QDM.MedicationDischarge extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
+      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
     else
       null
 
@@ -218,10 +214,8 @@ class CQL_QDM.MedicationDischarge extends CQL_QDM.QDMDatatype
   @returns {Code}
   ###
   frequency: ->
-    # TODO: Frequency currently not in HDS model.  Can probably add by calculating based off of dose & regimen
-    throw new Error('Bonnie does not currently support MedicationDischarge.frequency')
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system)
+      new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
     else
       null
 
@@ -238,8 +232,10 @@ class CQL_QDM.MedicationDischarge extends CQL_QDM.QDMDatatype
   @returns {Integer}
   ###
   refills: ->
-    # TODO: Refills should represent 'The number of refills allowed by the prescription.'
-    throw new Error('Bonnie does not currently support MedicationDischarge.refills')
+    if @_refills?
+      @_refills['scalar']
+    else
+      null
 
   ###
   @returns {Code}
@@ -255,7 +251,7 @@ class CQL_QDM.MedicationDischarge extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['value']})
+      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
     else
       null
 
@@ -278,7 +274,7 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
     super @entry
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     @_dosage = @entry.dose
-    @_frequency = @entry.frequency
+    @_frequency = @entry.administrationTiming
     @_negationRationale = @entry.negationReason
     @_refills = @entry.refills
     @_route = @entry.route
@@ -301,7 +297,7 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
+      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
     else
       null
 
@@ -309,10 +305,8 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
   @returns {Code}
   ###
   frequency: ->
-    # TODO: Frequency currently not in HDS model.  Can probably add by calculating based off of dose & regimen
-    throw new Error('Bonnie does not currently support MedicationDispensed.frequency')
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system)
+      new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
     else
       null
 
@@ -340,8 +334,10 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
   @returns {Integer}
   ###
   refills: ->
-    # TODO: Refills should represent 'The number of refills allowed by the prescription.'
-    throw new Error('Bonnie does not currently support MedicationDispensed.refills')
+    if @_refills?
+      @_refills['scalar']
+    else
+      null
 
   ###
   @returns {Code}
@@ -357,7 +353,7 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['value']})
+      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
     else
       null
 
@@ -376,7 +372,7 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
     @_activeDatetime = CQL_QDM.Helpers.convertDateTime(@entry.active_datetime)
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     @_dosage = @entry.dose
-    @_frequency = @entry.frequency
+    @_frequency = @entry.administrationTiming
     @_method = @entry.method
     @_negationRationale = @entry.negationReason
     @_reason = @entry.reason
@@ -407,7 +403,7 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
+      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
     else
       null
 
@@ -415,10 +411,8 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
   @returns {Code}
   ###
   frequency: ->
-    # TODO: Frequency currently not in HDS model.  Can probably add by calculating based off of dose & regimen
-    throw new Error('Bonnie does not currently support MedicationOrder.frequency')
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system)
+      new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
     else
       null
 
@@ -453,8 +447,10 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
   @returns {Integer}
   ###
   refills: ->
-    # TODO: Refills should represent 'The number of refills allowed by the prescription.'
-    throw new Error('Bonnie does not currently support MedicationOrder.refills')
+    if @_refills?
+      @_refills['scalar']
+    else
+      null
 
   ###
   @returns {Interval<Date>}
@@ -481,6 +477,6 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['value']})
+      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
     else
       null

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

@@ -0,0 +1,36 @@
+###
+@namespace scoping into the CQL_QDM namespace (all classes and
+their methods will be accessable through the CQL_QDM namespace)
+###
+@CQL_QDM ||= {}
+
+###
+Data elements that meet criteria using this datatype should document the type of plan or
+program in which the patient is expected to be enrolled. The program is identified as the Issuer
+(e.g., Aetna, BCBSA, Cigna, etc.). The code attribute indicates the coverage type indicating
+the program in which the subject of record participates (e.g., health insurance plan policy,
+disease specific policy, health maintenance organization policy, etc.)
+###
+class CQL_QDM.Participation extends CQL_QDM.QDMDatatype
+  ###
+  @param {Object} entry - the HDS data criteria object to convert
+  ###
+  constructor: (@entry) ->
+    super @entry
+    @_participationPeriodLow = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
+    if @entry.end_time
+      @_participationPeriodHigh = CQL_QDM.Helpers.convertDateTime(@entry.end_time)
+    else
+      # No end time; high is set to infinity
+      @_participationPeriodHigh = CQL_QDM.Helpers.infinityDateTime()
+
+  ###
+  @returns {Interval<Date>}
+  ###
+  participationPeriod: ->
+    low = @_participationPeriodLow
+    high = @_participationPeriodHigh
+    if low?
+      new cql.Interval(low, high)
+    else
+      null

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

@@ -18,6 +18,8 @@ class CQL_QDM.PatientCharacteristicEthnicity extends CQL_QDM.QDMDatatype
 
   getCode: ->
     if @_patient?.has('ethnicity')
-      code: @_patient.get('ethnicity')
+      # NOTE: hard coding the code system. this will be removed when we switch
+      # to the QDM patient model
+      new cql.Code(@_patient.get('ethnicity'), 'CDC Race')
     else
       null

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

@@ -20,10 +20,11 @@ class CQL_QDM.PatientCharacteristicExpired extends CQL_QDM.QDMDatatype
   ###
   getCode: ->
     if @_patient.get('deathdate')?
-      '419099009'
+      # NOTE: hard coding the code system. this will be removed when we switch
+      # to the QDM patient model
+      new cql.Code('419099009', 'SNOMED-CT')
     else
-      code:
-        ''
+      null
 
   ###
   @returns {Code}

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

@@ -18,6 +18,8 @@ class CQL_QDM.PatientCharacteristicRace extends CQL_QDM.QDMDatatype
 
   getCode: ->
     if @_patient?.has('race')
-      code: @_patient.get('race')
+      # NOTE: hard coding the code system. this will be removed when we switch
+      # to the QDM patient model
+      new cql.Code(@_patient.get('race'), 'CDC Race')
     else
       null

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

@@ -16,8 +16,6 @@ class CQL_QDM.PatientCharacteristicSex extends CQL_QDM.QDMDatatype
     @_patient = @patient
 
   getCode: ->
-    # NOTE: Eventually this could be replaced with actual codes. That would
-    # require modifications to the execution engine in order to handle that
-    # change.
-    code:
-      @_patient.get('gender')
+    # NOTE: hard coding the code system. this will be removed when we switch
+    # to the QDM patient model
+    new cql.Code(@_patient.get('gender'), 'AdministrativeGender')

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

@@ -18,7 +18,7 @@ class CQL_QDM.SubstanceAdministered extends CQL_QDM.QDMDatatype
     super @entry
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     @_dosage = @entry.dose
-    @_frequency = @entry.frequency
+    @_frequency = @entry.administrationTiming
     @_negationRationale = @entry.negationReason
     @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     if @entry.end_time
@@ -41,7 +41,7 @@ class CQL_QDM.SubstanceAdministered extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
+      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
     else
       null
 
@@ -49,10 +49,8 @@ class CQL_QDM.SubstanceAdministered extends CQL_QDM.QDMDatatype
   @returns {Code}
   ###
   frequency: ->
-    # TODO: Frequency currently not in HDS model.  Can probably add by calculating based off of dose & regimen
-    throw new Error('Bonnie does not currently support SubstanceAdministered.frequency')
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system)
+      new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
     else
       null
 
@@ -90,7 +88,7 @@ class CQL_QDM.SubstanceAdministered extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['value']})
+      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
     else
       null
 
@@ -107,7 +105,7 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
     super @entry
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     @_dosage = @entry.dose
-    @_frequency = @entry.frequency
+    @_frequency = @entry.administrationTiming
     @_method = @entry.method
     @_negationRationale = @entry.negationReason
     @_reason = @entry.reason
@@ -126,7 +124,7 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
+      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
     else
       null
 
@@ -134,10 +132,8 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
   @returns {Code}
   ###
   frequency: ->
-    # TODO: Frequency currently not in HDS model.  Can probably add by calculating based off of dose & regimen
-    throw new Error('Bonnie does not currently support SubstanceOrder.frequency')
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system)
+      new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
     else
       null
 
@@ -172,8 +168,10 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
   @returns {Integer}
   ###
   refills: ->
-    # TODO: Refills should represent 'The number of refills allowed by the prescription.'
-    throw new Error('Bonnie does not currently support SubstanceOrder.refills')
+    if @_refills?
+      @_refills['scalar']
+    else
+      null
 
   ###
   @returns {Code}
@@ -189,7 +187,7 @@ class CQL_QDM.SubstanceOrder extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['value']})
+      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
     else
       null
 
@@ -207,7 +205,7 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
     super @entry
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     @_dosage = @entry.dose
-    @_frequency = @entry.frequency
+    @_frequency = @entry.administrationTiming
     @_method = @entry.method
     @_negationRationale = @entry.negationReason
     @_reason = @entry.reason
@@ -226,7 +224,7 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
+      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['scalar']})
     else
       null
 
@@ -234,10 +232,8 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
   @returns {Code}
   ###
   frequency: ->
-    # TODO: Frequency currently not in HDS model.  Can probably add by calculating based off of dose & regimen
-    throw new Error('Bonnie does not currently support SubstanceRecommended.frequency')
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system)
+      new cql.Code(@_frequency.code, @_frequency.code_system, @_frequency.version, @_frequency.title)
     else
       null
 
@@ -272,8 +268,10 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
   @returns {Integer}
   ###
   refills: ->
-    # TODO: Refills should represent 'The number of refills allowed by the prescription.'
-    throw new Error('Bonnie does not currently support SubstanceRecommended.refills')
+    if @_refills?
+      @_refills['scalar']
+    else
+      null
 
   ###
   @returns {Code}
@@ -289,6 +287,6 @@ class CQL_QDM.SubstanceRecommended extends CQL_QDM.QDMDatatype
   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['value']})
+      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
     else
       null