diff --git a/IRaCIS.Core.Application/Service/Management/UserTypeService.cs b/IRaCIS.Core.Application/Service/Management/UserTypeService.cs index a8bbd36df..ec97e93f7 100644 --- a/IRaCIS.Core.Application/Service/Management/UserTypeService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserTypeService.cs @@ -115,13 +115,10 @@ namespace IRaCIS.Core.Application.Contracts { userTypeEnums = new List() { UserTypeEnum.PI, UserTypeEnum.MIM }; } - - - + if (userTypeSelectEnum == UserTypeSelectEnum.SiteSurvey) { userTypeEnums = new List() { UserTypeEnum.SR, UserTypeEnum.ClinicalResearchCoordinator }; - } @@ -136,6 +133,10 @@ namespace IRaCIS.Core.Application.Contracts userTypeEnums = new List() { UserTypeEnum.CRA, UserTypeEnum.ClinicalResearchCoordinator }; } + if (userTypeSelectEnum == UserTypeSelectEnum.TrialDoc) + { + userTypeEnums = new List() { UserTypeEnum.PI, UserTypeEnum.SR, UserTypeEnum.ProjectManager, UserTypeEnum.TA, UserTypeEnum.IQC, UserTypeEnum.IM, UserTypeEnum.MIM }; + } var query = _userTypeRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin) @@ -155,8 +156,12 @@ namespace IRaCIS.Core.Application.Contracts /// public async Task> GetTrialUserTypeList() { - var query = _userTypeRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin) - .Where(t => !t.UserTypeGroupList.Any(t=> t.Group.Code=="3")) + var userTypeEnums = new List() { UserTypeEnum.PI, UserTypeEnum.SR, UserTypeEnum.ProjectManager, UserTypeEnum.TA, UserTypeEnum.IQC,UserTypeEnum.IM,UserTypeEnum.MIM }; + + var query = _userTypeRepository + // .Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin) + //.Where(t => !t.UserTypeGroupList.Any(t=> t.Group.Code=="3")) + .Where( t => userTypeEnums.Contains(t.UserTypeEnum)) .OrderBy(t => t.Order).ProjectTo(_mapper.ConfigurationProvider); return await query.ToListAsync(); diff --git a/IRaCIS.Core.Domain.Share/User/UserType.cs b/IRaCIS.Core.Domain.Share/User/UserType.cs index d8e42bcb6..2cb21a40c 100644 --- a/IRaCIS.Core.Domain.Share/User/UserType.cs +++ b/IRaCIS.Core.Domain.Share/User/UserType.cs @@ -82,6 +82,8 @@ EnrollOrPD_EmailReceive = 4, EnrollOrPD_EMailCopy = 5, + + TrialDoc=6, }