replaced the use of SqlCohortDefinition by EncounterCohortDefinition in indicator A2