Don't re-parse ethnicity etc in patients controller
Continue Patient Builder approach allowing patient data to be saved