start and end date adjustments for health metrics

[carterliukimleyhorn]

Lots of auto - formatting happened. I marked where the logic changes are