Modify PatientDataEvaluators to use new QueryBuilders