From 311d651ba74367e8f01547456aa13367013251f9 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 5 Jul 2023 11:24:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Management/UserTypeService.cs       | 17 +++++++++++------
 IRaCIS.Core.Domain.Share/User/UserType.cs       |  2 ++
 2 files changed, 13 insertions(+), 6 deletions(-)

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>() { UserTypeEnum.PI, UserTypeEnum.MIM };
             }
-
-
-           
+          
             if (userTypeSelectEnum == UserTypeSelectEnum.SiteSurvey)
             {
                 userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.SR, UserTypeEnum.ClinicalResearchCoordinator };
-
             }
 
 
@@ -136,6 +133,10 @@ namespace IRaCIS.Core.Application.Contracts
                 userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.CRA, UserTypeEnum.ClinicalResearchCoordinator };
             }
 
+            if (userTypeSelectEnum == UserTypeSelectEnum.TrialDoc)
+            {
+                userTypeEnums = new List<UserTypeEnum>() { 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
         /// <returns></returns>
         public async Task<List<TrialUserType>> 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>() { 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<TrialUserType>(_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,
     }