Get rid of DatabaseQueryResult in favor of a few additional methods directly on EncounterService