cql_qdm_patientapi 1.2.0 → 1.3.0

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

@@ -16,18 +16,17 @@ class CQL_QDM.MedicationActive extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_dosage = @entry.dose
-    @_frequency = @entry.administrationTiming
-    @_route = @entry.route
-    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    if @entry.end_time
-      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(@entry.end_time)
+  constructor: (entry) ->
+    super entry
+    @_dosage = entry.dose
+    @_frequency = entry.administrationTiming
+    @_route = entry.route
+    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    if entry.end_time
+      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(entry.end_time)
     else
       # No end time; high is set to infinity
       @_relevantPeriodHigh = CQL_QDM.Helpers.infinityDateTime()
-    @_supply = @entry.supply
 
   ###
   @returns {Quantity}
@@ -70,15 +69,6 @@ class CQL_QDM.MedicationActive extends CQL_QDM.QDMDatatype
     else
       null
 
-  ###
-  @returns {Quantity}
-  ###
-  supply: ->
-    if @_supply?
-      new cql.Quantity({unit: @_supply['units'], value: @_supply['scalar']})
-    else
-      null
-
 
 ###
 Data elements that meet criteria using this datatype should document that the
@@ -89,21 +79,20 @@ class CQL_QDM.MedicationAdministered extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    @_dosage = @entry.dose
-    @_frequency = @entry.administrationTiming
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    if @entry.end_time
-      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(@entry.end_time)
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_dosage = entry.dose
+    @_frequency = entry.administrationTiming
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    if entry.end_time
+      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(entry.end_time)
     else
       # No end time; high is set to infinity
       @_relevantPeriodHigh = CQL_QDM.Helpers.infinityDateTime()
-    @_route = @entry.route
-    @_supply = @entry.supply
+    @_route = entry.route
 
   ###
   Author date time is only present when this data type has been negated.
@@ -171,15 +160,6 @@ class CQL_QDM.MedicationAdministered extends CQL_QDM.QDMDatatype
     else
       null
 
-  ###
-  @returns {Quantity}
-  ###
-  supply: ->
-    if @_supply?
-      new cql.Quantity({unit: @_supply['units'], value: @_supply['scalar']})
-    else
-      null
-
 
 ###
 Data elements that meet criteria using this datatype should document that the
@@ -191,16 +171,18 @@ class CQL_QDM.MedicationDischarge extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    @_dosage = @entry.dose
-    @_frequency = @entry.administrationTiming
-    @_negationRationale = @entry.negationReason
-    @_refills = @entry.refills
-    @_route = @entry.route
-    @_supply = @entry.supply
-    delete @entry.end_time
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_daysSupplied = entry.daysSupplied
+    @_dosage = entry.dose
+    @_frequency = entry.administrationTiming
+    @_negationRationale = entry.negationReason
+    @_prescriberIdentifier = entry.prescriberIdentifier
+    @_refills = entry.refills
+    @_route = entry.route
+    @_supply = entry.supply
+    delete entry.end_time
 
   ###
   @returns {Date}
@@ -208,6 +190,15 @@ class CQL_QDM.MedicationDischarge extends CQL_QDM.QDMDatatype
   authorDatetime: ->
     @_authorDatetime
 
+  ###
+  @returns {Integer}
+  ###
+  daysSupplied: ->
+    if @_daysSupplied? and @_daysSupplied['scalar']?
+      parseInt(@_daysSupplied['scalar'], 10)
+    else
+      null
+
   ###
   @returns {Quantity}
   ###
@@ -238,12 +229,21 @@ class CQL_QDM.MedicationDischarge extends CQL_QDM.QDMDatatype
     else
       null
 
+  ###
+  @returns {Id}
+  ###
+  prescriberId: ->
+   if @_prescriberIdentifier?
+    new CQL_QDM.Id(@_prescriberIdentifier.value, @_prescriberIdentifier.namingSystem)
+   else
+    null
+
   ###
   @returns {Integer}
   ###
   refills: ->
-    if @_refills?
-      @_refills['scalar']
+    if @_refills? and @_refills['scalar']?
+      parseInt(@_refills['scalar'], 10)
     else
       null
 
@@ -280,18 +280,21 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    @_dosage = @entry.dose
-    @_frequency = @entry.administrationTiming
-    @_negationRationale = @entry.negationReason
-    @_refills = @entry.refills
-    @_route = @entry.route
-    @_supply = @entry.supply
-    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    if @entry.end_time
-      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(@entry.end_time)
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_dispenserIdentifier = entry.dispenserIdentifier
+    @_daysSupplied = entry.daysSupplied
+    @_dosage = entry.dose
+    @_frequency = entry.administrationTiming
+    @_negationRationale = entry.negationReason
+    @_prescriberIdentifier = entry.prescriberIdentifier
+    @_refills = entry.refills
+    @_route = entry.route
+    @_supply = entry.supply
+    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    if entry.end_time
+      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(entry.end_time)
     else
       # No end time; high is set to infinity
       @_relevantPeriodHigh = CQL_QDM.Helpers.infinityDateTime()
@@ -302,6 +305,24 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
   authorDatetime: ->
     @_authorDatetime
 
+  ###
+  @returns {Id}
+  ###
+  dispenserId: ->
+   if @_dispenserIdentifier?
+    new CQL_QDM.Id(@_dispenserIdentifier.value, @_dispenserIdentifier.namingSystem)
+   else
+    null
+
+  ###
+  @returns {Integer}
+  ###
+  daysSupplied: ->
+    if @_daysSupplied? and @_daysSupplied['scalar']?
+      parseInt(@_daysSupplied['scalar'], 10)
+    else
+      null
+
   ###
   @returns {Quantity}
   ###
@@ -332,6 +353,15 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
     else
       null
 
+  ###
+  @returns {Id}
+  ###
+  prescriberId: ->
+   if @_prescriberIdentifier?
+    new CQL_QDM.Id(@_prescriberIdentifier.value, @_prescriberIdentifier.namingSystem)
+   else
+    null
+
   ###
   @returns {Interval<Date>}
   ###
@@ -347,8 +377,8 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
   @returns {Integer}
   ###
   refills: ->
-    if @_refills?
-      @_refills['scalar']
+    if @_refills? and @_refills['scalar']?
+      parseInt(@_refills['scalar'], 10)
     else
       null
 
@@ -380,20 +410,23 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    @_dosage = @entry.dose
-    @_frequency = @entry.administrationTiming
-    @_method = @entry.method
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    @_refills = @entry.refills
-    @_route = @entry.route
-    @_supply = @entry.supply
-    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    if @entry.end_time
-      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(@entry.end_time)
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_daysSupplied = entry.daysSupplied
+    @_dosage = entry.dose
+    @_frequency = entry.administrationTiming
+    @_method = entry.method
+    @_negationRationale = entry.negationReason
+    @_prescriberIdentifier = entry.prescriberIdentifier
+    @_reason = entry.reason
+    @_refills = entry.refills
+    @_route = entry.route
+    @_setting = entry.setting
+    @_supply = entry.supply
+    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    if entry.end_time
+      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(entry.end_time)
     else
       # No end time; high is set to infinity
       @_relevantPeriodHigh = CQL_QDM.Helpers.infinityDateTime()
@@ -404,6 +437,15 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
   authorDatetime: ->
     @_authorDatetime
 
+  ###
+  @returns {Integer}
+  ###
+  daysSupplied: ->
+    if @_daysSupplied? and @_daysSupplied['scalar']?
+      parseInt(@_daysSupplied['scalar'], 10)
+    else
+      null
+
   ###
   @returns {Quantity}
   ###
@@ -443,6 +485,15 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
     else
       null
 
+  ###
+  @returns {Id}
+  ###
+  prescriberId: ->
+   if @_prescriberIdentifier?
+    new CQL_QDM.Id(@_prescriberIdentifier.value, @_prescriberIdentifier.namingSystem)
+   else
+    null
+
   ###
   @returns {Code}
   ###
@@ -456,8 +507,8 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
   @returns {Integer}
   ###
   refills: ->
-    if @_refills?
-      @_refills['scalar']
+    if @_refills? and @_refills['scalar']?
+      parseInt(@_refills['scalar'], 10)
     else
       null
 
@@ -481,6 +532,15 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
     else
       null
 
+  ###
+  @returns {Code}
+  ###
+  setting: ->
+    if @_setting?
+      new cql.Code(@_setting.code, @_setting.code_system, null, @_setting.title || null)
+    else
+      null
+
   ###
   @returns {Quantity}
   ###

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

@@ -15,11 +15,11 @@ 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)
+  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()

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

@@ -11,10 +11,10 @@ class CQL_QDM.PatientCharacteristic extends CQL_QDM.QDMDatatype
   ###
   @param {Object} patient - the HDS patient object to use
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    @_codes = @entry.codes
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_codes = entry.codes
 
   ###
   @returns {Date}

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

@@ -11,15 +11,15 @@ class CQL_QDM.PatientCharacteristicPayer extends CQL_QDM.QDMDatatype
   ###
   @param {Object} patient - the HDS patient object to use
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    if @entry.end_time
-      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(@entry.end_time)
+  constructor: (entry) ->
+    super entry
+    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    if entry.end_time
+      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(entry.end_time)
     else
       # No end time; high is set to infinity
       @_relevantPeriodHigh = CQL_QDM.Helpers.infinityDateTime()
-    @_codes = @entry.codes
+    @_codes = entry.codes
 
   ###
   @returns {Interval<Date>}

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

@@ -16,14 +16,13 @@ class CQL_QDM.PhysicalExamOrder extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_anatomicalLocationSite = @entry.anatomicalLocation
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    @_method = @entry.method
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    delete @entry.end_time
+  constructor: (entry) ->
+    super entry
+    @_anatomicalLocationSite = entry.anatomicalLocation
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    delete entry.end_time
 
   ###
   @returns {Code}
@@ -40,15 +39,6 @@ class CQL_QDM.PhysicalExamOrder extends CQL_QDM.QDMDatatype
   authorDatetime: ->
     @_authorDatetime
 
-  ###
-  @returns {Code}
-  ###
-  method: ->
-    if @_method?
-      new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
-    else
-      null
-
   ###
   @returns {Code}
   ###
@@ -77,22 +67,22 @@ class CQL_QDM.PhysicalExamPerformed extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_anatomicalLocationSite = @entry.anatomicalLocation
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    @_method = @entry.method
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    if @entry.end_time
-      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(@entry.end_time)
+  constructor: (entry) ->
+    super entry
+    @_anatomicalLocationSite = entry.anatomicalLocation
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_method = entry.method
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    if entry.end_time
+      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(entry.end_time)
     else
       # No end time; high is set to infinity
       @_relevantPeriodHigh = CQL_QDM.Helpers.infinityDateTime()
-    if @entry.values? && @entry.values.length > 0
-      @_result = @entry.values?[0]
-    @_components = @entry.components
+    if entry.values? && entry.values.length > 0
+      @_result = entry.values?[0]
+    @_components = entry.components
 
   ###
   @returns {Code}
@@ -173,14 +163,13 @@ class CQL_QDM.PhysicalExamRecommended extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    @_anatomicalLocationSite = @entry.anatomicalLocation
-    @_method = @entry.method
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    delete @entry.end_time
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_anatomicalLocationSite = entry.anatomicalLocation
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    delete entry.end_time
 
   ###
   @returns {Code}
@@ -197,15 +186,6 @@ class CQL_QDM.PhysicalExamRecommended extends CQL_QDM.QDMDatatype
   authorDatetime: ->
     @_authorDatetime
 
-  ###
-  @returns {Code}
-  ###
-  method: ->
-    if @_method?
-      new cql.Code(@_method.code, @_method.code_system, null, @_method.title || null)
-    else
-      null
-
   ###
   @returns {Code}
   ###