Nishi, Abhi #000 Updating onActiveTreatment flag appropriately.