cql_qdm_patientapi 1.1.4 → 1.2.0

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

@@ -20,6 +20,7 @@ class CQL_QDM.FamilyHistory extends CQL_QDM.QDMDatatype
     super @entry
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     @_relationship = @entry.relationshipToPatient
+    delete @entry.end_time
 
   ###
   @returns {Date}
@@ -32,6 +33,6 @@ class CQL_QDM.FamilyHistory extends CQL_QDM.QDMDatatype
   ###
   relationship: ->
     if @_relationship?
-      new cql.Code(@_relationship.code, @_relationship.code_system)
+      new cql.Code(@_relationship.code, @_relationship.code_system, null, @_relationship.title || null)
     else
       null

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

@@ -22,6 +22,7 @@ class CQL_QDM.ImmunizationAdministered extends CQL_QDM.QDMDatatype
     @_reason = @entry.reason
     @_route = @entry.route
     @_supply = @entry.supply
+    delete @entry.end_time
 
   ###
   @returns {Date}
@@ -34,7 +35,10 @@ class CQL_QDM.ImmunizationAdministered extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
+      if @_dosage['unit']? || @_dosage['value']?
+        new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
+      else
+        new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -43,7 +47,7 @@ class CQL_QDM.ImmunizationAdministered 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
 
@@ -52,7 +56,7 @@ class CQL_QDM.ImmunizationAdministered 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
 
@@ -61,7 +65,7 @@ class CQL_QDM.ImmunizationAdministered extends CQL_QDM.QDMDatatype
   ###
   route: ->
     if @_route?
-      new cql.Code(@_route.code, @_route.code_system)
+      new cql.Code(@_route.code, @_route.code_system, null, @_route.title || null)
     else
       null
 
@@ -99,6 +103,7 @@ class CQL_QDM.ImmunizationOrder extends CQL_QDM.QDMDatatype
     @_reason = @entry.reason
     @_route = @entry.route
     @_supply = @entry.supply
+    delete @entry.end_time
 
   ###
   @returns {Date}
@@ -117,7 +122,10 @@ class CQL_QDM.ImmunizationOrder extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
+      if @_dosage['unit']? || @_dosage['value']?
+        new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
+      else
+        new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -126,7 +134,7 @@ class CQL_QDM.ImmunizationOrder 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
 
@@ -135,7 +143,7 @@ class CQL_QDM.ImmunizationOrder 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
 
@@ -144,7 +152,7 @@ class CQL_QDM.ImmunizationOrder extends CQL_QDM.QDMDatatype
   ###
   route: ->
     if @_route?
-      new cql.Code(@_route.code, @_route.code_system)
+      new cql.Code(@_route.code, @_route.code_system, null, @_route.title || null)
     else
       null
 

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

@@ -19,6 +19,7 @@ class CQL_QDM.InterventionOrder extends CQL_QDM.QDMDatatype
     @_negationRationale = @entry.negationReason
     @_reason = @entry.reason
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
+    delete @entry.end_time
 
   ###
   @returns {Date}
@@ -31,7 +32,7 @@ class CQL_QDM.InterventionOrder 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
 
@@ -40,7 +41,7 @@ class CQL_QDM.InterventionOrder 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
 
@@ -81,7 +82,7 @@ class CQL_QDM.InterventionPerformed 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
 
@@ -90,7 +91,7 @@ class CQL_QDM.InterventionPerformed 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
 
@@ -119,7 +120,7 @@ class CQL_QDM.InterventionPerformed 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
 
@@ -138,6 +139,7 @@ class CQL_QDM.InterventionRecommended extends CQL_QDM.QDMDatatype
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     @_negationRationale = @entry.negationReason
     @_reason = @entry.reason
+    delete @entry.end_time
 
   ###
   @returns {Date}
@@ -150,7 +152,7 @@ class CQL_QDM.InterventionRecommended 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
 
@@ -159,6 +161,6 @@ class CQL_QDM.InterventionRecommended 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/laboratorytest.js.coffee

@@ -19,6 +19,7 @@ class CQL_QDM.LaboratoryTestOrder extends CQL_QDM.QDMDatatype
     @_negationRationale = @entry.negationReason
     @_reason = @entry.reason
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
+    delete @entry.end_time
 
   ###
   @returns {Code}
@@ -34,7 +35,7 @@ class CQL_QDM.LaboratoryTestOrder 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
 
@@ -43,7 +44,7 @@ class CQL_QDM.LaboratoryTestOrder 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
 
@@ -94,7 +95,7 @@ class CQL_QDM.LaboratoryTestPerformed 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
 
@@ -103,7 +104,7 @@ class CQL_QDM.LaboratoryTestPerformed 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
 
@@ -112,7 +113,7 @@ class CQL_QDM.LaboratoryTestPerformed 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
 
@@ -173,7 +174,7 @@ class CQL_QDM.LaboratoryTestPerformed 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
 
@@ -207,6 +208,7 @@ class CQL_QDM.LaboratoryTestRecommended extends CQL_QDM.QDMDatatype
     @_method = @entry.method
     @_negationRationale = @entry.negationReason
     @_reason = @entry.reason
+    delete @entry.end_time
 
   ###
   @returns {Date}
@@ -219,7 +221,7 @@ class CQL_QDM.LaboratoryTestRecommended 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
 
@@ -228,7 +230,7 @@ class CQL_QDM.LaboratoryTestRecommended 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
 
@@ -237,6 +239,6 @@ class CQL_QDM.LaboratoryTestRecommended 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/medication.js.coffee

@@ -34,7 +34,10 @@ class CQL_QDM.MedicationActive extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
+      if @_dosage['unit']? || @_dosage['value']?
+        new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
+      else
+        new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -43,7 +46,7 @@ class CQL_QDM.MedicationActive extends CQL_QDM.QDMDatatype
   ###
   frequency: ->
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system)
+      new cql.Code(@_frequency.code, @_frequency.code_system, null, @_frequency.title || null)
     else
       null
 
@@ -52,7 +55,7 @@ class CQL_QDM.MedicationActive extends CQL_QDM.QDMDatatype
   ###
   route: ->
     if @_route?
-      new cql.Code(@_route.code, @_route.code_system)
+      new cql.Code(@_route.code, @_route.code_system, null, @_route.title || null)
     else
       null
 
@@ -114,7 +117,10 @@ class CQL_QDM.MedicationAdministered extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
+      if @_dosage['unit']? || @_dosage['value']?
+        new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
+      else
+        new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -123,7 +129,7 @@ class CQL_QDM.MedicationAdministered extends CQL_QDM.QDMDatatype
   ###
   frequency: ->
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system)
+      new cql.Code(@_frequency.code, @_frequency.code_system, null, @_frequency.title || null)
     else
       null
 
@@ -132,7 +138,7 @@ class CQL_QDM.MedicationAdministered 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
 
@@ -141,7 +147,7 @@ class CQL_QDM.MedicationAdministered 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
 
@@ -161,7 +167,7 @@ class CQL_QDM.MedicationAdministered extends CQL_QDM.QDMDatatype
   ###
   route: ->
     if @_route?
-      new cql.Code(@_route.code, @_route.code_system)
+      new cql.Code(@_route.code, @_route.code_system, null, @_route.title || null)
     else
       null
 
@@ -194,6 +200,7 @@ class CQL_QDM.MedicationDischarge extends CQL_QDM.QDMDatatype
     @_refills = @entry.refills
     @_route = @entry.route
     @_supply = @entry.supply
+    delete @entry.end_time
 
   ###
   @returns {Date}
@@ -206,7 +213,10 @@ class CQL_QDM.MedicationDischarge extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
+      if @_dosage['unit']? || @_dosage['value']?
+        new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
+      else
+        new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -215,7 +225,7 @@ class CQL_QDM.MedicationDischarge extends CQL_QDM.QDMDatatype
   ###
   frequency: ->
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system)
+      new cql.Code(@_frequency.code, @_frequency.code_system, null, @_frequency.title || null)
     else
       null
 
@@ -224,7 +234,7 @@ class CQL_QDM.MedicationDischarge 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
 
@@ -242,7 +252,7 @@ class CQL_QDM.MedicationDischarge extends CQL_QDM.QDMDatatype
   ###
   route: ->
     if @_route?
-      new cql.Code(@_route.code, @_route.code_system)
+      new cql.Code(@_route.code, @_route.code_system, null, @_route.title || null)
     else
       null
 
@@ -297,7 +307,10 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
+      if @_dosage['unit']? || @_dosage['value']?
+        new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
+      else
+        new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -306,7 +319,7 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
   ###
   frequency: ->
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system)
+      new cql.Code(@_frequency.code, @_frequency.code_system, null, @_frequency.title || null)
     else
       null
 
@@ -315,7 +328,7 @@ class CQL_QDM.MedicationDispensed 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
 
@@ -344,7 +357,7 @@ class CQL_QDM.MedicationDispensed extends CQL_QDM.QDMDatatype
   ###
   route: ->
     if @_route?
-      new cql.Code(@_route.code, @_route.code_system)
+      new cql.Code(@_route.code, @_route.code_system, null, @_route.title || null)
     else
       null
 
@@ -396,7 +409,10 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
   ###
   dosage: ->
     if @_dosage?
-      new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
+      if @_dosage['unit']? || @_dosage['value']?
+        new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
+      else
+        new cql.Quantity({unit: @_dosage['units'], value: @_dosage['scalar']})
     else
       null
 
@@ -405,7 +421,7 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
   ###
   frequency: ->
     if @_frequency?
-      new cql.Code(@_frequency.code, @_frequency.code_system)
+      new cql.Code(@_frequency.code, @_frequency.code_system, null, @_frequency.title || null)
     else
       null
 
@@ -414,7 +430,7 @@ class CQL_QDM.MedicationOrder 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
 
@@ -423,7 +439,7 @@ class CQL_QDM.MedicationOrder 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
 
@@ -432,7 +448,7 @@ class CQL_QDM.MedicationOrder 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
 
@@ -461,7 +477,7 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
   ###
   route: ->
     if @_route?
-      new cql.Code(@_route.code, @_route.code_system)
+      new cql.Code(@_route.code, @_route.code_system, null, @_route.title || null)
     else
       null