Vishal #586 isWithinCurrentAdherenceWindow  now considers adherence days
Vishal #586 bug fix