Refactor/fix consumption values on reports
Merge pull request #3564 from dimagi/consumptionreportfix

Refactor/fix consumption values on reports