cql_qdm_patientapi 1.2.0 → 1.3.0

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

@@ -15,29 +15,19 @@ class CQL_QDM.DeviceApplied extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_anatomicalApproachSite = @entry.anatomical_approach
-    @_anatomicalLocationSite = @entry.anatomical_location
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    @_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.anatomical_location
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_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()
 
-  ###
-  @returns {Code}
-  ###
-  anatomicalApproachSite: ->
-    if @_anatomicalApproachSite?
-      new cql.Code(@_anatomicalApproachSite.code, @_anatomicalApproachSite.code_system, null, @_anatomicalApproachSite.title || null)
-    else
-      null
-
   ###
   @returns {Code}
   ###
@@ -92,12 +82,12 @@ class CQL_QDM.DeviceOrder extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    delete @entry.end_time
+  constructor: (entry) ->
+    super entry
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    delete entry.end_time
 
   ###
   @returns {Code}
@@ -133,12 +123,12 @@ class CQL_QDM.DeviceRecommended 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)
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    delete @entry.end_time
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    delete entry.end_time
 
   ###
   @returns {Date}

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

@@ -19,17 +19,17 @@ class CQL_QDM.Diagnosis 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)
-    @_prevalencePeriodLow = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    if @entry.end_time
-      @_prevalencePeriodHigh = CQL_QDM.Helpers.convertDateTime(@entry.end_time)
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_prevalencePeriodLow = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    if entry.end_time
+      @_prevalencePeriodHigh = CQL_QDM.Helpers.convertDateTime(entry.end_time)
     else
       # No end time; high is set to infinity
       @_prevalencePeriodHigh = CQL_QDM.Helpers.infinityDateTime()
-    @_anatomicalLocationSite = @entry.anatomical_location
-    @_severity = @entry.severity
+    @_anatomicalLocationSite = entry.anatomical_location
+    @_severity = entry.severity
 
   ###
   @returns {Code}

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

@@ -19,13 +19,12 @@ class CQL_QDM.DiagnosticStudyOrder 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)
-    @_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)
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    delete entry.end_time
 
   ###
   @returns {Date}
@@ -33,15 +32,6 @@ class CQL_QDM.DiagnosticStudyOrder 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}
   ###
@@ -70,24 +60,24 @@ class CQL_QDM.DiagnosticStudyPerformed 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)
-    @_facilityLocation = @entry.facility
-    @_method = @entry.method
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    if @entry.values? && @entry.values.length > 0
-      @_result = @entry.values?[0]
-    @_resultDatetime = CQL_QDM.Helpers.convertDateTime(@entry.result_date_time)
-    @_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)
+    @_facilityLocation = entry.facility
+    @_method = entry.method
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    if entry.values? && entry.values.length > 0
+      @_result = entry.values?[0]
+    @_resultDatetime = CQL_QDM.Helpers.convertDateTime(entry.result_date_time)
+    @_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()
-    @_status = @entry.qdm_status
-    @_components = @entry.components
+    @_status = entry.qdm_status
+    @_components = entry.components
 
 
   ###
@@ -185,12 +175,11 @@ class CQL_QDM.DiagnosticStudyRecommended 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)
-    @_method = @entry.method
-    @_negationRationale = @entry.negationReason
-    delete @entry.end_time
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_negationRationale = entry.negationReason
+    delete entry.end_time
 
   ###
   @returns {Date}
@@ -198,15 +187,6 @@ class CQL_QDM.DiagnosticStudyRecommended 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}
   ###

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

@@ -13,13 +13,13 @@ class CQL_QDM.EncounterOrder 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)
-    @_facilityLocation = @entry.facility
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    delete @entry.end_time
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_facilityLocation = entry.facility
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    delete entry.end_time
 
   ###
   @returns {Date}
@@ -64,21 +64,21 @@ class CQL_QDM.EncounterPerformed extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_admissionSource = @entry.admission_source
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    @_diagnoses = @entry.diagnosis
-    @_dischargeDisposition = @entry.dischargeDisposition
-    @_facilityLocations = @entry.facility
-    @_negationRationale = @entry.negationReason
-    @_relevantPeriodLow = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    if @entry.end_time
-      @_relevantPeriodHigh = CQL_QDM.Helpers.convertDateTime(@entry.end_time)
+  constructor: (entry) ->
+    super entry
+    @_admissionSource = entry.admission_source
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_diagnoses = entry.diagnosis
+    @_dischargeDisposition = entry.dischargeDisposition
+    @_facilityLocations = entry.facility
+    @_negationRationale = entry.negationReason
+    @_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()
-    @_principalDiagnosis = @entry.principalDiagnosis
+    @_principalDiagnosis = entry.principalDiagnosis
 
   ###
   @returns {Code}
@@ -173,13 +173,13 @@ class CQL_QDM.EncounterRecommended 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)
-    @_facilityLocation = @entry.facility
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    delete @entry.end_time
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_facilityLocation = entry.facility
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    delete entry.end_time
 
   ###
   @returns {Date}

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

@@ -16,11 +16,11 @@ class CQL_QDM.FamilyHistory 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)
-    @_relationship = @entry.relationshipToPatient
-    delete @entry.end_time
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_relationship = entry.relationshipToPatient
+    delete entry.end_time
 
   ###
   @returns {Date}

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

@@ -14,15 +14,14 @@ class CQL_QDM.ImmunizationAdministered 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
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    @_route = @entry.route
-    @_supply = @entry.supply
-    delete @entry.end_time
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_dosage = entry.dose
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    @_route = entry.route
+    delete entry.end_time
 
   ###
   @returns {Date}
@@ -69,14 +68,6 @@ class CQL_QDM.ImmunizationAdministered extends CQL_QDM.QDMDatatype
     else
       null
 
-  ###
-  @returns {Quantity}
-  ###
-  supply: ->
-    if @_supply?
-      new cql.Quantity({unit: @_supply['units'], value: @_supply['scalar']})
-    else
-      null
 
 
 ###
@@ -88,22 +79,22 @@ class CQL_QDM.ImmunizationOrder 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)
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
 
     # if activeDatetime is provided, use it, otherwise default to authorDatetime per QDM spec
-    if @entry.active_datetime?
-      @_activeDatetime = CQL_QDM.Helpers.convertDateTime(@entry.active_datetime)
+    if entry.active_datetime?
+      @_activeDatetime = CQL_QDM.Helpers.convertDateTime(entry.active_datetime)
     else
       @_activeDatetime = @_authorDatetime
 
-    @_dosage = @entry.dose
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    @_route = @entry.route
-    @_supply = @entry.supply
-    delete @entry.end_time
+    @_dosage = entry.dose
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    @_route = entry.route
+    @_supply = entry.supply
+    delete entry.end_time
 
   ###
   @returns {Date}

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

@@ -14,12 +14,12 @@ class CQL_QDM.InterventionOrder extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    delete @entry.end_time
+  constructor: (entry) ->
+    super entry
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    delete entry.end_time
 
   ###
   @returns {Date}
@@ -55,20 +55,20 @@ class CQL_QDM.InterventionPerformed 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)
-    @_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)
+    @_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]
-    @_status = @entry.qdm_status
+    if entry.values? && entry.values.length > 0
+      @_result = entry.values?[0]
+    @_status = entry.qdm_status
 
   ###
   Author date time is only present when this data type has been negated.
@@ -134,12 +134,12 @@ class CQL_QDM.InterventionRecommended 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)
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    delete @entry.end_time
+  constructor: (entry) ->
+    super entry
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    delete entry.end_time
 
   ###
   @returns {Date}

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

@@ -13,22 +13,12 @@ class CQL_QDM.LaboratoryTestOrder extends CQL_QDM.QDMDatatype
   ###
   @param {Object} entry - the HDS data criteria object to convert
   ###
-  constructor: (@entry) ->
-    super @entry
-    @_method = @entry.method
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
-    delete @entry.end_time
-
-  ###
-  @returns {Code}
-  ###
-  method: ->
-    if @_method?
-      new cql.Code(@_method.code, @_method.code_system)
-    else
-      null
+  constructor: (entry) ->
+    super entry
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    @_authorDatetime = CQL_QDM.Helpers.convertDateTime(entry.start_time)
+    delete entry.end_time
 
   ###
   @returns {Code}
@@ -63,25 +53,25 @@ class CQL_QDM.LaboratoryTestPerformed 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)
-    @_method = @entry.method
-    @_negationRationale = @entry.negationReason
-    @_reason = @entry.reason
-    @_referenceRangeLow = @entry.referenceRangeLow
-    @_referenceRangeHigh = @entry.referenceRangeHigh
-    @_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)
+    @_method = entry.method
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    @_referenceRangeLow = entry.referenceRangeLow
+    @_referenceRangeHigh = entry.referenceRangeHigh
+    @_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]
-    @_resultDatetime = CQL_QDM.Helpers.convertDateTime(@entry.result_date_time)
-    @_status = @entry.qdm_status
-    @_components = @entry.components
+    if entry.values? && entry.values.length > 0
+      @_result = entry.values?[0]
+    @_resultDatetime = CQL_QDM.Helpers.convertDateTime(entry.result_date_time)
+    @_status = entry.qdm_status
+    @_components = entry.components
 
   ###
   Author date time is only present when this data type has been negated.
@@ -202,13 +192,12 @@ class CQL_QDM.LaboratoryTestRecommended 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)
-    @_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)
+    @_negationRationale = entry.negationReason
+    @_reason = entry.reason
+    delete entry.end_time
 
   ###
   @returns {Date}
@@ -216,15 +205,6 @@ class CQL_QDM.LaboratoryTestRecommended 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}
   ###