Correct mapping of person-day metric to record types

Also refactor metric-to-record-type mapping since now it is 1:N

Change-Id: Ia0929b51dfbaddee848e9f095da65e2a9fc38a39
Merge "Correct mapping of person-day metric to record types"