Updated to use new PatientWrapper rather than methods in EmrUtils