REPORT-583 - EncounterDatetimeDataEvaluator and EncounterTypeDataEvaluator should be refactored