REPORT-633 - SqlPatientDataEvaluator and SqlEncounterDataEvaluator are inconsistent with other sql evaluators