angshu | changed method parameter names for EncounterRepository.findAllEncountersByCatchment() and also modified code a bit to abstract out the catchment type