   ###
   supply: ->
     if @_supply?
-      new cql.Quantity({unit: @_supply['unit'], value: @_supply['value']})
+      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
     else
       null
 

  ###
  dosage: ->
    if @_dosage?
      new cql.Quantity({unit: @_dosage['unit'], value: @_dosage['value']})
    else
      null


  ###
  supply: ->
    if @_supply?
      new cql.Quantity({unit: @_supply['unit'], value: @_supply['scalar']})
    else
      null

