IntraHealth - Fixed problems with: location filter, calculations and small refactoring.
code refactored
Fixed fluffs errors
Merge pull request #3839 from lwyszomi/intrahealth-fixes

IntraHealth - Fixed problems with: location filter, calculations and small refactoring.