REPORTING-667: Expand VisitDataSetDefinition to support Patient and Encounter data definitions