Bug fixes in PatientTrace helper/getter methods - for status choices, return value stored in DB not the display text