Vikram | fix for clinic visits defect when baesline treament not enetered | fix for tests