修改一致性核查测试

IRC.Core.SCP/Properties/launchSettings.json

@@ -20,6 +20,16 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Uat_IRC_SCP"
       }
+    },
+    "US_Prod_IRC_SCP": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:6200",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "US_Prod_SCP"
+      }
     }
   }
 }

IRC.Core.SCP/Service/CStoreSCPService.cs

@@ -275,7 +275,7 @@ namespace IRaCIS.Core.SCP.Service
             var _distributedLockProvider = _serviceProvider.GetService<IDistributedLockProvider>();
 
             var storeRelativePath = string.Empty;
-            var ossFolderPath = $"{_trialId}/Image/PACS/{_trialSiteId}{studyInstanceUid}";
+            var ossFolderPath = $"{_trialId}/Image/PACS/{_trialSiteId}/{studyInstanceUid}";
 
 
             long fileSize = 0;

IRC.Core.SCP/appsettings.US_Prod_SCP.json

@@ -21,8 +21,8 @@
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=us-prod-mssql-service,1433;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=us-prod-mssql-service,1433;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+    "RemoteNew": "Server=us-mssql-prod,1433;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=us-mssql-prod,1433;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
   },
   "DicomSCPServiceConfig": {
     "CalledAEList": [

IRC.Core.SCP/appsettings.Uat_IRC_SCP.json

@@ -12,18 +12,18 @@
       "RegionId": "cn-shanghai",
       "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
       "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tRRZehUp2V9pyTPtAJm",
-      "AccessKeySecret": "FLizxkHsMm4CGYHtkV8E3PNJJZU7oV",
-      "RoleArn": "acs:ram::1899121822495495:role/dev-oss-access",
-      "BucketName": "zy-irc-uat-store",
-      "ViewEndpoint": "https://zy-irc-uat-store.oss-cn-shanghai.aliyuncs.com",
+      "AccessKeyId": "LTAI5tFUCCmz5TwghZHsj45Y",
+      "AccessKeySecret": "8evrBy1fVfzJG25i67Jm0xqn9Xcw2T",
+      "RoleArn": "acs:ram::1078130221702011:role/uat-oss-access",
+      "BucketName": "tl-med-irc-uat-store",
+      "ViewEndpoint": "https://tl-med-irc-uat-store.oss-cn-shanghai.aliyuncs.com",
       "Region": "oss-cn-shanghai",
       "DurationSeconds": 7200
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=47.117.164.182,1434;Database=Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=47.117.164.182,1434;Database=Uat_IRC.Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+    "RemoteNew": "Server=101.132.253.119,1435;Database=Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server101.132.253.119,1435;Database=Uat_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
   },
   "DicomSCPServiceConfig": {
     "CalledAEList": [

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -1,9 +1,11 @@
 using Amazon.Auth.AccessControlPolicy;
 using Amazon.SecurityToken;
+using AutoMapper;
 using Azure.Core;
+using IdentityModel.Client;
+using IdentityModel.OidcClient;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
-using IRaCIS.Core.API.OAuth;
 using IRaCIS.Core.Application.Auth;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Helper;
@@ -25,7 +27,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
 using ZiggyCreatures.Caching.Fusion;
 using AssumeRoleRequest = Amazon.SecurityToken.Model.AssumeRoleRequest;
@@ -102,196 +106,6 @@ namespace IRaCIS.Api.Controllers
 
 
 
-        /// <summary>  系统用户登录接口[New] </summary>
-        [HttpPost, Route("user/login")]
-        [AllowAnonymous]
-        public async Task<IResponseOutput> Login(UserLoginDTO loginUser,
-            [FromServices] IFusionCache _fusionCache,
-            [FromServices] IUserService _userService,
-            [FromServices] ITokenService _tokenService,
-            [FromServices] IReadingImageTaskService readingImageTaskService,
-            [FromServices] IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig,
-            [FromServices] IOptionsMonitor<SystemEmailSendConfig> _emailConfig,
-
-            [FromServices] IMailVerificationService _mailVerificationService)
-        {
-            var emailConfig = _emailConfig.CurrentValue;
-            var companyInfo = new SystemEmailSendConfigView() { CompanyName = emailConfig.CompanyName, CompanyNameCN = emailConfig.CompanyNameCN, CompanyShortName = emailConfig.CompanyShortName, CompanyShortNameCN = emailConfig.CompanyShortNameCN };
-
-            //MFA 邮箱验证  前端传递用户Id  和MFACode
-            if (loginUser.UserId != null && _verifyConfig.CurrentValue.OpenLoginMFA)
-            {
-                Guid userId = (Guid)loginUser.UserId;
-
-                //验证MFA 编码是否有问题 ,前端要拆开，自己调用验证的逻辑
-                //await _userService.VerifyMFACodeAsync(userId, loginUser.MFACode);
-
-                //var loginUser = await _userRepository.Where(u => u.UserName.Equals(userName) && u.Password == password).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
-
-                var basicInfo = await _userService.GetUserBasicInfo(userId, loginUser.Password);
-
-                var loginReturn = new LoginReturnDTO() { BasicInfo = basicInfo };
-
-                loginReturn.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(loginReturn.BasicInfo));
-
-
-                // 创建一个 CookieOptions 对象，用于设置 Cookie 的属性
-                var option = new CookieOptions
-                {
-                    Expires = DateTime.Now.AddMonths(1), // 设置过期时间为 30 分钟之后
-                    HttpOnly = false, // 确保 cookie 只能通过 HTTP 访问
-                    SameSite = Microsoft.AspNetCore.Http.SameSiteMode.None, // 设置 SameSite 属性
-                    Secure = false // 确保 cookie 只能通过 HTTPS 访问
-                };
-
-                HttpContext.Response.Cookies.Append("access_token", loginReturn.JWTStr, option);
-
-                // 验证阅片休息时间
-                await readingImageTaskService.ResetReadingRestTime(userId);
-
-                await _fusionCache.SetAsync(CacheKeys.UserToken(userId), loginReturn.JWTStr, TimeSpan.FromDays(7));
-
-                await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(userId), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes));
-
-                loginReturn.CompanyInfo = companyInfo;
-                return ResponseOutput.Ok(loginReturn);
-
-            }
-            else
-            {
-                var returnModel = await _userService.Login(loginUser.UserName, loginUser.Password);
-
-                if (returnModel.IsSuccess)
-                {
-                    #region GRPC 调用鉴权中心，因为服务器IIS问题 http/2   故而没法使用
-
-                    ////重试策略
-                    //var defaultMethodConfig = new MethodConfig
-                    //{
-                    //    Names = { MethodName.Default },
-                    //    RetryPolicy = new RetryPolicy
-                    //    {
-                    //        MaxAttempts = 3,
-                    //        InitialBackoff = TimeSpan.FromSeconds(1),
-                    //        MaxBackoff = TimeSpan.FromSeconds(5),
-                    //        BackoffMultiplier = 1.5,
-                    //        RetryableStatusCodes = { Grpc.Core.StatusCode.Unavailable }
-                    //    }
-                    //};
-
-                    //#region  unable to trust the certificate then the gRPC client can be configured to ignore the invalid certificate
-
-                    //var httpHandler = new HttpClientHandler();
-                    //// Return `true` to allow certificates that are untrusted/invalid
-                    //httpHandler.ServerCertificateCustomValidationCallback =
-                    //    HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
-
-
-                    //////这一句是让grpc支持本地 http  如果本地访问部署在服务器上，那么是访问不成功的 
-                    //AppContext.SetSwitch(
-                    //    "System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport", true);
-
-                    //#endregion
-
-
-
-                    //var grpcAdress = configuration.GetValue<string>("GrpcAddress");
-                    ////var grpcAdress = "http://localhost:7200";
-
-                    //var channel = GrpcChannel.ForAddress(grpcAdress, new GrpcChannelOptions
-                    //{
-                    //    HttpHandler = httpHandler,
-                    //    ServiceConfig = new ServiceConfig { MethodConfigs = { defaultMethodConfig } }
-
-                    //});
-                    ////var channel = GrpcChannel.ForAddress(grpcAdress);
-                    //var grpcClient = new TokenGrpcService.TokenGrpcServiceClient(channel);
-
-                    //var userInfo = returnModel.Data.BasicInfo;
-
-                    //var tokenResponse = grpcClient.GetUserToken(new GetTokenReuqest()
-                    //{
-                    //    Id = userInfo.Id.ToString(),
-                    //    ReviewerCode = userInfo.ReviewerCode,
-                    //    IsAdmin = userInfo.IsAdmin,
-                    //    RealName = userInfo.RealName,
-                    //    UserTypeEnumInt = (int)userInfo.UserTypeEnum,
-                    //    UserTypeShortName = userInfo.UserTypeShortName,
-                    //    UserName = userInfo.UserName
-                    //});
-
-                    //returnModel.Data.JWTStr = tokenResponse.Token;
-
-                    #endregion
-
-                    var userId = returnModel.Data.BasicInfo.Id;
-
-                    if (_verifyConfig.CurrentValue.OpenLoginMFA)
-                    {
-
-
-
-
-                        //MFA 发送邮件
-
-                        returnModel.Data.IsMFA = true;
-
-                        var email = returnModel.Data.BasicInfo.EMail;
-
-                        var hiddenEmail = IRCEmailPasswordHelper.MaskEmail(email);
-
-                        returnModel.Data.BasicInfo.EMail = hiddenEmail;
-
-                        //修改密码
-                        if (returnModel.Data.BasicInfo.IsFirstAdd || returnModel.Data.BasicInfo.LoginState == 1)
-                        {
-                            returnModel.Data.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(returnModel.Data.BasicInfo));
-                        }
-                        else
-                        {
-                            //正常登录才发送邮件
-                            await _userService.SendMFAEmail(userId);
-
-                        }
-
-                    }
-                    else
-                    {
-                        returnModel.Data.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(returnModel.Data.BasicInfo));
-
-                        // 创建一个 CookieOptions 对象，用于设置 Cookie 的属性
-                        var option = new CookieOptions
-                        {
-                            Expires = DateTime.Now.AddMonths(1), // 设置过期时间为 30 分钟之后
-                            HttpOnly = false, // 确保 cookie 只能通过 HTTP 访问
-                            SameSite = Microsoft.AspNetCore.Http.SameSiteMode.None, // 设置 SameSite 属性
-                            Secure = false // 确保 cookie 只能通过 HTTPS 访问
-                        };
-
-                        HttpContext.Response.Cookies.Append("access_token", returnModel.Data.JWTStr, option);
-
-
-
-                        // 验证阅片休息时间
-                        await readingImageTaskService.ResetReadingRestTime(returnModel.Data.BasicInfo.Id);
-
-                        await _fusionCache.SetAsync(CacheKeys.UserToken(userId), returnModel.Data.JWTStr, TimeSpan.FromDays(7));
-
-                        await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(userId), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes));
-                    }
-
-                }
-
-                returnModel.Data.CompanyInfo = companyInfo;
-                return returnModel;
-
-            }
-
-
-
-
-        }
-
         [AllowAnonymous]
         [HttpGet, Route("user/getPublicKey")]
         public IResponseOutput GetPublicKey([FromServices] IOptionsMonitor<IRCEncreptOption> _IRCEncreptOption)
@@ -306,18 +120,13 @@ namespace IRaCIS.Api.Controllers
         [AllowAnonymous]
         public IResponseOutput ShareImage([FromServices] ITokenService _tokenService)
         {
-            var token = _tokenService.GetToken(IRaCISClaims.Create(new UserBasicInfo()
+            var token = _tokenService.GetToken(new UserTokenInfo()
             {
-                Id = Guid.Empty,
-                IsReviewer = false,
-                IsAdmin = false,
-                RealName = "Share001",
+                IdentityUserId = Guid.NewGuid(),
                 UserName = "Share001",
-                Sex = 0,
-                //UserType = "ShareType",
                 UserTypeEnum = UserTypeEnum.ShareImage,
-                Code = "ShareCode001",
-            }));
+
+            });
             return ResponseOutput.Ok("/showdicom?studyId=f7b67793-8155-0223-2f15-118f2642efb8&type=Share&token=" + token);
         }
 
@@ -376,7 +185,7 @@ namespace IRaCIS.Api.Controllers
 
         [HttpGet("User/UserRedirect")]
         [AllowAnonymous]
-        public async Task<IActionResult> UserRedirect([FromServices] IRepository<User> _userRepository, string url, [FromServices] ILogger<ExtraController> _logger)
+        public async Task<IActionResult> UserRedirect([FromServices] IRepository<IdentityUser> _useRepository, string url, [FromServices] ILogger<ExtraController> _logger)
         {
 
             var decodeUrl = System.Web.HttpUtility.UrlDecode(url);
@@ -392,9 +201,9 @@ namespace IRaCIS.Api.Controllers
             var errorUrl = domainStrList[0] + "//" + domainStrList[2] + "/error";
 
 
-            if (!await _userRepository.AnyAsync(t => t.Id == Guid.Parse(userId) && t.EmailToken == token && t.IsFirstAdd))
+            if (!await _useRepository.AnyAsync(t => t.Id == Guid.Parse(userId) && t.EmailToken == token && t.IsFirstAdd))
             {
-                decodeUrl = errorUrl + $"?lang={lang}&ErrorMessage={System.Web.HttpUtility.UrlEncode(lang == "zh" ? "您的初始化链接已过期" : "Error！The initialization link has expired.    Return")} ";
+                decodeUrl = errorUrl + $"?lang={lang}&ErrorMessage={System.Web.HttpUtility.UrlEncode(lang == "zh" ? "您的初始化链接已过期" : "Error！The initialization link has expired.")} ";
             }
 
             return Redirect(decodeUrl);
@@ -433,63 +242,6 @@ namespace IRaCIS.Api.Controllers
             #endregion
 
 
-            #region 客户端方式获取logto 里面的信息
-
-            var baseUrl = "https://logto.test.extimaging.com";
-            var appId = "v2mr2ndxwkxz0xpsuc1th";
-            var appSecret = "yq9jUxl70QoOmwHxJ37h1rDoyJ5iz92Q";
-            var apiAddress = "https://default.logto.app/api"; //这里是个坑
-            var scope = "all";
-
-            var opts = new RestClientOptions(baseUrl);
-            using var client = new RestClient(opts);
-
-            //https://bump.sh/logto/doc/logto-management-api/authentication
-            var request = new RestRequest("oidc/token", Method.Post);
-            request
-                .AddHeader("Content-Type", "application/x-www-form-urlencoded")
-                .AddParameter("grant_type", "client_credentials")
-                .AddParameter("client_id", appId)
-                .AddParameter("client_secret", appSecret)
-                .AddParameter("resource", apiAddress) //注意这里默认值地址和api 地址有区别
-                .AddParameter("scope", scope);
-           
-
-            var response = await client.ExecuteAsync<LogtoTokenResponse>(request);
-
-            if (response.StatusCode == HttpStatusCode.OK)
-            {
-                var tokenResponse = response.Data;
-
-                Console.WriteLine(tokenResponse.ToJsonStr());
-
-                #region 获取应用信息
-
-                var applicationRequest = new RestRequest($"/api/applications", Method.Get)
-                    .AddHeader("Authorization", $"Bearer {tokenResponse.AccessToken}");
-
-                var applicationResponse = await client.ExecuteAsync(applicationRequest);
-                #endregion
-
-                #region 获取用户信息
-                //curl \
-                // -X GET https://[tenant_id].logto.app/api/users/{userId} \
-                // -H "Authorization: Bearer $ACCESS_TOKEN"
-
-                var userId = "4fqx4cb3438k";
-                var userInfoRequest = new RestRequest($"api/users/{userId}", Method.Get)
-                    .AddHeader("Authorization", $"Bearer {tokenResponse.AccessToken}");
-
-
-                var userResponse = await client.ExecuteAsync<LogtoUser>(userInfoRequest);
-
-                Console.WriteLine(userResponse.Content);
-
-                #endregion
-            }
-
-
-            #endregion
 
 
             return ResponseOutput.Ok();

IRaCIS.Core.API/Controllers/FinancialChangeController.cs

@@ -51,30 +51,30 @@ namespace IRaCIS.Core.API.Controllers.Special
         [TrialGlobalLimit( "AddOrUpdateTrial", "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput<Trial>> AddOrUpdateTrial(TrialCommand param)
         {
-            var userId = Guid.Parse(User.FindFirst("id").Value);
+            //var userId = Guid.Parse(User.FindFirst("id").Value);
             var result = await _trialService.AddOrUpdateTrial(param);
 
-            if (_trialService.TrialExpeditedChange)
-            {
-                var needCalReviewerIds = await _trialService.GetTrialEnrollmentReviewerIds(param.Id.Value);
-                var calcList = await _calculateService.GetNeedCalculateReviewerList(Guid.Empty, string.Empty);
+            //if (_trialService.TrialExpeditedChange)
+            //{
+            //    var needCalReviewerIds = await _trialService.GetTrialEnrollmentReviewerIds(param.Id.Value);
+            //    var calcList = await _calculateService.GetNeedCalculateReviewerList(Guid.Empty, string.Empty);
 
-                calcList.ForEach(t =>
-                {
-                    if (needCalReviewerIds.Contains(t.DoctorId))
-                    {
-                        _calculateService.CalculateMonthlyPayment(new CalculateDoctorAndMonthDTO()
-                        {
-                            NeedCalculateReviewers = new List<Guid>()
-                            {
-                                t.DoctorId
-                            },
-                            CalculateMonth = DateTime.Parse(t.YearMonth)
-                        }, User.FindFirst("id").Value);
+            //    calcList.ForEach(t =>
+            //    {
+            //        if (needCalReviewerIds.Contains(t.DoctorId))
+            //        {
+            //            _calculateService.CalculateMonthlyPayment(new CalculateDoctorAndMonthDTO()
+            //            {
+            //                NeedCalculateReviewers = new List<Guid>()
+            //                {
+            //                    t.DoctorId
+            //                },
+            //                CalculateMonth = DateTime.Parse(t.YearMonth)
+            //            }, User.FindFirst("id").Value);
 
-                    }
-                });
-            }
+            //        }
+            //    });
+            //}
 
             return result;
         }

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -522,10 +522,10 @@ namespace IRaCIS.Core.API.Controllers
         [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [UnitOfWork]
 
-        public async Task<IResponseOutput> ConfirmReReading(DataInspectionDto<ConfirmReReadingCommand> opt, [FromServices] IVisitTaskHelpeService _visitTaskCommonService, [FromServices] IVisitTaskService _visitTaskService)
+        public async Task<IResponseOutput> ConfirmReReading(DataInspectionDto<ConfirmReReadingCommand> opt,  [FromServices] IVisitTaskService _visitTaskService)
         {
             var singId = await _inspectionService.RecordSing(opt.SignInfo);
-            var result = await _visitTaskService.ConfirmReReading(opt.Data, _visitTaskCommonService);
+            var result = await _visitTaskService.ConfirmReReading(opt.Data);
             await _inspectionService.CompletedSign(singId, result);
             return result;
         }

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -297,7 +297,7 @@ namespace IRaCIS.Core.API.Controllers
         [HttpPost, Route("Study/ArchiveStudy")]
         [DisableFormValueModelBinding]
         [DisableRequestSizeLimit]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         public async Task<IResponseOutput> ArchiveStudyNew(Guid trialId, Guid subjectVisitId, string studyInstanceUid, Guid? abandonStudyId, Guid studyMonitorId,
              [FromServices] ILogger<UploadDownLoadController> _logger,
              [FromServices] IStudyService _studyService,
@@ -370,7 +370,7 @@ namespace IRaCIS.Core.API.Controllers
                         //await _uploadHub.Clients.All.ReceivProgressAsync(archiveStudyCommand.StudyInstanceUid, receivedCount);
 
 
-                        await _uploadHub.Clients.User(_userInfo.Id.ToString()).ReceivProgressAsync(archiveStudyCommand.StudyInstanceUid, receivedCount);
+                        await _uploadHub.Clients.User(_userInfo.UserRoleId.ToString()).ReceivProgressAsync(archiveStudyCommand.StudyInstanceUid, receivedCount);
 
                         archiveResult.ReceivedFileCount = receivedCount;
 
@@ -452,7 +452,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="_studyMonitorRepository"></param>
         /// <returns></returns>
         [HttpPost, Route("Study/PreArchiveStudy")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         public async Task<IResponseOutput> PreArchiveStudy(PreArchiveStudyCommand preArchiveStudyCommand,
      [FromServices] IStudyService _studyService,
      [FromServices] IRepository<StudyMonitor> _studyMonitorRepository)
@@ -488,7 +488,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="_noneDicomStudyFileRepository"></param>
         /// <returns></returns>
         [HttpPost("NoneDicomStudy/UploadNoneDicomFile")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         public async Task<IResponseOutput> UploadNoneDicomFile(UploadNoneDicomFileCommand incommand,
             [FromServices] IRepository<NoneDicomStudy> _noneDicomStudyRepository,
             [FromServices] IRepository<StudyMonitor> _studyMonitorRepository,
@@ -560,7 +560,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <returns></returns>
         /// <exception cref="BusinessValidationFailedException"></exception>
         [HttpPost("QCOperation/UploadVisitCheckExcel/{trialId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         public async Task<IResponseOutput> UploadVisitCheckExcel(Guid trialId, [FromServices] IOSSService oSSService, [FromServices] IRepository<InspectionFile> _inspectionFileRepository)
         {
@@ -850,11 +850,18 @@ namespace IRaCIS.Core.API.Controllers
                 throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidCenters"]);
             }
 
-            if (excelList.GroupBy(t => new { t.TrialSiteCode, t.UserTypeStr, t.Email }).Any(g => g.Count() > 1))
+            foreach (var item in excelList.GroupBy(t => t.Email.Trim()))
             {
-                //	同一邮箱，同一用户类型，只能生成一个账户,请核查Excel数据
+                var itemList = item.ToList();
 
-                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_CheckDuplicateAccounts"]);
+                var first = item.First();
+
+                if (itemList.Any(t => t.Email.Trim() != first.Email.Trim() || t.Phone.Trim() != first.Phone.Trim() || t.OrganizationName.Trim() != first.OrganizationName.Trim() || t.FirstName.Trim() != first.FirstName.Trim() || t.LastName.Trim() != first.LastName.Trim()))
+                {
+                    //同一邮箱，用户信息应该保持一致！
+
+                    throw new BusinessValidationFailedException(_localizer["UploadDownLoad_CheckDuplicateAccounts"]);
+                }
             }
 
             if (excelList.Any(t => !t.Email.Contains("@")))
@@ -879,7 +886,7 @@ namespace IRaCIS.Core.API.Controllers
 
             foreach (var item in excelList)
             {
-                switch (item.UserTypeStr.ToUpper())
+                switch (item.UserTypeStr.Trim().ToUpper())
                 {
                     case "CRC":
 
@@ -896,7 +903,7 @@ namespace IRaCIS.Core.API.Controllers
 
                 }
 
-                item.TrialSiteId = siteList.FirstOrDefault(t => t.TrialSiteCode.ToUpper() == item.TrialSiteCode.ToUpper()).TrialSiteId;
+                item.TrialSiteId = siteList.FirstOrDefault(t => t.TrialSiteCode.Trim().ToUpper() == item.TrialSiteCode.Trim().ToUpper()).TrialSiteId;
             }
 
             var list = excelList.Where(t => t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserTypeEnum == UserTypeEnum.CRA).ToList();

IRaCIS.Core.API/IRaCIS.Core.API.xml

@@ -34,9 +34,6 @@
             <param name="doctorId"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Api.Controllers.ExtraController.Login(IRaCIS.Application.Contracts.UserLoginDTO,ZiggyCreatures.Caching.Fusion.IFusionCache,IRaCIS.Core.Application.Service.IUserService,IRaCIS.Core.Application.Auth.ITokenService,IRaCIS.Core.Application.Contracts.IReadingImageTaskService,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},IRaCIS.Core.Application.Service.IMailVerificationService)">
-            <summary>  系统用户登录接口[New] </summary>
-        </member>
         <member name="M:IRaCIS.Api.Controllers.ExtraController.OAuthCallBack(System.String,System.String)">
             <summary>
             回调到前端，前端调用后端的接口 
@@ -284,7 +281,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.ConfirmReReading(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.ViewModel.ConfirmReReadingCommand},IRaCIS.Core.Application.Service.IVisitTaskHelpeService,IRaCIS.Core.Application.Service.IVisitTaskService)">
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.ConfirmReReading(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.ViewModel.ConfirmReReadingCommand},IRaCIS.Core.Application.Service.IVisitTaskService)">
             <summary>
             重阅同意
             </summary>
@@ -346,147 +343,6 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="T:IRaCIS.Core.API.OAuth.LogtoParameters.Tokens">
-            <summary>
-            The token names used by Cookie and OpenID Connect middleware to store and retrieve tokens from
-            Logto OpenID Connect provider.
-            <br/>
-            See <see href="https://github.com/dotnet/aspnetcore/blob/4a9118c674a798aaf6379b4b7b2d8787bc688f96/src/Security/Authentication/OpenIdConnect/src/OpenIdConnectHandler.cs#L994-L1035">tokens that are stored by OpenID Connect middleware</see> for more details.
-            </summary>
-        </member>
-        <member name="T:IRaCIS.Core.API.OAuth.LogtoParameters.Scopes">
-            <summary>
-            The scope names used by Logto OpenID Connect provider to request for user information.
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Scopes.Email">
-            <summary>
-            The scope name for requesting user's email.
-            Logto will issue two claims to the ID token: <c>email</c> and <c>email_verified</c>.
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Scopes.Phone">
-            <summary>
-            The scope name for requesting user's phone number.
-            Logto will issue two claims to the ID token: <c>phone</c> and <c>phone_verified</c>.
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Scopes.CustomData">
-            <summary>
-            The scope name for requesting user's custom data.
-            Logto will issue a claim to the response of the <c>userinfo</c> endpoint: <c>custom_data</c>.
-            <br/>
-            Note that when requesting this scope, you must set <see cref="!:LogtoOptions.GetClaimsFromUserInfoEndpoint"/> to <c>true</c>.
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Scopes.Identities">
-            <summary>
-            The scope name for requesting user's identities.
-            Logto will issue a claim to the response of the <c>userinfo</c> endpoint: <c>identities</c>.
-            <br/>
-            Note that when requesting this scope, you must set <see cref="!:LogtoOptions.GetClaimsFromUserInfoEndpoint"/> to <c>true</c>.
-            </summary>
-        </member>
-        <member name="T:IRaCIS.Core.API.OAuth.LogtoParameters.Claims">
-            <summary>
-            The claim names used by Logto OpenID Connect provider for ID token and userinfo endpoint.
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Claims.Issuer">
-            <summary>
-            The claim name for the issuer identifier for whom issued the token.
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Claims.Subject">
-            <summary>
-            The claim name for the subject identifier for whom the token is intended (user ID).
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Claims.Audience">
-            <summary>
-            The claim name for the audience that the token is intended for, which is the client ID.
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Claims.Expiration">
-            <summary>
-            The claim name for the expiration time of the token (in seconds).
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Claims.IssuedAt">
-            <summary>
-            The claim name for the time at which the token was issued (in seconds).
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Claims.Name">
-            <summary>
-            The claim name for the user's full name.
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Claims.Username">
-            <summary>
-            The claim name for user's username.
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Claims.Picture">
-            <summary>
-            The claim name for user's profile picture URL.
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Claims.Email">
-            <summary>
-            The claim name for user's email.
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Claims.EmailVerified">
-            <summary>
-            The claim name for user's email verification status.
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Claims.PhoneNumber">
-            <summary>
-            The claim name for user's phone number.
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Claims.PhoneNumberVerified">
-            <summary>
-            The claim name for user's phone number verification status.
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Claims.CustomData">
-            <summary>
-            The claim name for user's custom data.
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.API.OAuth.LogtoParameters.Claims.Identities">
-            <summary>
-            The claim name for user's identities.
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.API.OAuth.LogtoTokenResponse.AccessToken">
-            <summary>
-            The access token issued by the Logto authorization server.
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.API.OAuth.LogtoTokenResponse.TokenType">
-            <summary>
-            The type of the token issued by the Logto authorization server.
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.API.OAuth.LogtoTokenResponse.ExpiresIn">
-            <summary>
-            The lifetime in seconds of the access token.
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.API.OAuth.LogtoTokenResponse.RefreshToken">
-            <summary>
-            The refresh token, which can be used to obtain new access tokens using the same authorization grant.
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.API.OAuth.LogtoTokenResponse.IdToken">
-            <summary>
-            The ID token, which can be used to verify the identity of the user.
-            </summary>
-        </member>
         <member name="T:IRaCIS.Core.API.IpPolicyRateLimitSetup">
             <summary>
             IPLimit限流 启动服务

IRaCIS.Core.API/Progranm.cs

@@ -52,6 +52,7 @@ SerilogExtension.AddSerilogSetup(enviromentName);
 
 var builder = WebApplication.CreateBuilder(new WebApplicationOptions
 {
+
     EnvironmentName = enviromentName
 });
 

IRaCIS.Core.API/Properties/launchSettings.json

@@ -69,6 +69,14 @@
         "ASPNETCORE_ENVIRONMENT": "US_Uat_IRC"
       },
       "applicationUrl": "http://localhost:6100"
+    },
+    "IRaCIS.US_Prod_IRC": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "US_Prod_IRC"
+      },
+      "applicationUrl": "http://localhost:6100"
     }
 
   }

IRaCIS.Core.API/SignalRHub/UploadHub.cs

@@ -17,7 +17,7 @@ namespace IRaCIS.Core.API
     {
         public virtual string GetUserId(HubConnectionContext connection)
         {
-            return connection.User?.FindFirst(JwtIRaCISClaimType.Id)?.Value!;
+            return connection.User?.FindFirst(JwtIRaCISClaimType.IdentityUserId)?.Value!;
         }
     }
 

IRaCIS.Core.API/_PipelineExtensions/Serilog/SerilogConfig.cs

@@ -38,7 +38,7 @@ namespace IRaCIS.Core.API
                         diagnosticContext.Set("QueryString", request.QueryString.Value);
                     }
 
-                    diagnosticContext.Set("FullName", httpContext?.User?.FindFirst(JwtIRaCISClaimType.RealName)?.Value);
+                    diagnosticContext.Set("FullName", httpContext?.User?.FindFirst(JwtIRaCISClaimType.FullName)?.Value);
 
                     diagnosticContext.Set("UserType", httpContext?.User?.FindFirst(JwtIRaCISClaimType.UserTypeShortName)?.Value);
 

IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs

@@ -1,5 +1,6 @@
 using EntityFramework.Exceptions.SqlServer;
 using IRaCIS.Core.Application.Triggers;
+using IRaCIS.Core.Application.Triggers.AfterSaveTrigger;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Infra.EFCore.Interceptor;
@@ -79,6 +80,14 @@ namespace IRaCIS.Core.API
 
                     triggerOptions.AddTrigger<UserLogTrigger>();
 
+                    triggerOptions.AddTrigger<UserAddTrigger>();
+
+                    triggerOptions.AddTrigger<UserLogAfterTrigger>();
+
+                    triggerOptions.AddTrigger<IdenttiyUserRoleInfoTrigger>();
+
+                    
+
                 });
             });
 

IRaCIS.Core.API/_ServiceExtensions/SwaggerSetup.cs

@@ -109,7 +109,6 @@ public static class SwaggerSetup
             //路径配置，设置为空，表示直接在根域名（localhost:8001）访问该文件,
             //注意localhost:8001/swagger是访问不到的，去launchSettings.json把launchUrl去掉，如果你想换一个路径，直接写名字即可，比如直接写c.Route = "doc";
             options.RoutePrefix = string.Empty;
-            options.RoutePrefix = string.Empty;
 
             //DocExpansion设置为none可折叠所有方法
             options.DocExpansion(DocExpansion.None);

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -43,25 +43,22 @@
     "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
     "LoginFailLockMinutes": 30,
-
     "AutoLoginOutMinutes": 360,
 
     "OpenLoginMFA": false,
 
     "ContinuousReadingTimeMin": 120,
-
     "ReadingRestTimeMin": 10,
 
     "IsNeedChangePassWord": true,
-
     "ChangePassWordDays": 90
   },
 
   "SystemEmailSendConfig": {
     "Port": 465,
     "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "IRC@extimaging.com",
-    "FromName": "IRC",
+    "FromEmail": "irc@extimaging.com",
+    "FromName": "irc",
     "AuthorizationCode": "ExtImg@2022",
     "SiteUrl": "http://irc.extimaging.com/login",
     "OrganizationName": "Extlmaging",
@@ -71,7 +68,7 @@
     "CompanyShortName": "Extensive Imaging",
     "CompanyShortNameCN": "展影医疗",
     "IsEnv_US": false,
-    "IsOpenErrorNoticeEmail": true,
+    "IsOpenErrorNoticeEmail": false,
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]
   },
   "SystemPacsConfig": {

IRaCIS.Core.API/appsettings.Test_IRC.json

@@ -52,28 +52,24 @@
   "BasicSystemConfig": {
 
     "OpenUserComplexPassword": false,
-
     "OpenSignDocumentBeforeWork": false,
 
-    "OpenTrialRelationDelete": true,
-
     "OpenLoginLimit": false,
-
     "LoginMaxFailCount": 5,
-
     "LoginFailLockMinutes": 1,
-
-    "AutoLoginOutMinutes": 1,
+    "AutoLoginOutMinutes": 10,
 
     "OpenLoginMFA": false,
 
     "ContinuousReadingTimeMin": 120,
-
     "ReadingRestTimeMin": 10,
-    "IsNeedChangePassWord": true,
 
+    "IsNeedChangePassWord": true,
     "ChangePassWordDays": 90,
 
+
+    "OpenTrialRelationDelete": true,
+
     "ThirdPdfUrl": "http://106.14.89.110:30088/api/v1/convert/file/pdf"
   },
 

IRaCIS.Core.API/appsettings.US_Prod_IRC.json

@@ -7,8 +7,8 @@
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=us-prod-mssql-service,1433;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=us-prod-mssql-service,1433;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+    "RemoteNew": "Server=us-mssql-prod,1433;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=us-mssql-prod,1433;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
     //"RemoteNew": "Server=44.210.231.169,1435;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
     //"Hangfire": "Server=44.210.231.169,1435;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
   },
@@ -39,25 +39,25 @@
   },
   "BasicSystemConfig": {
 
-    "OpenUserComplexPassword": false,
-
-    "OpenSignDocumentBeforeWork": false,
-
-    "OpenTrialRelationDelete": true,
-
-    "OpenLoginLimit": false,
+    "OpenUserComplexPassword": true,
+    "OpenSignDocumentBeforeWork": true,
 
+    "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
-
     "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 60,
+    "AutoLoginOutMinutes": 120,
+
+    "OpenLoginMFA": true,
 
     "ContinuousReadingTimeMin": 120,
-
     "ReadingRestTimeMin": 10,
-    "IsNeedChangePassWord": true,
 
-    "ChangePassWordDays": 90
+    "IsNeedChangePassWord": true,
+    "ChangePassWordDays": 90,
+
+
+    "OpenTrialRelationDelete": false
+
   },
 
   "SystemEmailSendConfig": {
@@ -75,7 +75,7 @@
     "CompanyShortNameCN": "展影医疗",
     "SiteUrl": "https://lili.elevateimaging.ai/login",
     "IsEnv_US": true,
-    "IsOpenErrorNoticeEmail": true,
+    "IsOpenErrorNoticeEmail": false,
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]
   },
 

IRaCIS.Core.API/appsettings.US_Uat_IRC.json

@@ -50,26 +50,20 @@
   "BasicSystemConfig": {
 
     "OpenUserComplexPassword": true,
-
     "OpenSignDocumentBeforeWork": true,
 
-    "OpenTrialRelationDelete": true,
-
-    "OpenLoginLimit": false,
-
+    "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
-
     "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 60,
+    "AutoLoginOutMinutes": 120,
+
+    "OpenLoginMFA": true,
 
     "ContinuousReadingTimeMin": 120,
-
     "ReadingRestTimeMin": 10,
+
     "IsNeedChangePassWord": true,
-
-    "ChangePassWordDays": 90,
-
-    "OpenLoginMFA": false
+    "ChangePassWordDays": 90
   },
 
   "SystemEmailSendConfig": {
@@ -85,7 +79,7 @@
     "CompanyNameCN": "上海展影医疗科技有限公司",
     "CompanyShortName": "Elevate Imaging",
     "CompanyShortNameCN": "展影医疗",
-    "SiteUrl": "https://lili.test.elevateimaging.ai/login",
+    "SiteUrl": "https://lili.uat.elevateimaging.ai/login",
     "IsEnv_US": true,
     "IsOpenErrorNoticeEmail": false,
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -7,8 +7,8 @@
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=47.117.164.182,1434;Database=Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=47.117.164.182,1434;Database=Uat_IRC.Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+    "RemoteNew": "Server=101.132.253.119,1435;Database=Uat_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=101.132.253.119,1435;Database=Uat_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
   },
   "ObjectStoreService": {
 
@@ -18,11 +18,11 @@
       "RegionId": "cn-shanghai",
       "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
       "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tRRZehUp2V9pyTPtAJm",
-      "AccessKeySecret": "FLizxkHsMm4CGYHtkV8E3PNJJZU7oV",
-      "RoleArn": "acs:ram::1899121822495495:role/dev-oss-access",
-      "BucketName": "zy-irc-uat-store",
-      "ViewEndpoint": "https://zy-irc-uat-store.oss-cn-shanghai.aliyuncs.com",
+      "AccessKeyId": "LTAI5tFUCCmz5TwghZHsj45Y",
+      "AccessKeySecret": "8evrBy1fVfzJG25i67Jm0xqn9Xcw2T",
+      "RoleArn": "acs:ram::1078130221702011:role/uat-oss-access",
+      "BucketName": "tl-med-irc-uat-store",
+      "ViewEndpoint": "https://tl-med-irc-uat-store.oss-cn-shanghai.aliyuncs.com",
       "Region": "oss-cn-shanghai",
       "DurationSeconds": 7200
     },
@@ -56,7 +56,6 @@
   "BasicSystemConfig": {
 
     "OpenUserComplexPassword": true,
-
     "OpenSignDocumentBeforeWork": true,
 
     "OpenLoginLimit": true,
@@ -64,13 +63,13 @@
 
     "LoginFailLockMinutes": 30,
     "AutoLoginOutMinutes": 60,
+
     "OpenLoginMFA": false,
 
     "ContinuousReadingTimeMin": 120,
-
     "ReadingRestTimeMin": 10,
-    "IsNeedChangePassWord": true,
 
+    "IsNeedChangePassWord": true,
     "ChangePassWordDays": 90
 
   },
@@ -94,7 +93,7 @@
 
   "SystemPacsConfig": {
     "Port": "11113",
-    "IP": "47.117.164.182"
+    "IP": "101.132.253.119"
   }
 
 }

IRaCIS.Core.API/appsettings.json

@@ -66,5 +66,13 @@
     "ApiPathList": [
       "/test/get"
     ]
+  },
+  "oauth": {
+    "github": {
+      "app_id": "github_app_id",
+      "app_key": "github_app_key",
+      "redirect_uri": "https://oauthlogin.net/oauth/githubcallback",
+      "scope": "repo"
+    }
   }
 }

IRaCIS.Core.API/wwwroot/swagger/ui/abp.swagger.js

@@ -268,12 +268,12 @@ var abp = abp || {};
     }
 
     function loginUserInternal(tenantId, callback) {
-       
+
         var usernameOrEmailAddress = document.getElementById('userName').value;
-        if (!usernameOrEmailAddress) {
-            alert('UserName Can Not Be Null');
-            return false;
-        }
+        // if (!usernameOrEmailAddress) {
+        //    alert('UserName Can Not Be Null');
+        //     return false;
+        // }
 
         var password = document.getElementById('password').value;
         var pwdMd5 = document.getElementById('pwdMd5').value;
@@ -286,12 +286,12 @@ var abp = abp || {};
         var xhr = new XMLHttpRequest();
 
         xhr.onreadystatechange = function () {
-            
+
             if (xhr.readyState === XMLHttpRequest.DONE) {
-                debugger;
+                // debugger;
                 if (xhr.status === 200) {
-                    debugger;
-                   
+                    // debugger;
+
                     var resultdata = JSON.parse(xhr.responseText);
                     if (resultdata.ErrorMessage != '') {
                         alert(resultdata.ErrorMessage);
@@ -303,18 +303,23 @@ var abp = abp || {};
                     else {
                         var responseJSON = JSON.parse(xhr.responseText);
                         var result = responseJSON;
-                        var expireDate = new Date(Date.now() + (60*60*24 * 1000));
+                        var expireDate = new Date(Date.now() + (60 * 60 * 24 * 1000));
                         abp.auth.setToken(result.Result.JWTStr, expireDate);
-                        callback();
+                        let selectDom = document.getElementById("roleSelect")
+                        selectDom.options.length = 0;
+                        result.Result.BasicInfo.AccountList.forEach(item => {
+                            selectDom.options.add(new Option(item.UserTypeShortName, item.Id));
+                        })
+                        // callback();
                     }
-                   
+
                 } else {
                     alert('Login failed !');
                 }
             }
         };
-      
-        xhr.open('POST', '/user/login', true);
+
+        xhr.open('POST', '/User/getUserLoginRoleList', true);
         xhr.setRequestHeader('Abp.TenantId', tenantId);
         xhr.setRequestHeader('Content-type', 'application/json');
         var parm = {
@@ -330,7 +335,63 @@ var abp = abp || {};
         //xhr.send("{" + "userName:'" + usernameOrEmailAddress + "'," + "passWord:'" + password + "'}");
 
     };
+    function loginUserInternalRole(tenantId, callback) {
 
+        var usernameOrEmailAddress = document.getElementById('roleSelect').value;
+        //if (!usernameOrEmailAddress) {
+        //   alert('UserName Can Not Be Null');
+        //   return false;
+        //}
+
+        var password = document.getElementById('password').value;
+        var pwdMd5 = document.getElementById('pwdMd5').value;
+        console.log(pwdMd5);
+        if (!password && !pwdMd5) {
+            alert('PassWord And Md5 Can Not Be Null');
+            return false;
+        }
+
+        var xhr = new XMLHttpRequest();
+
+        xhr.onreadystatechange = function () {
+
+            if (xhr.readyState === XMLHttpRequest.DONE) {
+                // debugger;
+                if (xhr.status === 200) {
+                    // debugger;
+
+                    var resultdata = JSON.parse(xhr.responseText);
+                    if (resultdata.ErrorMessage != '') {
+                        alert(resultdata.ErrorMessage);
+                        return false;
+                    }
+                    if (resultdata.code == 300) {
+                        alert(resultdata.message);
+                    }
+                    else {
+                        var responseJSON = JSON.parse(xhr.responseText);
+                        var result = responseJSON;
+                        var expireDate = new Date(Date.now() + (60 * 60 * 24 * 1000));
+                        abp.auth.setToken(result.Result, expireDate);
+
+                        callback();
+                    }
+
+                } else {
+                    alert('Login failed !');
+                }
+            }
+        };
+
+        xhr.open('get', `/User/loginSelectUserRole?userRoleId=${usernameOrEmailAddress}`, true);
+        xhr.setRequestHeader('Abp.TenantId', tenantId);
+        xhr.setRequestHeader('Content-type', 'application/json');
+        var authToken = abp.auth.getToken();
+        xhr.setRequestHeader('Authorization', `Bearer ${authToken}`);
+        xhr.send();
+        //xhr.send("{" + "userName:'" + usernameOrEmailAddress + "'," + "passWord:'" + password + "'}");
+
+    };
     abp.swagger.login = function (callback) {
         //Get TenantId first
         var tenancyName = document.getElementById('tenancyName').value;
@@ -356,6 +417,31 @@ var abp = abp || {};
             loginUserInternal(null, callback); // Login for host
         }
     };
+    abp.swagger.loginRole = function (callback) {
+        //Get TenantId first
+        var tenancyName = document.getElementById('tenancyName').value;
+
+        if (tenancyName) {
+            var xhrTenancyName = new XMLHttpRequest();
+            xhrTenancyName.onreadystatechange = function () {
+                if (xhrTenancyName.readyState === XMLHttpRequest.DONE && xhrTenancyName.status === 200) {
+                    var responseJSON = JSON.parse(xhrTenancyName.responseText);
+                    var result = responseJSON.result;
+                    if (result.state === 1) { // Tenant exists and active.
+                        loginUserInternalRole(result.tenantId, callback); // Login for tenant    
+                    } else {
+                        alert('There is no such tenant or tenant is not active !');
+                    }
+                }
+            };
+
+            xhrTenancyName.open('POST', '/api/services/app/Account/IsTenantAvailable', true);
+            xhrTenancyName.setRequestHeader('Content-type', 'application/json');
+            xhrTenancyName.send("{" + "tenancyName:'" + tenancyName + "'}");
+        } else {
+            loginUserInternalRole(null, callback); // Login for host
+        }
+    };
 
     abp.swagger.logout = function () {
         abp.auth.clearToken();
@@ -419,9 +505,10 @@ var abp = abp || {};
 
         //Inputs
         createInput(modalUxContent, 'tenancyName', 'Tenancy Name (Leave empty for Host)');
-        createInput(modalUxContent, 'userName', 'Username or email address','text','cyldev');
+        createInput(modalUxContent, 'userName', 'Username or email address', 'text', 'cyldev');
         createInput(modalUxContent, 'password', 'Password', 'password', '123456');
         createInput(modalUxContent, 'pwdMd5', 'PwdMd5', 'text', '');
+        createSelect(modalUxContent, 'roleSelect', 'role', [])
 
         //Buttons
         var authBtnWrapper = document.createElement('div');
@@ -444,9 +531,18 @@ var abp = abp || {};
             abp.swagger.login(loginCallback);
         };
         authBtnWrapper.appendChild(authorizeButton);
+
+        // login role
+        var authorizeButton = document.createElement('button');
+        authorizeButton.className = 'btn modal-btn auth authorize button';
+        authorizeButton.innerText = 'LoginRole';
+        authorizeButton.onclick = function () {
+            abp.swagger.loginRole(loginCallback);
+        };
+        authBtnWrapper.appendChild(authorizeButton);
     }
 
-    function createInput(container, id, title, type, value="") {
+    function createInput(container, id, title, type, value = "") {
         var wrapper = document.createElement('div');
         wrapper.className = 'wrapper';
         if (id == "tenancyName") {
@@ -470,6 +566,31 @@ var abp = abp || {};
         input.autocomplete = "off";
 
 
+        section.appendChild(input);
+    }
+    function createSelect(container, id, title, option = []) {
+        var wrapper = document.createElement('div');
+        wrapper.className = 'wrapper';
+        if (id == "tenancyName") {
+            wrapper.style.display = 'none';
+        }
+        container.appendChild(wrapper);
+
+        var label = document.createElement('label');
+        label.innerText = title;
+        wrapper.appendChild(label);
+
+        var section = document.createElement('section');
+        section.className = 'block-tablet col-10-tablet block-desktop col-10-desktop';
+        wrapper.appendChild(section);
+
+        var input = document.createElement('select');
+        input.id = id;
+        input.style.width = '100%';
+        option.forEach(item => {
+            input.options.add(new Option(item.UserTypeShortName, item.Id));
+        })
+
         section.appendChild(input);
     }
 

IRaCIS.Core.Application/Auth/IRaCISClaims.cs

@@ -1,46 +0,0 @@
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Domain.Share;
-
-namespace IRaCIS.Core.Application.Auth
-{
-    public class IRaCISClaims
-    {
-        public Guid Id { get; set; }
-        public string FullName { get; set; } = String.Empty;
-        public string Code { get; set; } = String.Empty;
-        public string RealName { get; set; } = String.Empty;
-
-        public string UserTypeShortName { get; set; } = String.Empty;
-
-        public UserTypeEnum UserTypeEnum { get; set; }
-
-        public string PermissionStr { get; set; } = String.Empty;
-
-        public Guid UserTypeId { get; set; }
-
-        public int IsAdmin { get; }
-
-        public bool IsTestUser { get; set; }
-
-        public bool IsZhiZhun { get; set; }
-
-        public string Phone { get; set; } = String.Empty;
-
-        public static IRaCISClaims Create(UserBasicInfo user)
-        {
-            return new IRaCISClaims
-            {
-                Id = user.Id,
-                FullName = user.UserName,
-                RealName = user.RealName,
-                UserTypeEnum = user.UserTypeEnum,
-                UserTypeId = user.UserTypeId,
-                IsTestUser = user.IsTestUser,
-                Code = user.Code,
-                PermissionStr = user.PermissionStr,
-                IsZhiZhun = user.IsZhiZhun,
-                UserTypeShortName = user.UserTypeShortName
-            };
-        }
-    }
-}

IRaCIS.Core.Application/Auth/TokenService.cs

@@ -8,7 +8,7 @@ namespace IRaCIS.Core.Application.Auth
 
     public interface ITokenService
     {
-        string GetToken(IRaCISClaims user);
+        string GetToken(UserTokenInfo user);
     }
 
 
@@ -21,16 +21,16 @@ namespace IRaCIS.Core.Application.Auth
             _jwtSetting = option.Value;
         }
 
-        public string GetToken(IRaCISClaims user)
+        public string GetToken(UserTokenInfo user)
         {
             //创建用户身份标识，可按需要添加更多信息
             var claims = new Claim[]
             {
                 new Claim(Microsoft.IdentityModel.JsonWebTokens.JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()),
-                new Claim(JwtIRaCISClaimType.Id, user.Id.ToString()),
-                new Claim(JwtIRaCISClaimType.Name, user.FullName),
-                new Claim(JwtIRaCISClaimType.RealName, user.RealName),
-                new Claim(JwtIRaCISClaimType.Code,user.Code),
+                 new Claim(JwtIRaCISClaimType.IdentityUserId, user.IdentityUserId.ToString()),
+                new Claim(JwtIRaCISClaimType.UserRoleId, user.UserRoleId.ToString()),
+                new Claim(JwtIRaCISClaimType.UserName, user.UserName),
+                new Claim(JwtIRaCISClaimType.FullName, user.FullName),
                 new Claim(JwtIRaCISClaimType.UserTypeId,user.UserTypeId.ToString()),
                 new Claim(JwtIRaCISClaimType.UserTypeEnum,user.UserTypeEnum.ToString()),
                 new Claim(JwtIRaCISClaimType.UserTypeEnumInt,((int)user.UserTypeEnum).ToString()),

IRaCIS.Core.Application/Auth/UserTokenInfo.cs

@@ -0,0 +1,27 @@
+using IRaCIS.Application.Contracts;
+using IRaCIS.Core.Domain.Share;
+
+namespace IRaCIS.Core.Application.Auth
+{
+    public class UserTokenInfo
+    {
+        public Guid IdentityUserId { get; set; }
+
+        public Guid UserRoleId { get; set; }
+
+        public Guid UserTypeId { get; set; }
+
+        public UserTypeEnum UserTypeEnum { get; set; }
+
+        public string UserName { get; set; } = string.Empty;
+        public string FullName { get; set; } = string.Empty;
+
+        public string PermissionStr { get; set; } = string.Empty;
+
+        public bool IsTestUser { get; set; }
+
+        public bool IsZhiZhun { get; set; }
+
+        public string UserTypeShortName { get; set; } = string.Empty;
+    }
+}

IRaCIS.Core.Application/BusinessFilter/LegacyController/LimitUserRequestAuthorization.cs

@@ -48,7 +48,7 @@ public class LimitUserRequestAuthorization(
 
 
                 //2、在这里取缓存  进行比较  看是否有其他人进行了登陆，如果其他人登陆了，就把之前用户挤掉
-                var cacheUserToken = await _fusionCache.GetOrDefaultAsync<string>(CacheKeys.UserToken(_userInfo.Id));
+                var cacheUserToken = await _fusionCache.GetOrDefaultAsync<string>(CacheKeys.UserToken(_userInfo.IdentityUserId));
 
 
 
@@ -58,17 +58,17 @@ public class LimitUserRequestAuthorization(
                     cacheUserToken = _userInfo.UserToken;
 
                     //设置当前用户最新Token
-                    await _fusionCache.SetAsync(CacheKeys.UserToken(_userInfo.Id), _userInfo.UserToken, TimeSpan.FromDays(7));
+                    await _fusionCache.SetAsync(CacheKeys.UserToken(_userInfo.IdentityUserId), _userInfo.UserToken, TimeSpan.FromDays(7));
 
                     //重启应用程序，所有人续期，不一下子踢出所有人
-                    await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(_userInfo.Id), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));
+                    await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(_userInfo.IdentityUserId), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));
 
                 }
                 //是同一个人  
                 else if (cacheUserToken == _userInfo.UserToken)
                 {
 
-                    var cacheTime = await _fusionCache.GetOrDefaultAsync<string>(CacheKeys.UserAutoLoginOut(_userInfo.Id));
+                    var cacheTime = await _fusionCache.GetOrDefaultAsync<string>(CacheKeys.UserAutoLoginOut(_userInfo.IdentityUserId));
 
                     //过期了 需要自动退出
                     if (string.IsNullOrEmpty(cacheTime))
@@ -80,7 +80,7 @@ public class LimitUserRequestAuthorization(
                     }
                     else
                     {
-                        await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(_userInfo.Id), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));
+                        await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(_userInfo.IdentityUserId), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));
                     }
                 }
                 else
@@ -93,6 +93,21 @@ public class LimitUserRequestAuthorization(
 
                 }
 
+                //用户或者角色禁用，那么操作的人退出
+
+                var isDisable = await _fusionCache.GetOrDefaultAsync<bool>(CacheKeys.UserDisable(_userInfo.IdentityUserId),false);
+
+                var isRoleDisable = await _fusionCache.GetOrDefaultAsync<bool>(CacheKeys.UserRoleDisable(_userInfo.UserRoleId),false);
+
+                if (isDisable == true || isRoleDisable == true)
+                {
+                    context.HttpContext.Response.ContentType = "application/json";
+                    context.HttpContext.Response.StatusCode = StatusCodes.Status403Forbidden;
+                    // 用户或者角色被禁用。
+
+                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["LimitUser_AccountOrRoleDisable"], ApiResponseCodeEnum.AutoLoginOut));
+                }
+
             }
         }
 

IRaCIS.Core.Application/BusinessFilter/LegacyController/TrialResourceFilter.cs

@@ -1,196 +0,0 @@
-using IRaCIS.Core.Application.Helper;
-using IRaCIS.Core.Domain.Share;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Localization;
-using System.Text.RegularExpressions;
-using ZiggyCreatures.Caching.Fusion;
-using static IRaCIS.Core.Domain.Share.StaticData;
-
-namespace IRaCIS.Core.Application.Filter;
-
-/// <summary>
-/// 主要为了 处理项目结束 锁库，不允许操作
-/// </summary>
-public class TrialResourceFilter : Attribute, IAsyncResourceFilter
-{
-    private readonly IUserInfo _userInfo;
-    private readonly IFusionCache _fusionCache;
-    public IStringLocalizer _localizer;
-    private readonly IRepository<Trial> _trialRepository;
-    private readonly List<string> _trialOptList = new List<string>();
-
-
-    public TrialResourceFilter(IFusionCache fusionCache, IRepository<Trial> trialRepository, IStringLocalizer localizer, IUserInfo userInfo, string trialOpt = null, string trialOpt2 = null, string trialOpt3 = null)
-    {
-        _fusionCache = fusionCache;
-        _userInfo = userInfo;
-        _localizer = localizer;
-        _trialRepository = trialRepository;
-
-        if (!string.IsNullOrWhiteSpace(trialOpt)) _trialOptList.Add(trialOpt.Trim());
-        if (!string.IsNullOrWhiteSpace(trialOpt2)) _trialOptList.Add(trialOpt2.Trim());
-        if (!string.IsNullOrWhiteSpace(trialOpt3)) _trialOptList.Add(trialOpt3.Trim());
-
-    }
-
-    //优先选择异步的方法
-    public async Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
-    {
-        // var typeFilter = context.ActionDescriptor.EndpointMetadata.Where(t => t.GetType() == typeof(TypeFilterAttribute)).Select(t => (TypeFilterAttribute)t).ToList().FirstOrDefault();
-        //var  _trialOptList= typeFilter.Arguments.Select(t => t.ToString()).ToList();
-
-        // 获取当前请求的 Host 信息
-        var requestHost = context.HttpContext.Request.Host;
-
-        // 检查请求是否来自 localhost:6100
-        if (requestHost.Host == "localhost" && (requestHost.Port == 6100|| requestHost.Port==3305))
-        {
-            await next.Invoke();
-
-            return;
-        }
-
-        #region 处理新的用户类型，不能操作项目相关接口
-
-        // 后期列举出具体的类型，其他任何用户类型，都不允许操作
-        if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA && _userInfo.RequestUrl.ToLower() != "TrialDocument/userConfirm".ToLower())
-        {
-            //---对不起，您的账户没有操作权限。
-            context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_NoAccessPermission"]));
-
-            return;
-        }
-
-        #endregion
-
-
-
-        //TrialId 传递的途径多种，可能在path 可能在body  可能在数组中，也可能在对象中，可能就在url
-        var trialIdStr = string.Empty;
-
-        if (!string.IsNullOrWhiteSpace(context.HttpContext.Request.Query["trialId"]))
-        {
-            trialIdStr = context.HttpContext.Request.Query["trialId"];
-        }
-
-        //先尝试从path中取TrialId 
-        else if (context.RouteData.Values.Keys.Any(t => t.Contains("trialId")))
-        {
-            var index = context.RouteData.Values.Keys.ToList().IndexOf("trialId");
-            trialIdStr = context.RouteData.Values.Values.ToList()[index] as string;
-        }
-        else if (context.HttpContext.Request.Headers["Referer"].ToString().Contains("trialId"))
-        {
-            var headerStr = context.HttpContext.Request.Headers["Referer"].ToString();
-
-            var trialIdIndex = headerStr.IndexOf("trialId");
-
-
-            var matchResult = Regex.Match(headerStr.Substring(trialIdIndex), @"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
-
-            if (matchResult.Success)
-            {
-                trialIdStr = matchResult.Value;
-            }
-            else
-            {
-                //---正则取请求Refer 中trialId 失败，请联系开发人员核查
-                context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_ReferTrialIdFailed"]));
-            }
-
-        }
-        else
-        {
-            #region body 中取数据
-
-            //设置可以多次读
-            context.HttpContext.Request.EnableBuffering();
-            var reader = new StreamReader(context.HttpContext.Request.Body);
-            var contentFromBody = await reader.ReadToEndAsync();
-            //读取后，流的位置还原
-            context.HttpContext.Request.Body.Seek(0, SeekOrigin.Begin);
-            //context.HttpContext.Request.Body.Position = 0;
-
-            //找到参数位置在字符串中的索引
-            var trialIdIndex = contentFromBody.IndexOf("\"TrialId\"", StringComparison.OrdinalIgnoreCase);
-
-            if (trialIdIndex > -1)
-            {
-                //  (?<="trialId" *: *").*?(?=",)
-
-                //使用正则 [0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}
-
-                var matchResult = Regex.Match(contentFromBody.Substring(trialIdIndex), @"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
-
-                if (matchResult.Success)
-                {
-                    //有可能匹配错误   "trialId":"","documentId":"b8180000-3e2c-0016-9fe0-08da33f96236"  从缓存里面验证下
-
-                    trialIdStr = matchResult.Value;
-
-                    var trialStatusStr = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), _ => CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
-
-                    if (string.IsNullOrWhiteSpace(trialStatusStr))
-                    {
-
-                        //数据库 检查该项目Id不对
-                        context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_ReferTrialIdFailed"]));
-
-                        return;
-                    }
-                }
-                else
-                {
-                    //---正则取请求Refer 中trialId 失败，请联系开发人员核查
-                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_ReferTrialIdFailed"]));
-
-                    return;
-                }
-
-                //使用字符串取 如果是swagger  可能有时取的不对  因为空格的原因
-                //trialIdStr = contentFromBody.Substring(trialIdIndex + "TrialId".Length + 4, 3
-            }
-
-            #endregion
-        }
-
-        //通过path 或者body 找到trialId 了  
-        if (!string.IsNullOrWhiteSpace(trialIdStr))
-        {
-            var trialStatusStr = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), _ => CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
-
-            //  这里是统一拦截 项目有关的操作允许情况(特殊的地方，比如项目配置（有的在多种状态（初始化，ongoing）都可以操作，有的仅仅在Initializing）还有  项目添加和更新，不走这里，特殊处理,不然在这里显得很乱，判断是哪个接口)
-            if (trialStatusStr == StaticData.TrialState.TrialOngoing || _trialOptList.Any(t => t == TrialOpt.BeforeOngoingCantOpt))
-            {
-
-                await next.Invoke();
-
-            }
-            //  项目停止、或者完成  不允许操作
-            else
-            {
-                //---本次请求被配置规则拦截：项目状态处于进行中时,才允许操作,若此处逻辑有误，请联系开发人员修改
-                context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_InterceptedProjectStatusRule"]));
-
-            }
-
-        }
-        //添加项目  签名系统文档的时候  不做拦截   但是更新项目  签名项目文档的时候需要拦截
-        else if (_trialOptList.Any(t => t == TrialOpt.AddOrUpdateTrial || t == TrialOpt.SignSystemDocNoTrialId))
-        {
-            await next.Invoke();
-        }
-
-        else
-        {
-            //如果项目相关接口没有传递trialId 会来到这里,提醒，以便修改
-
-            //---该接口参数中，没有传递项目编号，请核对。
-            context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["TrialResource_MissingProjectNumber"]));
-        }
-
-
-    }
-}

IRaCIS.Core.Application/BusinessFilter/MinimalAPI/LimitUserRequestAuthorizationEndpointFilter.cs

@@ -41,19 +41,19 @@ public class LimitUserRequestAuthorizationEndpointFilter(
             }
 
             // 获取缓存中的用户 token
-            var cacheUserToken = await _fusionCache.GetOrDefaultAsync<string>(CacheKeys.UserToken(_userInfo.Id));
+            var cacheUserToken = await _fusionCache.GetOrDefaultAsync<string>(CacheKeys.UserToken(_userInfo.IdentityUserId));
 
             // 缓存中没有取到 token
             if (string.IsNullOrWhiteSpace(cacheUserToken))
             {
                 // 设置当前用户最新 token
-                await _fusionCache.SetAsync(CacheKeys.UserToken(_userInfo.Id), _userInfo.UserToken, TimeSpan.FromDays(7));
-                await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(_userInfo.Id), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));
+                await _fusionCache.SetAsync(CacheKeys.UserToken(_userInfo.IdentityUserId), _userInfo.UserToken, TimeSpan.FromDays(7));
+                await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(_userInfo.IdentityUserId), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));
             }
             // 如果是同一个用户
             else if (cacheUserToken == _userInfo.UserToken)
             {
-                var cacheTime = await _fusionCache.GetOrDefaultAsync<string>(CacheKeys.UserAutoLoginOut(_userInfo.Id));
+                var cacheTime = await _fusionCache.GetOrDefaultAsync<string>(CacheKeys.UserAutoLoginOut(_userInfo.IdentityUserId));
 
                 // 如果过期，自动登出
                 if (string.IsNullOrEmpty(cacheTime))
@@ -63,7 +63,7 @@ public class LimitUserRequestAuthorizationEndpointFilter(
                 }
                 else
                 {
-                    await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(_userInfo.Id), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));
+                    await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(_userInfo.IdentityUserId), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));
                 }
             }
             else

IRaCIS.Core.Application/BusinessFilter/_Config/_AppSettings.cs

@@ -140,7 +140,7 @@ public static class AppSettings
             case nameof(Doctor):
                 return IRaCISBasicConfig.DoctorCodePrefix + codeInt.ToString("D4");
 
-            case nameof(User):
+            case nameof(IdentityUser):
                 return IRaCISBasicConfig.UserCodePrefix + codeInt.ToString("D4");
 
             case nameof(QCChallenge):

IRaCIS.Core.Application/GlobalUsings.cs

@@ -10,5 +10,6 @@ global using Microsoft.Extensions.Localization;
 global using AutoMapper;
 global using IRaCIS.Core.Domain.Share;
 global using IRaCIS.Core.Application.BusinessFilter;
+global using IdentityUser = IRaCIS.Core.Domain.Models.IdentityUser;
 
 

IRaCIS.Core.Application/Helper/CacheHelper.cs

@@ -27,6 +27,18 @@ public static class CacheKeys
     //超时没请求接口自动退出
     public static string UserAutoLoginOut(Guid userId) => $"UserAutoLoginOut:{userId}";
 
+
+    public static string UserDisable(Guid userId) => $"UserDisable:{userId}";
+
+    public static string UserRoleDisable(Guid userRoleId) => $"UserRoleDisable:{userRoleId}";
+
+    /// <summary>
+    /// 用户登录错误 限制登录
+    /// </summary>
+    /// <param name="userName"></param>
+    /// <returns></returns>
+    public static string UserLoginError(string userName) => $"login-failures:{userName}";
+
     /// <summary>
     /// 跳过阅片
     /// </summary>

IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs

@@ -16,6 +16,7 @@ using NPOI.SS.UserModel;
 using NPOI.XSSF.UserModel;
 using System.Collections;
 using System.Globalization;
+using Xceed.Document.NET;
 
 namespace IRaCIS.Core.Application.Service;
 
@@ -63,7 +64,7 @@ public static class ExcelExportHelper
             foreach (var key in dic.Keys)
             {
                 //是数组 那么找到对应的属性 进行翻译
-                if (dic[key].GetType().GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IList<>)))
+                if (dic[key] != null && dic[key].GetType().GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IList<>)))
                 {
 
                     var newObjList = new List<object>();
@@ -73,39 +74,40 @@ public static class ExcelExportHelper
                     {
                         var itemDic = item.ConvertToDictionary();
 
-                        //处理集合里面时间类型，根据当前语言将时间转变为字符串
-                        foreach (var itemValuePair in itemDic)
-                        {
-                            if (DateTime.TryParse(itemValuePair.Value?.ToString(), out DateTime result))
-                            {
-                                itemDic[itemValuePair.Key] = ExportExcelConverterDate.DateTimeInternationalToString(result);
-                            }
-                        }
+                        ////处理集合里面时间类型，根据当前语言将时间转变为字符串
+                        //foreach (var itemValuePair in itemDic)
+                        //{
+                        //    // 临床数据 1，1 会变成2024-01-01
+                        //    if (itemValuePair.Value?.ToString().Length > 8 && DateTime.TryParse(itemValuePair.Value?.ToString(), out DateTime result))
+                        //    {
+                        //        itemDic[itemValuePair.Key] = ExportExcelConverterDate.DateTimeInternationalToString(result);
+                        //    }
+                        //}
 
 
                         foreach (var needTranslateProperty in needTranslatePropertyList)
                         {
-                            //翻译的属性依赖其他属性
-                            if (needTranslateProperty.IsTranslateDenpendOtherProperty)
+                            if (itemDic.Keys.Any(t => t == needTranslateProperty.Name))
                             {
-                                if (itemDic[needTranslateProperty.DependPropertyName]?.ToString().ToLower() == needTranslateProperty.DependPropertyValueStr.ToLower())
+                                //翻译的属性依赖其他属性
+                                if (needTranslateProperty.IsTranslateDenpendOtherProperty)
+                                {
+                                    if (itemDic[needTranslateProperty.DependPropertyName]?.ToString().ToLower() == needTranslateProperty.DependPropertyValueStr.ToLower())
+                                    {
+                                        var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
+
+                                        itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
+                                    }
+                                }
+                                //普通翻译 或者某一标准翻译
+                                else
                                 {
                                     var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
 
+
                                     itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
                                 }
                             }
-                            //普通翻译 或者某一标准翻译
-                            else
-                            {
-                                var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
-
-
-                                itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
-                            }
-
-
-
                         }
 
                         itemDic.Add("No", no++);
@@ -125,6 +127,7 @@ public static class ExcelExportHelper
 
             translateData = dic;
 
+
         }
 
 
@@ -162,12 +165,55 @@ public static class ExcelExportHelper
                 workbook.RemoveSheetAt(1);
             }
 
-            var memoryStream2 = new MemoryStream();
-            workbook.Write(memoryStream2, true);
+            //中文替换项目术语
+            if (data.TrialObjectNameList?.Count > 0)
+            {
+                var replaceObjectList = data.TrialObjectNameList;
+
+                var sheet = workbook.GetSheetAt(0);
+
+                int rowCount = sheet.PhysicalNumberOfRows;
+
+                for (int rowIndex = 0; rowIndex < rowCount; rowIndex++)
+                {
+                    var row = sheet.GetRow(rowIndex);
+
+                    if (row != null)
+                    {
+
+                        var colums = row.LastCellNum;
+
+                        for (int colIndex = 0; colIndex < colums; colIndex++)
+                        {
+                            var cell = row.GetCell(colIndex);
+
+                            // 只处理字符串类型的单元格
+                            if (cell != null)
+                            {
+                                var cellValue = cell.StringCellValue;
+
+                                var find = replaceObjectList.FirstOrDefault(t => t.Name == cellValue);
+                                if (find != null)
+                                {
+                                    cell.SetCellValue(find.TrialName);
+                                }
+                            }
+                        }
+                    }
+
+                }
+            }
+
+            using (var memoryStream2 = new MemoryStream())
+            {
+                workbook.Write(memoryStream2, true);
+
+                memoryStream2.Seek(0, SeekOrigin.Begin);
+
+                templateStream = memoryStream2;
+            }
 
-            memoryStream2.Seek(0, SeekOrigin.Begin);
 
-            templateStream = memoryStream2;
         }
 
         // 文件名称 从sheet里面取
@@ -209,13 +255,17 @@ public static class ExcelExportHelper
         /// </summary>
         public int AutoColumnTitleRowIndex { get; set; }
 
-
+        /// <summary>
+        /// 模板列最后的索引
+        /// </summary>
         public int TempalteLastColumnIndex { get; set; }
 
+        public List<string> CDISCList { get; set; } = new List<string>();
+
         /// <summary>
-        /// 动态的列名
+        /// 动态的列名  如果Id 重复，那么就按照名称填充，否则就按照Id 填充列数据
         /// </summary>
-        public List<string> ColumnNameList { get; set; } = new List<string>();
+        public List<ColumItem> ColumnIdNameList { get; set; }
 
         /// <summary>
         /// 动态翻译的字典名
@@ -242,7 +292,18 @@ public static class ExcelExportHelper
         /// </summary>
         public string DynamicItemTitleName { get; set; }
 
+        public string DynamicItemTitleId { get; set; }
+
         public List<int> RemoveColunmIndexList { get; set; } = new List<int>();
+
+        public class ColumItem
+        {
+            public Guid Id { get; set; }
+            public string Name { get; set; }
+        }
+
+        public List<string> ColumnIdList => ColumnIdNameList == null ? new List<string>() : ColumnIdNameList.Select(t => t.Id.ToString()).ToList();
+        public List<string> ColumnNameList => ColumnIdNameList == null ? new List<string>() : ColumnIdNameList.Select(t => t.Name).ToList();
     }
 
 
@@ -277,7 +338,7 @@ public static class ExcelExportHelper
             foreach (var key in dic.Keys)
             {
                 //是数组 那么找到对应的属性 进行翻译
-                if (dic[key].GetType().GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IList<>)))
+                if (dic[key] != null && dic[key].GetType().GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IList<>)))
                 //if (dic[key].GetType().IsAssignableFrom(typeof(JArray)))
                 {
 
@@ -289,36 +350,40 @@ public static class ExcelExportHelper
                         //var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
                         var itemDic = item.ConvertToDictionary();
 
-                        //处理集合里面时间类型，根据当前语言将时间转变为字符串
-                        foreach (var itemValuePair in itemDic)
-                        {
-                            if (DateTime.TryParse(itemValuePair.Value?.ToString(), out DateTime result))
-                            {
-                                itemDic[itemValuePair.Key] = ExportExcelConverterDate.DateTimeInternationalToString(result);
-                            }
-                        }
+                        ////处理集合里面时间类型，根据当前语言将时间转变为字符串
+                        //foreach (var itemValuePair in itemDic)
+                        //{
+                        //    if (itemValuePair.Value?.ToString().Length > 8 && DateTime.TryParse(itemValuePair.Value?.ToString(), out DateTime result))
+                        //    {
+                        //        itemDic[itemValuePair.Key] = ExportExcelConverterDate.DateTimeInternationalToString(result);
+                        //    }
+                        //}
 
                         foreach (var needTranslateProperty in needTranslatePropertyList)
                         {
-                            //翻译的属性依赖其他属性
-                            if (needTranslateProperty.IsTranslateDenpendOtherProperty)
+                            if (itemDic.Keys.Any(t => t == needTranslateProperty.Name))
                             {
-                                if (itemDic[needTranslateProperty.DependPropertyName]?.ToString().ToLower() == needTranslateProperty.DependPropertyValueStr.ToLower())
+                                //翻译的属性依赖其他属性
+                                if (needTranslateProperty.IsTranslateDenpendOtherProperty)
+                                {
+                                    if (itemDic[needTranslateProperty.DependPropertyName]?.ToString().ToLower() == needTranslateProperty.DependPropertyValueStr.ToLower())
+                                    {
+                                        var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
+
+                                        itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
+                                    }
+                                }
+                                //普通翻译 或者某一标准翻译
+                                else
                                 {
                                     var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
 
+
                                     itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
                                 }
                             }
-                            //普通翻译 或者某一标准翻译
-                            else
-                            {
-                                var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
 
 
-                                itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
-                            }
-
 
 
                         }
@@ -371,27 +436,70 @@ public static class ExcelExportHelper
                 workbook.RemoveSheetAt(1);
             }
 
+            #region 中文替换项目术语
+            if (data.TrialObjectNameList?.Count > 0)
+            {
+                var replaceObjectList = data.TrialObjectNameList;
+
+                var sheet = workbook.GetSheetAt(0);
+
+                int rowCount = sheet.PhysicalNumberOfRows;
+
+                for (int rowIndex = 0; rowIndex < rowCount; rowIndex++)
+                {
+                    var row = sheet.GetRow(rowIndex);
+                    if (row != null)
+                    {
+
+                        var colums = row.LastCellNum;
+
+                        for (int colIndex = 0; colIndex < colums; colIndex++)
+                        {
+                            var cell = row.GetCell(colIndex);
+
+                            // 只处理字符串类型的单元格
+                            if (cell != null)
+                            {
+                                var cellValue = cell.StringCellValue;
+
+                                var find = replaceObjectList.FirstOrDefault(t => t.Name == cellValue);
+                                if (find != null)
+                                {
+                                    cell.SetCellValue(find.TrialName);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            #endregion
+
+
 
             if (dynamicColumnConfig != null)
             {
+                var isCdics = dynamicColumnConfig.CDISCList.Count > 0;
+
                 var sheet = workbook.GetSheetAt(0);
 
+                var cdicsRow = sheet.GetRow(dynamicColumnConfig.AutoColumnTitleRowIndex - 1);
                 var titelRow = sheet.GetRow(dynamicColumnConfig.AutoColumnTitleRowIndex);
                 var templateRow = sheet.GetRow(dynamicColumnConfig.AutoColumnTitleRowIndex + 1);
 
                 //动态移除列的数量
                 var dynamicRemoveColunmCount = dynamicColumnConfig.RemoveColunmIndexList.Count();
 
+                //在动态列开始前移除的数量
                 var beforeDynamicRemoveCount = dynamicColumnConfig.RemoveColunmIndexList.Where(t => t < dynamicColumnConfig.AutoColumnStartIndex).Count();
 
                 //动态添加列的数量
-                var needAddCount = dynamicColumnConfig.ColumnNameList.Count;
+                var needAddCount = dynamicColumnConfig.ColumnIdNameList.Count;
 
                 //原始表  最终索引
                 var originTotalEndIndex = dynamicColumnConfig.TempalteLastColumnIndex;
 
                 //减去动态移除后原始结束索引
-                var originRemoveEndIndex= originTotalEndIndex- dynamicRemoveColunmCount;
+                var originRemoveEndIndex = originTotalEndIndex - dynamicRemoveColunmCount;
 
                 //最终表 动态列开始索引
                 var dynamicColunmStartIndex = dynamicColumnConfig.AutoColumnStartIndex - beforeDynamicRemoveCount;
@@ -427,8 +535,14 @@ public static class ExcelExportHelper
                 //创建新的列
                 for (int i = originTotalEndIndex; i < originTotalEndIndex + needAddCount; i++)
                 {
+                   
                     titelRow.CreateCell(i + 1);
                     templateRow.CreateCell(i + 1);
+
+                    if (isCdics)
+                    {
+                        cdicsRow.CreateCell(i + 1);
+                    }
                 }
                 //移动Title 和下面的模板标识
 
@@ -448,9 +562,17 @@ public static class ExcelExportHelper
 
                 for (int i = dynamicColunmStartIndex; i < dynamicColunmStartIndex + needAddCount; i++)
                 {
-                    var name = dynamicColumnConfig.ColumnNameList[i - dynamicColunmStartIndex];
+                    var name = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].Name;
 
                     titelRow.GetCell(i).SetCellValue(name);
+                    templateRow.GetCell(i).SetCellValue("");
+
+                    if (isCdics)
+                    {
+                        var cdicsCode = dynamicColumnConfig.CDISCList[i - dynamicColunmStartIndex];
+
+                        cdicsRow.GetCell(i).SetCellValue(cdicsCode);
+                    }
                 }
             }
 
@@ -463,7 +585,6 @@ public static class ExcelExportHelper
                 templateStream = memoryStream2;
             }
 
-
         }
 
         #endregion
@@ -483,6 +604,9 @@ public static class ExcelExportHelper
 
         if (dynamicColumnConfig != null)
         {
+            //Excel 列是按照名称填充 还是Id 填充
+            var isExcelAddDataWithName = dynamicColumnConfig.ColumnIdNameList.Select(t => t.Id).Distinct().Count() == 1;
+
             var dynamicTranslateDataList = await _dictionaryService.GetBasicDataSelect(dynamicColumnConfig.TranslateDicNameList.ToArray());
 
             // 使用NPOI  进行二次处理
@@ -513,8 +637,18 @@ public static class ExcelExportHelper
 
                     //var writeIndex = itemList.IndexOf(itemObj) + dynamicColumnConfig.AutoColumnStartIndex;
 
-                    var writeIndex = dynamicColumnConfig.ColumnNameList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleName].ToString())  + dynamicColumnConfig.AutoColumnStartIndex;
-                   
+                    var writeIndex = 0;
+
+                    if (isExcelAddDataWithName)
+                    {
+                        writeIndex = dynamicColumnConfig.ColumnNameList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleName].ToString()) + dynamicColumnConfig.AutoColumnStartIndex;
+                    }
+                    else
+                    {
+                        writeIndex = dynamicColumnConfig.ColumnIdList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleId].ToString()) + dynamicColumnConfig.AutoColumnStartIndex;
+                    }
+
+
                     if (itemDicName.IsNotNullOrEmpty())
                     {
 
@@ -548,6 +682,332 @@ public static class ExcelExportHelper
         #endregion
     }
 
+    /// <summary>
+    /// 暂时废弃--合并到上面
+    /// </summary>
+    /// <param name="code"></param>
+    /// <param name="data"></param>
+    /// <param name="_commonDocumentRepository"></param>
+    /// <param name="_hostEnvironment"></param>
+    /// <param name="_dictionaryService"></param>
+    /// <param name="translateType"></param>
+    /// <param name="criterionType"></param>
+    /// <param name="dynamicColumnConfig"></param>
+    /// <returns></returns>
+    public static async Task<(MemoryStream, string)> CDISC_DataExport_Async(string code, ExcelExportInfo data, IRepository<CommonDocument> _commonDocumentRepository, IWebHostEnvironment _hostEnvironment, IDictionaryService? _dictionaryService = null, Type? translateType = null, CriterionType? criterionType = null, DynamicColumnConfig? dynamicColumnConfig = null)
+    {
+        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+        //判断是否有字典翻译
+
+        object translateData = data;
+
+        Dictionary<string, object> translatedDic = default;
+
+        if (_dictionaryService != null && translateType != null)
+        {
+
+            //一个值 对应不同的字典翻译
+            var needTranslatePropertyList = translateType.GetProperties().Where(t => t.IsDefined(typeof(DictionaryTranslateAttribute), true))
+                .SelectMany(c =>
+                c.GetCustomAttributes(typeof(DictionaryTranslateAttribute), false).Select(f => (DictionaryTranslateAttribute?)f).Where(t => t.CriterionType == criterionType || t.CriterionType == null)
+                .Select(k => new { c.Name, k.DicParentCode, k.IsTranslateDenpendOtherProperty, k.DependPropertyName, k.DependPropertyValueStr })
+                ).ToList();
+
+
+
+            //字典表查询出所有需要翻译的数据
+
+            var translateDataList = await _dictionaryService.GetBasicDataSelect(needTranslatePropertyList.Select(t => t.DicParentCode).Distinct().ToArray());
+
+            var dic = data.ConvertToDictionary();
+            //var dic = (JsonConvert.DeserializeObject<IDictionary<string, object>>(data.ToJsonNotIgnoreNull())).IfNullThrowException();
+
+            foreach (var key in dic.Keys)
+            {
+                //是数组 那么找到对应的属性 进行翻译
+                if (dic[key] != null && dic[key].GetType().GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IList<>)))
+                //if (dic[key].GetType().IsAssignableFrom(typeof(JArray)))
+                {
+
+                    var newObjList = new List<object>();
+                    var no = 1;
+                    foreach (var item in dic[key] as IList)
+                    //foreach (var item in dic[key] as JArray)
+                    {
+                        //var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
+                        var itemDic = item.ConvertToDictionary();
+
+                        foreach (var needTranslateProperty in needTranslatePropertyList)
+                        {
+                            if (itemDic.Keys.Any(t => t == needTranslateProperty.Name))
+                            {
+                                //翻译的属性依赖其他属性
+                                if (needTranslateProperty.IsTranslateDenpendOtherProperty)
+                                {
+                                    if (itemDic[needTranslateProperty.DependPropertyName]?.ToString().ToLower() == needTranslateProperty.DependPropertyValueStr.ToLower())
+                                    {
+                                        var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
+
+                                        itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
+                                    }
+                                }
+                                //普通翻译 或者某一标准翻译
+                                else
+                                {
+                                    var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
+
+
+                                    itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
+                                }
+                            }
+
+
+
+
+                        }
+
+                        itemDic.Add("No", no++);
+                        newObjList.Add(itemDic);
+                    }
+
+                    dic[key] = newObjList;
+
+                }
+            }
+
+
+            //data = dic;
+            translateData = dic;
+            translatedDic = dic;
+
+        }
+
+
+        var (physicalPath, fileName) = await FileStoreHelper.GetCommonDocPhysicalFilePathAsync(_hostEnvironment, _commonDocumentRepository, code);
+
+
+        //模板路径
+        var tplPath = physicalPath;
+
+        #region 根据中英文  删除模板sheet
+
+        // 打开模板文件
+        var templateFile = new FileStream(tplPath, FileMode.Open, FileAccess.Read);
+
+        // 获取文件流
+        var templateStream = new MemoryStream();
+        templateFile.CopyTo(templateStream);
+        templateStream.Seek(0, SeekOrigin.Begin);
+
+        var workbook = new XSSFWorkbook(templateStream);
+
+        int sheetCount = workbook.NumberOfSheets;
+
+        if (sheetCount == 2)
+        {
+            if (isEn_US)
+            {
+                workbook.RemoveSheetAt(0);
+            }
+            else
+            {
+                workbook.RemoveSheetAt(1);
+            }
+
+            if (dynamicColumnConfig != null)
+            {
+                var sheet = workbook.GetSheetAt(0);
+
+
+                var cdicsRow = sheet.GetRow(dynamicColumnConfig.AutoColumnTitleRowIndex - 1);
+                var titelRow = sheet.GetRow(dynamicColumnConfig.AutoColumnTitleRowIndex);
+                var templateRow = sheet.GetRow(dynamicColumnConfig.AutoColumnTitleRowIndex + 1);
+
+                //动态移除列的数量
+                var dynamicRemoveColunmCount = dynamicColumnConfig.RemoveColunmIndexList.Count();
+
+                //在动态列开始前移除的数量
+                var beforeDynamicRemoveCount = dynamicColumnConfig.RemoveColunmIndexList.Where(t => t < dynamicColumnConfig.AutoColumnStartIndex).Count();
+
+                //动态添加列的数量
+                var needAddCount = dynamicColumnConfig.ColumnIdNameList.Count;
+
+                //原始表  最终索引
+                var originTotalEndIndex = dynamicColumnConfig.TempalteLastColumnIndex;
+
+                //减去动态移除后原始结束索引
+                var originRemoveEndIndex = originTotalEndIndex - dynamicRemoveColunmCount;
+
+                //最终表 动态列开始索引
+                var dynamicColunmStartIndex = dynamicColumnConfig.AutoColumnStartIndex - beforeDynamicRemoveCount;
+
+                //最终表 动态列的终止索引
+                var dynamicColunmEndIndex = dynamicColunmStartIndex + needAddCount - 1;
+
+                //最终表  最终索引
+                var totalColunmEndIndex = originTotalEndIndex + needAddCount - dynamicRemoveColunmCount;
+
+
+                //动态列后需要移动的数量
+                var backMoveCount = totalColunmEndIndex - dynamicColunmEndIndex;
+
+                //删除需要动态删除的列  从大到小移除，否则索引会变
+                foreach (var removeIndex in dynamicColumnConfig.RemoveColunmIndexList.OrderByDescending(t => t))
+                {
+                    //将后面的列向前移动
+                    for (var i = 0; i < originTotalEndIndex - removeIndex; i++)
+                    {
+                        Console.WriteLine(titelRow.GetCell(removeIndex + i + 1).StringCellValue);
+                        titelRow.GetCell(removeIndex + i).SetCellValue(titelRow.GetCell(removeIndex + i + 1).StringCellValue);
+                        templateRow.GetCell(removeIndex + i).SetCellValue(templateRow.GetCell(removeIndex + i + 1).StringCellValue);
+
+                        //后面的数据要清空
+                        titelRow.GetCell(removeIndex + i + 1).SetCellValue("");
+                        templateRow.GetCell(removeIndex + i + 1).SetCellValue("");
+
+                    }
+
+                }
+
+                //创建新的列
+                for (int i = originTotalEndIndex; i < originTotalEndIndex + needAddCount; i++)
+                {
+                    cdicsRow.CreateCell(i + 1);
+                    titelRow.CreateCell(i + 1);
+                    templateRow.CreateCell(i + 1);
+                }
+                //移动Title 和下面的模板标识
+
+                var gap = totalColunmEndIndex - originRemoveEndIndex;
+
+                for (int i = totalColunmEndIndex; i > dynamicColunmEndIndex; i--)
+                {
+
+                    titelRow.GetCell(i).SetCellValue(titelRow.GetCell(i - gap).StringCellValue);
+
+                    templateRow.GetCell(i).SetCellValue(templateRow.GetCell(i - gap).StringCellValue);
+                }
+
+
+
+                //设置动态Tilte
+
+                for (int i = dynamicColunmStartIndex; i < dynamicColunmStartIndex + needAddCount; i++)
+                {
+                    var name = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].Name;
+
+                    var cdicsCode = dynamicColumnConfig.CDISCList[i - dynamicColunmStartIndex];
+
+                    cdicsRow.GetCell(i).SetCellValue(cdicsCode);
+                    titelRow.GetCell(i).SetCellValue(name);
+                    templateRow.GetCell(i).SetCellValue("");
+                }
+            }
+
+            using (var memoryStream2 = new MemoryStream())
+            {
+                workbook.Write(memoryStream2, true);
+
+                memoryStream2.Seek(0, SeekOrigin.Begin);
+
+                templateStream = memoryStream2;
+            }
+
+        }
+
+        #endregion
+
+        #region MiniExcel
+
+        var memoryStream = new MemoryStream();
+
+        var config = new OpenXmlConfiguration()
+        {
+            IgnoreTemplateParameterMissing = true,
+        };
+
+        await MiniExcel.SaveAsByTemplateAsync(memoryStream, templateStream.ToArray(), translateData, config);
+
+        memoryStream.Seek(0, SeekOrigin.Begin);
+
+        if (dynamicColumnConfig != null)
+        {
+            var isExcelAddDataWithName = dynamicColumnConfig.ColumnIdNameList.Select(t => t.Id).Count() == 1;
+
+            var dynamicTranslateDataList = await _dictionaryService.GetBasicDataSelect(dynamicColumnConfig.TranslateDicNameList.ToArray());
+
+            // 使用NPOI  进行二次处理
+            var wb = new XSSFWorkbook(memoryStream);
+            var sheet = wb.GetSheetAt(0);
+
+            var list = translatedDic["List"] as IList;
+
+            foreach (var itemResult in list)
+            {
+                var index = list.IndexOf(itemResult);
+
+                //从第四行开始处理动态列
+                var row = sheet.GetRow(index + dynamicColumnConfig.AutoColumnTitleRowIndex + 1);
+
+                var itemDic = itemResult.ToDictionary();
+
+                var itemList = itemDic[dynamicColumnConfig.DynamicListName] as IList;
+
+                //这个数组是动态的，有的多，有的少，所以在此对比Title 一致才赋值
+                foreach (var itemObj in itemList)
+                {
+
+                    var iteObjDic = itemObj.ToDictionary();
+
+                    var itemDicName = iteObjDic[dynamicColumnConfig.DynamicItemDicName]?.ToString();
+                    var itemValue = iteObjDic[dynamicColumnConfig.DynamicItemValueName]?.ToString();
+
+                    //var writeIndex = itemList.IndexOf(itemObj) + dynamicColumnConfig.AutoColumnStartIndex;
+
+                    var writeIndex = 0;
+                    if (isExcelAddDataWithName)
+                    {
+                        writeIndex = dynamicColumnConfig.ColumnNameList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleName].ToString()) + dynamicColumnConfig.AutoColumnStartIndex;
+                    }
+                    else
+                    {
+                        writeIndex = dynamicColumnConfig.ColumnIdList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleId].ToString()) + dynamicColumnConfig.AutoColumnStartIndex;
+                    }
+
+                    if (itemDicName.IsNotNullOrEmpty())
+                    {
+
+                        var translatedItemData = dynamicTranslateDataList[itemDicName].Where(t => t.Code.ToLower() == itemValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
+
+                        row.GetCell(writeIndex).SetCellValue(translatedItemData);
+                    }
+                    else
+                    {
+                        row.GetCell(writeIndex).SetCellValue(itemValue);
+
+                    }
+
+                }
+            }
+
+            var memoryStream2 = new MemoryStream();
+            wb.Write(memoryStream2, true);
+            memoryStream2.Seek(0, SeekOrigin.Begin);
+
+            memoryStream = memoryStream2;
+
+        }
+
+
+        return (memoryStream, fileName);
+
+
+
+
+        #endregion
+    }
+
+
 
     /// <summary>
     /// 导出文件模板

IRaCIS.Core.Application/Helper/HangfireJobHelper.cs

@@ -73,6 +73,12 @@ namespace IRaCIS.Core.Application.Helper
                 case EmailBusinessScenario.QCToCRCImageQuestion:
                     HangfireJobHelper.AddOrUpdateCronJob<IMediator>(jobId, t => t.Send(new QCImageQuestionRecurringEvent() { TrialId = trialId }, default), emailCron);
                     break;
+                    //加急阅片 10分钟
+                case EmailBusinessScenario.ExpeditedReading:
+                    HangfireJobHelper.AddOrUpdateCronJob<IMediator>(jobId, t => t.Send(new UrgentIRUnReadTaskRecurringEvent() { TrialId = trialId }, default), emailCron);
+                    break;
+
+                    
                 default:
                     break;
             }

IRaCIS.Core.Application/Helper/OSSService.cs

@@ -145,6 +145,8 @@ public interface IOSSService
 
     public Task DeleteFromPrefix(string prefix);
 
+    List<string> GetRootFolderNames();
+
     public ObjectStoreDTO GetObjectStoreTempToken();
 }
 
@@ -526,6 +528,55 @@ public class OSSService : IOSSService
 
     }
 
+    /// <summary>
+    /// 获取所有根目录名称
+    /// </summary>
+    /// <returns></returns>
+    public List<string> GetRootFolderNames()
+    {
+        GetObjectStoreTempToken();
+        var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+        var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint,
+                                        AliyunOSSTempToken.AccessKeyId,
+                                        AliyunOSSTempToken.AccessKeySecret,
+                                        AliyunOSSTempToken.SecurityToken);
+
+        List<string> rootFolders = new List<string>();
+        string nextMarker = null;
+
+        try
+        {
+            ObjectListing objectListing = null;
+            do
+            {
+                // 列出根目录下的对象和文件夹
+                 objectListing = _ossClient.ListObjects(new  Aliyun.OSS.ListObjectsRequest(aliConfig.BucketName)
+                {
+                  
+                    MaxKeys = 1000,
+                    Marker = nextMarker,
+                    Delimiter = "/"  // 使用分隔符来模拟文件夹
+                });
+
+                // 遍历 CommonPrefixes 获取根文件夹名称
+                foreach (var prefix in objectListing.CommonPrefixes)
+                {
+                    rootFolders.Add(prefix.TrimEnd('/')); // 去掉末尾的斜杠
+                }
+
+                // 设置 NextMarker 以获取下一页的数据
+                nextMarker = objectListing.NextMarker;
+
+            } while (objectListing.IsTruncated);
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Error: {ex.Message}");
+        }
+
+        return rootFolders;
+    }
+
     /// <summary>
     /// 删除某个目录的文件
     /// </summary>

IRaCIS.Core.Application/IRaCIS.Core.Application.csproj

@@ -32,6 +32,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="IdentityModel.OidcClient" Version="6.0.0" />
 		<PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.4" />
 		<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.36" />
 		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
@@ -69,4 +70,8 @@
 		<ProjectReference Include="..\IRaCIS.Core.Infra.EFCore\IRaCIS.Core.Infra.EFCore.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Folder Include="Service\MinimalApiService\CodeTemplate\FrontTemplate\" />
+	</ItemGroup>
+
 </Project>

IRaCIS.Core.Application/MassTransit/Consumer/ConsistencyCheckConsumer.cs

@@ -191,7 +191,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
 
                             // dialogMsg.AppendLine(@$"<br>说明：为高效解决/处理以上全部质疑问题，麻烦您准确核实实际影像检查情况。请注意影像日期与实际检查的日期可能会不一致，部分检查（如PET -CT)可能同时存在多种模态影像。准确核实后，请回复该访视正确的影像检查情况。");
                             dbSV.CheckState = CheckStateEnum.CVPassed;
-                            dbSV.CheckUserId = _userInfo.Id;
+                            dbSV.CheckUserId = _userInfo.UserRoleId;
                             dbSV.CheckPassedTime = DateTime.Now;
                             dbSV.CheckChallengeState = CheckChanllengeTypeEnum.Closed;
 
@@ -217,7 +217,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
                         else
                         {
                             //"Problems are as follows:
-                            dialogMsg.AppendLine($"<br/><div style='color: red'>{_localizer["ConsistencyVerification_Prob"]}</div>");
+                            dialogMsg.AppendLine($"<br/><div>{_localizer["ConsistencyVerification_Prob"]}</div>");
 
                             num = 0;
                             foreach (var item in dbExceptExcel)

IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs

@@ -22,7 +22,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer;
 /// 加急的医学反馈任务  通知MIM
 /// </summary>
 public class UrgentMedicalReviewAddedEventConsumer(
-      IRepository<User> _userRepository,
+      IRepository<UserRole> _userRoleRepository,
        IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
       IRepository<Trial> _trialRepository,
         IRepository<SubjectVisit> _subjectVisitRepository,
@@ -58,7 +58,7 @@ public class UrgentMedicalReviewAddedEventConsumer(
             return;
         }
         var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == medicalReview.VisitTask.TrialReadingCriterionId);
-        var userinfo = await _userRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();
+        var userinfo = await _userRoleRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();
 
         var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReview.VisitTaskId).Include(x=>x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();
 
@@ -91,7 +91,7 @@ public class UrgentMedicalReviewAddedEventConsumer(
              new DictionaryDto (){DictionaryCode= "ReadingCategory",EnumValue=taskInfo.ReadingCategory.GetEnumInt(), },
              new DictionaryDto (){DictionaryCode= "MedicalReviewDoctorUserIdea",EnumValue=medicalReview.DoctorUserIdeaEnum.GetEnumInt(), },
              new DictionaryDto (){DictionaryCode= "MedicalReviewAuditState",EnumValue=medicalReview.AuditState.GetEnumInt(), },
-             new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=taskInfo.IsUrgent.ToString(), }
+             new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=taskInfo.IsUrgent.ToString().ToLower(), }
             }
          }) ;
 
@@ -128,7 +128,7 @@ public class UrgentMedicalReviewAddedEventConsumer(
 
 //IR 回复医学反馈通知MIM
 public class UrgentIRRepliedMedicalReviewConsumer(
-      IRepository<User> _userRepository,
+      IRepository<UserRole> _userRoleRepository,
        IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
       IRepository<Trial> _trialRepository,
         IRepository<SubjectVisit> _subjectVisitRepository,
@@ -159,7 +159,7 @@ public class UrgentIRRepliedMedicalReviewConsumer(
             return;
         }
         var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == medicalReview.VisitTask.TrialReadingCriterionId);
-        var userinfo = await _userRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();
+        var userinfo = await _userRoleRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();
 
         var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReview.VisitTaskId).Include(x => x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();
 
@@ -192,7 +192,7 @@ public class UrgentIRRepliedMedicalReviewConsumer(
              new DictionaryDto (){DictionaryCode= "ReadingCategory",EnumValue=taskInfo.ReadingCategory.GetEnumInt(), },
              new DictionaryDto (){DictionaryCode= "MedicalReviewDoctorUserIdea",EnumValue=medicalReview.DoctorUserIdeaEnum.GetEnumInt(), },
              new DictionaryDto (){DictionaryCode= "MedicalReviewAuditState",EnumValue=medicalReview.AuditState.GetEnumInt(), },
-             new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=taskInfo.IsUrgent.ToString(), }
+             new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=taskInfo.IsUrgent.ToString().ToLower(), }
             }
         });
 
@@ -231,7 +231,7 @@ public class UrgentIRRepliedMedicalReviewConsumer(
 /// MIM 回复医学返回通知IR
 /// </summary>
 public class UrgentMIMRepliedMedicalReviewConsumer(
-      IRepository<User> _userRepository,
+      IRepository<UserRole> _userRoleRepository,
        IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
       IRepository<Trial> _trialRepository,
         IRepository<SubjectVisit> _subjectVisitRepository,
@@ -268,7 +268,7 @@ public class UrgentMIMRepliedMedicalReviewConsumer(
         var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == medicalReview.VisitTask.TrialReadingCriterionId);
         var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReview.VisitTaskId).Include(x => x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();
 
-        var userinfo = await _userRepository.Where(x => x.Id == taskInfo.DoctorUserId).FirstOrDefaultAsync();
+        var userinfo = await _userRoleRepository.Where(x => x.Id == taskInfo.DoctorUserId).FirstOrDefaultAsync();
 
       
 
@@ -299,9 +299,9 @@ public class UrgentMIMRepliedMedicalReviewConsumer(
             DictionaryList = new List<DictionaryDto>()
             {
              new DictionaryDto (){DictionaryCode= "ReadingCategory",EnumValue=taskInfo.ReadingCategory.GetEnumInt(), },
-             new DictionaryDto (){DictionaryCode= "IsPass",EnumValue=medicalReview.IsHaveQuestion.ToString(), },// 审核结论
+             new DictionaryDto (){DictionaryCode= "IsPass",EnumValue=medicalReview.IsHaveQuestion.ToString().ToLower(), },// 审核结论
              new DictionaryDto (){DictionaryCode= "AuditAdvice",EnumValue=medicalReview.AuditAdviceEnum.GetEnumInt(), },// 审核建议
-             new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=taskInfo.IsUrgent.ToString(), }, //是否加急
+             new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=taskInfo.IsUrgent.ToString().ToLower(), }, //是否加急
 
  
           
@@ -346,8 +346,8 @@ public class UrgentMIMRepliedMedicalReviewConsumer(
 /// 加急阅片 IR 申请重阅  或者PM 申请重阅
 /// </summary>
 public class UrgentIRApplyedReReadingConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
       IRepository<Trial> _trialRepository,
         IRepository<SubjectVisit> _subjectVisitRepository,
@@ -370,9 +370,9 @@ public class UrgentIRApplyedReReadingConsumer(
         var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == taskInfo.TrialReadingCriterionId);
         
 
-        var doctorInfo = await _userRepository.Where(x => x.Id == taskInfo.DoctorUserId).FirstOrDefaultAsync();
+        var doctorInfo = await _userRoleRepository.Where(x => x.Id == taskInfo.DoctorUserId).FirstOrDefaultAsync();
 
-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == taskInfo.TrialId).Include(x => x.User).Select(x=>x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == taskInfo.TrialId).Include(x => x.UserRole).Select(x=>x.UserRole).ToListAsync();
 
         var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.ProjectManager||x.UserTypeEnum==UserTypeEnum.APM).ToList();
         if (context.Message.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)

IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs

@@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer;
 public class UserSiteSurveySubmitedEventConsumer(
       IRepository<Trial> _trialRepository,
       IRepository<TrialSite> _trialSiteRepository,
-       IRepository<TrialUser> _trialUserRepository,
+       IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
       IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig
@@ -47,9 +47,9 @@ public class UserSiteSurveySubmitedEventConsumer(
 
         var trialId = siteSurveyInfo.TrialId;
 
-        var trialUserList = await _trialUserRepository.Where(t => t.TrialId == siteSurveyInfo.TrialId)
-            .Where(t => t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM || t.User.UserTypeEnum == UserTypeEnum.ProjectManager || t.User.UserTypeEnum == UserTypeEnum.APM)
-            .Select(t => new { t.User.FullName, t.User.EMail, t.User.UserTypeEnum }).ToListAsync();
+        var trialUserList = await _trialUserRoleRepository.Where(t => t.TrialId == siteSurveyInfo.TrialId)
+            .Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM || t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserRole.UserTypeEnum == UserTypeEnum.APM)
+            .Select(t => new { t.UserRole.FullName, t.UserRole.IdentityUser.EMail, t.UserRole.UserTypeEnum }).ToListAsync();
 
         var sPMOrCPMList = trialUserList.Where(t => t.UserTypeEnum == UserTypeEnum.SPM || t.UserTypeEnum == UserTypeEnum.CPM).ToList();
         var pmAndAPMList = trialUserList.Where(t => t.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserTypeEnum == UserTypeEnum.APM).ToList();
@@ -110,10 +110,10 @@ public class UserSiteSurveySubmitedEventConsumer(
             return (topicStr, htmlBodyStr);
         };
 
-        var scenario = _trialSiteSurveyRepository.Any(t => t.Id != trialSiteSurveyId && t.TrialId == siteSurveyInfo.TrialId && t.TrialSiteId == siteSurveyInfo.TrialSiteId) ?
+        var scenario = _trialSiteSurveyRepository.Where(t => t.Id != trialSiteSurveyId && t.TrialId == siteSurveyInfo.TrialId && t.TrialSiteId == siteSurveyInfo.TrialSiteId).IgnoreQueryFilters().Any() ?
           EmailBusinessScenario.Approval_UpdateSiteSurvey : EmailBusinessScenario.Approval_SubmitSiteSurvey;
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.Approval_SubmitSiteSurvey, messageToSend, emailConfigFunc);
+        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, scenario, messageToSend, emailConfigFunc);
 
         await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
 
@@ -125,7 +125,7 @@ public class UserSiteSurveySubmitedEventConsumer(
 /// </summary>
 public class SiteSurveySPMSubmitedEventConsumer(
       IRepository<Trial> _trialRepository,
-      IRepository<TrialUser> _trialUserRepository,
+      IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<TrialSite> _trialSiteRepository,
       IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
       IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
@@ -145,9 +145,9 @@ public class SiteSurveySPMSubmitedEventConsumer(
 
         var messageToSend = new MimeMessage();
 
-        var trialUserList = _trialUserRepository.Where(t => t.TrialId == trialId)
-            .Where(t => t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM || t.User.UserTypeEnum == UserTypeEnum.ProjectManager || t.User.UserTypeEnum == UserTypeEnum.APM)
-            .Select(t => new { t.User.EMail, t.User.FullName, t.User.UserTypeEnum }).ToList();
+        var trialUserList = _trialUserRoleRepository.Where(t => t.TrialId == trialId)
+            .Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM || t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserRole.UserTypeEnum == UserTypeEnum.APM)
+            .Select(t => new { t.UserRole.IdentityUser.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum }).ToList();
 
         var sPMOrCPMList = trialUserList.Where(t => t.UserTypeEnum == UserTypeEnum.SPM || t.UserTypeEnum == UserTypeEnum.CPM).ToList();
         var pmAndAPMList = trialUserList.Where(t => t.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserTypeEnum == UserTypeEnum.APM).ToList();
@@ -174,7 +174,7 @@ public class SiteSurveySPMSubmitedEventConsumer(
 
         Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
         {
-            var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
+            var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo);
             var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
             toUserName,
             siteInfo.TrialSiteCode,
@@ -200,7 +200,7 @@ public class SiteSurveySPMSubmitedEventConsumer(
 /// 调研表驳回发送邮件    之前已有，需要迁移过来
 /// </summary>
 public class SiteSurverRejectedEventConsumer(
-       IRepository<TrialUser> _trialUserRepository,
+       IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<Trial> _trialRepository,
       IRepository<TrialSite> _trialSiteRepository,
       IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
@@ -229,13 +229,13 @@ public class SiteSurverRejectedEventConsumer(
             //PM 驳回到SPM
             if (siteSurveyInfo.State == TrialSiteSurveyEnum.CRCSubmitted)
             {
-                //var user = await _userRepository.FirstOrDefaultAsync(t => t.Id == siteSurveyInfo.PreliminaryUserId);
+                //var user = await _userRoleRepository.FirstOrDefaultAsync(t => t.Id == siteSurveyInfo.PreliminaryUserId);
 
                 //name = user.FullName;
 
-                var sPMOrCPMList = _trialUserRepository.Where(t => t.TrialId == trialId)
-                  .Where(t => t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM)
-                  .Select(t => new { t.User.EMail, t.User.FullName, t.User.UserTypeEnum }).ToList();
+                var sPMOrCPMList = _trialUserRoleRepository.Where(t => t.TrialId == trialId)
+                  .Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM)
+                  .Select(t => new { t.UserRole.IdentityUser.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum }).ToList();
 
 
                 foreach (var user in sPMOrCPMList)
@@ -274,7 +274,7 @@ public class SiteSurverRejectedEventConsumer(
 
         Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
         {
-            var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
+            var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo);
             var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
            toUserName,
             trialInfo.TrialCode,

IRaCIS.Core.Application/MassTransit/Consumer/SubjectVisitQCAndCheckConsumer.cs

@@ -23,8 +23,8 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer;
 /// CRC 提交了 通知QC进行质控  Code005，006
 /// </summary>
 public class CRCSubmitedAndQCToAuditEventConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<Trial> _trialRepository,
       IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
@@ -43,7 +43,7 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
 
         var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).FirstOrDefaultAsync();
 
-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
 
         var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.IQC).ToList();
 
@@ -73,12 +73,17 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
             }
         });
 
-        foreach (var userinfo in userinfoList)
-        {
             var messageToSend = new MimeMessage();
             //发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-            messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+        
+
+            foreach (var userinfo in userinfoList)
+            {
+               messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+            }
+
+            var userNames = userinfoList.Select(x => x.FullName).ToList();
 
             foreach (var pm in pmandAPm)
             {
@@ -95,7 +100,7 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
                 var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
                 var htmlBodyStr = string.Format(
                    CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                   userinfo.FullName,              // 用户名  {0}
+                   string.Join(',', userNames),  // 用户名  {0}
                    trialInfo.ExperimentName,        // 项目   {1}
                    subjectCode, // 受试者 {2}
                    subjectVisit.VisitName,             // 访视  {3}
@@ -113,7 +118,7 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
                 messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
-        }
+       
     }
 }
 
@@ -122,8 +127,8 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
 /// CRC 回复质控质疑 通知QC  Code012，013
 /// </summary>
 public class CRCRepliedQCChallengeEventConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<Trial> _trialRepository,
       IRepository<QCChallenge> _qCChallengeRepository,
@@ -148,7 +153,7 @@ public class CRCRepliedQCChallengeEventConsumer(
 
 
 
-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
 
 
 
@@ -181,7 +186,7 @@ public class CRCRepliedQCChallengeEventConsumer(
             IsEn_US = isEn_US,
             DictionaryList = new List<DictionaryDto>()
             {
-             new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=qCChallengeDialog.QCChallenge.IsClosed.ToString(), }, //是否关闭
+             new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=qCChallengeDialog.QCChallenge.IsClosed.ToString().ToLower(), }, //是否关闭
 
             }
         });
@@ -219,8 +224,8 @@ public class CRCRepliedQCChallengeEventConsumer(
 /// QC回复 质控质疑，通知CRC (014，015)
 /// </summary>
 public class QCRepliedQCChallengeEventConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<Trial> _trialRepository,
       IRepository<QCChallenge> _qCChallengeRepository,
@@ -234,12 +239,27 @@ public class QCRepliedQCChallengeEventConsumer(
     {
         Console.WriteLine("发送(014，015) 【  QC回复 质控质疑，通知CRC】邮件！！！");
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
-        var qCChallengeDialog = await _qCChallengeDialogRepository.Where(x => x.Id == context.Message.QCChallengeDialogId).Include(x => x.QCChallenge).FirstNotNullAsync();
+
+        string talkContent = string.Empty;
+        var isclose = false;
+        if (context.Message.QCChallengeDialogId != null)
+        {
+            var qCChallengeDialog = await _qCChallengeDialogRepository.Where(x => x.Id == context.Message.QCChallengeDialogId.Value).Include(x => x.QCChallenge).FirstNotNullAsync();
+            talkContent = qCChallengeDialog.TalkContent;
+            isclose = qCChallengeDialog.QCChallenge.IsClosed;
+        }
+        else if(context.Message.QCChallengeId != null)
+        {
+            var qCChallenge = await _qCChallengeRepository.Where(x => x.Id == context.Message.QCChallengeId.Value).FirstNotNullAsync();
+            talkContent = qCChallenge.Content;
+            isclose = qCChallenge.IsClosed;
+        }
+       
         var subjectVisitId = context.Message.SubjectVisitId;
 
         var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).FirstNotNullAsync();
 
-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
 
         var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).ToList();
 
@@ -257,7 +277,7 @@ public class QCRepliedQCChallengeEventConsumer(
             IsEn_US = isEn_US,
             DictionaryList = new List<DictionaryDto>()
             {
-          new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=qCChallengeDialog.QCChallenge.IsClosed.ToString(), }, //是否关闭
+          new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=isclose.ToString().ToLower(), }, //是否关闭
 
          }
         });
@@ -285,12 +305,12 @@ public class QCRepliedQCChallengeEventConsumer(
                 var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
                 var htmlBodyStr = string.Format(
                    CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                   userinfo.FullName,              // 用户名  {0}
                    trialInfo.ExperimentName,        // 项目   {1}
-                   userinfo.FullName,              // 用户名  {1}
                    subjectCode, // 受试者 {2}
                    subjectVisit.VisitName,             // 访视  {3}
                    dictionValue[0],    // 质疑是否关闭 {4}
-                   qCChallengeDialog.TalkContent,    // 质疑内容 {5}
+                   talkContent,    // 质疑内容 {5}
                    _systemEmailConfig.SiteUrl             // 链接                  {65}
                     );
 
@@ -313,8 +333,8 @@ public class QCRepliedQCChallengeEventConsumer(
 /// CRC 回复一致性核查质疑 通知PM  (019,020)
 /// </summary>
 public class CRCRepliedCheckChallengeEventConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<Trial> _trialRepository,
       IRepository<QCChallenge> _qCChallengeRepository,
@@ -334,7 +354,7 @@ public class CRCRepliedCheckChallengeEventConsumer(
 
         var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).FirstNotNullAsync();
 
-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
 
         var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).ToList();
 
@@ -376,8 +396,8 @@ public class CRCRepliedCheckChallengeEventConsumer(
                 var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
                 var htmlBodyStr = string.Format(
                    CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                    trialInfo.ExperimentName,        // 项目   {1}
-                   userinfo.FullName,              // 用户名  {1}
+                   userinfo.FullName,              // 用户名  {0}
+                   trialInfo.ExperimentName,        // 项目   {1}
                    subjectCode, // 受试者 {2}
                    subjectVisit.VisitName,             // 访视  {3}
                    dictionValue[0],    // 核查状态 {4}
@@ -405,8 +425,8 @@ public class CRCRepliedCheckChallengeEventConsumer(
 
 /// </summary>
 public class PMRepliedCheckChallengeEventConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<Trial> _trialRepository,
       IRepository<CheckChallengeDialog> _checkChallengeDialogRepository,
@@ -424,9 +444,9 @@ public class PMRepliedCheckChallengeEventConsumer(
         var checkChallengeDialog = await _checkChallengeDialogRepository.Where(x => x.Id == context.Message.CheckChallengeDialogId).FirstNotNullAsync();
         var subjectVisitId = context.Message.SubjectVisitId;
 
-        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).FirstNotNullAsync();
+        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.NoneDicomStudyList).Include(x => x.StudyList).Include(x => x.Subject).FirstNotNullAsync();
 
-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
 
         var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).ToList();
 
@@ -434,24 +454,12 @@ public class PMRepliedCheckChallengeEventConsumer(
 
         var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
 
-        string json = checkChallengeDialog.ParamInfo;
+     
         List<string> modalities = new List<string>();
-        if (json.IsNotNullOrEmpty())
-        {
-            List<Dictionary<string, string>> studies = JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(json);
-            foreach (var study in studies)
-            {
-                if (study.ContainsKey("Modality"))
-                {
-                    modalities.Add(study["Modality"]);
-                }
-            }
-        }
+        modalities =subjectVisit.NoneDicomStudyList.Select(t => t.Modality)
+ .Union(subjectVisit.StudyList.Select(k => k.ModalityForEdit)).ToList();
 
-        modalities = modalities.Distinct().ToList();
-
-
-         var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+        var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
         {
 
             DictionaryRepository = _dictionaryRepository,
@@ -516,8 +524,8 @@ public class PMRepliedCheckChallengeEventConsumer(
 /// 通知PM 进行一致性核查 (018,030)
 /// </summary>
 public class CheckStateChangedToAuditEventConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<Trial> _trialRepository,
       IRepository<QCChallenge> _qCChallengeRepository,
@@ -536,7 +544,7 @@ public class CheckStateChangedToAuditEventConsumer(
 
         var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).FirstNotNullAsync();
 
-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
 
         var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).ToList();
 
@@ -578,8 +586,8 @@ public class CheckStateChangedToAuditEventConsumer(
                 var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
                 var htmlBodyStr = string.Format(
                    CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                    trialInfo.ExperimentName,        // 项目   {1}
-                   userinfo.FullName,              // 用户名  {1}
+                    userinfo.FullName,   // 姓名  {0}
+                    trialInfo.ExperimentName,        // 项目   {1}                       
                    subjectCode, // 受试者 {2}
                    subjectVisit.VisitName,             // 访视  {3}
                    dictionValue[0],    // 核查状态 {4}
@@ -604,8 +612,8 @@ public class CheckStateChangedToAuditEventConsumer(
 /// QC 领取了质控任务 (007，008) 
 /// </summary>
 public class QCClaimTaskEventConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<Trial> _trialRepository,
       IRepository<QCChallenge> _qCChallengeRepository,
@@ -631,7 +639,7 @@ public class QCClaimTaskEventConsumer(
 
 
 
-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
 
 
 
@@ -674,8 +682,8 @@ public class QCClaimTaskEventConsumer(
          }
         });
 
-        var subjectcodes = subjectVisitList.Select(x => x.Subject.Code).ToList();
-        var visitnames = subjectVisitList.Select(x => x.VisitName).ToList();
+        var subjectcodes = subjectVisitList.Select(x => x.Subject.Code).Distinct().ToList();
+        var visitnames = subjectVisitList.Select(x => x.VisitName).Distinct().ToList();
 
         Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
         {
@@ -697,7 +705,7 @@ public class QCClaimTaskEventConsumer(
 
         await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
 
-         context.Message.IsPd ? EmailBusinessScenario.PDVerification_PendingImageQCClaim : EmailBusinessScenario.EligibilityVerification_PendingClaim,
+         context.Message.IsPd ? EmailBusinessScenario.PDVerification_PendingImageQC : EmailBusinessScenario.EligibilityVerification_PendingImageQC,
 
             messageToSend, emailConfigFunc);
 

IRaCIS.Core.Application/MassTransit/Consumer/TestConsumer.cs

@@ -30,13 +30,13 @@ public class MasstransiTestCommand
 ///          publish  请求流不会先到消费者，发布后，直接执行后续代码
 ///          
 /// </summary>
-/// <param name="_userRepository"></param>
-public class MasstransitTestConsumer(IRepository<User> _userRepository) : IConsumer<MasstransiTestCommand>
+/// <param name="_userRoleRepository"></param>
+public class MasstransitTestConsumer(IRepository<UserRole> _userRoleRepository) : IConsumer<MasstransiTestCommand>
 {
     public async Task Consume(ConsumeContext<MasstransiTestCommand> context)
     {
 
-        Console.WriteLine(_userRepository._dbContext.GetHashCode());
+        Console.WriteLine(_userRoleRepository._dbContext.GetHashCode());
         Console.WriteLine("Now is " + DateTime.Now.ToString());
         Console.WriteLine($"MassTransit.Consumer :{context.Message.value}");
 

IRaCIS.Core.Application/MassTransit/Recurring/IRRecurringConsumer.cs

@@ -1,4 +1,5 @@
-using IRaCIS.Application.Contracts;
+using DocumentFormat.OpenXml;
+using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.MassTransit.Consumer;
@@ -25,7 +26,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
         IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository,
         IRepository<VisitTask> _visitTaskRepository,
          IRepository<Dictionary> _dictionaryRepository,
-        IRepository<TrialUser> _trialUserRepository,
+        IRepository<TrialUserRole> _trialUserRoleRepository,
         IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
         IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<UrgentIRUnReadTaskRecurringEvent>
     {
@@ -43,7 +44,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                 IsEn_US = isEn_US,
                 DictionaryList = new List<DictionaryDto>()
                 {
-                    new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue="1" } 
+                    new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue="true" }
                 }
             });
 
@@ -51,31 +52,31 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
 
             Expression<Func<VisitTask, bool>> comonTaskFilter = t => t.TrialId == trialId && t.TaskState == TaskState.Effect && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskAllocationState == TaskAllocationState.Allocated;
 
-            var trialUserList = _trialUserRepository.Where(t => t.TrialId == trialId).Select(t => new
+            var trialUserList = _trialUserRoleRepository.Where(t => t.TrialId == trialId && t.TrialUser.JoinTime != null).Select(t => new
             {
                 t.UserId,
-                t.User.FullName,
-                t.User.EMail,
-                t.User.UserName,
+                t.UserRole.FullName,
+                t.UserRole.IdentityUser.EMail,
+                t.UserRole.IdentityUser.UserName,
                 t.Trial.TrialCode,
                 t.Trial.ResearchProgramNo
                 //TrialReadingCriterionList = t.Trial.TrialReadingCriterionList.Select(t => new { t.CriterionName, TrialReadingCriterionId = t.Id }).ToList()
             });
 
 
-            foreach (var trialUser in trialUserList) 
+            foreach (var trialUser in trialUserList)
             {
 
-                var userId=trialUser.UserId;
+                var userId = trialUser.UserId;
 
-                var doctorCriterionList =  await _trialReadingCriterionRepository.Where(t => t.IsSigned && t.IsConfirm && t.Trial.TrialUserList.Any(t => t.UserId == userId))
-                     .Select(c => new 
+                var doctorCriterionList = await _trialReadingCriterionRepository.Where(t => t.IsSigned && t.IsConfirm && t.TrialId == trialId && t.Trial.TrialUserRoleList.Any(t => t.UserId == userId))
+                     .Select(c => new
                      {
 
                          TrialReadingCriterionId = c.Id,
-                         CriterionName=c.CriterionName,
+                         CriterionName = c.CriterionName,
 
-                         UnReadList = c.VisitTaskList
+                         UnReadList = c.VisitTaskList.Where(t => t.ExpetidEmailNoticeTime == null) //没有被通知
                               .Where(t => t.DoctorUserId == userId && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect)
                               // 前序 不存在 未一致性核查未通过的
                               .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
@@ -84,69 +85,84 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
 
                               .Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
 
-                              .Where(t=> t.SourceSubjectVisit.PDState==PDStateEnum.PDProgress || t.SourceSubjectVisit.IsEnrollmentConfirm ||
+                              .Where(t => t.SourceSubjectVisit.PDState == PDStateEnum.PDProgress || t.SourceSubjectVisit.IsEnrollmentConfirm ||
                               t.ReadModule.SubjectVisit.PDState == PDStateEnum.PDProgress || t.ReadModule.SubjectVisit.IsEnrollmentConfirm)
-                              .Select(c=>new 
+                              .Select(c => new
                               {
-                                SubejctCode=  c.IsAnalysisCreate? c.BlindSubjectCode:  c.Subject.Code,
-                                 c.TaskBlindName,
-                                c.TaskName
+                                  SubejctCode = c.IsAnalysisCreate ? c.BlindSubjectCode : c.Subject.Code,
+                                  c.TaskBlindName,
+                                  c.TaskName,
+                                  VisitTaskId = c.Id
                               }).ToList()
 
                      }).ToListAsync();
 
 
-                var toTalUnreadCount= doctorCriterionList.SelectMany(t=>t.UnReadList).Count();
+                var toTalUnreadCount = doctorCriterionList.SelectMany(t => t.UnReadList).Count();
 
-
-                var messageToSend = new MimeMessage();
-
-                //发件地址
-                messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-                messageToSend.To.Add(new MailboxAddress(trialUser.FullName, trialUser.EMail));
-
-                var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
-
-                Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
+                if (toTalUnreadCount > 0)
                 {
-                    var topicStr = string.Format(input.topicStr, trialUser.ResearchProgramNo);
+                    var messageToSend = new MimeMessage();
 
-                    var template = input.htmlBodyStr;
+                    //发件地址
+                    messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+                    messageToSend.To.Add(new MailboxAddress(trialUser.FullName, trialUser.EMail));
 
-                    //正则提取循环的部分 {%for%}(.*?){%end for%}
-                    string pattern = @"{%for%}(.*?){%end for%}";
-                    var match = Regex.Match(template, pattern, RegexOptions.Singleline);
+                    var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
-                    string criteriaTemplate = match.Groups[1].Value; // 提取循环模板
-
-                    // 构建循环内容
-                    string criteriaDetails = "";
-                    foreach (var criteria in doctorCriterionList)
+                    Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                     {
-                        criteriaDetails += string.Format(criteriaTemplate, criteria.CriterionName, criteria.UnReadList.Select(t=>t.SubejctCode).Distinct().Count(), criteria.UnReadList.Count());
-                    }
+                        var topicStr = string.Format(input.topicStr, trialUser.ResearchProgramNo);
 
-                    // 用循环内容替换原始模板中的循环部分
-                    string emailContent = Regex.Replace(template, pattern, criteriaDetails);
+                        var template = input.htmlBodyStr;
+
+                        //正则提取循环的部分 {%for%}(.*?){%end for%}
+                        string pattern = @"{%for%}(.*?){%end for%}";
+                        var match = Regex.Match(template, pattern, RegexOptions.Singleline);
+
+                        string criteriaTemplate = match.Groups[1].Value; // 提取循环模板
+
+                        // 构建循环内容
+                        string criteriaDetails = "";
+                        foreach (var criteria in doctorCriterionList)
+                        {
+                            if (criteria.UnReadList.Count() > 0)
+                            {
+                                criteriaDetails += string.Format(criteriaTemplate, criteria.CriterionName, criteria.UnReadList.Select(t => t.SubejctCode).Distinct().Count(), criteria.UnReadList.Count());
+
+                            }
+                        }
+
+                        // 用循环内容替换原始模板中的循环部分
+                        string emailContent = template.Replace(criteriaTemplate, criteriaDetails).Replace("{%for%}", "").Replace("{%end for%}", "");
 
 
-                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                        trialUser.FullName,
 
-                    DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
-                    toTalUnreadCount,
+                        var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, emailContent),
+                            trialUser.FullName,
 
-                    trialUser.ResearchProgramNo,
-                     dictionValue[0],
-                    _systemEmailConfig.SiteUrl
-                        );
+                        DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                        toTalUnreadCount,
 
-                    return (topicStr, htmlBodyStr);
-                };
+                        trialUser.ResearchProgramNo,
+                         dictionValue[0],
+                        _systemEmailConfig.SiteUrl
+                            );
 
-                await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.ExpeditedReading, messageToSend, emailConfigFunc);
+                        return (topicStr, htmlBodyStr);
+                    };
+
+                    await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.ExpeditedReading, messageToSend, emailConfigFunc);
+
+                    await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+
+                    //处理标记已通知的任务
+
+                    var visitTaskIdList = doctorCriterionList.Where(t => t.UnReadList.Count() > 0).SelectMany(t => t.UnReadList.Select(u => u.VisitTaskId)).ToList();
+
+                    await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => visitTaskIdList.Contains(t.Id), u => new VisitTask() { ExpetidEmailNoticeTime = DateTime.Now });
+                }
 
-                await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
 
             }
 

IRaCIS.Core.Application/MassTransit/Recurring/OldRecurringEmailHelper.cs

@@ -22,9 +22,9 @@ public static class OldRecurringEmailHelper
     public static async Task SendTrialEmailAsync(
       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
       IRepository<Trial> _trialRepository,
-      IRepository<TrialUser> _trialUserRepository,
+      IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<VisitTask> _visitTaskRepository,
-      IRepository<TrialSiteUser> _trialSiteUserRepository,
+      IRepository<TrialSiteUserRole> _trialSiteUserRoleRepository,
 
         Guid trialId, EmailBusinessScenario businessScenario, 
         Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc,
@@ -59,7 +59,7 @@ public static class OldRecurringEmailHelper
 
             var allUserTypeEnumList = toUserTypeEnumList.Union(copyUserTypeEnumList).Distinct().ToList();
 
-            var allUserList = await _trialUserRepository.Where(t => t.TrialId == trialId && allUserTypeEnumList.Contains(t.User.UserTypeEnum)).Select(t => new { t.UserId, t.User.EMail, t.User.FullName, t.User.UserTypeEnum }).ToListAsync();
+            var allUserList = await _trialUserRoleRepository.Where(t => t.TrialId == trialId && allUserTypeEnumList.Contains(t.UserRole.UserTypeEnum)).Select(t => new { t.UserId, t.UserRole.IdentityUser.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum }).ToListAsync();
 
 
             var toUserList = allUserList.Where(t => toUserTypeEnumList.Contains(t.UserTypeEnum))
@@ -72,7 +72,7 @@ public static class OldRecurringEmailHelper
             }
             if (trialSiteId != null && toUserTypeEnumList.Any(t => t == UserTypeEnum.ClinicalResearchCoordinator || t == UserTypeEnum.CRA))
             {
-                var curentSiteUserIdList = _trialSiteUserRepository.Where(t => t.TrialId == trialId && t.TrialSiteId == trialSiteId).Select(t => t.UserId).ToList();
+                var curentSiteUserIdList = _trialSiteUserRoleRepository.Where(t => t.TrialId == trialId && t.TrialSiteId == trialSiteId).Select(t => t.UserId).ToList();
 
                 toUserList = toUserList.Where(t => (t.UserTypeEnum != UserTypeEnum.CRA && t.UserTypeEnum != UserTypeEnum.ClinicalResearchCoordinator) || curentSiteUserIdList.Contains(t.UserId)).ToList();
             }
@@ -86,7 +86,7 @@ public static class OldRecurringEmailHelper
 
             if (trialSiteId != null && copyUserTypeEnumList.Any(t => t == UserTypeEnum.ClinicalResearchCoordinator || t == UserTypeEnum.CRA))
             {
-                var curentSiteUserIdList = _trialSiteUserRepository.Where(t => t.TrialId == trialId && t.TrialSiteId == trialSiteId).Select(t => t.UserId).ToList();
+                var curentSiteUserIdList = _trialSiteUserRoleRepository.Where(t => t.TrialId == trialId && t.TrialSiteId == trialSiteId).Select(t => t.UserId).ToList();
 
                 copyUserList = copyUserList.Where(t => (t.UserTypeEnum != UserTypeEnum.CRA && t.UserTypeEnum != UserTypeEnum.ClinicalResearchCoordinator) || curentSiteUserIdList.Contains(t.UserId)).ToList();
             }

IRaCIS.Core.Application/MassTransit/Recurring/QCRecurringEmailConsumer.cs

@@ -23,9 +23,9 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer;
 
 public class QCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRepository,
     IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
-      IRepository<TrialUser> _trialUserRepository,
+      IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<VisitTask> _visitTaskRepository,
-      IRepository<TrialSiteUser> _trialSiteUserRepository,
+      IRepository<TrialSiteUserRole> _trialSiteUserRoleRepository,
       IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig) : IConsumer<QCImageQuestionRecurringEvent>
 {
     public async Task Consume(ConsumeContext<QCImageQuestionRecurringEvent> context)
@@ -37,7 +37,7 @@ public class QCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRepo
         var trialInfo = await _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.ResearchProgramNo, t.ExperimentName, t.TrialCode, t.TrialStatusStr }).FirstNotNullAsync();
 
         //找到 该项目的CRC 用户Id
-        var userList = await _trialUserRepository.Where(t => t.TrialId == trialId).Where(t => t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Select(t => new { t.UserId, t.User.FullName }).ToListAsync();
+        var userList = await _trialUserRoleRepository.Where(t => t.TrialId == trialId).Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Select(t => new { t.UserId, t.UserRole.FullName }).ToListAsync();
 
         //判断是否任务可以领取 ，可以的话 发送邮件
 
@@ -73,9 +73,9 @@ public class QCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRepo
                 await OldRecurringEmailHelper.SendTrialEmailAsync(
                       _trialEmailNoticeConfigRepository,
                          _trialRepository,
-                          _trialUserRepository,
+                          _trialUserRoleRepository,
                           _visitTaskRepository,
-                     _trialSiteUserRepository,
+                     _trialSiteUserRoleRepository,
                     trialId, EmailBusinessScenario.QCToCRCImageQuestion, topicAndHtmlFunc);
             }
         }
@@ -88,9 +88,9 @@ public class QCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRepo
 /// </summary>
 public class CRCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRepository,
     IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
-      IRepository<TrialUser> _trialUserRepository,
+      IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<VisitTask> _visitTaskRepository,
-      IRepository<TrialSiteUser> _trialSiteUserRepository,
+      IRepository<TrialSiteUserRole> _trialSiteUserRoleRepository,
       IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig) : IConsumer<CRCImageQuestionRecurringEvent>
 {
     public async Task Consume(ConsumeContext<CRCImageQuestionRecurringEvent> context)
@@ -101,7 +101,7 @@ public class CRCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRep
         var trialInfo = await _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.ResearchProgramNo, t.ExperimentName, t.TrialCode, t.TrialStatusStr, t.DeclarationTypeEnumList }).FirstNotNullAsync();
 
         //找到 该项目的IQC 用户Id
-        var userList = await _trialUserRepository.Where(t => t.TrialId == trialId).Where(t => t.User.UserTypeEnum == UserTypeEnum.IQC).Select(t => new { t.UserId, t.User.FullName }).ToListAsync();
+        var userList = await _trialUserRoleRepository.Where(t => t.TrialId == trialId).Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.IQC).Select(t => new { t.UserId, t.UserRole.FullName }).ToListAsync();
 
         //判断是否任务可以领取 ，可以的话 发送邮件
 
@@ -141,9 +141,9 @@ public class CRCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRep
 
                 await OldRecurringEmailHelper.SendTrialEmailAsync(_trialEmailNoticeConfigRepository,
                          _trialRepository,
-                          _trialUserRepository,
+                          _trialUserRoleRepository,
                           _visitTaskRepository,
-                     _trialSiteUserRepository,
+                     _trialSiteUserRoleRepository,
                     trialId, EmailBusinessScenario.CRCToQCQuestion, topicAndHtmlFunc);
             }
         }
@@ -155,9 +155,9 @@ public class CRCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRep
 /// </summary>
 public class ImageQCRecurringEventConsumer(IRepository<Trial> _trialRepository,
     IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
-      IRepository<TrialUser> _trialUserRepository,
+      IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<VisitTask> _visitTaskRepository,
-      IRepository<TrialSiteUser> _trialSiteUserRepository,
+      IRepository<TrialSiteUserRole> _trialSiteUserRoleRepository,
       IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig) : IConsumer<ImageQCRecurringEvent>
 {
     public async Task Consume(ConsumeContext<ImageQCRecurringEvent> context)
@@ -169,7 +169,7 @@ public class ImageQCRecurringEventConsumer(IRepository<Trial> _trialRepository,
         var trialInfo = await _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.ResearchProgramNo, t.ExperimentName, t.TrialCode, t.TrialStatusStr }).FirstNotNullAsync();
 
         //找到 该项目的IQC 用户Id
-        var userList = await _trialUserRepository.Where(t => t.TrialId == trialId).Where(t => t.User.UserTypeEnum == UserTypeEnum.IQC).Select(t => new { t.UserId, t.User.FullName }).ToListAsync();
+        var userList = await _trialUserRoleRepository.Where(t => t.TrialId == trialId).Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.IQC).Select(t => new { t.UserId, t.UserRole.FullName }).ToListAsync();
 
         //判断是否任务可以领取 ，可以的话 发送邮件
         var userIdList = userList.Select(t => t.UserId).ToList();
@@ -209,9 +209,9 @@ public class ImageQCRecurringEventConsumer(IRepository<Trial> _trialRepository,
                 await OldRecurringEmailHelper.SendTrialEmailAsync(
                      _trialEmailNoticeConfigRepository,
                          _trialRepository,
-                          _trialUserRepository,
+                          _trialUserRoleRepository,
                           _visitTaskRepository,
-                     _trialSiteUserRepository,
+                     _trialSiteUserRoleRepository,
                     trialId, EmailBusinessScenario.QCTask, topicAndHtmlFunc);
             }
         }

IRaCIS.Core.Application/Service/Allocation/Interface/IVisitTaskService.cs

@@ -14,7 +14,7 @@ namespace IRaCIS.Core.Application.Service
     {
         Task<IResponseOutput> ApplyReReading(ApplyReReadingCommand applyReReadingCommand);
 
-        Task<IResponseOutput> ConfirmReReading(ConfirmReReadingCommand agreeReReadingCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService);
+        Task<IResponseOutput> ConfirmReReading(ConfirmReReadingCommand agreeReReadingCommand);
 
         Task<PageOutput<IRUnReadSubjectView>> GetSubjectReadingIQueryable(GetReadingIQueryableInDto inDto);
     }

IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs

@@ -18,7 +18,7 @@ namespace IRaCIS.Core.Application.Service
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Trial")]
     public class TaskAllocationRuleService(IRepository<TaskAllocationRule> _taskAllocationRuleRepository,
-        IRepository<User> _userRepository,
+        IRepository<UserRole> _userRoleRepository,
         IRepository<Enroll> _enrollRepository,
         IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
         IRepository<SubjectCanceDoctor> _subjectCanceDoctorRepository,
@@ -124,15 +124,15 @@ namespace IRaCIS.Core.Application.Service
         public async Task<List<TrialDoctorUserSelectView>> GetDoctorUserSelectList(Guid trialId, [FromServices] IRepository<Enroll> _enrollRepository)
         {
             var query = from enroll in _enrollRepository.Where(t => t.TrialId == trialId && t.EnrollStatus >= EnrollStatus.ConfirmIntoGroup)
-                        join user in _userRepository.AsQueryable() on enroll.DoctorId equals user.DoctorId
+                        join user in _userRoleRepository.AsQueryable() on enroll.DoctorId equals user.DoctorId
                         select new TrialDoctorUserSelectView()
                         {
                             TrialId = enroll.TrialId,
                             //ReadingType = enroll.Trial.ReadingType,
                             DoctorUserId = user.Id,
-                            FullName = user.FullName,
-                            UserCode = user.UserCode,
-                            UserName = user.UserName,
+                            FullName = user.IdentityUser.FullName,
+                            UserCode = user.IdentityUser.UserCode,
+                            UserName = user.IdentityUser.UserName,
                             UserTypeEnum = user.UserTypeRole.UserTypeEnum,
                             ReadingCategoryList = enroll.EnrollReadingCategoryList.Select(t => t.ReadingCategory).ToList()
 
@@ -151,14 +151,14 @@ namespace IRaCIS.Core.Application.Service
                                               .WhereIf(selectQuery.TrialReadingCriterionId != null && selectQuery.ReadingCategory == null, t => t.Enroll.EnrollReadingCategoryList.Any(t => t.TrialReadingCriterionId == selectQuery.TrialReadingCriterionId))
                                               .WhereIf(selectQuery.TrialReadingCriterionId != null && selectQuery.ReadingCategory != null,
                                                    t => t.Enroll.EnrollReadingCategoryList.Any(t => t.TrialReadingCriterionId == selectQuery.TrialReadingCriterionId && t.ReadingCategory == selectQuery.ReadingCategory))
-                        join user in _userRepository.AsQueryable() on allocationRule.DoctorUserId equals user.Id
+                        join user in _userRoleRepository.AsQueryable() on allocationRule.DoctorUserId equals user.Id
                         select new TrialDoctorUserSelectView()
                         {
                             TrialId = allocationRule.TrialId,
                             DoctorUserId = user.Id,
-                            FullName = user.FullName,
-                            UserCode = user.UserCode,
-                            UserName = user.UserName,
+                            FullName = user.IdentityUser.FullName,
+                            UserCode = user.IdentityUser.UserCode,
+                            UserName = user.IdentityUser.UserName,
                             UserTypeEnum = user.UserTypeRole.UserTypeEnum,
 
                             ReadingCategoryList = selectQuery.TrialReadingCriterionId == null ?

IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs

@@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Service
         IRepository<Trial> _trialRepository,
         IRepository<TrialSite> _trialSiteRepository,
         IRepository<Enroll> _enrollRepository,
-        IRepository<User> _userRepository,
+        IRepository<UserRole> _userRoleRepository,
         IRepository<TrialVirtualSiteCodeUpdate> _trialVirtualSiteCodeUpdateRepository,
         IVisitTaskHelpeService _visitTaskCommonService, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITaskConsistentRuleService
     {
@@ -227,7 +227,7 @@ namespace IRaCIS.Core.Application.Service
                     {
                         var lastTask = (subject.VisitTaskList.Take(filterObj.PlanVisitCount).Last()).Clone();
 
-                        var existGlobal = _visitTaskRepository.Where(t => t.SubjectId == lastTask.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Global && t.VisitTaskNum == lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global]).ProjectTo<VisitTaskSimpleDTO>(_mapper.ConfigurationProvider).FirstOrDefault();
+                        var existGlobal = _visitTaskRepository.Where(t => t.SubjectId == lastTask.SubjectId && t.ArmEnum==lastTask.ArmEnum && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Global && t.VisitTaskNum == lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global]).ProjectTo<VisitTaskSimpleDTO>(_mapper.ConfigurationProvider).FirstOrDefault();
 
 
                         if (existGlobal == null)
@@ -369,7 +369,7 @@ namespace IRaCIS.Core.Application.Service
 
             var doctorUserIdQuery = from enroll in _enrollRepository.Where(t => t.TrialId == trialId).Where(t => t.EnrollReadingCategoryList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(c => c.ReadingCategory == ReadingCategory.Global || c.ReadingCategory == ReadingCategory.Visit))
                                     .Where(t => t.EnrollReadingCriteriaList.Any(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.IsJoinAnalysis == true))
-                                    join user in _userRepository.Where() on enroll.DoctorId equals user.DoctorId
+                                    join user in _userRoleRepository.Where() on enroll.DoctorId equals user.DoctorId
                                     select user.Id;
 
             var configDoctorUserIdList = await doctorUserIdQuery.ToListAsync();
@@ -469,7 +469,7 @@ namespace IRaCIS.Core.Application.Service
                             var lastTask = (subjectAddTaskList.Take(filterObj.PlanVisitCount).Last()).Clone();
 
 
-                            var existGlobal = _visitTaskRepository.Where(t => t.SubjectId == lastTask.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Global && t.VisitTaskNum == lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global]).ProjectTo<VisitTaskGroupSimpleDTO>(_mapper.ConfigurationProvider).FirstOrDefault();
+                            var existGlobal = _visitTaskRepository.Where(t => t.SubjectId == lastTask.SubjectId && t.ArmEnum == lastTask.ArmEnum && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Global && t.VisitTaskNum == lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global]).ProjectTo<VisitTaskGroupSimpleDTO>(_mapper.ConfigurationProvider).FirstOrDefault();
 
 
                             if (existGlobal == null)
@@ -707,9 +707,9 @@ namespace IRaCIS.Core.Application.Service
                 DoctorUserList = t.SubjectDoctorList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.IsConfirmed && t.ArmEnum <= Arm.DoubleReadingArm2).Select(t => new UserSimpleInfo()
                 {
                     UserId = t.Id,
-                    FullName = t.DoctorUser.FullName,
-                    UserCode = t.DoctorUser.UserCode,
-                    UserName = t.DoctorUser.UserName
+                    FullName = t.DoctorUser.IdentityUser.FullName,
+                    UserCode = t.DoctorUser.IdentityUser.UserCode,
+                    UserName = t.DoctorUser.IdentityUser.UserName
                 }).ToList(),
 
                 ValidVisitCount = t.SubjectVisitTaskList.AsQueryable().Where(visitTaskFilter).GroupBy(t => new { t.SubjectId, t.VisitTaskNum }).Where(g => g.Count() == 2).Count(),
@@ -784,7 +784,7 @@ namespace IRaCIS.Core.Application.Service
 
             var taskConsistentRuleQueryable = from enroll in _enrollRepository.Where(t => t.TrialId == trialId && t.EnrollStatus == EnrollStatus.ConfirmIntoGroup
                                               && t.EnrollReadingCriteriaList.Any(c => c.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && c.IsJoinAnalysis))
-                                              join user in _userRepository.Where() on enroll.DoctorUserId equals user.Id
+                                              join user in _userRoleRepository.Where() on enroll.DoctorUserId equals user.Id
                                               join taskConsistentRule in _taskConsistentRuleRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.IsSelfAnalysis) on enroll.TrialId equals taskConsistentRule.TrialId
                                               select new TaskConsistentRuleView()
                                               {
@@ -830,9 +830,9 @@ namespace IRaCIS.Core.Application.Service
                                                   AnalysisDoctorUser = new UserSimpleInfo()
                                                   {
                                                       UserId = user.Id,
-                                                      UserCode = user.UserCode,
-                                                      FullName = user.FullName,
-                                                      UserName = user.UserName
+                                                      UserCode = user.IdentityUser.UserCode,
+                                                      FullName = user.IdentityUser.FullName,
+                                                      UserName = user.IdentityUser.UserName
                                                   }
                                               };
 

IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewRuleService.cs

@@ -16,7 +16,7 @@ namespace IRaCIS.Core.Application.Service
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Trial")]
     public class TaskMedicalReviewRuleService(IRepository<TaskMedicalReviewRule> _taskMedicalReviewRuleRepository,
-        IRepository<TrialUser> _trialUserRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITaskMedicalReviewRuleService
+        IRepository<TrialUserRole> _trialUserRoleRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITaskMedicalReviewRuleService
     {
 
 
@@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Service
             var taskTaskMedicalReviewRuleQueryable = _taskMedicalReviewRuleRepository.Where(t => t.TrialId == inQuery.TrialId)
             .ProjectTo<TaskMedicalReviewRuleView>(_mapper.ConfigurationProvider);
 
-            var isHaveMIM = await _trialUserRepository.AnyAsync(t => t.User.UserTypeEnum == Domain.Share.UserTypeEnum.MIM && t.TrialId == inQuery.TrialId);
+            var isHaveMIM = await _trialUserRoleRepository.AnyAsync(t => t.UserRole.UserTypeEnum == Domain.Share.UserTypeEnum.MIM && t.TrialId == inQuery.TrialId);
 
             return (await taskTaskMedicalReviewRuleQueryable.ToListAsync(), new { IsHaveMIM = isHaveMIM });
         }

IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs

@@ -18,7 +18,7 @@ namespace IRaCIS.Core.Application.Service
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Trial")]
     public class TaskMedicalReviewService(IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
-        IRepository<TrialUser> _trialUserRepository,
+        IRepository<TrialUserRole> _trialUserRoleRepository,
         IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
         IRepository<VisitTask> _visitTaskRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITaskMedicalReviewService
     {
@@ -196,7 +196,7 @@ namespace IRaCIS.Core.Application.Service
         public async Task<IResponseOutput<PageOutput<TaskMedicalReviewView>>> GetMIMMedicalReviewTaskList(TaskMedicalReviewQuery inQuery)
         {
 
-            var taskMedicalReviewQueryable = _taskMedicalReviewRepository.Where(t => t.VisitTask.TrialId == inQuery.TrialId && t.MedicalManagerUserId == _userInfo.Id && t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
+            var taskMedicalReviewQueryable = _taskMedicalReviewRepository.Where(t => t.VisitTask.TrialId == inQuery.TrialId && t.MedicalManagerUserId == _userInfo.UserRoleId && t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
 
                 .WhereIf(inQuery.IsGetNextMedicalReviewTask,
                 x => (
@@ -328,7 +328,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpGet("{trialId:guid}")]
         public async Task<List<UserSimpleInfo>> GetMIMUserList(Guid trialId)
         {
-            var query = _trialUserRepository.Where(t => (t.User.UserTypeEnum == Domain.Share.UserTypeEnum.MIM || t.User.UserTypeEnum == Domain.Share.UserTypeEnum.MC) && t.TrialId == trialId).Select(t => t.User).ProjectTo<UserSimpleInfo>(_mapper.ConfigurationProvider);
+            var query = _trialUserRoleRepository.Where(t => (t.UserRole.UserTypeEnum == Domain.Share.UserTypeEnum.MIM || t.UserRole.UserTypeEnum == Domain.Share.UserTypeEnum.MC) && t.TrialId == trialId).Select(t => t.UserRole).ProjectTo<UserSimpleInfo>(_mapper.ConfigurationProvider);
 
             return await query.ToListAsync();
         }

IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs

@@ -17,9 +17,9 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<TaskAllocationRule, TaskAllocationRuleView>()
-                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
-                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
-                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
+                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.IdentityUser.UserCode))
+                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.IdentityUser.UserName))
+                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.IdentityUser.FullName))
                  .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName));
 
             List<Guid> subjectIdList = new List<Guid>();
@@ -27,9 +27,9 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<TaskAllocationRule, DoctorVisitTaskStatView>()
-                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
-                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
-                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
+                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.IdentityUser.UserCode))
+                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.IdentityUser.UserName))
+                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.IdentityUser.FullName))
                  .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName))
                  //.ForMember(o => o.ArmList, t => t.MapFrom(u => u.DoctorVisitTaskList.Where(c => c.TrialId == u.TrialId).Select(t => t.ArmEnum).Distinct()))
                  .ForMember(o => o.TotalTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count()))
@@ -127,9 +127,9 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(o => o.SubjectCode, t => t.MapFrom(u => /*u.IsAnalysisCreate == true ? u.BlindSubjectCode :*/   u.Subject.Code))
                  .ForMember(o => o.MedicalNo, t => t.MapFrom(u => u.Subject.MedicalNo))
 
-                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
-                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
-                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
+                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.IdentityUser.UserCode))
+                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.IdentityUser.UserName))
+                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.IdentityUser.FullName))
                  .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName))
                                   //.ForMember(o => o.IsClinicalDataSigned, t => t.MapFrom(u => u.Subject.ClinicalDataList.Any(c => c.IsSign && (c.ReadingId == u.SouceReadModuleId || c.ReadingId == u.SourceSubjectVisitId))))
                                   ;
@@ -176,9 +176,9 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<VisitTask, HistoryReadingDoctorUser>()
-                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
-                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
-                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
+                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.IdentityUser.UserCode))
+                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.IdentityUser.UserName))
+                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.IdentityUser.FullName))
                  .ForMember(o => o.JudgeTaskCode, t => t.MapFrom(u => u.TaskCode))
                  .ForMember(o => o.DoctorUserId, t => t.MapFrom(u => u.DoctorUser.Id));
 
@@ -195,9 +195,9 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<SubjectUser, AssignDoctorView>()
                 //.ForMember(o => o.AssignTime, t => t.MapFrom(u => u.AssignTime))
-                .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
-                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
-                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
+                .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.IdentityUser.UserCode))
+                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.IdentityUser.UserName))
+                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.IdentityUser.FullName))
                  .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName));
 
 
@@ -205,7 +205,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<TaskAllocationRuleAddOrEdit, TaskAllocationRule>();
 
 
-            CreateMap<User, TrialDoctorUserSelectView>()
+            CreateMap<UserRole, TrialDoctorUserSelectView>()
                  .ForMember(o => o.DoctorUserId, t => t.MapFrom(u => u.Id))
                  .ForMember(o => o.FullName, t => t.MapFrom(u => u.FullName));
 
@@ -250,12 +250,12 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-            CreateMap<User, UserSimpleInfo>()
+            CreateMap<UserRole, UserSimpleInfo>()
 
                   .ForMember(o => o.UserId, t => t.MapFrom(u => u.Id))
-             .ForMember(o => o.UserCode, t => t.MapFrom(u => u.UserCode))
-              .ForMember(o => o.UserName, t => t.MapFrom(u => u.UserName))
-              .ForMember(o => o.FullName, t => t.MapFrom(u => u.FullName));
+             .ForMember(o => o.UserCode, t => t.MapFrom(u => u.IdentityUser.UserCode))
+              .ForMember(o => o.UserName, t => t.MapFrom(u => u.IdentityUser.UserName))
+              .ForMember(o => o.FullName, t => t.MapFrom(u => u.IdentityUser.FullName));
             //.ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.UserTypeRole.UserTypeShortName));
 
 

IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs

@@ -30,8 +30,8 @@ namespace IRaCIS.Core.Application.Service
                 .WhereIf(queryCommonDocument.CriterionTypeEnum != null, t => t.CriterionTypeEnum == queryCommonDocument.CriterionTypeEnum)
                 .WhereIf(queryCommonDocument.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == queryCommonDocument.BusinessScenarioEnum)
                 .WhereIf(!string.IsNullOrEmpty(queryCommonDocument.Code), t => t.Code.Contains(queryCommonDocument.Code))
-                .WhereIf(!string.IsNullOrEmpty(queryCommonDocument.Name), t => t.Name.Contains(queryCommonDocument.Name))
-                .ProjectTo<CommonDocumentView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, userId = _userInfo.Id });
+                .WhereIf(!string.IsNullOrEmpty(queryCommonDocument.Name), t => t.Name.Contains(queryCommonDocument.Name) || t.NameCN.Contains(queryCommonDocument.Name))
+                .ProjectTo<CommonDocumentView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, userId = _userInfo.UserRoleId });
 
             return await commonDocumentQueryable.ToPagedListAsync(queryCommonDocument);
         }

IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs

@@ -3,7 +3,9 @@
 //	   生成时间 2022-02-15 11:55:57 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
+using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Domain.Share;
+using System.ComponentModel.DataAnnotations;
 namespace IRaCIS.Core.Application.Contracts
 {
     public class TrialSelectEmailNoticeConfigView : EmailNoticeConfigView
@@ -62,7 +64,15 @@ namespace IRaCIS.Core.Application.Contracts
         public bool? IsDistinguishCriteria { get; set; }
 
         public SysEmailLevel? SystemLevel { get; set; }
-        public int? BusinessModuleEnum { get; set; }
+        public BusinessModule? BusinessModuleEnum { get; set; }
+
+        public int? EmailUrgentEnum { get; set; }
+
+        public UserTypeEnum? ToUserType { get; set; }
+
+        public UserTypeEnum? CopyUserType { get; set; }
+
+        public BusinessLevel? BusinessLevelEnum { get; set; }
 
     }
 
@@ -133,8 +143,41 @@ namespace IRaCIS.Core.Application.Contracts
     }
 
 
+    public class EmailNoticeConfigExportDto
+    {
+        public Guid? Id { get; set; }
+        public string Code { get; set; } = String.Empty;
 
 
+        [DictionaryTranslate("Email_BusinessScenario")]
+        public EmailBusinessScenario BusinessScenarioEnum { get; set; }
+
+
+        [DictionaryTranslate("YesOrNo")]
+        public bool IsDistinguishCriteria { get; set; }
+
+
+        [DictionaryTranslate("CriterionType")]
+        public CriterionType? CriterionTypeEnum { get; set; }
+
+        [DictionaryTranslate("BusinessModule")]
+        public int BusinessModuleEnum { get; set; }
+
+        [DictionaryTranslate("BusinessLevel")]
+        public int BusinessLevelEnum { get; set; }
+
+        [DictionaryTranslate("EmailUrgent")]
+        public int EmailUrgentEnum { get; set; }
+
+        public string Description { get; set; } = string.Empty;
+
+
+        public string EmailTopic { get; set; } = string.Empty;
+
+        public string EmailTopicCN { get; set; } = string.Empty;
+
+    }
+
 }
 
 

IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs

@@ -110,6 +110,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string Module { get; set; } = string.Empty;
 
+        public int? State { get; set; }
+
     }
 
     public class BatchAddInternationalizationDto : BatchInternationalizationDto

IRaCIS.Core.Application/Service/Common/DevelopService.cs

@@ -1,25 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace IRaCIS.Core.Application.Service.Common
-{
-
-    /// <summary>
-    ///  开始时候一些帮助 比如根据配置的字典生成枚举
-    /// </summary>
-    /// <param name="_dictionaryRepository"></param>
-    [ApiExplorerSettings(GroupName = "Common")]
-    public class DevelopService(IRepository<Dictionary> _dictionaryRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService
-    {
-        /// <summary>
-        /// 根据配置的字典名生成后端枚举
-        /// </summary>
-        /// <param name="dicName"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<IResponseOutput> BackDicGenerateEnum(string dicName)
-        {
-
-            return ResponseOutput.Ok();
-        }
-    }
-}

IRaCIS.Core.Application/Service/Common/DictionaryService.cs

@@ -26,37 +26,6 @@ namespace IRaCIS.Core.Application.Service
         IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrial, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IDictionaryService
     {
 
-        public async Task<IResponseOutput> GenerateEnumDefine(string code)
-        {
-            var searchList = await _dicRepository.Where(t => t.Parent.Code == code && t.ParentId != null && t.IsEnable).ProjectTo<BasicDicSelect>(_mapper.ConfigurationProvider).ToListAsync();
-
-            // StringBuilder 用于构建枚举代码字符串
-            var enumCode = new StringBuilder();
-
-            // 生成枚举定义
-            enumCode.AppendLine($"public enum {code}");
-            enumCode.AppendLine("{");
-
-            foreach (var item in searchList)
-            {
-                // 添加 XML 注释作为枚举描述
-                enumCode.AppendLine($"    /// <summary>");
-                enumCode.AppendLine($"    /// {item.ValueCN}"); // 假设你有一个描述字段
-                enumCode.AppendLine($"    /// </summary>");
-                // 每个枚举值生成
-                enumCode.AppendLine($"    {item.Value.Trim().Replace(" ", "")} = {item.Code},");
-
-            }
-
-            enumCode.AppendLine("}");
-
-            // 返回生成的枚举代码
-            var enumStr = enumCode.ToString();
-
-            return ResponseOutput.Ok(enumStr);
-
-        }
-
         /// <summary>
         /// 添加bool
         /// </summary>

IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs

@@ -25,10 +25,15 @@ namespace IRaCIS.Core.Application.Contracts
             .WhereIf(inQuery.SystemLevel == null, t => t.SystemLevel == SysEmailLevel.not_sys)
             .WhereIf(inQuery.SystemLevel != null, t => t.SystemLevel == inQuery.SystemLevel)
             .WhereIf(inQuery.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == inQuery.IsDistinguishCriteria)
+             .WhereIf(inQuery.BusinessLevelEnum != null, t => t.BusinessLevelEnum == inQuery.BusinessLevelEnum)
             .WhereIf(inQuery.CriterionTypeEnum != null, t => t.CriterionTypeEnum == inQuery.CriterionTypeEnum)
+             .WhereIf(inQuery.BusinessModuleEnum != null, t => t.BusinessModuleEnum == inQuery.BusinessModuleEnum)
             .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
             .WhereIf(inQuery.IsReturnRequired != null, t => t.IsReturnRequired == inQuery.IsReturnRequired)
             .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable)
+             .WhereIf(inQuery.EmailUrgentEnum != null, t => t.EmailUrgentEnum == inQuery.EmailUrgentEnum)
+            .WhereIf(inQuery.ToUserType != null, t => t.EmailNoticeUserTypeList.Any(t => t.UserType == inQuery.ToUserType && t.EmailUserType == EmailUserType.To))
+            .WhereIf(inQuery.CopyUserType != null, t => t.EmailNoticeUserTypeList.Any(t => t.UserType == inQuery.CopyUserType && t.EmailUserType == EmailUserType.Copy))
             .ProjectTo<EmailNoticeConfigView>(_mapper.ConfigurationProvider);
 
             return await emailNoticeConfigQueryable.ToPagedListAsync(inQuery);
@@ -39,9 +44,10 @@ namespace IRaCIS.Core.Application.Contracts
         {
             var verifyExp1 = new EntityVerifyExp<EmailNoticeConfig>()
             {
-                VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum,
+                VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.CriterionTypeEnum== addOrEditEmailNoticeConfig.CriterionTypeEnum,
 
                 VerifyMsg = _localizer["EmailNoticeConfig_RepeatEmailScenario"]
+
             };
 
             // 匹配所有占位符的正则表达式，允许包含空格的占位符

IRaCIS.Core.Application/Service/Common/ExploreRecommendService.cs

@@ -25,10 +25,10 @@ namespace IRaCIS.Core.Application.Service
             var exploreRecommendQueryable =
 
                _exploreRecommendRepository.Where().IgnoreQueryFilters()
-               .WhereIf(string.IsNullOrEmpty(inQuery.Title), t => t.Title.Contains(inQuery.Title))
-               .WhereIf(string.IsNullOrEmpty(inQuery.FileName), t => t.Title.Contains(inQuery.FileName))
-               .WhereIf(string.IsNullOrEmpty(inQuery.DownloadUrl), t => t.Title.Contains(inQuery.DownloadUrl))
-               .WhereIf(string.IsNullOrEmpty(inQuery.Version), t => t.Title.Contains(inQuery.Version))
+               .WhereIf(!string.IsNullOrEmpty(inQuery.Title), t => t.Title.Contains(inQuery.Title))
+               .WhereIf(!string.IsNullOrEmpty(inQuery.FileName), t => t.Title.Contains(inQuery.FileName))
+               .WhereIf(!string.IsNullOrEmpty(inQuery.DownloadUrl), t => t.Title.Contains(inQuery.DownloadUrl))
+               .WhereIf(!string.IsNullOrEmpty(inQuery.Version), t => t.Title.Contains(inQuery.Version))
                 .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == t.IsDeleted)
              .ProjectTo<ExploreRecommendView>(_mapper.ConfigurationProvider);
 

IRaCIS.Core.Application/Service/Common/InternationalizationService.cs

@@ -18,7 +18,7 @@ namespace IRaCIS.Core.Application.Service
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Common")]
     public class InternationalizationService(IRepository<Internationalization> _internationalizationRepository,
-        IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, IInternationalizationService
+        IMapper _mapper, IRepository<PublishLog> _publishLogRepository, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, IInternationalizationService
     {
 
 
@@ -61,6 +61,8 @@ namespace IRaCIS.Core.Application.Service
         [AllowAnonymous]
         public async Task<IResponseOutput> BatchAddOrUpdateFrontInternationalization(List<BatchInternationalizationDto> batchList)
         {
+            var result = (await _publishLogRepository.Where(t => t.IsCurrentVersion == true).ProjectTo<PublishLogView>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
+
             foreach (var item in batchList)
             {
                 var find = await _internationalizationRepository.FirstOrDefaultAsync(t => t.Code == item.Code && t.Description == item.Description && t.InternationalizationType == 0);
@@ -71,13 +73,21 @@ namespace IRaCIS.Core.Application.Service
                 }
                 else
                 {
+
+                    var frontState = item.State == null ? 0 : (int)item.State;
+
                     var mapItem = _mapper.Map<Internationalization>(item);
                     mapItem.InternationalizationType = 0;
 
                     // 0 是预翻译  1是已确认  2是后端废弃
-                    mapItem.State = 0;
+                    mapItem.State = frontState;
 
-                    await _internationalizationRepository.AddAsync(mapItem);
+                    find = await _internationalizationRepository.AddAsync(mapItem);
+                }
+
+                if (find.PublishLogId == null || find.PublishLogId == Guid.Empty)
+                {
+                    find.PublishLogId = result.Id;
                 }
             }
             await _internationalizationRepository.SaveChangesAsync();

IRaCIS.Core.Application/Service/Common/MailService.cs

@@ -1,6 +1,7 @@
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Auth;
 using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
 using MailKit;
@@ -29,11 +30,11 @@ namespace IRaCIS.Core.Application.Service
 
         Task AdminResetPwdSendEmailAsync(Guid userId, string pwdNotMd5 = "123456");
 
-        Task SiteSurveyUserJoinEmail(Guid trialId, Guid userId, string baseUrl, string rootUrl);
+        Task SiteSurveyUserJoinEmail(Guid trialId, Guid userId, string userTypes, string baseUrl, string rootUrl);
 
-        Task ExternalUserJoinEmail(Guid trialId, Guid userId, string baseUrl, string rootUrl);
+        Task ExternalUserJoinEmail(Guid trialId, Guid userId, string userTypes, string baseUrl, string rootUrl);
 
-        Task<Guid> DoctorJoinTrialEmail(Guid trialId, Guid doctorId, string baseUrl, string rootUrl);
+        Task<(Guid identityUserId, Guid userRoleId)> DoctorJoinTrialEmail(Guid trialId, Guid doctorId, string baseUrl, string rootUrl);
 
         Task UserFeedBackMail(Guid feedBackId);
     }
@@ -42,7 +43,9 @@ namespace IRaCIS.Core.Application.Service
       IRepository<SystemBasicData> _systemBasicDatarepository,
       IRepository<VisitTask> _visitTaskRepository,
       IRepository<TrialSite> _trialSiteRepository,
-      IRepository<User> _userRepository,
+      IRepository<UserRole> _userRoleRepository,
+       IRepository<UserLog> _userLogRepository,
+       IRepository<IdentityUser> _identityUserRepository,
       IRepository<UserFeedBack> _userFeedBackRepository,
       ITokenService _tokenService,
       IRepository<SubjectVisit> _subjectVisitRepository,
@@ -169,83 +172,11 @@ namespace IRaCIS.Core.Application.Service
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, sucessHandle);
         }
 
-        //用户重置邮箱 
-        public async Task SendMailEditEmail(Guid userId, string userName, string emailAddress, int verificationCode)
-        {
-
-            var messageToSend = new MimeMessage();
-            //发件地址
-            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-            //收件地址
-            messageToSend.To.Add(new MailboxAddress(userName, emailAddress));
-            //主题
-            //---[来自展影IRC] 关于重置邮箱的提醒
-
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
-
-            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
-            {
-                var topicStr = string.Format(input.topicStr, companyName);
-
-                var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),
-
-                    userName,
-                    //---您正在进行邮箱重置操作
-                    verificationCode
-                    );
-
-                return (topicStr, htmlBodyStr);
-            };
-
-
-            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.UserResetEmail, messageToSend, emailConfigFunc);
-
-
-            var sucessHandle = GetEmailSuccessHandle(userId, verificationCode, emailAddress);
-
-            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, sucessHandle);
-
-
-        }
 
 
 
-        //不登录  通过邮箱重置密码
-        public async Task AnolymousSendEmailForResetAccount(string emailAddress, int verificationCode)
-        {
-            var messageToSend = new MimeMessage();
-            //发件地址
-            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-            //收件地址
-            messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress));
 
 
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
-
-            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
-            {
-                var topicStr = string.Format(input.topicStr, companyName);
-
-                var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),
-
-                       "Sir/Madam",
-                //---您正在进行邮箱重置密码操作
-                    verificationCode
-                    );
-
-                return (topicStr, htmlBodyStr);
-            };
-
-
-            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.UnloginUseEmailResetPassword, messageToSend, emailConfigFunc);
-
-            ////此时不知道用户
-            var sucessHandle = GetEmailSuccessHandle(Guid.Empty, verificationCode, emailAddress);
-
-
-            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, sucessHandle);
-        }
-
         /// <summary>
         /// Reviewer简历录入 发送验证码
         /// </summary>
@@ -333,12 +264,13 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
+        #region 邮件已修改
 
         //添加用户发送邮件
         public async Task AddUserSendEmailAsync(Guid userId, string baseUrl, string routeUrl)
         {
 
-            var sysUserInfo = (await _userRepository.Where(t => t.Id == userId).Include(t => t.UserTypeRole).FirstOrDefaultAsync()).IfNullThrowException();
+            var sysUserInfo = (await _identityUserRepository.Where(t => t.Id == userId).Include(t => t.UserRoleList).ThenInclude(c => c.UserTypeRole).FirstOrDefaultAsync()).IfNullThrowException();
 
 
             var messageToSend = new MimeMessage();
@@ -350,11 +282,11 @@ namespace IRaCIS.Core.Application.Service
             //---[来自展影IRC] 关于创建账户的提醒
 
 
-            var token = _tokenService.GetToken(IRaCISClaims.Create(_mapper.Map<UserBasicInfo>(sysUserInfo)));
+            var token = _tokenService.GetToken(new UserTokenInfo() { IdentityUserId = sysUserInfo.Id });
 
-            await _userRepository.BatchUpdateNoTrackingAsync(t => t.Id == sysUserInfo.Id, u => new User() { EmailToken = token });
+            await _identityUserRepository.BatchUpdateNoTrackingAsync(t => t.Id == sysUserInfo.Id, u => new IdentityUser() { EmailToken = token });
 
-            routeUrl = routeUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + sysUserInfo.UserTypeRole.UserTypeShortName + "&lang=" + (_userInfo.IsEn_Us ? "en" : "zh") + "&access_token=" + token;
+            routeUrl = routeUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&lang=" + (_userInfo.IsEn_Us ? "en" : "zh") + "&access_token=" + token;
 
             var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
 
@@ -370,8 +302,8 @@ namespace IRaCIS.Core.Application.Service
                 var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),
 
                   sysUserInfo.FullName,
-                   sysUserInfo.UserName,
-                   sysUserInfo.UserTypeRole.UserTypeShortName,
+                   sysUserInfo.EMail,
+                    //string.Join(',', sysUserInfo.UserRoleList.Select(t => t.UserTypeRole.UserTypeShortName)),
                     redirectUrl
                     );
 
@@ -388,7 +320,7 @@ namespace IRaCIS.Core.Application.Service
         //管理员重置密码发送邮件
         public async Task AdminResetPwdSendEmailAsync(Guid userId, string pwdNotMd5 = "123456")
         {
-            var sysUserInfo = (await _userRepository.Where(t => t.Id == userId).Include(t => t.UserTypeRole).FirstOrDefaultAsync()).IfNullThrowException();
+            var sysUserInfo = (await _identityUserRepository.Where(t => t.Id == userId).Include(t => t.UserRoleList).ThenInclude(c => c.UserTypeRole).FirstOrDefaultAsync()).IfNullThrowException();
 
             var messageToSend = new MimeMessage();
             //发件地址
@@ -408,7 +340,7 @@ namespace IRaCIS.Core.Application.Service
 
                     sysUserInfo.FullName,
                    sysUserInfo.UserName,
-                   sysUserInfo.UserTypeRole.UserTypeShortName,
+                   //string.Join(',', sysUserInfo.UserRoleList.Select(t => t.UserTypeRole.UserTypeShortName)),
                    pwdNotMd5
                     );
 
@@ -421,11 +353,148 @@ namespace IRaCIS.Core.Application.Service
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
 
+        //用户重置邮箱 
+        public async Task SendMailEditEmail(Guid userId, string userName, string emailAddress, int verificationCode)
+        {
+
+            var messageToSend = new MimeMessage();
+            //发件地址
+            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+            //收件地址
+            messageToSend.To.Add(new MailboxAddress(userName, emailAddress));
+            //主题
+            //---[来自展影IRC] 关于重置邮箱的提醒
+
+            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+
+            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
+            {
+                var topicStr = string.Format(input.topicStr, companyName);
+
+                var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),
+
+                    userName,
+                    //---您正在进行邮箱重置操作
+                    verificationCode
+                    );
+
+                return (topicStr, htmlBodyStr);
+            };
+
+
+            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.UserResetEmail, messageToSend, emailConfigFunc);
+
+
+            var sucessHandle = GetEmailSuccessHandle(userId, verificationCode, emailAddress);
+
+            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, sucessHandle);
+
+
+        }
+
+
+        //不登录  通过邮箱重置密码
+        public async Task AnolymousSendEmailForResetAccount(string emailAddress, int verificationCode)
+        {
+            var messageToSend = new MimeMessage();
+            //发件地址
+            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+            //收件地址
+            messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress));
+
+
+            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+
+            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
+            {
+                var topicStr = string.Format(input.topicStr, companyName);
+
+                var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),
+
+                       "Sir/Madam",
+                //---您正在进行邮箱重置密码操作
+                    verificationCode
+                    );
+
+                return (topicStr, htmlBodyStr);
+            };
+
+
+            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.UnloginUseEmailResetPassword, messageToSend, emailConfigFunc);
+
+            ////此时不知道用户
+            var sucessHandle = GetEmailSuccessHandle(Guid.Empty, verificationCode, emailAddress);
+
+
+            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, sucessHandle);
+        }
+
+        //外部用户 加入项目
+        public async Task ExternalUserJoinEmail(Guid trialId, Guid userId, string userTypes, string baseUrl, string rootUrl)
+        {
+            var trialInfo = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId)).IfNullThrowException();
+
+            var sysUserInfo = (await _identityUserRepository.Where(t => t.Id == userId).FirstOrDefaultAsync()).IfNullThrowException();
+
+            var messageToSend = new MimeMessage();
+            //发件地址
+            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+            //收件地址
+            messageToSend.To.Add(new MailboxAddress(String.Empty, sysUserInfo.EMail));
+            //主题
+            // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信";
+
+
+
+            var token = _tokenService.GetToken(new UserTokenInfo() { IdentityUserId = sysUserInfo.Id });
+            if (sysUserInfo.IsFirstAdd)
+            {
+                await _identityUserRepository.BatchUpdateNoTrackingAsync(t => t.Id == sysUserInfo.Id, u => new Domain.Models.IdentityUser() { EmailToken = token });
+            }
+
+            var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
+
+            var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&lang=" + (_userInfo.IsEn_Us ? "en" : "zh") + "&access_token=" + token;
+
+            var redirectUrl = $"{domain}/api/User/UserRedirect?url={System.Web.HttpUtility.UrlEncode(routeUrl)}";
+
+
+            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+
+            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
+            {
+                var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
+
+                var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),
+
+                    sysUserInfo.FullName,
+                    trialInfo.ExperimentName,
+                    trialInfo.ResearchProgramNo,
+                    trialInfo.TrialCode,
+                    sysUserInfo.IsFirstAdd ? sysUserInfo.EMail : sysUserInfo.UserName,
+                    userTypes,
+                     sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl
+                    );
+
+                return (topicStr, htmlBodyStr);
+            };
+
+
+            await GetEmailSubejctAndHtmlInfoAndBuildAsync(sysUserInfo.IsFirstAdd ? EmailBusinessScenario.SiteUseOrExternalUserFirstrJoinTrial : EmailBusinessScenario.SiteUserOrExternalUserExistJoinTrial, messageToSend, emailConfigFunc);
+
+
+            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, null);
+
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = userId, OptType = UserOptType.UpdateUserRole }, true);
+
+        }
 
         //Site调研 用户加入项目
-        public async Task SiteSurveyUserJoinEmail(Guid trialId, Guid userId, string baseUrl, string rootUrl)
+        public async Task SiteSurveyUserJoinEmail(Guid trialId, Guid userId, string userTypes, string baseUrl, string rootUrl)
         {
-            var sysUserInfo = (await _userRepository.Where(t => t.Id == userId).Include(t => t.UserTypeRole).FirstOrDefaultAsync()).IfNullThrowException();
+            var sysUserInfo = (await _identityUserRepository.Where(t => t.Id == userId).FirstOrDefaultAsync()).IfNullThrowException();
+
+
 
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
 
@@ -438,14 +507,14 @@ namespace IRaCIS.Core.Application.Service
             // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信";
 
 
-            var token = _tokenService.GetToken(IRaCISClaims.Create(_mapper.Map<UserBasicInfo>(sysUserInfo)));
+            var token = _tokenService.GetToken(new UserTokenInfo() { IdentityUserId = sysUserInfo.Id });
 
             if (sysUserInfo.IsFirstAdd)
             {
-                await _userRepository.BatchUpdateNoTrackingAsync(t => t.Id == sysUserInfo.Id, u => new User() { EmailToken = token });
+                await _identityUserRepository.BatchUpdateNoTrackingAsync(t => t.Id == sysUserInfo.Id, u => new Domain.Models.IdentityUser() { EmailToken = token });
             }
 
-            var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + sysUserInfo.UserTypeRole.UserTypeShortName + "&lang=" + (_userInfo.IsEn_Us ? "en" : "zh") + "&access_token=" + token;
+            var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&lang=" + (_userInfo.IsEn_Us ? "en" : "zh") + "&access_token=" + token;
 
             var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
 
@@ -464,8 +533,8 @@ namespace IRaCIS.Core.Application.Service
                     trialInfo.ExperimentName,
                     trialInfo.ResearchProgramNo,
                     trialInfo.TrialCode,
-                    sysUserInfo.UserName,
-                    sysUserInfo.UserTypeRole.UserTypeShortName,
+                    sysUserInfo.IsFirstAdd ? sysUserInfo.EMail : sysUserInfo.UserName,
+                    userTypes,
                     sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl
                     );
 
@@ -478,74 +547,19 @@ namespace IRaCIS.Core.Application.Service
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
 
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = userId, OptType = UserOptType.UpdateUserRole }, true);
 
         }
 
-        //外部用户 加入项目
-        public async Task ExternalUserJoinEmail(Guid trialId, Guid userId, string baseUrl, string rootUrl)
-        {
-            var trialInfo = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId)).IfNullThrowException();
 
-            var sysUserInfo = (await _userRepository.Where(t => t.Id == userId).Include(t => t.UserTypeRole).FirstOrDefaultAsync()).IfNullThrowException();
-
-
-            var messageToSend = new MimeMessage();
-            //发件地址
-            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-            //收件地址
-            messageToSend.To.Add(new MailboxAddress(String.Empty, sysUserInfo.EMail));
-            //主题
-            // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信";
-
-
-
-            var token = _tokenService.GetToken(IRaCISClaims.Create(_mapper.Map<UserBasicInfo>(sysUserInfo)));
-            if (sysUserInfo.IsFirstAdd)
-            {
-                await _userRepository.BatchUpdateNoTrackingAsync(t => t.Id == sysUserInfo.Id, u => new User() { EmailToken = token });
-            }
-
-            var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
-
-            var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + sysUserInfo.UserTypeRole.UserTypeShortName + "&lang=" + (_userInfo.IsEn_Us ? "en" : "zh") + "&access_token=" + token;
-
-            var redirectUrl = $"{domain}/api/User/UserRedirect?url={System.Web.HttpUtility.UrlEncode(routeUrl)}";
-
-
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
-
-            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
-            {
-                var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
-
-                var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),
-
-                    sysUserInfo.FullName,
-                    trialInfo.ExperimentName,
-                    trialInfo.ResearchProgramNo,
-                    trialInfo.TrialCode,
-                   sysUserInfo.UserName,
-                    sysUserInfo.UserTypeRole.UserTypeShortName,
-                   sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl
-                    );
-
-                return (topicStr, htmlBodyStr);
-            };
-
-
-            await GetEmailSubejctAndHtmlInfoAndBuildAsync(sysUserInfo.IsFirstAdd ? EmailBusinessScenario.SiteUseOrExternalUserFirstrJoinTrial : EmailBusinessScenario.SiteUserOrExternalUserExistJoinTrial, messageToSend, emailConfigFunc);
-
-
-            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, null);
-
-        }
+        #endregion
 
 
         //医生生成账号加入  或者已存在账号加入到项目中
-        public async Task<Guid> DoctorJoinTrialEmail(Guid trialId, Guid doctorId, string baseUrl, string rootUrl)
+        public async Task<(Guid identityUserId, Guid userRoleId)> DoctorJoinTrialEmail(Guid trialId, Guid doctorId, string baseUrl, string rootUrl)
         {
             var doctor = await _doctorTypeRepository.FindAsync(doctorId);
-            User sysUserInfo = new User();
+            var sysUserInfo = new IdentityUser();
 
             var userType = await _userTypeRepository.FirstAsync(t => t.UserTypeEnum == UserTypeEnum.IndependentReviewer);
 
@@ -553,13 +567,13 @@ namespace IRaCIS.Core.Application.Service
 
             using (await @lock.AcquireAsync())
             {
-                var isDoctorHaveAccount = await _userRepository.AnyAsync(t => t.DoctorId == doctorId);
+                var isDoctorHaveAccount = await _userRoleRepository.AnyAsync(t => t.DoctorId == doctorId || t.IdentityUser.EMail == doctor.EMail);
 
 
                 if (!isDoctorHaveAccount)
                 {
 
-                    var saveItem = new User() { FirstName = doctor.FirstName, LastName = doctor.LastName, EMail = doctor.EMail };
+                    var saveItem = new IdentityUser() { FirstName = doctor.FirstName, LastName = doctor.LastName, EMail = doctor.EMail };
 
                     var trialType = await _trialRepository.Where(t => t.Id == trialId).Select(t => t.TrialType).FirstOrDefaultAsync();
 
@@ -569,31 +583,40 @@ namespace IRaCIS.Core.Application.Service
                     }
 
 
-                    saveItem.Code = _userRepository.Select(t => t.Code).DefaultIfEmpty().Max() + 1;
+                    saveItem.Code = _identityUserRepository.Select(t => t.Code).DefaultIfEmpty().Max() + 1;
 
-                    saveItem.UserCode = AppSettings.GetCodeStr(saveItem.Code, nameof(User));
+                    saveItem.UserCode = AppSettings.GetCodeStr(saveItem.Code, nameof(IdentityUser));
 
-                    saveItem.UserName = saveItem.UserCode;
+                    saveItem.UserRoleList = new List<UserRole>() { new UserRole() { DoctorId = doctorId, UserTypeEnum = UserTypeEnum.IndependentReviewer, UserTypeId = userType.Id } };
 
-                    saveItem.UserTypeEnum = UserTypeEnum.IndependentReviewer;
-
-                    saveItem.DoctorId = doctorId;
-                    saveItem.UserTypeId = userType.Id;
-
-                    var savedUser = await _userRepository.AddAsync(saveItem);
+                    var savedUser = await _identityUserRepository.AddAsync(saveItem);
 
                     //下面获取Token 需要这部分信息
-                    sysUserInfo = savedUser.Clone();
-
-                    sysUserInfo.UserTypeRole = userType;
-
-                    await _userRepository.SaveChangesAsync();
+                    sysUserInfo = savedUser;
 
                 }
                 else
                 {
-                    sysUserInfo = (await _userRepository.Where(t => t.DoctorId == doctorId).Include(t => t.UserTypeRole).FirstOrDefaultAsync()).IfNullThrowException();
+                    sysUserInfo = (await _identityUserRepository.Where(t => t.UserRoleList.Any(t => t.DoctorId == doctorId || t.IdentityUser.EMail == doctor.EMail), true).Include(t => t.UserRoleList).FirstOrDefaultAsync()).IfNullThrowException();
+
+
+                    var findRole = sysUserInfo.UserRoleList.FirstOrDefault(t => t.UserTypeId == userType.Id);
+                    //不存在该角色，那么就加入该角色
+                    if (findRole == null)
+                    {
+                        sysUserInfo.UserRoleList.Add(new UserRole() { DoctorId = doctorId, UserTypeEnum = UserTypeEnum.IndependentReviewer, UserTypeId = userType.Id });
+                    }
+                    else
+                    {
+                        findRole.IsUserRoleDisabled = false;
+                    }
+
+                    sysUserInfo.Status = UserStateEnum.Enable;
+
                 }
+
+                //保证能有userRoleId
+                await _userRoleRepository.SaveChangesAsync();
             }
 
 
@@ -607,20 +630,14 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-            var basicInfo = IRaCISClaims.Create(_mapper.Map<UserBasicInfo>(sysUserInfo));
-
-            ////第一次添加的时候  注意赋值
-            //basicInfo.PermissionStr = userType.PermissionStr;
-            //basicInfo.UserTypeShortName = userType.UserTypeShortName;
-
-            var token = _tokenService.GetToken(basicInfo);
+            var token = _tokenService.GetToken(new UserTokenInfo() { IdentityUserId = sysUserInfo.Id });
 
             if (sysUserInfo.IsFirstAdd)
             {
-                await _userRepository.BatchUpdateNoTrackingAsync(t => t.Id == sysUserInfo.Id, u => new User() { EmailToken = token });
+                await _identityUserRepository.BatchUpdateNoTrackingAsync(t => t.Id == sysUserInfo.Id, u => new Domain.Models.IdentityUser() { EmailToken = token });
             }
 
-            var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + userType.UserTypeShortName + "&lang=" + (_userInfo.IsEn_Us ? "en" : "zh") + "&access_token=" + token;
+            var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&lang=" + (_userInfo.IsEn_Us ? "en" : "zh") + "&access_token=" + token;
 
             var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
 
@@ -642,8 +659,8 @@ namespace IRaCIS.Core.Application.Service
                     trialInfo.ExperimentName,
                     trialInfo.ResearchProgramNo,
                     trialInfo.TrialCode,
-                    sysUserInfo.UserName,
-                    userType.UserTypeShortName,
+                    sysUserInfo.IsFirstAdd ? sysUserInfo.EMail : sysUserInfo.UserName,
+                    userType.UserTypeName,
                     sysUserInfo.IsFirstAdd ? redirectUrl : baseUrl
                     );
 
@@ -656,7 +673,10 @@ namespace IRaCIS.Core.Application.Service
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, null);
 
-            return sysUserInfo.Id;
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = sysUserInfo.Id, OptType = UserOptType.UpdateUserRole }, true);
+
+
+            return (sysUserInfo.Id, sysUserInfo.UserRoleList.First(t => t.UserTypeEnum == UserTypeEnum.IndependentReviewer).Id);
         }
 
 
@@ -664,7 +684,7 @@ namespace IRaCIS.Core.Application.Service
 
         public async Task UserFeedBackMail(Guid feedBackId)
         {
-            var feedBack = await _userFeedBackRepository.Where(t => t.Id == feedBackId).Include(t => t.CreateUser).ThenInclude(t => t.UserTypeRole).FirstNotNullAsync();
+            var feedBack = await _userFeedBackRepository.Where(t => t.Id == feedBackId).Include(t => t.CreateUserRole.UserTypeRole).Include(t => t.CreateUserRole.IdentityUser).FirstNotNullAsync();
 
             var messageToSend = new MimeMessage();
             //发件地址
@@ -680,8 +700,8 @@ namespace IRaCIS.Core.Application.Service
 
             var userTypeEnumList = emailConfigInfo.EmailNoticeUserTypeList.Where(t => t.EmailUserType == EmailUserType.To).Select(t => t.UserType).ToList();
 
-            var emailList = await _userRepository.Where(t => userTypeEnumList.Contains(t.UserTypeEnum) &&
-             (isHaveTrialId ? t.UserTrials.Any(t => t.TrialId == feedBack.TrialId) : true)).Select(t => new { t.EMail, t.UserTypeEnum, t.FullName }).ToListAsync();
+            var emailList = await _userRoleRepository.Where(t => userTypeEnumList.Contains(t.UserTypeEnum) && t.IsUserRoleDisabled == false && t.IdentityUser.Status == UserStateEnum.Enable &&
+             (isHaveTrialId ? t.IdentityUser.UserTrialList.Any(t => t.TrialId == feedBack.TrialId && t.TrialUserRoleList.Any(c => userTypeEnumList.Contains(c.UserRole.UserTypeEnum))) : true)).Select(t => new { t.IdentityUser.EMail, t.UserTypeEnum, t.IdentityUser.FullName }).ToListAsync();
 
 
             foreach (var email in emailList)
@@ -709,8 +729,8 @@ namespace IRaCIS.Core.Application.Service
                         info.TrialCode,
                         info.SubejctCode,
                         info.VisitName,
-                        feedBack.CreateUser.UserTypeRole.UserTypeShortName,
-                         feedBack.CreateUser.FullName,
+                        feedBack.CreateUserRole.UserTypeRole.UserTypeShortName,
+                         feedBack.CreateUserRole.IdentityUser.FullName,
                          emailType,
                          feedBack.QuestionDescription,
                          _systemEmailConfig.SiteUrl
@@ -739,8 +759,8 @@ namespace IRaCIS.Core.Application.Service
                         info.TrialCode,
                         info.SubejctCode,
                         info.VisitName,
-                        feedBack.CreateUser.UserTypeRole.UserTypeShortName,
-                         feedBack.CreateUser.FullName,
+                        feedBack.CreateUserRole.UserTypeRole.UserTypeShortName,
+                         feedBack.CreateUserRole.IdentityUser.FullName,
                          emailType,
                          feedBack.QuestionDescription,
                          _systemEmailConfig.SiteUrl
@@ -768,8 +788,8 @@ namespace IRaCIS.Core.Application.Service
                     var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),
                        userNames,
                         info.TrialCode,
-                        feedBack.CreateUser.UserTypeRole.UserTypeShortName,
-                        feedBack.CreateUser.FullName,
+                        feedBack.CreateUserRole.UserTypeRole.UserTypeShortName,
+                        feedBack.CreateUserRole.IdentityUser.FullName,
                          emailType,
                          feedBack.QuestionDescription,
                          _systemEmailConfig.SiteUrl
@@ -793,8 +813,8 @@ namespace IRaCIS.Core.Application.Service
 
                     var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),
                         userNames,
-                        feedBack.CreateUser.UserTypeRole.UserTypeShortName,
-                         feedBack.CreateUser.FullName,
+                        feedBack.CreateUserRole.UserTypeRole.UserTypeShortName,
+                         feedBack.CreateUserRole.IdentityUser.FullName,
                          feedBack.QuestionDescription,
                          _systemEmailConfig.SiteUrl
                         );

IRaCIS.Core.Application/Service/Common/PublishLogService.cs

@@ -42,7 +42,7 @@ namespace IRaCIS.Core.Application.Service
         {
             Version version;
 
-            if (!Version.TryParse(addOrEditPublishLog.Version, out version)|| !Version.TryParse(addOrEditPublishLog.Version_US, out version))
+            if (!Version.TryParse(addOrEditPublishLog.Version, out version))
             {
                 //"版本号不符合要求"
                 return ResponseOutput.NotOk(_localizer["PublishLog_NotValidVersion"]);
@@ -50,7 +50,7 @@ namespace IRaCIS.Core.Application.Service
 
             var verifyExp1 = new EntityVerifyExp<PublishLog>()
             {
-                VerifyExp = u => u.Version == addOrEditPublishLog.Version || u.Version_US == addOrEditPublishLog.Version_US,
+                VerifyExp = u => u.Version == addOrEditPublishLog.Version ,
 
                 //"发布编号不能重复"
                 VerifyMsg = _localizer["PublishLog_RepeatVersion"]

IRaCIS.Core.Application/Service/Common/SystemBasicDataService.cs

@@ -5,6 +5,7 @@
 //--------------------------------------------------------------------
 
 using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Mvc;
 namespace IRaCIS.Core.Application.Services
 {
@@ -25,7 +26,10 @@ namespace IRaCIS.Core.Application.Services
         [HttpPost]
         public async Task<PageOutput<SystemBasicDataView>> GetSystemBasicDataList(SystemBasicDataQuery inQuery)
         {
-            var systemBasicDataQueryable = _systemBasicDataRepository.Where(t => t.ParentId == null)
+            var systemBasicDataQueryable = _systemBasicDataRepository
+                 .Where(t => t.ParentId == null)
+                 .WhereIf(inQuery.Code != null, t => t.Code.Contains(inQuery.Code))
+                 .WhereIf(inQuery.Name != null, t => t.Name.Contains(inQuery.Name))
             .ProjectTo<SystemBasicDataView>(_mapper.ConfigurationProvider);
 
             return await systemBasicDataQueryable.ToPagedListAsync(inQuery, nameof(SystemBasicDataView.Code));

IRaCIS.Core.Application/Service/Common/_MapConfig.cs

@@ -28,6 +28,9 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<EmailNoticeConfig, EmailNoticeConfigView>()
                 .ForMember(t => t.EmailNoticeUserList, u => u.MapFrom(c => c.EmailNoticeUserTypeList));
 
+            CreateMap<EmailNoticeConfig, EmailNoticeConfigExportDto>();
+            
+
             CreateMap<Dictionary, DicView>()
             .ForMember(t => t.ParentCode, u => u.MapFrom(c => c.Parent.Code));
             CreateMap<SystemBasicData, SystemBasicDataView>();
@@ -73,6 +76,9 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<Internationalization, InternationalizationAddOrEdit>().ReverseMap();
 
+            CreateMap<InternationalizationAddOrEdit, IRCGlobalInfoDTO>();
+            
+
             CreateMap<Internationalization, BatchInternationalizationDto>().ReverseMap();
 
             CreateMap<Internationalization, IRCGlobalInfoDTO>();
@@ -92,9 +98,9 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<TrialImageDownload, TrialImageDownloadExportDto>()
-                .ForMember(d => d.UserFullName, u => u.MapFrom(s => s.CreateUser.FullName))
-                .ForMember(d => d.UserTypeEnum, u => u.MapFrom(s => s.CreateUser.UserTypeEnum))
-                .ForMember(d => d.UserName, u => u.MapFrom(s => s.CreateUser.UserName))
+                .ForMember(d => d.UserFullName, u => u.MapFrom(s => s.CreateUserRole.FullName))
+                .ForMember(d => d.UserTypeEnum, u => u.MapFrom(s => s.CreateUserRole.UserTypeEnum))
+                .ForMember(d => d.UserName, u => u.MapFrom(s => s.CreateUserRole.IdentityUser.UserName))
                 .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.Subject.TrialSite.TrialSiteCode));
 
 

IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs

@@ -59,7 +59,7 @@ namespace IRaCIS.Application.Contracts
         public string DepartmentOtherCN { get; set; } = String.Empty;
 
         //增加的
-        public Guid? SpecialityId { get; set; } = Guid.Empty;
+        public Guid? SpecialityId { get; set; }
         public string SpecialityOther { get; set; } = string.Empty;
         public string SpecialityOtherCN { get; set; } = string.Empty;
         public string Speciality { get; set; } = string.Empty;
@@ -174,6 +174,8 @@ namespace IRaCIS.Application.Contracts
     public class SelectionReviewerDTO : DoctorDTO
     {
         public int DoctorTrialState { get; set; }
+
+        public bool IsEnroll { get; set; } = false;
         public string OptUserName { get; set; } = string.Empty;
         public DateTime? OptTime { get; set; }
         public string? OptTimeStr => OptTime?.ToString("yyyy-MM-dd HH:mm:ss");
@@ -209,7 +211,7 @@ namespace IRaCIS.Application.Contracts
         public string BlindName { get; set; }
         public string BlindNameCN { get; set; } = string.Empty;
 
-        public Guid? SpecialityId { get; set; } = Guid.Empty;
+        public Guid? SpecialityId { get; set; }
 
         public string SpecialityCN { get; set; } = string.Empty;
         public string Speciality { get; set; } = string.Empty;
@@ -308,6 +310,8 @@ namespace IRaCIS.Application.Contracts
         public string WeChat { get; set; } = String.Empty;
         public int Nation { get; set; }
 
+        public string? BlindPublications { get; set; }
+
         /// <summary>
         /// 工作兼职
         /// </summary>
@@ -318,13 +322,42 @@ namespace IRaCIS.Application.Contracts
         /// </summary>
         public string WorkPartTimeEn { get; set; } = string.Empty;
 
+        /// <summary>
+        /// 大学
+        /// </summary>
+        public string UniversityAffiliated { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 大学
+        /// </summary>
+        public string UniversityAffiliatedCN { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 城市
+        /// </summary>
+        public string City { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 城市
+        /// </summary>
+        public string CityCN { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 医院
+        /// </summary>
+        public string HospitalName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 医院
+        /// </summary>
+        public string HospitalNameCN { get; set; } = string.Empty;
 
     }
 
 
     public class SendEmailInDto
     {
-        public string Email { get; set; }
+        public List<string> Email { get; set; }
 
         public string Url { get; set; }
     }
@@ -361,18 +394,26 @@ namespace IRaCIS.Application.Contracts
 
     }
 
+    public class DeleteSummarizeInfoInDto
+    {
+        public Guid Id { get; set; }
+    }
     public class GetSummarizeInfoInDto
     {
         public Guid DoctorId { get; set; }
 
-        public Guid? TrialId { get; set; }
+        public Guid? TrialId { get; set; } = null;
     }
 
-    public class UpdateGneralSituationDto
+    public class SummarizeInfoDto
     {
-        public Guid Id { get; set; }
 
-        public Guid? TrialId { get; set; }
+        public Guid? Id { get; set; }
+
+        /// <summary>
+        /// 医生Id
+        /// </summary>
+        public Guid DoctorId { get; set; }
 
         /// <summary>
         /// 概述
@@ -383,24 +424,70 @@ namespace IRaCIS.Application.Contracts
         /// 概述
         /// </summary>
         public string SummarizeEn { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 是否是主模板
+        /// </summary>
+        public bool IsMain { get; set; }
+
+        /// <summary>
+        /// 适应症
+        /// </summary>
+        public string Indication { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 适应症
+        /// </summary>
+        public string IndicationEn { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 项目Id
+        /// </summary>
+        public Guid? TrialId { get; set; }
+
+        public SaveSummarizeInfo SaveSummarizeInfoType { get; set; } = SaveSummarizeInfo.SaveSelf;
+    }
+
+    public enum SaveSummarizeInfo
+    {
+        /// <summary>
+        /// 保存自己
+        /// </summary>
+        SaveSelf = 0,
+
+        /// <summary>
+        /// 保存并覆盖
+        /// </summary>
+        SaveAndCover = 1,
+
+        /// <summary>
+        /// 保存并新增
+        /// </summary>
+        SaveAndAdd = 2,
+
+    }
+
+    public class UpdateGneralSituationDto
+    {
+      public List<SummarizeInfoDto> SummarizeList { get; set; }
     }
 
     public class BasicInfoAndEmploymentDto: DoctorBasicInfoCommand
     {
         //部门
-        public Guid? DepartmentId { get; set; } = Guid.Empty;
+        public Guid? DepartmentId { get; set; }
         public string DepartmentOther { get; set; } = string.Empty;
         public string DepartmentOtherCN { get; set; } = string.Empty;
         //职称
-        public Guid? RankId { get; set; } = Guid.Empty;
+        public Guid? RankId { get; set; }
         public string RankOther { get; set; } = string.Empty;
         public string RankOtherCN { get; set; } = string.Empty;
         //职位  主席 副主席
-        public Guid? PositionId { get; set; } = Guid.Empty;
+        public Guid? PositionId { get; set; }
         public string PositionOther { get; set; } = string.Empty;
         public string PositionOtherCN { get; set; } = string.Empty;
 
-        public Guid? HospitalId { get; set; } = Guid.Empty;
+        public Guid? HospitalId { get; set; } 
 
         public Guid? PhysicianId { get; set; }
         public string Physician { get; set; } = string.Empty;
@@ -580,19 +667,19 @@ namespace IRaCIS.Application.Contracts
     {
         public Guid Id { get; set; }
         //部门
-        public Guid? DepartmentId { get; set; } = Guid.Empty;
+        public Guid? DepartmentId { get; set; }
         public string DepartmentOther { get; set; } = string.Empty;
         public string DepartmentOtherCN { get; set; } = string.Empty;
         //职称
-        public Guid? RankId { get; set; } = Guid.Empty;
+        public Guid? RankId { get; set; } = null;
         public string RankOther { get; set; } = string.Empty;
         public string RankOtherCN { get; set; } = string.Empty;
         //职位  主席 副主席
-        public Guid? PositionId { get; set; } = Guid.Empty;
+        public Guid? PositionId { get; set; } 
         public string PositionOther { get; set; } = string.Empty;
         public string PositionOtherCN { get; set; } = string.Empty;
 
-        public Guid? HospitalId { get; set; } = Guid.Empty;
+        public Guid? HospitalId { get; set; }
 
         public Guid? PhysicianId { get; set; }
         public string Physician { get; set; } = string.Empty;
@@ -608,6 +695,55 @@ namespace IRaCIS.Application.Contracts
         /// </summary>
         public string WorkPartTimeEn { get; set; } = string.Empty;
 
+        /// <summary>
+        /// 大学
+        /// </summary>
+        public string University { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 大学
+        /// </summary>
+        public string UniversityCN { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 城市
+        /// </summary>
+        public string City { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 城市
+        /// </summary>
+        public string CityCN { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 医院
+        /// </summary>
+        public string HospitalEn { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 医院
+        /// </summary>
+        public string HospitalCN { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 大学
+        /// </summary>
+        public string UniversityAffiliated { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 大学
+        /// </summary>
+        public string UniversityAffiliatedCN { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 医院
+        /// </summary>
+        public string HospitalName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 医院
+        /// </summary>
+        public string HospitalNameCN { get; set; } = string.Empty;
     }
 
     #endregion
@@ -735,7 +871,7 @@ namespace IRaCIS.Application.Contracts
         public string SubspecialityOther { get; set; } = string.Empty;
         public string SubspecialityOtherCN { get; set; } = string.Empty;
 
-        public Guid? SpecialityId { get; set; } = Guid.Empty;
+        public Guid? SpecialityId { get; set; }
         public string SpecialityCN { get; set; } = string.Empty;
         public string SpecialityOther { get; set; } = string.Empty;
         public string SpecialityOtherCN { get; set; } = string.Empty;

IRaCIS.Core.Application/Service/Doctor/DTO/EducationModel.cs

@@ -31,12 +31,13 @@
     {
         public DateTime? CreateTime { get; set; }
 
-        public string BeginDateStr => BeginDate?.ToString("yyyy-MM");
-        public string EndDateStr => EndDate?.ToString("yyyy-MM");
+        public string BeginDateStr => BeginDate?.ToString("yyyy/MM");
+        public string EndDateStr => EndDate?.ToString("yyyy/MM");
 
     }
     public class PostgraduateCommand
     {
+
         public Guid? Id { get; set; }
         public Guid DoctorId { get; set; }
 
@@ -81,9 +82,9 @@
     {
         public DateTime? CreateTime { get; set; }
 
-        public string BeginDateStr => BeginDate?.ToString("yyyy-MM");
+        public string BeginDateStr => BeginDate?.ToString("yyyy/MM");
 
-        public string EndDateStr => EndDate?.ToString("yyyy-MM");
+        public string EndDateStr => EndDate?.ToString("yyyy/MM");
     }
     public class DoctorEducationExperienceDTO
     {

IRaCIS.Core.Application/Service/Doctor/DTO/HolidayModel.cs

@@ -8,4 +8,15 @@
         public DateTime EndDate { get; set; }
         public int Status { get; set; } = 1;
     }
+
+    public class GetIsVacationInDto
+    {
+        public Guid DoctorId { get; set; }
+    }
+
+
+    public class GetIsVacationOutDto
+    {
+        public bool IsVacation { get; set; }
+    }
 }

IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs

@@ -31,6 +31,7 @@ namespace IRaCIS.Core.Application.Service
 
 
             var query = _doctorRepository.AsQueryable()
+                   .Where(x=>x.TrialId==null)
                    .WhereIf(inQuery.DepartmentId != null, t => t.DepartmentId == inQuery.DepartmentId)
                    .WhereIf(inQuery.SpecialityId != null, t => t.SpecialityId == inQuery.SpecialityId)
                    .WhereIf(inQuery.HospitalId != null, t => t.HospitalId == inQuery.HospitalId)
@@ -76,6 +77,7 @@ namespace IRaCIS.Core.Application.Service
             var guidList = inQuery.ReadingTypeIdList.Concat(inQuery.SubspecialityIdList).Concat(inQuery.TitleIdList);
 
             var query = _doctorRepository/*.WhereIf(nation != AttendedReviewerType.USAndCN,  t => t.Nation ==(int) nation)*/
+             .Where(x=>x.TrialId==null)
 
              .WhereIf(inQuery.DepartmentId != null, t => t.DepartmentId == inQuery.DepartmentId)
              .WhereIf(inQuery.SpecialityId != null, t => t.SpecialityId == inQuery.SpecialityId)
@@ -102,6 +104,8 @@ namespace IRaCIS.Core.Application.Service
             var doctorStateList = await _enrollDetailRepository.Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus == EnrollStatus.HasApplyDownloadResume)
                .ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
+            var doctorEnrollList =await _enrollRepository.Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus >= EnrollStatus.InviteIntoGroup)
+            .ToListAsync();
             result.CurrentPageData.ToList().ForEach(doctor =>
               {
                   //简历申请列表  --处理已经申请的
@@ -109,6 +113,7 @@ namespace IRaCIS.Core.Application.Service
                   if (doctorState != null)
                   {
                       doctor.DoctorTrialState = (int)EnrollStatus.HasApplyDownloadResume;
+                      doctor.IsEnroll = doctorEnrollList.Any(x => x.DoctorId == doctor.Id);
                       doctor.OptTime = doctorState.OptTime;
                       doctor.OptUserName = doctorState.OptUserName;
                   }

IRaCIS.Core.Application/Service/Doctor/DoctorService.cs

@@ -1,9 +1,11 @@
-using IRaCIS.Application.Contracts;
+using DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments;
+using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.MassTransit.Consumer;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
+using MassTransit;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using MimeKit;
@@ -13,7 +15,10 @@ namespace IRaCIS.Core.Application.Service
     [ApiExplorerSettings(GroupName = "Reviewer")]
     public class DoctorService(IRepository<Doctor> _doctorRepository,
         IRepository<DoctorDictionary> _doctorDictionaryRepository,
+           IRepository<DoctorSummarize> _doctorSummarizeRepository,
         IRepository<Enroll> _enrollRepository,
+           IRepository<Hospital> _hospitalRepository,
+          IRepository<Dictionary> _dictionaryRepository,
         IRepository<Attachment> _attachmentRepository,
              IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
         IRepository<DoctorCriterionFile> _doctorCriterionFileRepository,
@@ -69,6 +74,13 @@ namespace IRaCIS.Core.Application.Service
                 //插入中间表
                 basicInfoModel.TitleIds.ForEach(titleId => doctor.DoctorDicRelationList.Add(new DoctorDictionary() { DoctorId = doctor.Id, KeyName = StaticData.Title, DictionaryId = titleId }));
 
+                // 新增给默认值
+                doctor.CooperateStatus = ContractorStatusEnum.Noncooperation;
+                doctor.ReviewStatus = ReviewerInformationConfirmStatus.ConfirmRefuse;
+                doctor.AcceptingNewTrial = false;
+                doctor.ActivelyReading = false;
+                doctor.IsVirtual = false;
+
 
                 await _doctorRepository.AddAsync(doctor);
                 //_doctorRepository.Add(doctor);
@@ -218,41 +230,121 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<bool> UpdateGneralSituation(UpdateGneralSituationDto inDto)
+        public async Task<(DoctorSummarize,bool)> AddOrUpdateGneralSituation(SummarizeInfoDto inDto)
         {
-            if (inDto.TrialId != null)
+            if (inDto.TrialId != null&&inDto.Id==null)
             {
-                await _doctorRepository.UpdatePartialFromQueryAsync(x => x.DoctorId == inDto.Id&&x.TrialId==inDto.TrialId.Value, x => new Doctor()
+                var systemCount = await _doctorSummarizeRepository.Where(x => x.DoctorId == inDto.DoctorId && x.TrialId == null).CountAsync();
+                if (systemCount == 0)
                 {
-                    Summarize = inDto.Summarize,
-                    SummarizeEn = inDto.SummarizeEn,
-                });
-             
-            }
-            else
-            {
-                await _doctorRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.Id, x => new Doctor()
-                {
-                    Summarize = inDto.Summarize,
-                    SummarizeEn = inDto.SummarizeEn,
-                });
+                    var trialinfo = await _trialRepository.Where(x => x.Id == inDto.TrialId).FirstNotNullAsync();
+                    var dictionery = await _dictionaryRepository.Where(x => x.Parent.Code == "Indication" && x.Code == trialinfo.IndicationEnum.ToString()).FirstNotNullAsync();
+                    inDto.IndicationEn = dictionery.Value;
+                    inDto.Indication = dictionery.ValueCN;
+                    var system=  inDto.Clone();
+                    system.TrialId = null;
+                    system.IsMain = true;
+                    await _doctorSummarizeRepository.InsertOrUpdateAsync(system, true);
+                }
             }
 
+            if (inDto.TrialId == null)
+            {
+                var systemCount = await _doctorSummarizeRepository.Where(x => x.DoctorId == inDto.DoctorId && x.TrialId == null).CountAsync();
+                if (systemCount == 0)
+                {
+                    inDto.IsMain = true;
+                  
+                }
+                if (inDto.Indication.IsNullOrEmpty() && inDto.IndicationEn.IsNullOrEmpty())
+                {
+                    inDto.Indication = "默认";
+                    inDto.IndicationEn = "Default";
+                }
+                var exists = await _doctorSummarizeRepository
+                     .Where(x=> x.IndicationEn!=string.Empty && x.Indication!=string.Empty)
+                     .Where( x => x.IndicationEn == inDto.IndicationEn|| x.Indication == inDto.Indication)
+                  
+                     .AnyAsync(x => x.DoctorId == inDto.DoctorId && x.TrialId == null&&x.Id!=inDto.Id);
+                if (exists)
+                {
+                    throw new BusinessValidationFailedException(_localizer["DoctorSummarize_repeat"]);
+                }
+            }
+
+        
+
+            if (inDto.TrialId != null && inDto.SaveSummarizeInfoType!= SaveSummarizeInfo.SaveSelf)
+            {
+                switch (inDto.SaveSummarizeInfoType)
+                {
+                    case SaveSummarizeInfo.SaveAndCover:
+                        await _doctorSummarizeRepository.BatchUpdateNoTrackingAsync(x =>
+                        x.DoctorId == inDto.DoctorId && x.TrialId == null &&
+                        x.IndicationEn == inDto.IndicationEn && x.Indication == inDto.Indication, x => new DoctorSummarize()
+                        {
+                            Summarize = inDto.Summarize,
+                            SummarizeEn = inDto.SummarizeEn
+                        });
+                        break;
+                    case SaveSummarizeInfo.SaveAndAdd:
+
+
+                        var exists = await _doctorSummarizeRepository
+                       .WhereIf(_userInfo.IsEn_Us, x => x.IndicationEn == inDto.IndicationEn)
+                       .WhereIf(!_userInfo.IsEn_Us, x => x.Indication == inDto.Indication)
+                       .AnyAsync(x => x.DoctorId == inDto.DoctorId && x.TrialId == null);
+                        if (exists)
+                        {
+                            throw new BusinessValidationFailedException(_localizer["DoctorSummarize_repeat"]);
+                        }
+                        await _doctorSummarizeRepository.BatchDeleteNoTrackingAsync(x => x.DoctorId == inDto.DoctorId && x.TrialId == inDto.TrialId);
+
+
+                        var needData = inDto.Clone();
+                        needData.TrialId = null;
+                        await _doctorSummarizeRepository.InsertOrUpdateAsync(needData, true);
+                        break;
+                }
+            }
+
+
+            if (inDto.TrialId == null && inDto.IsMain)
+            {
+
+                await _doctorSummarizeRepository.BatchUpdateNoTrackingAsync(x => x.DoctorId == inDto.DoctorId && x.TrialId == null, 
+                    x => new DoctorSummarize()
+                {
+                    IsMain = false
+                });
+            }
            
-            var success= await _doctorRepository.SaveChangesAsync();
-            return success;
+              
+            var entity = await _doctorSummarizeRepository.InsertOrUpdateAsync(inDto, true);
+            return (entity,true);
         }
 
+        /// <summary>
+        /// 删除概述
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<bool> DeleteSummarizeInfo(DeleteSummarizeInfoInDto inDto)
+        {
+            var result = await _doctorSummarizeRepository.DeleteFromQueryAsync(x=>x.Id==inDto.Id);
+            return await _doctorSummarizeRepository.SaveChangesAsync();
+        }
 
         /// <summary>
         /// 获取概述
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        public async Task<UpdateGneralSituationDto?> GetSummarizeInfo(GetSummarizeInfoInDto inDto)
+        [HttpPost]
+        public async Task<UpdateGneralSituationDto> GetSummarizeInfo(GetSummarizeInfoInDto inDto)
         {
-            var doctorBasicInfo = (await _doctorRepository.Where(t => t.Id == inDto.DoctorId)
-            .ProjectTo<UpdateGneralSituationDto>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
+         
             if (inDto.TrialId != null)
             {
                 var doctorInfo = await trialExperienceService.GetTrialDoctorInfo(new GetTrialDoctorInfoInDto()
@@ -261,15 +353,12 @@ namespace IRaCIS.Core.Application.Service
                     DoctorId = inDto.DoctorId,
                 });
 
-                doctorBasicInfo = new UpdateGneralSituationDto()
-                {
-                    Summarize = doctorInfo.Summarize,
-                    SummarizeEn = doctorInfo.SummarizeEn,
-
-                };
             }
-          
-            return doctorBasicInfo;
+            var result = await _doctorSummarizeRepository.Where(t => t.DoctorId == inDto.DoctorId && t.TrialId == inDto.TrialId)
+            .ProjectTo<SummarizeInfoDto>(_mapper.ConfigurationProvider).ToListAsync();
+            return new UpdateGneralSituationDto() { 
+            SummarizeList= result
+            };
         }
 
         /// <summary>
@@ -283,7 +372,12 @@ namespace IRaCIS.Core.Application.Service
             var messageToSend = new MimeMessage();
             //发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-            messageToSend.To.Add(new MailboxAddress(String.Empty, inDto.Email));
+            foreach (var item in inDto.Email)
+            {
+                messageToSend.To.Add(new MailboxAddress(String.Empty, item));
+
+            }
+       
 
 
             Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
@@ -489,7 +583,7 @@ namespace IRaCIS.Core.Application.Service
 
         [HttpPost]
 
-        public async Task<IResponseOutput> UpdateEmploymentInfo(EmploymentCommand doctorWorkInfoModel)
+        public async Task<IResponseOutput> UpdateEmploymentInfo(EmploymentCommand inDto)
         {
             #region 废弃
             //var success = _doctorRepository.Update(d => d.Id == doctorWorkInfoModel.Id, u => new Doctor()
@@ -519,8 +613,7 @@ namespace IRaCIS.Core.Application.Service
             //var success = _doctorRepository.SaveChanges();
             #endregion
 
-
-            var entity = await _doctorRepository.InsertOrUpdateAsync(doctorWorkInfoModel, true);
+            var entity = await _doctorRepository.InsertOrUpdateAsync(inDto, true);
 
 
             return ResponseOutput.Ok();
@@ -629,7 +722,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<IResponseOutput> UpdateAuditResume(ResumeConfirmCommand auditResumeParam)
         {
-            var userId = _userInfo.Id;
+            var userId = _userInfo.UserRoleId;
             //判断 合作协议、正式简历 是否有。如果没有，显示提示信息，并且不能保存
             var attachmentList = await _attachmentRepository.Where(u => u.DoctorId == auditResumeParam.Id)
                 .Select(u => u.Type).ToListAsync();

IRaCIS.Core.Application/Service/Doctor/EducationService.cs

@@ -8,6 +8,7 @@ namespace IRaCIS.Core.Application.Service
 {
     [ApiExplorerSettings(GroupName = "Reviewer")]
     public class EducationService(IRepository<Postgraduate> _postgraduateRepository,
+        IRepository<Hospital> _hospitalRepository,
         IRepository<Education> _educationRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IEducationService
     {
 
@@ -21,7 +22,7 @@ namespace IRaCIS.Core.Application.Service
                 .OrderBy(t => t.CreateTime).ProjectTo<EducationInfoViewModel>(_mapper.ConfigurationProvider).ToListAsync();
 
             var postgraduateList = await _postgraduateRepository.Where(o => o.DoctorId == doctorId)
-                .OrderBy(t => t.CreateTime).ProjectTo<PostgraduateViewModel>(_mapper.ConfigurationProvider).ToListAsync();
+                .OrderBy(t => t.CreateTime).ProjectTo<PostgraduateViewModel>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us }).ToListAsync();
 
 
             return new DoctorEducationExperienceDTO()
@@ -88,7 +89,7 @@ namespace IRaCIS.Core.Application.Service
         /// <summary> 添加/更新医生继续学习经历</summary>
 
         [HttpPost]
-        public async Task<IResponseOutput> AddOrUpdatePostgraduateInfo(PostgraduateCommand postgraduateViewModel)
+        public async Task<IResponseOutput> AddOrUpdatePostgraduateInfo(PostgraduateCommand inDto)
         {
             #region 封装前
 
@@ -109,8 +110,7 @@ namespace IRaCIS.Core.Application.Service
 
             //}
             #endregion
-
-            var entity = await _postgraduateRepository.InsertOrUpdateAsync(postgraduateViewModel, true);
+            var entity = await _postgraduateRepository.InsertOrUpdateAsync(inDto, true);
             return ResponseOutput.Ok(entity.Id);
         }
         /// <summary>

IRaCIS.Core.Application/Service/Doctor/TrialExperienceService.cs

@@ -1,5 +1,6 @@
 using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
+using MassTransit;
 using Microsoft.AspNetCore.Mvc;
 
 namespace IRaCIS.Core.Application.Service
@@ -7,6 +8,7 @@ namespace IRaCIS.Core.Application.Service
     [ApiExplorerSettings(GroupName = "Reviewer")]
     public class TrialExperienceService(IRepository<TrialExperience> _trialExperienceRepository,
         IRepository<Doctor> _doctorRepository,
+           IRepository<DoctorSummarize> _doctorSummarizeRepository,
         IRepository<TrialExperienceCriteria> _trialExperienceCriteriaRepository,
         IRepository<Attachment> _attachmentRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialExperienceService
     {
@@ -84,11 +86,59 @@ namespace IRaCIS.Core.Application.Service
                     TrialId = inDto.TrialId,
                     OtherClinicalExperience = systemInfoDcotor.OtherClinicalExperience,
                     OtherClinicalExperienceCN = systemInfoDcotor.OtherClinicalExperienceCN,
-                    Summarize = systemInfoDcotor.Summarize,
-                    SummarizeEn = systemInfoDcotor.SummarizeEn,
                 };
 
+                #region 概述
+                ///没有就加
+                var summarizeCount = await _doctorSummarizeRepository.Where(x => x.DoctorId == inDto.DoctorId && x.TrialId == inDto.TrialId).CountAsync();
+                if (summarizeCount == 0)
+                {
+                    var main = await _doctorSummarizeRepository.Where(x => x.DoctorId == inDto.DoctorId && x.IsMain && x.TrialId == null).ProjectTo<SummarizeInfoDto>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
+                    if (main != null)
+                    {
+                        main.Id = null;
+                        main.TrialId = inDto.TrialId;
+                        main.IsMain = false;
+                        var entity = await _doctorSummarizeRepository.InsertOrUpdateAsync(main, true);
+                    }
+
+                }
                 doctorInfo = await _doctorRepository.AddAsync(doctor, true);
+                #endregion
+
+
+
+
+
+
+                #region 临床试验
+
+                var trialExperienceList = await _trialExperienceRepository.Where(o => o.DoctorId == inDto.DoctorId)
+                   .Where(x=>x.TrialId==null||x.TrialId!=inDto.TrialId)
+                  .Where(x => x.ExperienceDataType == ExperienceDataType.System || x.ExperienceDataType == ExperienceDataType.SystemAuto).Include(x => x.ExperienceCriteriaList).ToListAsync();
+                List<TrialExperienceCriteria> criteriaList = new List<TrialExperienceCriteria>();
+                foreach (var item in trialExperienceList)
+                {
+                    item.Trial = null;
+                    item.TrialId = inDto.TrialId;
+                    item.ExperienceDataType = ExperienceDataType.Trial;
+                    item.Id = NewId.NextGuid();
+                    item.ExperienceCriteriaList.ForEach(x => {
+
+                        criteriaList.Add(new TrialExperienceCriteria()
+                        {
+                            DoctorId = item.DoctorId,
+                            EvaluationCriteriaId = x.EvaluationCriteriaId,
+                            TrialExperienceId = item.Id
+                        });
+                    });
+                    item.ExperienceCriteriaList = new List<TrialExperienceCriteria>();
+                }
+                await _trialExperienceCriteriaRepository.AddRangeAsync(criteriaList);
+                await _trialExperienceRepository.AddRangeAsync(trialExperienceList);
+                await _trialExperienceRepository.SaveChangesAsync();
+                #endregion
+
             }
 
             return doctorInfo;
@@ -107,25 +157,20 @@ namespace IRaCIS.Core.Application.Service
             }
             else
             {
-                // 当前项目没有则复制
-                if (!(await _trialExperienceRepository.AnyAsync(x => x.TrialId == inDto.TrialId)))
+                // 先添加
+                await GetTrialDoctorInfo(new GetTrialDoctorInfoInDto()
                 {
-                    var trialExperienceList = await _trialExperienceRepository.Where(o => o.DoctorId == inDto.DoctorId)
-                    .Where(x => x.ExperienceDataType == ExperienceDataType.System || x.ExperienceDataType == ExperienceDataType.SystemAuto).ToListAsync();
-                    foreach (var item in trialExperienceList)
-                    {
-                        item.Trial = null;
-                        item.TrialId = inDto.TrialId;
-                        item.ExperienceDataType = ExperienceDataType.Trial;
-                    }
-                }
-
+                    DoctorId = inDto.DoctorId,
+                    TrialId = inDto.TrialId.Value,
+                });
                 var doctorClinicalTrialExperienceList = await _trialExperienceRepository
                  .Where(o => o.DoctorId == inDto.DoctorId)
                  .Where(x => x.ExperienceDataType == ExperienceDataType.Trial|| x.ExperienceDataType == ExperienceDataType.TrialAuto)
                  .Where(x => x.TrialId == inDto.TrialId.Value)
                  .OrderBy(t => t.CreateTime)
                  .ProjectTo<TrialExperienceListDTO>(_mapper.ConfigurationProvider).ToListAsync();
+
+
                 return doctorClinicalTrialExperienceList;
             }
          
@@ -242,7 +287,7 @@ namespace IRaCIS.Core.Application.Service
 
             if (inDto.TrialId != null)
             {
-                var success = await _doctorRepository.BatchUpdateNoTrackingAsync(o => o.Id == inDto.DoctorId&&o.TrialId==inDto.TrialId.Value, u => new Doctor()
+                var success = await _doctorRepository.BatchUpdateNoTrackingAsync(o => o.DoctorId == inDto.DoctorId&&o.TrialId==inDto.TrialId.Value, u => new Doctor()
                 {
                     OtherClinicalExperience = inDto.OtherClinicalExperience ?? string.Empty,
                     OtherClinicalExperienceCN = inDto.OtherClinicalExperienceCN ?? string.Empty

IRaCIS.Core.Application/Service/Doctor/VacationService.cs

@@ -70,6 +70,36 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
+        /// <summary>
+        /// 获取是否休假
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<GetIsVacationOutDto> GetIsVacation(GetIsVacationInDto inDto)
+        {
+            var query = await _vacationRepository.Where(u => u.DoctorId == inDto.DoctorId).ToListAsync();
+
+            bool isVacation = false;
+
+            var now = DateTime.Now;
+            foreach (var item in query)
+            {
+                if (item.StartDate <= now && now <= item.EndDate)
+                {
+                    isVacation = true;
+                    break;
+                }
+            }
+
+
+            return new GetIsVacationOutDto() { 
+            
+            IsVacation= isVacation
+            };
+
+        }
+
         [NonDynamicMethod]
         public async Task<IResponseOutput> OnVacation(Guid doctorId)
         {

IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs

@@ -11,6 +11,7 @@ namespace IRaCIS.Core.Application.Service
     {
         public DoctorConfig()
         {
+            var isEn_Us = false;
 
             // 从 DateTime 映射到 DateOnly
             CreateMap<DateTime, DateOnly>().ConvertUsing(dt => DateOnly.FromDateTime(dt));
@@ -57,11 +58,18 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<AddDoctorCriterionFileDto, DoctorCriterionFile>();
             CreateMap<DoctorCriterionFile, GetDoctorCriterionFileOutDto>();
             CreateMap<Doctor, DoctorBasicInfoCommand>();
+
+            CreateMap<Doctor, BasicInfoAndEmploymentDto>();
+
+            CreateMap<BasicInfoAndEmploymentDto, Doctor>().ForAllMembers(opts => opts.Condition((src, dest, srcMember) => srcMember != null)); ;
+
             CreateMap<Education, EducationInfoViewModel>();
 
             CreateMap<Vacation, VacationCommand>();
             CreateMap<ResearchPublication, ResearchPublicationDTO>();
             CreateMap<Postgraduate, PostgraduateViewModel>();
+              //    .ForMember(t => t.Hospital, c => c.MapFrom(d => d.HospitalEnt.HospitalName))
+              //.ForMember(t => t.HospitalCN, c => c.MapFrom(d => d.HospitalEnt.HospitalNameCN));
             CreateMap<Attachment, AttachmentDTO>();
             CreateMap<Doctor, ResumeConfirmDTO>();
 
@@ -70,6 +78,9 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<Doctor, PaymentModeDto>();
 
+            CreateMap<DoctorSummarize, SummarizeInfoDto>();
+            CreateMap<SummarizeInfoDto, DoctorSummarize>();
+
             CreateMap<PaymentModeDto, Doctor>();
 
             CreateMap<Doctor, TrialExperienceModel>();
@@ -88,11 +99,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<DoctorDTO, SelectionReviewerDTO>()
                 ;
 
-            CreateMap<User, UserBasicInfo>()
-             .ForMember(d => d.UserTypeShortName, u => u.MapFrom(t => t.UserTypeRole.UserTypeShortName))
-             .ForMember(d => d.Code, u => u.MapFrom(t => t.UserCode))
-             .ForMember(d => d.PermissionStr, u => u.MapFrom(t => t.UserTypeRole.PermissionStr))
-             .ForMember(d => d.RealName, u => u.MapFrom(user => string.IsNullOrEmpty(user.FirstName) ? user.LastName : user.LastName + " / " + user.FirstName));
+            CreateMap<UserRole, UserBasicInfo>();
 
             CreateMap<TrialExperience, TrialExperienceListDTO>()
             .ForMember(x=>x.VisitReadingCount, u => u.MapFrom(t => (t.ExperienceDataType==ExperienceDataType.TrialAuto||t.ExperienceDataType==ExperienceDataType.SystemAuto)?
@@ -105,15 +112,17 @@ namespace IRaCIS.Core.Application.Service
              .ForMember(d => d.EvaluationCriteriaList, u => u.MapFrom(t => t.ExperienceCriteriaList.Select(t => t.EvaluationCriteria.Value)))
              .ForMember(d => d.EvaluationCriteriaIdList, u => u.MapFrom(t => t.ExperienceCriteriaList.Select(t => t.EvaluationCriteriaId)));
 
-            CreateMap<Doctor, UserBasicInfo>()
-                 .ForMember(d => d.Code, u => u.MapFrom(t => t.ReviewerCode))
-                  .ForMember(d => d.RealName, u => u.MapFrom(t => t.ChineseName))
-                  .ForMember(d => d.IsReviewer, u => u.MapFrom(t => true))
-                  .ForMember(d => d.UserName, u => u.MapFrom(doctor => doctor.LastName + " / " + doctor.FirstName));
+            //CreateMap<Doctor, UserBasicInfo>()
+            //     .ForMember(d => d.Code, u => u.MapFrom(t => t.ReviewerCode))
+            //      .ForMember(d => d.RealName, u => u.MapFrom(t => t.ChineseName))
+            //      .ForMember(d => d.IsReviewer, u => u.MapFrom(t => true))
+            //      .ForMember(d => d.UserName, u => u.MapFrom(doctor => doctor.LastName + " / " + doctor.FirstName));
 
             #region 医生基本信息  
             CreateMap<Doctor, SelectionReviewerDTO>()
-                .ForMember(d => d.DoctorUserName, u => u.MapFrom(t => t.User.UserName));
+                .ForMember(d => d.DoctorUserName, u => u.MapFrom(t => t.UserRole.IdentityUser.UserName));
+
+
             CreateMap<Doctor, DoctorDTO>().IncludeMembers(t => t.Hospital).Include<Doctor, SelectionReviewerDTO>()
                  .ForMember(d => d.AccountUserName, u => u.MapFrom(s => s.EnrollList.Where(t => t.DoctorUserId != null).Select(c => c.DoctorUser.UserName).FirstOrDefault()))
                  .ForMember(d => d.Department, u => u.MapFrom(s => s.Department.Value))
@@ -171,7 +180,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<EnrollDetail, DoctorStateModelDTO>()
                 .ForMember(d => d.IntoGroupState, u => u.MapFrom(s => s.EnrollStatus))
                 .ForMember(d => d.OptTime, u => u.MapFrom(s => s.CreateTime))
-                 .ForMember(d => d.OptUserName, u => u.MapFrom(s => s.CreateUser.UserName));
+                 .ForMember(d => d.OptUserName, u => u.MapFrom(s => s.CreateUserRole.IdentityUser.UserName));
 
             CreateMap<Enroll, ConfirmationReviewerDTO>().IncludeMembers(t => t.Doctor, t => t.Doctor.Hospital)
                  .ForMember(o => o.DictionaryList, t => t.MapFrom(u => u.Doctor.DoctorDicRelationList.Where(t => t.KeyName == StaticData.ReadingType || t.KeyName == StaticData.Subspeciality).Select(t => t.Dictionary).OrderBy(t => t.ShowOrder)))

IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs

@@ -3,6 +3,7 @@
 //	   生成时间 2022-01-05 09:17:10 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
+using Newtonsoft.Json;
 using System.ComponentModel.DataAnnotations;
 
 namespace IRaCIS.Core.Application.Contracts
@@ -38,6 +39,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string ExperimentName { get; set; }
 
+
     }
 
 
@@ -56,8 +58,14 @@ namespace IRaCIS.Core.Application.Contracts
         public string RealName { get; set; } = string.Empty;
 
 
-        public Guid UserTypeId { get; set; }
-        public string UserTypeShortName { get; set; } = string.Empty;
+        public string DocTypeCode { get; set; }
+
+        public List<string> UserConfirmedUserTypeList => (DocNeedSignUserTypeList != null && IdentityUserTypeList != null) ? IdentityUserTypeList.Intersect(DocNeedSignUserTypeList).ToList() : new List<string>();
+
+
+        public IEnumerable<string> IdentityUserTypeList { get; set; }
+        public IEnumerable<string> DocNeedSignUserTypeList { get; set; }
+
     }
 
 

IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs

@@ -108,6 +108,16 @@ namespace IRaCIS.Core.Application.ViewModel
         public string SortField { get; set; } = string.Empty;
 
         public bool Asc { get; set; }
+
+        public bool? IsEnable { get; set; }
+
+        public int? EmailUrgentEnum { get; set; }
+
+        public UserTypeEnum? ToUserType { get; set; }
+
+        public UserTypeEnum? CopyUserType { get; set; }
+
+        public BusinessModule? BusinessModuleEnum { get; set; }
     }
 
 

IRaCIS.Core.Application/Service/Document/EmailSendService.cs

@@ -1,4 +1,5 @@
 using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.MassTransit.Consumer;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
 using Microsoft.Extensions.Options;
@@ -9,18 +10,18 @@ namespace IRaCIS.Core.Application.Service
     public interface IEmailSendService
     {
         Task SendEnrollOrPdEmail(Guid visitTaskId, bool? isEnrollment, bool? isPDConfirm);
-       
+
         Task<(TrialEmailNoticeConfig?, SMTPEmailConfig?)> BuildEmailConfig(Guid trialId, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, Guid? siteId = null, Guid? trialReadingCriterionId = null);
     }
 
     public class EmailSendService(IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
       IRepository<Trial> _trialRepository,
-      IRepository<TrialUser> _trialUserRepository,
+      IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<VisitTask> _visitTaskRepository,
-      IRepository<TrialSiteUser> _trialSiteUserRepository,
+      IRepository<TrialSiteUserRole> _trialSiteUserRoleRepository,
       IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IEmailSendService
     {
-
+        private readonly SystemEmailSendConfig _systemEmailConfig = _SystemEmailSendConfig.CurrentValue;
 
         public static string EmailNamePlaceholder => StaticData.EmailSend.EmailNamePlaceholder;
 
@@ -130,6 +131,9 @@ namespace IRaCIS.Core.Application.Service
 
                 var (topicStr, htmlBodyStr, isEn_us, onlyToUserId) = topicAndHtmlFunc(trialEmailConfig);
 
+                //处理替换公司名
+                htmlBodyStr = CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlBodyStr);
+
 
                 sendEmailConfig.TopicDescription = topicStr;
                 sendEmailConfig.HtmlBodyStr = htmlBodyStr;
@@ -144,7 +148,7 @@ namespace IRaCIS.Core.Application.Service
 
                 var allUserTypeEnumList = toUserTypeEnumList.Union(copyUserTypeEnumList).Distinct().ToList();
 
-                var allUserList = await _trialUserRepository.Where(t => t.TrialId == trialId && allUserTypeEnumList.Contains(t.User.UserTypeEnum)).Select(t => new { t.UserId, t.User.EMail, t.User.FullName, t.User.UserTypeEnum }).ToListAsync();
+                var allUserList = await _trialUserRoleRepository.Where(t => t.TrialId == trialId && allUserTypeEnumList.Contains(t.UserRole.UserTypeEnum)).Select(t => new { t.UserId, t.UserRole.IdentityUser.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum }).ToListAsync();
 
 
                 var toUserList = allUserList.Where(t => toUserTypeEnumList.Contains(t.UserTypeEnum))
@@ -157,7 +161,7 @@ namespace IRaCIS.Core.Application.Service
                 }
                 if (trialSiteId != null && toUserTypeEnumList.Any(t => t == UserTypeEnum.ClinicalResearchCoordinator || t == UserTypeEnum.CRA))
                 {
-                    var curentSiteUserIdList = _trialSiteUserRepository.Where(t => t.TrialId == trialId && t.TrialSiteId == trialSiteId).Select(t => t.UserId).ToList();
+                    var curentSiteUserIdList = _trialSiteUserRoleRepository.Where(t => t.TrialId == trialId && t.TrialSiteId == trialSiteId).Select(t => t.UserId).ToList();
 
                     toUserList = toUserList.Where(t => (t.UserTypeEnum != UserTypeEnum.CRA && t.UserTypeEnum != UserTypeEnum.ClinicalResearchCoordinator) || curentSiteUserIdList.Contains(t.UserId)).ToList();
                 }
@@ -171,7 +175,7 @@ namespace IRaCIS.Core.Application.Service
 
                 if (trialSiteId != null && copyUserTypeEnumList.Any(t => t == UserTypeEnum.ClinicalResearchCoordinator || t == UserTypeEnum.CRA))
                 {
-                    var curentSiteUserIdList = _trialSiteUserRepository.Where(t => t.TrialId == trialId && t.TrialSiteId == trialSiteId).Select(t => t.UserId).ToList();
+                    var curentSiteUserIdList = _trialSiteUserRoleRepository.Where(t => t.TrialId == trialId && t.TrialSiteId == trialSiteId).Select(t => t.UserId).ToList();
 
                     copyUserList = copyUserList.Where(t => (t.UserTypeEnum != UserTypeEnum.CRA && t.UserTypeEnum != UserTypeEnum.ClinicalResearchCoordinator) || curentSiteUserIdList.Contains(t.UserId)).ToList();
                 }

IRaCIS.Core.Application/Service/Document/Interface/ITrialDocumentService.cs

@@ -20,7 +20,7 @@ namespace IRaCIS.Core.Application.Contracts
         Task<List<TrialUserDto>> GetTrialUserSelect(Guid trialId);
 
 
-        Task<PageOutput<DocumentUnionWithUserStatView>> GetTrialSystemDocumentList(DocumentTrialUnionQuery querySystemDocument);
-        List<TrialUserUnionDocumentView> GetTrialUserDocumentList(Guid trialId);
+        //Task<PageOutput<DocumentUnionWithUserStatView>> GetTrialSystemDocumentList(DocumentTrialUnionQuery querySystemDocument);
+        //List<TrialUserUnionDocumentView> GetTrialUserDocumentList(Guid trialId);
     }
 }

IRaCIS.Core.Application/Service/Document/Interface/ITrialEmailNoticeConfigService.cs

@@ -16,7 +16,7 @@ namespace IRaCIS.Core.Application.Interfaces
     {
 
 
-        Task<List<TrialEmailNoticeConfigView>> GetTrialEmailNoticeConfigList(TrialEmailNoticeConfigQuery inQuery);
+        Task<IResponseOutput<List<TrialEmailNoticeConfigView>>> GetTrialEmailNoticeConfigList(TrialEmailNoticeConfigQuery inQuery);
 
         Task<IResponseOutput> AddOrUpdateTrialEmailNoticeConfig(TrialEmailNoticeConfigAddOrEdit addOrEditTrialEmailNoticeConfig);
 

IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs

@@ -6,7 +6,7 @@
 
 using IRaCIS.Core.Application.Contracts;
 using Microsoft.AspNetCore.Mvc;
-using User = IRaCIS.Core.Domain.Models.User;
+using UserRole = IRaCIS.Core.Domain.Models.UserRole;
 
 namespace IRaCIS.Core.Application.Services
 {
@@ -15,8 +15,9 @@ namespace IRaCIS.Core.Application.Services
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Trial")]
     public class SystemDocumentService(IRepository<SystemDocument> _systemDocumentRepository,
-        IRepository<User> _userRepository,
-        IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISystemDocumentService
+        IRepository<UserRole> _userRoleRepository,
+          IRepository<IdentityUser> _identityUserRepository,
+        IRepository<SystemDocConfirmedIdentityUser> _systemDocConfirmedUserRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISystemDocumentService
     {
 
 
@@ -35,7 +36,7 @@ namespace IRaCIS.Core.Application.Services
                .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
                .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId)
                 .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted)
-               .ProjectTo<SystemDocumentView>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us, userId = _userInfo.Id });
+               .ProjectTo<SystemDocumentView>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us, userId = _userInfo.UserRoleId });
 
             return await systemDocumentQueryable.ToPagedListAsync(inQuery);
         }
@@ -109,7 +110,7 @@ namespace IRaCIS.Core.Application.Services
 
             await _systemDocumentRepository.UpdatePartialFromQueryAsync(systemDocumentId, u => new SystemDocument() { IsDeleted = true });
 
-            await _systemDocConfirmedUserRepository.UpdatePartialFromQueryAsync(x => x.SystemDocumentId == systemDocumentId, x => new SystemDocConfirmedUser()
+            await _systemDocConfirmedUserRepository.UpdatePartialFromQueryAsync(x => x.SystemDocumentId == systemDocumentId, x => new SystemDocConfirmedIdentityUser()
             {
                 IsDeleted = true
             });
@@ -146,15 +147,16 @@ namespace IRaCIS.Core.Application.Services
 
             var isInternal = _userInfo.IsZhiZhun;
 
-            var query = from sysDoc in _systemDocumentRepository.Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+            var query = from sysDoc in _systemDocumentRepository.AsQueryable(true)
+                        .Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                     .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
-                    //外部人员 只签署 文档类型枚举值有值的
+                    //外部人员 只签署 外部需要签署的
                     .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
                     .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId)
-                        join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = _userInfo.Id, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
+                        join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = _userInfo.IdentityUserId, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
                         from confirm in cc.DefaultIfEmpty()
 
-                        join user in _userRepository.Where() on _userInfo.Id equals user.Id
+                        join user in _identityUserRepository.Where() on _userInfo.IdentityUserId equals user.Id
 
                         select new UnionDocumentWithConfirmInfoView()
                         {
@@ -173,15 +175,24 @@ namespace IRaCIS.Core.Application.Services
 
                             ConfirmUserId = confirm.ConfirmUserId,
                             ConfirmTime = confirm.ConfirmTime,
-                            RealName = user.LastName + " / " + user.FirstName,
+                            RealName = user.FullName,
                             UserName = user.UserName,
-                            UserTypeId = user.UserTypeId,
-                            UserTypeShortName = user.UserTypeRole.UserTypeShortName
+
+                            DocTypeCode=sysDoc.FileType.Code
+
+                            //UserTypeId = user.UserTypeId,
+                            //UserTypeShortName = user.UserTypeRole.UserTypeShortName
                         };
 
-            return await query.WhereIf(inQuery.IsSigned == true, t => t.ConfirmTime != null)
+            var list = await query 
+                               //过滤掉删除的，并且没有签名的
+                              .Where(t => !(t.IsDeleted == true && t.ConfirmTime == null))
+                              .WhereIf(inQuery.IsSigned == true, t => t.ConfirmTime != null)
                               .WhereIf(inQuery.IsSigned == false, t => t.ConfirmTime == null)
-                              .ToPagedListAsync(inQuery);
+                              .ToPagedListAsync(inQuery,nameof(UnionDocumentWithConfirmInfoView.DocTypeCode));
+
+
+            return list;
 
 
 

IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs

@@ -6,8 +6,13 @@
 
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
+using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using NPOI.SS.Formula.Functions;
+using System.Linq;
+using System.Linq.Dynamic.Core;
 
 namespace IRaCIS.Core.Application.Services
 {
@@ -16,15 +21,15 @@ namespace IRaCIS.Core.Application.Services
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Trial")]
     public class TrialDocumentService(IRepository<TrialDocument> _trialDocumentRepository,
-        IRepository<TrialDocConfirmedUser> _trialDocUserTypeConfirmedUserRepository,
         IRepository<Trial> _trialRepository,
         ISystemDocumentService _systemDocumentService,
-        IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository,
+        IRepository<SystemDocConfirmedIdentityUser> _systemDocConfirmedUserRepository,
         IRepository<SystemDocNeedConfirmedUserType> _systemDocNeedConfirmedUserTypeRepository,
          IRepository<TrialDocNeedConfirmedUserType> _trialDocNeedConfirmedUserTypeRepository,
         IRepository<SystemDocument> _systemDocumentRepository,
-        IRepository<TrialUser> _trialUserRepository,
-        IRepository<TrialDocConfirmedUser> _trialDocConfirmedUserRepository,
+        IRepository<TrialIdentityUser> _trialIdentityUserRepository,
+         IRepository<TrialUserRole> _trialUserRoleRepository,
+        IRepository<TrialDocConfirmedIdentityUser> _trialDocConfirmedUserRepository,
         IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialDocumentService
     {
 
@@ -57,9 +62,9 @@ namespace IRaCIS.Core.Application.Services
                                     .WhereIf(inQuery.TrialId != null, t => t.TrialId == inQuery.TrialId)
                                     .Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
 
-                                    join trialUser in _trialUserRepository.Where(t => t.UserId == _userInfo.Id) on trialDoc.TrialId equals trialUser.TrialId
+                                    join trialUser in _trialIdentityUserRepository.Where(t => t.IdentityUserId == _userInfo.IdentityUserId) on trialDoc.TrialId equals trialUser.TrialId
                                     join confirm in _trialDocConfirmedUserRepository.Where() on
-                                    new { trialUser.UserId, TrialDocumentId = trialDoc.Id } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
+                                    new { trialUser.IdentityUserId, TrialDocumentId = trialDoc.Id } equals new { IdentityUserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
 
                                     from confirm in cc.DefaultIfEmpty()
                                     select new TrialSignDocView()
@@ -82,11 +87,12 @@ namespace IRaCIS.Core.Application.Services
                                         //IsConfirmed = confirm.ConfirmTime != null,
                                         ConfirmUserId = confirm.ConfirmUserId,
                                         ConfirmTime = confirm.ConfirmTime,
-                                        RealName = trialUser.User.FullName,
-                                        UserName = trialUser.User.UserName,
-                                        UserTypeId = trialUser.User.UserTypeId,
-                                        UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName
+                                        RealName = trialUser.IdentityUser.FullName,
+                                        UserName = trialUser.IdentityUser.UserName,
 
+                                        IdentityUserTypeList = trialUser.TrialUserRoleList.Select(t => t.UserRole.UserTypeRole.UserTypeShortName).ToList(),
+
+                                        DocNeedSignUserTypeList = trialDoc.NeedConfirmedUserTypeList.Select(t => t.UserTypeRole.UserTypeShortName).ToList(),
                                     };
 
             trialDocQueryable = trialDocQueryable.WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
@@ -218,75 +224,183 @@ namespace IRaCIS.Core.Application.Services
 
             var trialInfo = await (_trialRepository.Where(t => t.Id == inQuery.TrialId, ignoreQueryFilters: true).Select(t => new { t.TrialFinishedTime, t.TrialStatusStr }).FirstNotNullAsync());
 
-            //系统文档查询
-            var systemDocumentQueryable = from needConfirmedUserType in _systemDocNeedConfirmedUserTypeRepository.Where(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId, ignoreQueryFilters: true)
-                                               .WhereIf(trialInfo.TrialFinishedTime != null, u => u.SystemDocument.CreateTime < trialInfo.TrialFinishedTime)
-                                               .WhereIf(!_userInfo.IsAdmin, t => t.SystemDocument.IsDeleted == false || (t.SystemDocument.IsDeleted == true && t.SystemDocument.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id)))
+            var isInternal = _userInfo.IsZhiZhun;
 
-                                          join trialUser in _trialUserRepository.Where(t => t.TrialId == inQuery.TrialId && t.UserId == _userInfo.Id)
-                                                                          on needConfirmedUserType.NeedConfirmUserTypeId equals trialUser.User.UserTypeId
-                                          join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = trialUser.UserId, SystemDocumentId = needConfirmedUserType.SystemDocumentId } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
-                                          from confirm in cc.DefaultIfEmpty()
-                                          select new UnionDocumentWithConfirmInfoView()
-                                          {
-                                              IsSystemDoc = true,
+            #region 统一用户修改 
 
-                                              Id = needConfirmedUserType.SystemDocument.Id,
-                                              CreateTime = needConfirmedUserType.SystemDocument.CreateTime,
-                                              IsDeleted = needConfirmedUserType.SystemDocument.IsDeleted,
-                                              SignViewMinimumMinutes = needConfirmedUserType.SystemDocument.SignViewMinimumMinutes,
-                                              Name = needConfirmedUserType.SystemDocument.Name,
-                                              Path = needConfirmedUserType.SystemDocument.Path,
-                                              FileTypeId = needConfirmedUserType.SystemDocument.FileTypeId,
-                                              FileType = _userInfo.IsEn_Us ? needConfirmedUserType.SystemDocument.FileType.Value : needConfirmedUserType.SystemDocument.FileType.ValueCN,
-                                              UpdateTime = needConfirmedUserType.SystemDocument.UpdateTime,
+            var systemDocQuery =
+                 from sysDoc in _systemDocumentRepository.AsQueryable(true).Where(t => t.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+                    //外部人员 只签署 外部需要签署的
+                    .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
+                 from trialUser in _trialIdentityUserRepository.AsQueryable(false)
+                  .Where(t => t.TrialId == inQuery.TrialId && t.IdentityUserId == _userInfo.IdentityUserId
+                  && t.TrialUserRoleList.Any(t => sysDoc.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == t.UserRole.UserTypeId)))
 
-                                              FullFilePath = needConfirmedUserType.SystemDocument.Path,
+                 join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = trialUser.IdentityUserId, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
+                 from confirm in cc.DefaultIfEmpty()
+                 select new UnionDocumentWithConfirmInfoView()
+                 {
+                     IsSystemDoc = true,
+
+                     Id = sysDoc.Id,
+                     CreateTime = sysDoc.CreateTime,
+                     IsDeleted = sysDoc.IsDeleted,
+                     SignViewMinimumMinutes = sysDoc.SignViewMinimumMinutes,
+                     Name = sysDoc.Name,
+                     Path = sysDoc.Path,
+                     FileType = _userInfo.IsEn_Us ? sysDoc.FileType.Value : sysDoc.FileType.ValueCN,
+                     FileTypeId = sysDoc.FileTypeId,
+                     UpdateTime = sysDoc.UpdateTime,
+                     //IsConfirmed = confirm.ConfirmTime != null,
+
+                     ConfirmUserId = confirm.ConfirmUserId,
+                     ConfirmTime = confirm.ConfirmTime,
+
+                     RealName = trialUser.IdentityUser.FullName,
+                     UserName = trialUser.IdentityUser.UserName,
+
+                     //UserTypeId = trialUser.UserRole.UserTypeId,
+                     //UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName,
+                     //DocNeedSignUserTypeList = sysDoc.NeedConfirmedUserTypeList.Select(t => t.UserTypeRole.UserTypeName),
+
+                     FullFilePath = sysDoc.Path
+                 };
 
-                                              //IsConfirmed = confirm.ConfirmTime != null,
-                                              ConfirmUserId = confirm.ConfirmUserId,
-                                              ConfirmTime = confirm.ConfirmTime,
-                                              RealName = trialUser.User.FullName,
-                                              UserName = trialUser.User.UserName,
-                                              UserTypeId = trialUser.User.UserTypeId,
-                                              UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName
-                                          };
 
             //项目文档查询
-            var trialDocQueryable = from trialDoc in _trialDocumentRepository.AsQueryable(true).Where(t => t.TrialId == inQuery.TrialId)
-               .WhereIf(!_userInfo.IsAdmin, t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
-               .WhereIf(!_userInfo.IsAdmin, t => t.IsDeleted == false || (t.IsDeleted == true && t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id)))
+            var trialDocQuery =
+                  from trialDoc in _trialDocumentRepository.AsQueryable(true).Where(t => t.TrialId == inQuery.TrialId).Where(t => t.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+                  from trialUser in _trialIdentityUserRepository.AsQueryable(false).Where(t => t.TrialId == inQuery.TrialId && t.IdentityUserId == _userInfo.IdentityUserId
+                                && t.TrialUserRoleList.Any(t => trialDoc.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == t.UserRole.UserTypeId)))
 
-                                    join trialUser in _trialUserRepository.Where(t => t.TrialId == inQuery.TrialId && t.UserId == _userInfo.Id) on trialDoc.TrialId equals trialUser.TrialId
-                                    join confirm in _trialDocConfirmedUserRepository.Where(t => t.TrialDocument.TrialId == inQuery.TrialId) on
-                                    new { trialUser.UserId, TrialDocumentId = trialDoc.Id } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
-                                    from confirm in cc.DefaultIfEmpty()
-                                    select new UnionDocumentWithConfirmInfoView()
-                                    {
-                                        Id = trialDoc.Id,
-                                        IsSystemDoc = false,
-                                        CreateTime = trialDoc.CreateTime,
-                                        FullFilePath = trialDoc.Path,
-                                        IsDeleted = trialDoc.IsDeleted,
-                                        Name = trialDoc.Name,
-                                        Path = trialDoc.Path,
-                                        FileTypeId = trialDoc.FileTypeId,
-                                        FileType = _userInfo.IsEn_Us ? trialDoc.FileType.Value : trialDoc.FileType.ValueCN,
-                                        UpdateTime = trialDoc.UpdateTime,
-                                        SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
+                  join confirm in _trialDocConfirmedUserRepository.Where(t => t.TrialDocument.TrialId == inQuery.TrialId) on
+                   new { trialUser.IdentityUserId, TrialDocumentId = trialDoc.Id } equals new { IdentityUserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
+                  from confirm in cc.DefaultIfEmpty()
+                  select new UnionDocumentWithConfirmInfoView()
+                  {
+                      IsSystemDoc = false,
 
-                                        //IsConfirmed = confirm.ConfirmTime != null,
-                                        ConfirmUserId = confirm.ConfirmUserId,
-                                        ConfirmTime = confirm.ConfirmTime,
-                                        RealName = trialUser.User.FullName,
-                                        UserName = trialUser.User.UserName,
-                                        UserTypeId = trialUser.User.UserTypeId,
-                                        UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName
+                      Id = trialDoc.Id,
+                      CreateTime = trialDoc.CreateTime,
+                      IsDeleted = trialDoc.IsDeleted,
+                      SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
+                      Name = trialDoc.Name,
+                      Path = trialDoc.Path,
+                      FileTypeId = trialDoc.FileTypeId,
+                      FileType = _userInfo.IsEn_Us ? trialDoc.FileType.Value : trialDoc.FileType.ValueCN,
+                      UpdateTime = trialDoc.UpdateTime,
+                      //IsConfirmed= confirm.ConfirmTime!=null,
 
-                                    };
+
+
+                      ConfirmUserId = confirm.ConfirmUserId,
+                      ConfirmTime = confirm.ConfirmTime,
+                      RealName = trialUser.IdentityUser.FullName,
+                      UserName = trialUser.IdentityUser.UserName,
+
+                      //DocNeedSignUserTypeList = trialDoc.NeedConfirmedUserTypeList.Select(t => t.UserTypeRole.UserTypeName),
+
+                      //UserTypeId = trialUser.UserRole.UserTypeId,
+                      //UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName,
+
+                      FullFilePath = trialDoc.Path
+                  };
+
+
+
+            #endregion
+
+
+
+            #region 废弃
+
+            ////系统文档查询
+            //var systemDocQuery = from needConfirmedUserType in _systemDocNeedConfirmedUserTypeRepository.Where(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId, ignoreQueryFilters: true)
+            //                                   .WhereIf(trialInfo.TrialFinishedTime != null, u => u.SystemDocument.CreateTime < trialInfo.TrialFinishedTime)
+            //                                   .WhereIf(!_userInfo.IsAdmin, t => t.SystemDocument.IsDeleted == false || (t.SystemDocument.IsDeleted == true && t.SystemDocument.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId)))
+
+            //                              join trialUser in _trialUserRoleRepository.Where(t => t.TrialId == inQuery.TrialId && t.UserRole.IdentityUserId == _userInfo.IdentityUserId)
+            //                                                              on needConfirmedUserType.NeedConfirmUserTypeId equals trialUser.UserRole.UserTypeId
+            //                              join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = trialUser.UserId, SystemDocumentId = needConfirmedUserType.SystemDocumentId } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
+            //                              from confirm in cc.DefaultIfEmpty()
+            //                              select new UnionDocumentWithConfirmInfoView()
+            //                              {
+            //                                  IsSystemDoc = true,
+
+            //                                  Id = needConfirmedUserType.SystemDocument.Id,
+            //                                  CreateTime = needConfirmedUserType.SystemDocument.CreateTime,
+            //                                  IsDeleted = needConfirmedUserType.SystemDocument.IsDeleted,
+            //                                  SignViewMinimumMinutes = needConfirmedUserType.SystemDocument.SignViewMinimumMinutes,
+            //                                  Name = needConfirmedUserType.SystemDocument.Name,
+            //                                  Path = needConfirmedUserType.SystemDocument.Path,
+            //                                  FileTypeId = needConfirmedUserType.SystemDocument.FileTypeId,
+            //                                  FileType = _userInfo.IsEn_Us ? needConfirmedUserType.SystemDocument.FileType.Value : needConfirmedUserType.SystemDocument.FileType.ValueCN,
+            //                                  UpdateTime = needConfirmedUserType.SystemDocument.UpdateTime,
+
+            //                                  FullFilePath = needConfirmedUserType.SystemDocument.Path,
+
+            //                                  //IsConfirmed = confirm.ConfirmTime != null,
+            //                                  ConfirmUserId = confirm.ConfirmUserId,
+            //                                  ConfirmTime = confirm.ConfirmTime,
+            //                                  RealName = trialUser.UserRole.FullName,
+            //                                  UserName = trialUser.UserRole.IdentityUser.UserName,
+
+
+
+            //                                  //IdentityUserTypeList = trialUser.TrialUser.TrialUserRoleList.Select(t => t.UserRole.UserTypeRole.UserTypeShortName),
+
+            //                                  //DocNeedSignUserTypeList = needConfirmedUserType.SystemDocument.NeedConfirmedUserTypeList.Select(t => t.UserTypeRole.UserTypeShortName).ToList(),
+
+            //                                  //UserTypeId = trialUser.UserRole.UserTypeId,
+            //                                  //UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName
+            //                              };
+
+            ////项目文档查询
+            //var trialDocQuery = from trialDoc in _trialDocumentRepository.AsQueryable(true).Where(t => t.TrialId == inQuery.TrialId)
+            //   .WhereIf(!_userInfo.IsAdmin, t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+            //   .WhereIf(!_userInfo.IsAdmin, t => t.IsDeleted == false || (t.IsDeleted == true && t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId)))
+
+            //                        join trialUser in _trialUserRoleRepository.Where(t => t.TrialId == inQuery.TrialId && t.UserRole.IdentityUserId == _userInfo.IdentityUserId) on trialDoc.TrialId equals trialUser.TrialId
+            //                        join confirm in _trialDocConfirmedUserRepository.Where(t => t.TrialDocument.TrialId == inQuery.TrialId) on
+            //                        new { trialUser.UserId, TrialDocumentId = trialDoc.Id } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
+            //                        from confirm in cc.DefaultIfEmpty()
+            //                        select new UnionDocumentWithConfirmInfoView()
+            //                        {
+            //                            Id = trialDoc.Id,
+            //                            IsSystemDoc = false,
+            //                            CreateTime = trialDoc.CreateTime,
+            //                            FullFilePath = trialDoc.Path,
+            //                            IsDeleted = trialDoc.IsDeleted,
+            //                            Name = trialDoc.Name,
+            //                            Path = trialDoc.Path,
+            //                            FileTypeId = trialDoc.FileTypeId,
+            //                            FileType = _userInfo.IsEn_Us ? trialDoc.FileType.Value : trialDoc.FileType.ValueCN,
+            //                            UpdateTime = trialDoc.UpdateTime,
+            //                            SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
+
+            //                            //IsConfirmed = confirm.ConfirmTime != null,
+            //                            ConfirmUserId = confirm.ConfirmUserId,
+            //                            ConfirmTime = confirm.ConfirmTime,
+            //                            RealName = trialUser.UserRole.FullName,
+            //                            UserName = trialUser.UserRole.IdentityUser.UserName,
+
+            //                            //UserTypeId = trialUser.UserRole.UserTypeId,
+            //                            //UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName
+
+
+            //                            //IdentityUserTypeList = trialUser.TrialUser.TrialUserRoleList.Select(t => t.UserRole.UserTypeRole.UserTypeShortName).ToList(),
+
+            //                            //DocNeedSignUserTypeList = trialDoc.NeedConfirmedUserTypeList.Select(t => t.UserTypeRole.UserTypeShortName).ToList(),
+            //                        };
+
+            #endregion
 
             #region 报错  奇怪的bug
-            var unionQuery = systemDocumentQueryable.Union(trialDocQueryable)
+
+
+            var unionQuery = systemDocQuery.Concat(trialDocQuery)
+                //过滤掉删除的，并且没有签名的
+                .Where(t=>!(t.IsDeleted == true && t.ConfirmTime==null))
                 .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
                 .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId)
                 .WhereIf(inQuery.IsSign == true, t => t.ConfirmTime != null)
@@ -318,16 +432,15 @@ namespace IRaCIS.Core.Application.Services
             #endregion
 
 
-
-
             var needSignTrialDocCount = await _trialDocumentRepository.AsQueryable(true).Where(t => t.TrialId == inQuery.TrialId && t.Trial.TrialStatusStr != StaticData.TrialState.TrialStopped)
-                       .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
-                       .Where(t => t.IsDeleted == false && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+                       .Where(t => t.Trial.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.TrialUserRoleList.Any(t => t.UserRole.UserTypeId == _userInfo.UserTypeId)))
+                       .Where(t => t.IsDeleted == false && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                        .CountAsync();
 
 
-            var needSignSystemDocCount = await _systemDocumentRepository
-                      .Where(t => t.IsDeleted == false && !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+            var needSignSystemDocCount = await _systemDocumentRepository.AsQueryable(true)
+                                    .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
+                      .Where(t => t.IsDeleted == false && !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                       .CountAsync();
 
             var trialTaskConfig = _trialRepository.Where(t => t.Id == inQuery.TrialId).ProjectTo<TrialProcessConfigDTO>(_mapper.ConfigurationProvider).FirstOrDefault();
@@ -338,7 +451,7 @@ namespace IRaCIS.Core.Application.Services
             var isAdditionalAssessment = _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsSigned && t.IsAdditionalAssessment == true
             && t.TrialCriterionAdditionalAssessmentTypeList.Any(c =>/*c.AdditionalAssessmentType==Domain.Share.Reading.AdditionalAssessmentType.BrainMetastasis &&*/ c.IsSelected == true)).Any();
 
-            return ResponseOutput.Ok<PageOutput<UnionDocumentWithConfirmInfoView>>(result, new { NeedSignCount = needSignTrialDocCount + needSignSystemDocCount, NeedSignTrialDocCount = needSignTrialDocCount, NeedSignSystemDocCount = needSignSystemDocCount, IsAdditionalAssessment = isAdditionalAssessment && isManualGenerateTask, TrialStatusStr = trialInfo.TrialStatusStr, TrialConfig = trialTaskConfig });
+            return ResponseOutput.Ok(result, new { NeedSignCount = needSignTrialDocCount + needSignSystemDocCount, NeedSignTrialDocCount = needSignTrialDocCount, NeedSignSystemDocCount = needSignSystemDocCount, IsAdditionalAssessment = isAdditionalAssessment && isManualGenerateTask, TrialStatusStr = trialInfo.TrialStatusStr, TrialConfig = trialTaskConfig });
         }
 
 
@@ -353,10 +466,151 @@ namespace IRaCIS.Core.Application.Services
         public async Task<IResponseOutput<PageOutput<UnionDocumentWithConfirmInfoView>>> GetDocumentConfirmList(DocumentTrialUnionQuery inQuery)
         {
 
+            #region 测试
+
+            var trialInfo = (await _trialRepository.Where(t => t.Id == inQuery.TrialId, ignoreQueryFilters: true).Select(t => new { t.TrialFinishedTime, t.TrialStatusStr }).FirstNotNullAsync());
+
+            var trialDocQuery =
+                  from trialDoc in _trialDocumentRepository.AsQueryable(false).Where(t => t.TrialId == inQuery.TrialId)
+                                  .Where(t => inQuery.UserTypeId != null ? t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId) : true)
+                  from trialUser in _trialIdentityUserRepository.AsQueryable(false).Where(t => t.TrialId == inQuery.TrialId
+                                && t.TrialUserRoleList.AsQueryable().Any(t => trialDoc.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == t.UserRole.UserTypeId))
+                                )
+                                 .Where(t => inQuery.UserId != null ? t.IdentityUserId == inQuery.UserId : true)
+
+                  join confirm in _trialDocConfirmedUserRepository.Where(t => t.TrialDocument.TrialId == inQuery.TrialId) on
+                   new { trialUser.IdentityUserId, TrialDocumentId = trialDoc.Id } equals new { IdentityUserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
+                  from confirm in cc.DefaultIfEmpty()
+                  select new UnionDocumentWithConfirmInfoView()
+                  {
+                      IsSystemDoc = false,
+
+                      Id = trialDoc.Id,
+                      CreateTime = trialDoc.CreateTime,
+                      IsDeleted = trialDoc.IsDeleted,
+                      SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
+                      Name = trialDoc.Name,
+                      Path = trialDoc.Path,
+                      FileTypeId = trialDoc.FileTypeId,
+                      FileType = _userInfo.IsEn_Us ? trialDoc.FileType.Value : trialDoc.FileType.ValueCN,
+                      UpdateTime = trialDoc.UpdateTime,
+                      //IsConfirmed= confirm.ConfirmTime!=null,
+
+
+
+                      ConfirmUserId = trialUser.IdentityUserId,
+                      ConfirmTime = confirm.ConfirmTime,
+                      RealName = trialUser.IdentityUser.FullName,
+                      UserName = trialUser.IdentityUser.UserName,
+
+                      //UserTypeId = trialUser.UserRole.UserTypeId,
+                      //UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName,
+                      //DocNeedSignUserTypeList = trialDoc.NeedConfirmedUserTypeList.Select(t => t.UserTypeRole.UserTypeName),
+
+                      FullFilePath = trialDoc.Path
+                  };
+
+
+
+            var systemDocQuery =
+                 from sysDoc in _systemDocumentRepository.AsQueryable(false).Where(u => trialInfo.TrialFinishedTime != null ? u.CreateTime < trialInfo.TrialFinishedTime : true)
+                 from trialUser in _trialIdentityUserRepository.AsQueryable(false).Where(t => t.TrialId == inQuery.TrialId
+                       && t.TrialUserRoleList.Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserRole.UserTypeId)))
+                    .Where(t => inQuery.UserId != null ? t.IdentityUserId == inQuery.UserId : true)
+
+                 join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = trialUser.IdentityUserId, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
+                 from confirm in cc.DefaultIfEmpty()
+                 select new UnionDocumentWithConfirmInfoView()
+                 {
+                     IsSystemDoc = true,
+
+                     Id = sysDoc.Id,
+                     CreateTime = sysDoc.CreateTime,
+                     IsDeleted = sysDoc.IsDeleted,
+                     SignViewMinimumMinutes = sysDoc.SignViewMinimumMinutes,
+                     Name = sysDoc.Name,
+                     Path = sysDoc.Path,
+                     FileType = _userInfo.IsEn_Us ? sysDoc.FileType.Value : sysDoc.FileType.ValueCN,
+                     FileTypeId = sysDoc.FileTypeId,
+                     UpdateTime = sysDoc.UpdateTime,
+                     //IsConfirmed = confirm.ConfirmTime != null,
+
+                     ConfirmUserId = trialUser.IdentityUserId,
+                     ConfirmTime = confirm.ConfirmTime,
+
+                     RealName = trialUser.IdentityUser.FullName,
+                     UserName = trialUser.IdentityUser.UserName,
+
+                     //UserTypeId = trialUser.UserRole.UserTypeId,
+                     //UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName,
+
+                     FullFilePath = sysDoc.Path
+                 };
+
+            //var tt = await trialDocQuery.ToPagedListAsync(inQuery);
+
+            var unionQuery = trialDocQuery.Union(systemDocQuery).IgnoreQueryFilters().Where(t => !(t.IsDeleted == true && t.ConfirmTime == null))
+                .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
+                .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId)
+                .WhereIf(inQuery.IsConfirmed == true, t => t.ConfirmTime != null)
+                .WhereIf(inQuery.IsConfirmed == false, t => t.ConfirmTime == null)
+                .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted);
+
+            var result = await unionQuery.ToPagedListAsync(inQuery);
+
+            #region 处理文档 需要签署的角色类型  和每个人的角色信息
+
+            var trialDocIdList = result.CurrentPageData.Where(t => t.IsSystemDoc == false).Select(t => t.Id).ToList();
+
+            var sysDocIdList = result.CurrentPageData.Where(t => t.IsSystemDoc == true).Select(t => t.Id).ToList();
+
+            var trialIdentityUserIdList = result.CurrentPageData.Select(t => t.ConfirmUserId).Distinct().ToList();
+
+            var trialDocUserTypeList = _trialDocNeedConfirmedUserTypeRepository.Where(t => trialDocIdList.Contains(t.TrialDocumentId)).Select(t => new { t.TrialDocumentId, t.UserTypeRole.UserTypeShortName }).ToList();
+
+            var sysDocUserTypeList = _systemDocNeedConfirmedUserTypeRepository.Where(t => sysDocIdList.Contains(t.SystemDocumentId)).Select(t => new { t.SystemDocumentId, t.UserTypeRole.UserTypeShortName }).ToList();
+
+            var trialUserUserTypeList = _trialIdentityUserRepository.Where(t => t.TrialId==inQuery.TrialId &&   trialIdentityUserIdList.Contains(t.IdentityUserId)).IgnoreQueryFilters().Select(t => new { t.IdentityUserId, UserTypeList = t.TrialUserRoleList.Select(c => c.UserRole.UserTypeRole.UserTypeShortName).ToList() });
+
+
+            foreach (var item in result.CurrentPageData)
+            {
+                if (item.IsSystemDoc)
+                {
+                    item.DocNeedSignUserTypeList = sysDocUserTypeList.Where(t => t.SystemDocumentId == item.Id).Select(t => t.UserTypeShortName).ToList();
+                }
+                else
+                {
+                    item.DocNeedSignUserTypeList = trialDocUserTypeList.Where(t => t.TrialDocumentId == item.Id).Select(t => t.UserTypeShortName).ToList();
+                }
+
+                item.IdentityUserTypeList = trialUserUserTypeList.Where(t => t.IdentityUserId == item.ConfirmUserId).SelectMany(c => c.UserTypeList).ToList();
+            }
+
+
+            #endregion
+
+            var needSignTrialDocCount = await _trialDocumentRepository.AsQueryable(true)
+                    .Where(t => t.Trial.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.TrialUserRoleList.Any(t => t.UserRole.UserTypeId == _userInfo.UserTypeId)))
+                    .Where(t => t.IsDeleted == false && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+                    .CountAsync();
+
+
+            var needSignSystemDocCount = await _systemDocumentRepository
+                      .Where(t => t.IsDeleted == false && !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+                      .CountAsync();
+
+
+            return ResponseOutput.Ok(result, new { NeedSignCount = needSignTrialDocCount + needSignSystemDocCount, NeedSignTrialDocCount = needSignTrialDocCount, NeedSignSystemDocCount = needSignSystemDocCount, TrialStatusStr = trialInfo.TrialStatusStr });
+
+
+
+
+            #endregion
 
             #region linq join 方式
             //var trialDocQuery = from trialDocumentNeedConfirmedUserType in _trialDocumentNeedConfirmedUserTypeRepository.Where(t => t.TrialDocument.TrialId == querySystemDocument.TrialId)
-            //                    join trialUser in _trialUserRepository.Where(t => t.TrialId == querySystemDocument.TrialId)
+            //                    join trialUser in _trialUserRoleRepository.Where(t => t.TrialId == querySystemDocument.TrialId)
             //                                                  .WhereIf(querySystemDocument.UserId != null, t => t.UserId == querySystemDocument.UserId)
             //                    on trialDocumentNeedConfirmedUserType.NeedConfirmUserTypeId equals trialUser.User.UserTypeId
 
@@ -387,100 +641,106 @@ namespace IRaCIS.Core.Application.Services
 
             #endregion
 
-            var trialInfo = (await _trialRepository.Where(t => t.Id == inQuery.TrialId, ignoreQueryFilters: true).Select(t => new { t.TrialFinishedTime, t.TrialStatusStr }).FirstNotNullAsync());
+            #region 废弃
+            //var trialInfo = (await _trialRepository.Where(t => t.Id == inQuery.TrialId, ignoreQueryFilters: true).Select(t => new { t.TrialFinishedTime, t.TrialStatusStr }).FirstNotNullAsync());
 
-            var trialDocQuery = from trialDocumentNeedConfirmedUserType in _trialDocNeedConfirmedUserTypeRepository.Where(t => t.TrialDocument.TrialId == inQuery.TrialId)
-                                join trialUser in _trialUserRepository.Where(t => t.TrialId == inQuery.TrialId)
-                                                                              .WhereIf(inQuery.UserId != null, t => t.UserId == inQuery.UserId)
-                                                                              .WhereIf(inQuery.UserTypeId != null, t => t.User.UserTypeId == inQuery.UserTypeId)
-                                                on trialDocumentNeedConfirmedUserType.NeedConfirmUserTypeId equals trialUser.User.UserTypeId
+            //var trialDocQuery = from trialDocumentNeedConfirmedUserType in _trialDocNeedConfirmedUserTypeRepository.Where(t => t.TrialDocument.TrialId == inQuery.TrialId)
+            //                    join trialUser in _trialUserRoleRepository.Where(t => t.TrialId == inQuery.TrialId)
+            //                                                                  .WhereIf(inQuery.UserId != null, t => t.UserRole.IdentityUserId == inQuery.UserId)
+            //                                                                  .WhereIf(inQuery.UserTypeId != null, t => t.UserRole.UserTypeId == inQuery.UserTypeId)
+            //                                    on trialDocumentNeedConfirmedUserType.NeedConfirmUserTypeId equals trialUser.UserRole.UserTypeId
 
-                                join confirm in _trialDocConfirmedUserRepository.Where(t => t.TrialDocument.TrialId == inQuery.TrialId) on
-                                 new { trialUser.UserId, TrialDocumentId = trialDocumentNeedConfirmedUserType.TrialDocumentId } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
-                                from confirm in cc.DefaultIfEmpty()
-                                select new UnionDocumentWithConfirmInfoView()
-                                {
-                                    IsSystemDoc = false,
+            //                    join confirm in _trialDocConfirmedUserRepository.Where(t => t.TrialDocument.TrialId == inQuery.TrialId) on
+            //                     new { trialUser.UserRole.IdentityUserId, TrialDocumentId = trialDocumentNeedConfirmedUserType.TrialDocumentId } equals new { IdentityUserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
+            //                    from confirm in cc.DefaultIfEmpty()
+            //                    select new UnionDocumentWithConfirmInfoView()
+            //                    {
+            //                        IsSystemDoc = false,
 
-                                    Id = trialDocumentNeedConfirmedUserType.TrialDocument.Id,
-                                    CreateTime = trialDocumentNeedConfirmedUserType.TrialDocument.CreateTime,
-                                    IsDeleted = trialDocumentNeedConfirmedUserType.TrialDocument.IsDeleted,
-                                    SignViewMinimumMinutes = trialDocumentNeedConfirmedUserType.TrialDocument.SignViewMinimumMinutes,
-                                    Name = trialDocumentNeedConfirmedUserType.TrialDocument.Name,
-                                    Path = trialDocumentNeedConfirmedUserType.TrialDocument.Path,
-                                    FileTypeId = trialDocumentNeedConfirmedUserType.TrialDocument.FileTypeId,
-                                    FileType = _userInfo.IsEn_Us ? trialDocumentNeedConfirmedUserType.TrialDocument.FileType.Value : trialDocumentNeedConfirmedUserType.TrialDocument.FileType.ValueCN,
-                                    UpdateTime = trialDocumentNeedConfirmedUserType.TrialDocument.UpdateTime,
-                                    //IsConfirmed= confirm.ConfirmTime!=null,
+            //                        Id = trialDocumentNeedConfirmedUserType.TrialDocument.Id,
+            //                        CreateTime = trialDocumentNeedConfirmedUserType.TrialDocument.CreateTime,
+            //                        IsDeleted = trialDocumentNeedConfirmedUserType.TrialDocument.IsDeleted,
+            //                        SignViewMinimumMinutes = trialDocumentNeedConfirmedUserType.TrialDocument.SignViewMinimumMinutes,
+            //                        Name = trialDocumentNeedConfirmedUserType.TrialDocument.Name,
+            //                        Path = trialDocumentNeedConfirmedUserType.TrialDocument.Path,
+            //                        FileTypeId = trialDocumentNeedConfirmedUserType.TrialDocument.FileTypeId,
+            //                        FileType = _userInfo.IsEn_Us ? trialDocumentNeedConfirmedUserType.TrialDocument.FileType.Value : trialDocumentNeedConfirmedUserType.TrialDocument.FileType.ValueCN,
+            //                        UpdateTime = trialDocumentNeedConfirmedUserType.TrialDocument.UpdateTime,
+            //                        //IsConfirmed= confirm.ConfirmTime!=null,
 
 
 
-                                    ConfirmUserId = confirm.ConfirmUserId,
-                                    ConfirmTime = confirm.ConfirmTime,
-                                    RealName = trialUser.User.FullName,
-                                    UserName = trialUser.User.UserName,
-                                    UserTypeId = trialUser.User.UserTypeId,
-                                    UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName,
+            //                        ConfirmUserId = confirm.ConfirmUserId,
+            //                        ConfirmTime = confirm.ConfirmTime,
+            //                        RealName = trialUser.UserRole.FullName,
+            //                        UserName = trialUser.UserRole.IdentityUser.UserName,
 
-                                    FullFilePath = trialDocumentNeedConfirmedUserType.TrialDocument.Path
-                                };
+            //                        //UserTypeId = trialUser.UserRole.UserTypeId,
+            //                        //UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName,
+
+            //                        FullFilePath = trialDocumentNeedConfirmedUserType.TrialDocument.Path
+            //                    };
 
 
 
-            var systemDocQuery = from needConfirmEdUserType in _systemDocNeedConfirmedUserTypeRepository.WhereIf(trialInfo.TrialFinishedTime != null, u => u.SystemDocument.CreateTime < trialInfo.TrialFinishedTime)
+            //var systemDocQuery = from needConfirmEdUserType in _systemDocNeedConfirmedUserTypeRepository.WhereIf(trialInfo.TrialFinishedTime != null, u => u.SystemDocument.CreateTime < trialInfo.TrialFinishedTime)
 
-                                 join trialUser in _trialUserRepository.Where(t => t.TrialId == inQuery.TrialId)
-                                                                       .WhereIf(inQuery.UserId != null, t => t.UserId == inQuery.UserId)
-                                       on needConfirmEdUserType.NeedConfirmUserTypeId equals trialUser.User.UserTypeId
-                                 join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = trialUser.UserId, SystemDocumentId = needConfirmEdUserType.SystemDocumentId } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
-                                 from confirm in cc.DefaultIfEmpty()
-                                 select new UnionDocumentWithConfirmInfoView()
-                                 {
-                                     IsSystemDoc = true,
+            //                     join trialUser in _trialUserRoleRepository.Where(t => t.TrialId == inQuery.TrialId)
+            //                                                           .WhereIf(inQuery.UserId != null, t => t.UserRole.IdentityUserId == inQuery.UserId)
+            //                           on needConfirmEdUserType.NeedConfirmUserTypeId equals trialUser.UserRole.UserTypeId
+            //                     join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = trialUser.UserId, SystemDocumentId = needConfirmEdUserType.SystemDocumentId } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
+            //                     from confirm in cc.DefaultIfEmpty()
+            //                     select new UnionDocumentWithConfirmInfoView()
+            //                     {
+            //                         IsSystemDoc = true,
 
-                                     Id = needConfirmEdUserType.SystemDocument.Id,
-                                     CreateTime = needConfirmEdUserType.SystemDocument.CreateTime,
-                                     IsDeleted = needConfirmEdUserType.SystemDocument.IsDeleted,
-                                     SignViewMinimumMinutes = needConfirmEdUserType.SystemDocument.SignViewMinimumMinutes,
-                                     Name = needConfirmEdUserType.SystemDocument.Name,
-                                     Path = needConfirmEdUserType.SystemDocument.Path,
-                                     FileType = _userInfo.IsEn_Us ? needConfirmEdUserType.SystemDocument.FileType.Value : needConfirmEdUserType.SystemDocument.FileType.ValueCN,
-                                     FileTypeId = needConfirmEdUserType.SystemDocument.FileTypeId,
-                                     UpdateTime = needConfirmEdUserType.SystemDocument.UpdateTime,
-                                     //IsConfirmed = confirm.ConfirmTime != null,
+            //                         Id = needConfirmEdUserType.SystemDocument.Id,
+            //                         CreateTime = needConfirmEdUserType.SystemDocument.CreateTime,
+            //                         IsDeleted = needConfirmEdUserType.SystemDocument.IsDeleted,
+            //                         SignViewMinimumMinutes = needConfirmEdUserType.SystemDocument.SignViewMinimumMinutes,
+            //                         Name = needConfirmEdUserType.SystemDocument.Name,
+            //                         Path = needConfirmEdUserType.SystemDocument.Path,
+            //                         FileType = _userInfo.IsEn_Us ? needConfirmEdUserType.SystemDocument.FileType.Value : needConfirmEdUserType.SystemDocument.FileType.ValueCN,
+            //                         FileTypeId = needConfirmEdUserType.SystemDocument.FileTypeId,
+            //                         UpdateTime = needConfirmEdUserType.SystemDocument.UpdateTime,
+            //                         //IsConfirmed = confirm.ConfirmTime != null,
 
-                                     ConfirmUserId = confirm.ConfirmUserId,
-                                     ConfirmTime = confirm.ConfirmTime,
-                                     RealName = trialUser.User.FullName,
-                                     UserName = trialUser.User.UserName,
-                                     UserTypeId = trialUser.User.UserTypeId,
-                                     UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName,
+            //                         ConfirmUserId = confirm.ConfirmUserId,
+            //                         ConfirmTime = confirm.ConfirmTime,
+            //                         RealName = trialUser.UserRole.FullName,
+            //                         UserName = trialUser.UserRole.IdentityUser.UserName,
 
-                                     FullFilePath = needConfirmEdUserType.SystemDocument.Path
-                                 };
+            //                         //UserTypeId = trialUser.UserRole.UserTypeId,
+            //                         //UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName,
 
-            var unionQuery = trialDocQuery.Union(systemDocQuery).IgnoreQueryFilters().Where(t => !(t.IsDeleted == true && t.ConfirmUserId == null))
-                .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
-                .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId)
-                .WhereIf(inQuery.IsConfirmed == true, t => t.ConfirmTime != null)
-                .WhereIf(inQuery.IsConfirmed == false, t => t.ConfirmTime == null)
-                .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted)
-                .WhereIf(inQuery.UserTypeId != null, t => t.UserTypeId == inQuery.UserTypeId);
+            //                         FullFilePath = needConfirmEdUserType.SystemDocument.Path
+            //                     };
 
-            var result = await unionQuery.ToPagedListAsync(inQuery);
+            //var unionQuery = trialDocQuery.Union(systemDocQuery).IgnoreQueryFilters().Where(t => !(t.IsDeleted == true && t.ConfirmUserId == null))
+            //    .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
+            //    .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId)
+            //    .WhereIf(inQuery.IsConfirmed == true, t => t.ConfirmTime != null)
+            //    .WhereIf(inQuery.IsConfirmed == false, t => t.ConfirmTime == null)
+            //    .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted)
+            //    /*.Distinct()*/;
 
-            var needSignTrialDocCount = await _trialDocumentRepository.AsQueryable(true)
-                    .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
-                    .Where(t => t.IsDeleted == false && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
-                    .CountAsync();
+            //var result = await unionQuery.ToPagedListAsync(inQuery);
+
+            //var needSignTrialDocCount = await _trialDocumentRepository.AsQueryable(true)
+            //        .Where(t => t.Trial.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId))
+            //        .Where(t => t.IsDeleted == false && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+            //        .CountAsync();
 
 
-            var needSignSystemDocCount = await _systemDocumentRepository
-                      .Where(t => t.IsDeleted == false && !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
-                      .CountAsync();
+            //var needSignSystemDocCount = await _systemDocumentRepository
+            //          .Where(t => t.IsDeleted == false && !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+            //          .CountAsync();
 
 
-            return ResponseOutput.Ok(result, new { NeedSignCount = needSignTrialDocCount + needSignSystemDocCount, NeedSignTrialDocCount = needSignTrialDocCount, NeedSignSystemDocCount = needSignSystemDocCount, TrialStatusStr = trialInfo.TrialStatusStr });
+            //return ResponseOutput.Ok(result, new { NeedSignCount = needSignTrialDocCount + needSignSystemDocCount, NeedSignTrialDocCount = needSignTrialDocCount, NeedSignSystemDocCount = needSignSystemDocCount, TrialStatusStr = trialInfo.TrialStatusStr });
+
+            #endregion
+
         }
 
 
@@ -492,8 +752,8 @@ namespace IRaCIS.Core.Application.Services
         [HttpGet("{trialId:guid}")]
         public async Task<List<TrialUserDto>> GetTrialUserSelect(Guid trialId)
         {
-            return await _trialUserRepository.Where(t => t.TrialId == trialId)
-                .Select(t => new TrialUserDto() { UserId = t.UserId, RealName = t.User.FullName, UserName = t.User.UserName })
+            return await _trialIdentityUserRepository.Where(t => t.TrialId == trialId)
+                .Select(t => new TrialUserDto() { UserId = t.IdentityUserId, RealName = t.IdentityUser.FullName, UserName = t.IdentityUser.UserName })
                    .ToListAsync();
         }
 
@@ -513,7 +773,7 @@ namespace IRaCIS.Core.Application.Services
             return ResponseOutput.Ok(result);
         }
 
-        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("BeforeOngoingCantOpt", "AfterStopCannNotOpt")]
         //[Authorize(Policy = IRaCISPolicy.PM)]
         public async Task<IResponseOutput> AddOrUpdateTrialDocument(AddOrEditTrialDocument addOrEditTrialDocument)
         {
@@ -585,7 +845,7 @@ namespace IRaCIS.Core.Application.Services
         /// <returns></returns>
         [HttpDelete("{trialId:guid}/{trialDocumentId:guid}")]
         //[Authorize(Policy = IRaCISPolicy.PM)]
-        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("BeforeOngoingCantOpt", "AfterStopCannNotOpt")]
         public async Task<IResponseOutput> DeleteTrialDocument(Guid trialDocumentId, Guid trialId)
         {
             if (await _trialDocumentRepository.AsQueryable(true).Where(t => t.Id == trialDocumentId).AnyAsync(t => t.TrialDocConfirmedUserList.Any()))
@@ -614,9 +874,9 @@ namespace IRaCIS.Core.Application.Services
             var success = false;
             if (isSystemDoc)
             {
-                if (!await _systemDocConfirmedUserRepository.AnyAsync(t => t.SystemDocumentId == documentId && t.ConfirmUserId == _userInfo.Id))
+                if (!await _systemDocConfirmedUserRepository.AnyAsync(t => t.SystemDocumentId == documentId && t.ConfirmUserId == _userInfo.IdentityUserId))
                 {
-                    await _systemDocConfirmedUserRepository.AddAsync(new SystemDocConfirmedUser() { SystemDocumentId = documentId, ConfirmUserId = _userInfo.Id, SignFirstViewTime = DateTime.Now });
+                    await _systemDocConfirmedUserRepository.AddAsync(new SystemDocConfirmedIdentityUser() { SystemDocumentId = documentId, ConfirmUserId = _userInfo.IdentityUserId, SignFirstViewTime = DateTime.Now });
 
                 }
 
@@ -624,10 +884,10 @@ namespace IRaCIS.Core.Application.Services
             else
             {
 
-                if (!await _trialDocUserTypeConfirmedUserRepository.AnyAsync(t => t.TrialDocumentId == documentId && t.ConfirmUserId == _userInfo.Id))
+                if (!await _trialDocConfirmedUserRepository.AnyAsync(t => t.TrialDocumentId == documentId && t.ConfirmUserId == _userInfo.IdentityUserId))
                 {
 
-                    await _trialDocConfirmedUserRepository.AddAsync(new TrialDocConfirmedUser() { TrialDocumentId = documentId, ConfirmUserId = _userInfo.Id, SignFirstViewTime = DateTime.Now });
+                    await _trialDocConfirmedUserRepository.AddAsync(new TrialDocConfirmedIdentityUser() { TrialDocumentId = documentId, ConfirmUserId = _userInfo.IdentityUserId, SignFirstViewTime = DateTime.Now });
 
                 }
 
@@ -642,9 +902,9 @@ namespace IRaCIS.Core.Application.Services
         [HttpPut("{documentId:guid}")]
         public async Task<IResponseOutput> SetSystemDocFirstViewTime(Guid documentId)
         {
-            if (!await _systemDocConfirmedUserRepository.AnyAsync(t => t.SystemDocumentId == documentId && t.ConfirmUserId == _userInfo.Id))
+            if (!await _systemDocConfirmedUserRepository.AnyAsync(t => t.SystemDocumentId == documentId && t.ConfirmUserId == _userInfo.IdentityUserId))
             {
-                await _systemDocConfirmedUserRepository.AddAsync(new SystemDocConfirmedUser() { SystemDocumentId = documentId, ConfirmUserId = _userInfo.Id, SignFirstViewTime = DateTime.Now });
+                await _systemDocConfirmedUserRepository.AddAsync(new SystemDocConfirmedIdentityUser() { SystemDocumentId = documentId, ConfirmUserId = _userInfo.IdentityUserId, SignFirstViewTime = DateTime.Now });
 
             }
 
@@ -656,10 +916,10 @@ namespace IRaCIS.Core.Application.Services
         [HttpPut("{trialId:guid}/{documentId:guid}")]
         public async Task<IResponseOutput> SetTrialDocFirstViewTime(Guid documentId)
         {
-            if (!await _trialDocUserTypeConfirmedUserRepository.AnyAsync(t => t.TrialDocumentId == documentId && t.ConfirmUserId == _userInfo.Id))
+            if (!await _trialDocConfirmedUserRepository.AnyAsync(t => t.TrialDocumentId == documentId && t.ConfirmUserId == _userInfo.IdentityUserId))
             {
 
-                await _trialDocConfirmedUserRepository.AddAsync(new TrialDocConfirmedUser() { TrialDocumentId = documentId, ConfirmUserId = _userInfo.Id, SignFirstViewTime = DateTime.Now });
+                await _trialDocConfirmedUserRepository.AddAsync(new TrialDocConfirmedIdentityUser() { TrialDocumentId = documentId, ConfirmUserId = _userInfo.IdentityUserId, SignFirstViewTime = DateTime.Now });
 
             }
             var success = await _trialDocConfirmedUserRepository.SaveChangesAsync();
@@ -671,14 +931,14 @@ namespace IRaCIS.Core.Application.Services
         /// 用户 签名某个文档   可能是系统的，也可能是项目的
         /// </summary>
         /// <returns></returns>
-        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("BeforeOngoingCantOpt", "AfterStopCannNotOpt")]
         public async Task<IResponseOutput> UserConfirm(UserConfirmCommand userConfirmCommand)
         {
 
             if (userConfirmCommand.isSystemDoc)
             {
 
-                var sysDocConfirm = await _systemDocConfirmedUserRepository.FirstOrDefaultAsync(t => t.SystemDocumentId == userConfirmCommand.DocumentId && t.ConfirmUserId == _userInfo.Id, true);
+                var sysDocConfirm = await _systemDocConfirmedUserRepository.FirstOrDefaultAsync(t => t.SystemDocumentId == userConfirmCommand.DocumentId && t.ConfirmUserId == _userInfo.IdentityUserId, true);
 
                 if (sysDocConfirm.ConfirmTime != null)
                 {
@@ -705,7 +965,7 @@ namespace IRaCIS.Core.Application.Services
             else
             {
 
-                var trialDocConfirm = await _trialDocUserTypeConfirmedUserRepository.FirstOrDefaultAsync(t => t.TrialDocumentId == userConfirmCommand.DocumentId && t.ConfirmUserId == _userInfo.Id, true);
+                var trialDocConfirm = await _trialDocConfirmedUserRepository.FirstOrDefaultAsync(t => t.TrialDocumentId == userConfirmCommand.DocumentId && t.ConfirmUserId == _userInfo.IdentityUserId, true);
 
                 if (trialDocConfirm.ConfirmTime != null)
                 {
@@ -722,7 +982,7 @@ namespace IRaCIS.Core.Application.Services
                 trialDocConfirm.ConfirmTime = DateTime.Now;
                 trialDocConfirm.SignText = userConfirmCommand.SignText;
 
-                await _trialDocUserTypeConfirmedUserRepository.SaveChangesAsync();
+                await _trialDocConfirmedUserRepository.SaveChangesAsync();
 
             }
 
@@ -738,13 +998,13 @@ namespace IRaCIS.Core.Application.Services
         /// <param name="isSystemDoc"></param>
         /// <returns></returns>
         [HttpPut("{documentId:guid}/{isSystemDoc:bool}")]
-        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt", "SignSystemDocNoTrialId" )]
+        [TrialGlobalLimit("BeforeOngoingCantOpt", "AfterStopCannNotOpt", "SignSystemDocNoTrialId")]
         public async Task<IResponseOutput> UserAbandonDoc(Guid documentId, bool isSystemDoc)
         {
             if (isSystemDoc)
             {
                 await _systemDocumentRepository.UpdatePartialFromQueryAsync(documentId, u => new SystemDocument() { IsDeleted = true });
-                await _systemDocConfirmedUserRepository.UpdatePartialFromQueryAsync(x => x.SystemDocumentId == documentId, x => new SystemDocConfirmedUser()
+                await _systemDocConfirmedUserRepository.UpdatePartialFromQueryAsync(x => x.SystemDocumentId == documentId, x => new SystemDocConfirmedIdentityUser()
                 {
                     IsDeleted = true
                 });
@@ -752,7 +1012,7 @@ namespace IRaCIS.Core.Application.Services
             else
             {
                 await _trialDocumentRepository.UpdatePartialFromQueryAsync(documentId, u => new TrialDocument() { IsDeleted = true });
-                await _trialDocUserTypeConfirmedUserRepository.UpdatePartialFromQueryAsync(x => x.TrialDocumentId == documentId, x => new TrialDocConfirmedUser()
+                await _trialDocConfirmedUserRepository.UpdatePartialFromQueryAsync(x => x.TrialDocumentId == documentId, x => new TrialDocConfirmedIdentityUser()
                 {
                     IsDeleted = true
                 });
@@ -762,93 +1022,8 @@ namespace IRaCIS.Core.Application.Services
         }
 
 
-        #region 废弃
 
 
-        /// <summary>
-        /// 从项目下参与者的维度  先看人员列表(展示统计数字)  点击数字 再看人员具体签署的  系统文档+项目文档（共用上面与人相关的具体文档列表）
-        /// </summary>
-        /// <param name="trialId"></param>
-        /// <returns></returns>
-        [HttpGet("{trialId:guid}")]
-        [Obsolete]
-        public List<TrialUserUnionDocumentView> GetTrialUserDocumentList(Guid trialId)
-        {
-            var query = _trialUserRepository.Where(t => t.TrialId == trialId)
-                  .Select(t => new TrialUserUnionDocumentView()
-                  {
-                      UserId = t.UserId,
-                      UserName = t.User.UserName,
-                      RealName = t.User.FullName,
-                      UserTypeShortName = t.User.UserTypeRole.UserTypeShortName,
-                      TrialDocumentCount = t.Trial.TrialDocumentList.Count(u => u.NeedConfirmedUserTypeList.Any(k => k.NeedConfirmUserTypeId == t.User.UserTypeId)),
-                      TrialDocumentConfirmedCount = t.Trial.TrialDocumentList.SelectMany(u => u.TrialDocConfirmedUserList).Count(k => k.ConfirmUserId == t.UserId),
-                      SystemDocumentConfirmedCount = t.User.SystemDocConfirmedList.Count(),
-                      //这样写不行
-                      //SystemDocumentCount = _systemDocumentRepository.Where(s => s.NeedConfirmedUserTypeList.Any(kk => kk.NeedConfirmUserTypeId == t.User.UserTypeId))
-                      //                       .WhereIf(!_userInfo.IsAdmin, s => s.IsAbandon == false || (s.IsAbandon == true && s.SystemDocConfirmedUserList.Any(uu => uu.ConfirmUserId == t.UserId))).Count()
-                      SystemDocumentCount = t.User.UserTypeRole.SystemDocNeedConfirmedUserTypeList.Where(cc => cc.NeedConfirmUserTypeId == t.User.UserTypeId).Select(y => y.SystemDocument).Count()
-                  });
-
-            return query.ToList();
-        }
-
-
-        /// <summary>
-        /// 从 文档的维度     先看到文档列表（系统文档+项目文档   以及需要确认的人数 和已经确认人数） 点击数字查看某文档下面人确认情况
-        /// </summary>
-        /// <param name="inQuery"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [Obsolete]
-        public async Task<PageOutput<DocumentUnionWithUserStatView>> GetTrialSystemDocumentList(DocumentTrialUnionQuery inQuery)
-        {
-            var systemDocumentQueryable = _systemDocumentRepository
-                .WhereIf(!_userInfo.IsAdmin, t => t.IsDeleted == false)
-                .Select(t => new DocumentUnionWithUserStatView()
-                {
-                    Id = t.Id,
-                    IsSystemDoc = true,
-                    CreateTime = t.CreateTime,
-                    FullFilePath = t.Path,
-                    IsDeleted = t.IsDeleted,
-                    Name = t.Name,
-                    Path = t.Path,
-                    FileType = t.FileType.Value,
-                    UpdateTime = t.UpdateTime,
-                    SignViewMinimumMinutes = t.SignViewMinimumMinutes,
-                    DocumentConfirmedUserCount = t.SystemDocConfirmedUserList.Count(),
-
-                    //DocumentUserCount= _trialUserRepository.Where(tu=>tu.TrialId== querySystemDocument.TrialId).Count(u=>t.NeedConfirmedUserTypeList.Any(cc=>cc.NeedConfirmUserTypeId== u.User.UserTypeId ))
-                    DocumentUserCount = t.NeedConfirmedUserTypeList.SelectMany(u => u.UserTypeRole.UserList.SelectMany(b => b.UserTrials.Where(r => r.TrialId == inQuery.TrialId))).Count()
-                });
-
-            var trialDocQueryable = _trialDocumentRepository.Where(t => t.TrialId == inQuery.TrialId).Select(t => new DocumentUnionWithUserStatView()
-            {
-                Id = t.Id,
-                IsSystemDoc = false,
-                CreateTime = t.CreateTime,
-                FullFilePath = t.Path,
-                IsDeleted = t.IsDeleted,
-                Name = t.Name,
-                Path = t.Path,
-                FileType = t.FileType.Value,
-                UpdateTime = t.UpdateTime,
-                SignViewMinimumMinutes = t.SignViewMinimumMinutes,
-
-                DocumentConfirmedUserCount = t.TrialDocConfirmedUserList.Count(),
-                DocumentUserCount = t.Trial.TrialUserList.Count(cc => t.NeedConfirmedUserTypeList.Any(k => k.NeedConfirmUserTypeId == cc.User.UserTypeId))
-
-            });
-
-            var unionQuery = systemDocumentQueryable.Union(trialDocQueryable)
-                 .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
-                 .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId);
-
-            return await unionQuery.ToPagedListAsync(inQuery);
-        }
-        #endregion
-
 
 
     }

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

@@ -8,6 +8,7 @@ using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Interfaces;
+using IRaCIS.Core.Application.MassTransit.Consumer;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Domain.Share.Common;
@@ -33,7 +34,7 @@ namespace IRaCIS.Core.Application.Service
             IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
             IRepository<ReadingGlobalTaskInfo> _readingGlobalTaskInfoRepository,
             IRepository<VisitTask> _visitTaskRepository,
-            IRepository<TrialUser> _trialUserRepository,
+            IRepository<TrialUserRole> _trialUserRoleRepository,
             IRepository<TrialEmailNoticeUser> _trialEmailNoticeUserRepository,
             IRepository<Subject> _subjectRepository,
             IRepository<ReadModule> _readModuleRepository,
@@ -280,8 +281,7 @@ namespace IRaCIS.Core.Application.Service
             {
                 var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, taskInfo.ResearchProgramNo, taskInfo.SubjectCode);
 
-                var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
-                   StaticData.EmailSend.EmailNamePlaceholder, taskInfo.ResearchProgramNo, taskInfo.SubjectCode);
+                var htmlBodyStr = isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN;
 
 
                 return (topicStr, htmlBodyStr, isEn_us, null);
@@ -300,7 +300,7 @@ namespace IRaCIS.Core.Application.Service
 
                 var answer = "否";
                 var isNeedSend = true;
-                var minUserIdList = _trialUserRepository.Where(t => t.User.UserTypeEnum == Domain.Share.UserTypeEnum.MIM && t.TrialId == taskInfo.TrialId).Select(t => t.UserId).ToList();
+                var minUserIdList = _trialUserRoleRepository.Where(t => t.UserRole.UserTypeEnum == Domain.Share.UserTypeEnum.MIM && t.TrialId == taskInfo.TrialId).Select(t => t.UserId).ToList();
 
 
 
@@ -1199,7 +1199,7 @@ namespace IRaCIS.Core.Application.Service
         public async Task<List<TrialUserType>> GetTrialUserTypeSelectList(Guid trialId)
         {
 
-            var query = _trialUserRepository.Where(t => t.TrialId == trialId, false, true).IgnoreQueryFilters().Select(t => t.User.UserTypeRole).Distinct()
+            var query = _trialUserRoleRepository.Where(t => t.TrialId == trialId, false, true).IgnoreQueryFilters().Select(t => t.UserRole.UserTypeRole).Distinct()
 
               .ProjectTo<TrialUserType>(_mapper.ConfigurationProvider);
 
@@ -1222,13 +1222,13 @@ namespace IRaCIS.Core.Application.Service
             var userTypeList = trialEmailNoticeConfig.TrialEmailNoticeUserList.Select(t => t.UserType).ToList();
 
 
-            var query = _trialUserRepository.Where(t => t.TrialId == trialId && userTypeList.Contains(t.User.UserTypeEnum), false, true).IgnoreQueryFilters()
+            var query = _trialUserRoleRepository.Where(t => t.TrialId == trialId && userTypeList.Contains(t.UserRole.UserTypeEnum), false, true).IgnoreQueryFilters()
                 .Select(t => new TrialSelectUser()
                 {
                     UserId = t.UserId,
-                    UserName = t.User.UserName,
-                    RealName = t.User.FullName,
-                    UserTypeEnum = t.User.UserTypeEnum
+                    UserName = t.UserRole.IdentityUser.UserName,
+                    RealName = t.UserRole.FullName,
+                    UserTypeEnum = t.UserRole.UserTypeEnum
                 }).Distinct();
 
             return await query.ToListAsync();
@@ -1242,19 +1242,51 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<PageOutput<TrialSelectEmailNoticeConfigView>> GetSysEmailNoticeConfigList(EmailNoticeConfigQuery inQuery)
         {
-            var emailNoticeConfigQueryable = _emailNoticeConfigRepository
-           .WhereIf(inQuery.SystemLevel == null, t => t.SystemLevel == SysEmailLevel.not_sys || t.SystemLevel == SysEmailLevel.sys_Config_role)
-           //.WhereIf(inQuery.SystemLevel != null, t => t.SystemLevel == inQuery.SystemLevel)
+            var trialConfig = _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new { t.IsEnrollementQualificationConfirm, t.IsPDProgressView }).First();
+
+            var emailNoticeConfigQueryable = _emailNoticeConfigRepository.Where(t => t.BusinessLevelEnum == BusinessLevel.Trial)
            .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
            .WhereIf(inQuery.IsReturnRequired != null, t => t.IsReturnRequired == inQuery.IsReturnRequired)
            .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable)
            .WhereIf(inQuery.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == inQuery.IsDistinguishCriteria)
            .WhereIf(inQuery.BusinessModuleEnum != null, t => t.BusinessModuleEnum == inQuery.BusinessModuleEnum)
+           .WhereIf(inQuery.EmailUrgentEnum != null, t => t.EmailUrgentEnum == inQuery.EmailUrgentEnum)
+           .WhereIf(inQuery.ToUserType != null, t => t.EmailNoticeUserTypeList.Any(t => t.UserType == inQuery.ToUserType && t.EmailUserType == EmailUserType.To))
+           .WhereIf(inQuery.CopyUserType != null, t => t.EmailNoticeUserTypeList.Any(t => t.UserType == inQuery.CopyUserType && t.EmailUserType == EmailUserType.Copy))
+           .WhereIf(trialConfig.IsEnrollementQualificationConfirm == false, t => t.BusinessModuleEnum != BusinessModule.EligibilityVerification)
+           .WhereIf(trialConfig.IsPDProgressView == false, t => t.BusinessModuleEnum != BusinessModule.PDVerification)
+           .WhereIf(trialConfig.IsPDProgressView == false && trialConfig.IsEnrollementQualificationConfirm == false, t => t.BusinessModuleEnum != BusinessModule.PDVerification
+               && t.BusinessModuleEnum != BusinessModule.EligibilityVerification)
            .ProjectTo<TrialSelectEmailNoticeConfigView>(_mapper.ConfigurationProvider, new { trialId = inQuery.TrialId });
 
             return await emailNoticeConfigQueryable.ToPagedListAsync(inQuery);
         }
 
+        public async Task<IResponseOutput> BatchAddEnrollOrPdEmailConfig(Guid trialId)
+        {
+            var trialConfig = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.IsEnrollementQualificationConfirm, t.IsPDProgressView }).First();
+
+            var emailNoticeConfigQueryable = _emailNoticeConfigRepository
+
+              .WhereIf(trialConfig.IsEnrollementQualificationConfirm == true && trialConfig.IsPDProgressView == false, t => t.BusinessModuleEnum == BusinessModule.EligibilityVerification || t.BusinessModuleEnum == BusinessModule.Eligibility_PDVerification)
+              .WhereIf(trialConfig.IsEnrollementQualificationConfirm == false && trialConfig.IsPDProgressView == true, t => t.BusinessModuleEnum == BusinessModule.PDVerification || t.BusinessModuleEnum == BusinessModule.Eligibility_PDVerification)
+               .WhereIf(trialConfig.IsPDProgressView == true && trialConfig.IsEnrollementQualificationConfirm == true, t => t.BusinessModuleEnum == BusinessModule.PDVerification
+               || t.BusinessModuleEnum == BusinessModule.EligibilityVerification || t.BusinessModuleEnum == BusinessModule.Eligibility_PDVerification)
+              .ProjectTo<TrialSelectEmailNoticeConfigView>(_mapper.ConfigurationProvider, new { trialId = trialId });
+
+
+            var list = await emailNoticeConfigQueryable.ToListAsync();
+
+            var addList = _mapper.Map<List<BatchAddTrialEmailNoticeConfig>>(list.Where(t => t.IsHaveSelected == false).ToList());
+
+            foreach (var item in addList)
+            {
+                item.TrialId = trialId;
+            }
+
+            return await BatchAddSysEmailConfig(addList);
+
+        }
         /// <summary>
         ///  批量勾选  传递列表每行数据，后台进行处理转换，建立关联关系
         /// </summary>
@@ -1262,6 +1294,10 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         public async Task<IResponseOutput> BatchAddSysEmailConfig(List<BatchAddTrialEmailNoticeConfig> batchAddList)
         {
+            if (!batchAddList.Any())
+            {
+                return ResponseOutput.Ok();
+            }
 
             var first = batchAddList.First();
             var trialId = first.TrialId;
@@ -1312,31 +1348,56 @@ namespace IRaCIS.Core.Application.Service
 
             await _trialEmailNoticeConfigRepository.SaveChangesAsync();
 
+            //处理定时任务
+            var taskInfoList = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId== trialId && t.EmailCron != string.Empty && t.IsAutoSend)
+             .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
+             .ToListAsync();
+
+            foreach (var task in taskInfoList)
+            {
+                //利用主键作为任务Id
+                var jobId = $"{task.TrialId}({task.TrialCode})_({task.BusinessScenarioEnum})";
+
+                HangfireJobHelper.AddOrUpdateTrialCronJob(jobId, trialId, task.BusinessScenarioEnum, task.EmailCron);
+            }
+
             return ResponseOutput.Ok();
 
 
         }
 
 
+
         [HttpPost]
-        public async Task<List<TrialEmailNoticeConfigView>> GetTrialEmailNoticeConfigList(TrialEmailNoticeConfigQuery inQuery)
+        public async Task<IResponseOutput<List<TrialEmailNoticeConfigView>>> GetTrialEmailNoticeConfigList(TrialEmailNoticeConfigQuery inQuery)
         {
             //await SyncSystemEmainCofigDocListAsync(inQuery.TrialId);
 
+            var trialConfig = _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new { t.IsEnrollementQualificationConfirm, t.IsPDProgressView }).First();
+
             var trialEmailNoticeConfigQueryable = _trialEmailNoticeConfigRepository.Where(t => t.TrialId == inQuery.TrialId)
               .WhereIf(inQuery.IsDistinguishCriteria == false, t => t.TrialReadingCriterionId == null)
-               .WhereIf(inQuery.IsDistinguishCriteria == true, t => t.CriterionTypeEnum != null)
+              .WhereIf(inQuery.IsDistinguishCriteria == true, t => t.CriterionTypeEnum != null)
               .WhereIf(inQuery.TrialReadingCriterionId != null, t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
               .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
+              .WhereIf(inQuery.EmailUrgentEnum != null, t => t.EmailUrgentEnum == inQuery.EmailUrgentEnum)
+              .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable)
+              .WhereIf(inQuery.ToUserType != null, t => t.TrialEmailNoticeUserList.Any(t => t.UserType == inQuery.ToUserType && t.EmailUserType == EmailUserType.To))
+              .WhereIf(inQuery.CopyUserType != null, t => t.TrialEmailNoticeUserList.Any(t => t.UserType == inQuery.CopyUserType && t.EmailUserType == EmailUserType.Copy))
+
+              .WhereIf(inQuery.BusinessModuleEnum != null, t => t.BusinessModuleEnum == inQuery.BusinessModuleEnum)
+
               .ProjectTo<TrialEmailNoticeConfigView>(_mapper.ConfigurationProvider);
 
             var sortField = string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TrialEmailNoticeConfigView.Code) : inQuery.SortField;
             var orderQuery = inQuery.Asc ? trialEmailNoticeConfigQueryable.OrderBy(sortField) : trialEmailNoticeConfigQueryable.OrderBy(sortField + " desc");
-            return await orderQuery.ToListAsync();
+            var list = await orderQuery.ToListAsync();
+
+            return ResponseOutput.Ok(list, trialConfig);
         }
 
 
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         public async Task<IResponseOutput> AddOrUpdateTrialEmailNoticeConfig(TrialEmailNoticeConfigAddOrEdit addOrEditTrialEmailNoticeConfig)
         {
             await TestEmailConfigAsync(addOrEditTrialEmailNoticeConfig);
@@ -1405,7 +1466,12 @@ namespace IRaCIS.Core.Application.Service
 
                 await _trialEmailNoticeConfigRepository.SaveChangesAsync();
 
-                var jobId = $"{addOrEditTrialEmailNoticeConfig.TrialId}_{id}";
+                var cronInfo = await _trialEmailNoticeConfigRepository.Where(t => t.Id == addOrEditTrialEmailNoticeConfig.Id)
+            .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
+            .FirstAsync();
+
+                var jobId = $"{cronInfo.TrialId}({cronInfo.TrialCode})_({cronInfo.BusinessScenarioEnum})";
+
 
                 if (addOrEditTrialEmailNoticeConfig.IsAutoSend)
                 {
@@ -1459,7 +1525,7 @@ namespace IRaCIS.Core.Application.Service
 
             #region 人员还未加入，可以先配置邮件  历史废弃
 
-            //var toUserList = await _trialUserRepository.Where(t => t.TrialId == config.TrialId)
+            //var toUserList = await _trialUserRoleRepository.Where(t => t.TrialId == config.TrialId)
             //   .WhereIf(config.ToUserTypeList != null, t => config.ToUserTypeList.Contains(t.User.UserTypeEnum))
             //   .Select(t => new { t.User.EMail, t.User.FullName }).ToListAsync();
 
@@ -1523,12 +1589,16 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         [HttpDelete("{trialEmailNoticeConfigId:guid}")]
         public async Task<IResponseOutput> DeleteTrialEmailNoticeConfig(Guid trialEmailNoticeConfigId)
         {
-            var trialId = await _trialEmailNoticeConfigRepository.Where(t => t.Id == trialEmailNoticeConfigId).Select(t => t.TrialId).FirstOrDefaultAsync();
-            var jobId = $"{trialId}_{trialEmailNoticeConfigId}";
+
+            var cronInfo = await _trialEmailNoticeConfigRepository.Where(t => t.Id == trialEmailNoticeConfigId)
+           .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
+           .FirstAsync();
+
+            var jobId = $"{cronInfo.TrialId}({cronInfo.TrialCode})_({cronInfo.BusinessScenarioEnum})";
 
             HangfireJobHelper.RemoveCronJob(jobId);
 

IRaCIS.Core.Application/Service/Document/_MapConfig.cs

@@ -40,7 +40,7 @@ namespace IRaCIS.Core.Application.Service
             //    .ForMember(t => t.UserConfirmInfo, c => c.MapFrom(t => t.TrialDocConfirmedUserList.Where(u => u.ConfirmUserId == userId).FirstOrDefault()))
             //    .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path + "?access_token=" + token)); ;
 
-            CreateMap<TrialDocConfirmedUser, TrialDocumentUserConfirmView>()
+            CreateMap<TrialDocConfirmedIdentityUser, TrialDocumentUserConfirmView>()
                 .ForMember(d => d.UserName, c => c.MapFrom(t => t.User.UserName))
                 .ForMember(d => d.RealName, c => c.MapFrom(t => t.User.FullName));
 
@@ -49,11 +49,11 @@ namespace IRaCIS.Core.Application.Service
             //   .ForMember(d => d.RealName, c => c.MapFrom(t => t.User.LastName + " / " + t.User.FirstName));
 
 
-            CreateMap<TrialUser, TrialDocumentUserConfirmView>();
+            CreateMap<TrialUserRole, TrialDocumentUserConfirmView>();
 
             CreateMap<BatchAddTrialEmailNoticeConfig, TrialEmailNoticeConfig>();
 
-
+            CreateMap<TrialSelectEmailNoticeConfigView, BatchAddTrialEmailNoticeConfig > ();
 
 
             CreateMap<AddOrEditTrialDocument, TrialDocument>()
@@ -78,11 +78,11 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<TrialEmailNoticeConfigAddOrEdit, TrialEmailNoticeConfig>();
 
-            CreateMap<TrialUser, TrialUserSelct>()
-                 .ForMember(d => d.Phone, c => c.MapFrom(t => t.User.Phone))
-                 .ForMember(d => d.Email, c => c.MapFrom(t => t.User.EMail))
-                 .ForMember(d => d.RealName, c => c.MapFrom(t => t.User.FullName))
-                .ForMember(d => d.UserName, c => c.MapFrom(t => t.User.UserName));
+            CreateMap<TrialUserRole, TrialUserSelct>()
+                 .ForMember(d => d.Phone, c => c.MapFrom(t => t.UserRole.IdentityUser.Phone))
+                 .ForMember(d => d.Email, c => c.MapFrom(t => t.UserRole.IdentityUser.EMail))
+                 .ForMember(d => d.RealName, c => c.MapFrom(t => t.UserRole.IdentityUser.FullName))
+                .ForMember(d => d.UserName, c => c.MapFrom(t => t.UserRole.IdentityUser.UserName));
 
 
             CreateMap<TrialEmailNoticeUser, EmailUserInfoDto>();

IRaCIS.Core.Application/Service/Financial/TrialPaymentPriceService.cs

@@ -66,7 +66,7 @@ namespace IRaCIS.Core.Application.Service
                 SowPath = "",
                 SowName = "",
                 UpdateTime = DateTime.Now,
-                UpdateUserId = _userInfo.Id
+                UpdateUserId = _userInfo.UserRoleId
             });
 
             return ResponseOutput.Result(success);

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomStudyModel.cs

@@ -37,7 +37,7 @@
 
         public bool SoftDelete { get; set; } = false;
 
-        public string InstitutionName { get; set; } = string.Empty;
+        //public string InstitutionName { get; set; } = string.Empty;
         public string PatientId { get; set; } = string.Empty;
         public string PatientName { get; set; } = string.Empty;
         public string PatientAge { get; set; } = string.Empty;

IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs

@@ -65,19 +65,19 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
            (t.TrialReadingCriterion.IsReadingTaskViewInOrder == ReadingOrder.Random && t.TrialReadingCriterion.ImageUploadEnum != ReadingImageUpload.None))))
             {
                 //找到 非一致性分析，未签名，状态正常的 并且任务名称是TimePoint的 任务
-                var needDealTaskList = await _visitTaskRepository.Where(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.Id
+                var needDealTaskList = await _visitTaskRepository.Where(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.UserRoleId
                    && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskBlindName == "Timepoint" && t.ReadingCategory == ReadingCategory.Visit
                    && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze), true).ToListAsync();
 
                 if (needDealTaskList.Count > 0)
                 {
                     //已完成的访视任务数量（包含重阅的）
-                    var haveFinishedTaskCount = await _visitTaskRepository.CountAsync(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.Id
+                    var haveFinishedTaskCount = await _visitTaskRepository.CountAsync(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.UserRoleId
                     && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit);
 
                     //已经处理过的任务名称的数量
 
-                    var haveDealedTaskList = await _visitTaskRepository.Where(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.Id
+                    var haveDealedTaskList = await _visitTaskRepository.Where(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.UserRoleId
                     && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit && t.TaskBlindName != "Timepoint").Select(t => new { t.TaskBlindName, t.SourceSubjectVisitId, t.SouceReadModuleId }).ToListAsync();
 
 
@@ -153,7 +153,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
 
             var query = _visitTaskRepository.Where(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.SourceSubjectVisitId != null
-            && t.DoctorUserId == _userInfo.Id && t.TaskState == TaskState.Effect)
+            && t.DoctorUserId == _userInfo.UserRoleId && t.TaskState == TaskState.Effect)
                 //满足 有序，或者随机只看到当前任务的dicom 非dicom检查
                 .WhereIf(criterionInfo.IsReadingTaskViewInOrder != ReadingOrder.SubjectRandom && inQuery.VisitTaskId != null, t => t.Id == inQuery.VisitTaskId)
                 .Select(u => new SubjectImageUploadDTO()
@@ -325,7 +325,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                     if (findStudy.SubejectCode == inCommand.SubjectCode && findStudy.SubjectId == inCommand.SubjectId)
                     {
                         //上传给后处理其他访视了
-                        if (inCommand.VisitTaskId != null && findStudy.VisitTaskId != null && findStudy.VisitTaskId != inCommand.VisitTaskId)
+                        if (inCommand.VisitTaskId != null && findStudy.VisitTaskId != null && findStudy.VisitTaskId != inCommand.VisitTaskId && findStudy.SubjectVisitId != currentUploadSubjectVisitId)
                         {
                             result.Add(new TaskStudyArchiveConfirmResult() { StudyInstanceUid = studyUid, IsAllowReUpload = false, IsAllowUpload = false });
                         }
@@ -402,7 +402,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 else
                 {
                     //在事务未完成前 防止前端重复提交
-                    await _fusionCache.SetAsync(CacheKeys.TrialTaskStudyUidDBLock(incommand.TrialId, incommand.VisitTaskId, incommand.Study.StudyInstanceUid), _userInfo.Id, TimeSpan.FromMinutes(1));
+                    await _fusionCache.SetAsync(CacheKeys.TrialTaskStudyUidDBLock(incommand.TrialId, incommand.VisitTaskId, incommand.Study.StudyInstanceUid), _userInfo.UserRoleId, TimeSpan.FromMinutes(1));
                 }
             }
 
@@ -653,7 +653,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         {
             var subjectCode = inQuery.SubjectCode;
             var subjectId = inQuery.SubjectId;
-            var doctorUserId = _userInfo.Id;
+            var doctorUserId = _userInfo.UserRoleId;
 
             if (inQuery.VisitTaskId != null)
             {
@@ -839,7 +839,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         public async Task<List<SubjectCRCImageUploadedStudyDto>> GetSubjectImageDownloadSelectList(IRReadingDownloadQuery inQuery)
         {
 
-            var doctorUserId = _userInfo.Id;
+            var doctorUserId = _userInfo.UserRoleId;
             var isAnalysisCreate = false;
 
             //要根据标准阅片顺序，确定是否查询单个任务的，还是查询所有的
@@ -1129,9 +1129,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             var query = _trialImageDownloadRepository.Where(t => t.TrialId == inQuery.TrialId)
                   .WhereIf(inQuery.SubjectCode.IsNotNullOrEmpty(), t => t.SubjectCode.Contains(inQuery.SubjectCode))
                   .WhereIf(inQuery.IP.IsNotNullOrEmpty(), t => t.IP.Contains(inQuery.IP))
-                   .WhereIf(inQuery.Name.IsNotNullOrEmpty(), t => t.CreateUser.UserName.Contains(inQuery.Name) || t.CreateUser.FullName.Contains(inQuery.Name))
+                   .WhereIf(inQuery.Name.IsNotNullOrEmpty(), t => t.CreateUserRole.IdentityUser.UserName.Contains(inQuery.Name) || t.CreateUserRole.FullName.Contains(inQuery.Name))
                   .WhereIf(inQuery.ImageType != null, t => t.ImageType == inQuery.ImageType)
-                  .WhereIf(inQuery.UserType != null, t => t.CreateUser.UserTypeEnum == inQuery.UserType)
+                  .WhereIf(inQuery.UserType != null, t => t.CreateUserRole.UserTypeEnum == inQuery.UserType)
                   .WhereIf(inQuery.IsSuccess != null, t => t.IsSuccess == inQuery.IsSuccess)
                   .WhereIf(inQuery.DownloadStartTime != null, t => t.DownloadStartTime >= inQuery.DownloadStartTime)
                   .WhereIf(inQuery.DownloadEndTime != null, t => t.DownloadEndTime <= inQuery.DownloadEndTime)
@@ -1538,7 +1538,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         public async Task<List<SubjectUploadTaskInfo>> GetIRUploadTaskList_Old(CRCUploadTaskQuery inQuery)
         {
             var query = _visitTaskRepository.Where(t => t.SubjectId == inQuery.SubjectId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId
-                                                   && t.SourceSubjectVisitId != null && t.DoctorUserId == _userInfo.Id && t.TaskState == TaskState.Effect)
+                                                   && t.SourceSubjectVisitId != null && t.DoctorUserId == _userInfo.UserRoleId && t.TaskState == TaskState.Effect)
                .ProjectTo<SubjectUploadTaskInfo>(_mapper.ConfigurationProvider);
 
 

IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs

@@ -102,18 +102,13 @@ namespace IRaCIS.Core.Application.Services
             var resource = new ResourceInfo()
             {
                 StudyId = imageShare.StudyId,
-                Token = _tokenService.GetToken(IRaCISClaims.Create(new UserBasicInfo()
+                Token = _tokenService.GetToken(new UserTokenInfo()
                 {
-                    Id = Guid.Empty,
-                    IsReviewer = false,
-                    IsAdmin = false,
-                    RealName = "Share001",
+                    IdentityUserId = Guid.NewGuid(),
+                    FullName = "Share001",
                     UserName = "Share001",
-                    Sex = 0,
-                    //UserType = "ShareType",
                     UserTypeEnum = UserTypeEnum.ShareImage,
-                    Code = "ShareCode001",
-                }))
+                })
             };
 
 

IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs

@@ -4,6 +4,7 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 using IRaCIS.Core.Application.Filter;
+using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using Medallion.Threading;
 using Microsoft.AspNetCore.Mvc;
@@ -58,7 +59,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
         [UnitOfWork]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         public async Task<IResponseOutput<NoneDicomStudyAddReturnDto>> AddOrUpdateNoneDicomStudy(NoneDicomStudyAddOrEdit addOrEditNoneDicomStudy)
         {
 
@@ -70,6 +71,8 @@ namespace IRaCIS.Core.Application.Contracts
 
             }
 
+
+
             NoneDicomStudy? optEntity = null;
             var @lock = _distributedLockProvider.CreateLock($"NoneDicomCode");
 
@@ -85,6 +88,7 @@ namespace IRaCIS.Core.Application.Contracts
                     optEntity = await _noneDicomStudyRepository.InsertFromDTOAsync(addOrEditNoneDicomStudy);
 
                     optEntity.StudyCode = AppSettings.GetCodeStr(optEntity.Code, nameof(NoneDicomStudy));
+
                 }
                 else
                 {
@@ -105,7 +109,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         }
 
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         [HttpDelete("{trialId:guid}/{subjectVisitId:guid}/{noneDicomStudyId:guid}")]
         public async Task<IResponseOutput> DeleteNoneDicomStudy(Guid noneDicomStudyId, Guid subjectVisitId)
         {
@@ -128,7 +132,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
         [HttpDelete("{trialId:guid}/{subjectVisitId:guid}/{noneDicomStudyFileId:guid}")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         public async Task<IResponseOutput> DeleteNoneDicomStudyFile(Guid noneDicomStudyFileId, Guid subjectVisitId)
         {
             //提交了 但是IQC同意的时候 是可以删除的 | 普通提交后也不能删除
@@ -155,7 +159,7 @@ namespace IRaCIS.Core.Application.Contracts
         public async Task<List<NoneDicomStudyFileView>> GetNoneDicomStudyFileList(Guid noneDicomStudyId)
         {
             return await _noneDicomStudyFileRepository.Where(t => t.NoneDicomStudyId == noneDicomStudyId)
-                .ProjectTo<NoneDicomStudyFileView>(_mapper.ConfigurationProvider).ToListAsync();
+                .ProjectTo<NoneDicomStudyFileView>(_mapper.ConfigurationProvider).OrderBy(t => t.CreateTime).ToListAsync();
         }
 
         [HttpGet("{subjectVisitId:guid}")]

IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs

@@ -22,7 +22,7 @@ namespace IRaCIS.Core.Application.Services
         [HttpGet, Route("{studyId:guid}")]
         public async Task<IResponseOutput<List<DicomSeriesDTO>>> List(Guid studyId)
         {
-
+             //断点
             var seriesList = await _seriesRepository.Where(s => s.StudyId == studyId).OrderBy(s => s.SeriesNumber).
               ThenBy(s => s.SeriesTime).ThenBy(s => s.CreateTime)
               .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();

IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs

@@ -65,7 +65,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         }
 
 
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         public async Task<IResponseOutput> PreArchiveDicomStudy(PreArchiveDicomStudyCommand preArchiveStudyCommand)
         {
@@ -99,20 +99,20 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             if (visitTaskId != null)
             {
                 var cacheValue = _fusionCache.GetOrDefault<Guid>(CacheKeys.TrialTaskStudyUidUploading(trialId, visitTaskId.Value, studyInstanceUid));
-                if (cacheValue != Guid.Empty && cacheValue != _userInfo.Id)
+                if (cacheValue != Guid.Empty && cacheValue != _userInfo.UserRoleId)
                 {
                     //---当前已有人正在上传和归档该检查!
                     return ResponseOutput.NotOk(I18n.T("UploadDownLoad_ArchiveInProgress"));
                 }
                 else
                 {
-                    await _fusionCache.SetAsync(CacheKeys.TrialTaskStudyUidUploading(trialId, visitTaskId.Value, studyInstanceUid), _userInfo.Id, TimeSpan.FromSeconds(15));
+                    await _fusionCache.SetAsync(CacheKeys.TrialTaskStudyUidUploading(trialId, visitTaskId.Value, studyInstanceUid), _userInfo.UserRoleId, TimeSpan.FromSeconds(15));
 
                 }
             }
             else
             {
-                await _fusionCache.SetAsync(CacheKeys.TrialStudyUidUploading(trialId, studyInstanceUid), _userInfo.Id, TimeSpan.FromSeconds(15));
+                await _fusionCache.SetAsync(CacheKeys.TrialStudyUidUploading(trialId, studyInstanceUid), _userInfo.UserRoleId, TimeSpan.FromSeconds(15));
 
             }
 
@@ -122,7 +122,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
 
 
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         public async Task<IResponseOutput> AddOrUpdateArchiveStudy(NewArchiveStudyCommand incommand)
         {
 
@@ -139,7 +139,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 else
                 {
                     //在事务未完成前 防止前端重复提交
-                    await _fusionCache.SetAsync(CacheKeys.TrialStudyUidDBLock(incommand.TrialId, incommand.Study.StudyInstanceUid), _userInfo.Id, TimeSpan.FromMinutes(3));
+                    await _fusionCache.SetAsync(CacheKeys.TrialStudyUidDBLock(incommand.TrialId, incommand.Study.StudyInstanceUid), _userInfo.UserRoleId, TimeSpan.FromMinutes(3));
                 }
             }
 
@@ -254,6 +254,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                         }
                     }
 
+                    findStudy = addStudy;
+
                 }
                 else
                 {
@@ -321,6 +323,20 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                 }
 
+                #region 只配置单个部位自动赋值
+                //项目配置的影像部位
+                var trialBodyParts = _trialRepository.Where(t => t.Id == trialId).Select(t => t.BodyPartTypes).FirstOrDefault();
+
+                var trialBodyPartList = trialBodyParts.Split('|', StringSplitOptions.RemoveEmptyEntries);
+
+                if (trialBodyPartList.Count() == 1)
+                {
+                    var first = trialBodyPartList.First();
+                    findStudy.BodyPartForEdit = first;
+                }
+                #endregion
+
+
                 var @lock2 = _distributedLockProvider.CreateLock($"StudyCommit");
 
                 using (await @lock2.AcquireAsync())
@@ -357,7 +373,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             var svExpression = QCCommon.GetDicomStudySubjectVisitFilter(inQuery.VisitPlanArray);
 
             var dicomStudyQuery = _dicomStudyRepository.Where(t => t.TrialId == inQuery.TrialId)
-                    .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.Subject.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.Id))
+                    .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.Subject.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.UserRoleId))
                       //.WhereIf(!string.IsNullOrEmpty(studyQuery.VisitPlanInfo), studyQuery.VisitPlanInfo.Contains('.') ? t => t.SubjectVisit.VisitNum.ToString().Contains(".") : t => t.SubjectVisit.VisitNum == decimal.Parse(studyQuery.VisitPlanInfo))
                       .WhereIf(inQuery.VisitPlanArray != null && inQuery.VisitPlanArray?.Length > 0, svExpression)
                     .WhereIf(!string.IsNullOrWhiteSpace(inQuery.SubjectInfo), t => t.Subject.Code.Contains(inQuery.SubjectInfo))
@@ -394,7 +410,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                         TrialSiteCode = t.Subject.TrialSite.TrialSiteCode,
 
-                        Uploader = t.CreateUser.UserName,
+                        Uploader = t.CreateUserRole.IdentityUser.UserName,
 
                         UploadTime = t.CreateTime
 
@@ -406,7 +422,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
 
             var nodeDicomStudyQuery = _noneDicomStudyRepository.Where(t => t.TrialId == inQuery.TrialId)
-                .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.Subject.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.Id))
+                .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.Subject.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.UserRoleId))
                  //.WhereIf(!string.IsNullOrEmpty(studyQuery.VisitPlanInfo), studyQuery.VisitPlanInfo.Contains('.') ? t => t.SubjectVisit.VisitNum.ToString().Contains(".") : t => t.SubjectVisit.VisitNum == decimal.Parse(studyQuery.VisitPlanInfo))
                  .WhereIf(inQuery.VisitPlanArray != null && inQuery.VisitPlanArray?.Length > 0, svExpression2)
                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.SubjectInfo), t => t.Subject.Code.Contains(inQuery.SubjectInfo))
@@ -444,7 +460,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                      TrialSiteCode = t.Subject.TrialSite.TrialSiteCode,
 
-                     Uploader = t.CreateUser.UserName,
+                     Uploader = t.CreateUserRole.IdentityUser.UserName,
 
                      UploadTime = t.CreateTime
 
@@ -468,7 +484,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         {
             var svExpression = QCCommon.GetStudyMonitorSubjectVisitFilter(inQuery.VisitPlanArray);
             var StudyMonitorQuery = _studyMonitorRepository.Where(t => t.TrialId == inQuery.TrialId, ignoreQueryFilters: true)
-                 .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.Subject.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.Id))
+                 .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.Subject.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.UserRoleId))
                   //.WhereIf(!string.IsNullOrEmpty(studyQuery.VisitPlanInfo), studyQuery.VisitPlanInfo.Contains('.') ? t => t.SubjectVisit.VisitNum.ToString().Contains(".") : t => t.SubjectVisit.VisitNum == decimal.Parse(studyQuery.VisitPlanInfo))
                   .WhereIf(inQuery.VisitPlanArray != null && inQuery.VisitPlanArray?.Length > 0, svExpression)
                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.SubjectInfo), t => t.Subject.Code.Contains(inQuery.SubjectInfo))
@@ -476,7 +492,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                  .WhereIf(inQuery.SubjectVisitId != null, t => t.SubjectId == inQuery.SubjectVisitId)
                  .WhereIf(inQuery.TrialSiteId != null, t => t.Subject.TrialSiteId == inQuery.TrialSiteId)
                  .WhereIf(inQuery.IsDicom != null, t => t.IsDicom == inQuery.IsDicom)
-                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.Uploader), t => t.CreateUser.UserName.Contains(inQuery.Uploader))
+                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.Uploader), t => t.CreateUserRole.IdentityUser.UserName.Contains(inQuery.Uploader))
                  .WhereIf(inQuery.IsSuccess != null, t => t.IsSuccess == inQuery.IsSuccess)
                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.StudyCode), t => t.StudyCode.Contains(inQuery.StudyCode))
                  .WhereIf(inQuery.UploadStartTime != null, t => t.UploadStartTime >= inQuery.UploadStartTime)
@@ -499,7 +515,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                      TrialSiteCode = t.Subject.TrialSite.TrialSiteCode,
 
-                     Uploader = t.CreateUser.UserName,
+                     Uploader = t.CreateUserRole.IdentityUser.UserName,
 
                      UploadTime = t.CreateTime,
 
@@ -615,7 +631,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         public async Task<IResponseOutput<List<VerifyStudyUploadResult>>> VerifyTaskStudyAllowUploadAsync(VerifyTaskUploadOrReupload verifyInfo)
         {
 
-            var queryStudy = _visitTaskRepository.Where(t => t.SubjectId == verifyInfo.SubjectId && t.SourceSubjectVisitId != null && t.DoctorUserId == _userInfo.Id).Select(u => new
+            var queryStudy = _visitTaskRepository.Where(t => t.SubjectId == verifyInfo.SubjectId && t.SourceSubjectVisitId != null && t.DoctorUserId == _userInfo.UserRoleId).Select(u => new
             {
                 VisitTaskId = u.Id,
                 SourceSubjectVisitId = u.SourceSubjectVisitId,
@@ -654,7 +670,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                 var result = new VerifyStudyUploadResult();
 
-                if (_fusionCache.GetOrDefault<Guid>($"StudyUid_{trialId}_{studyInstanceUid}") != _userInfo.Id)
+                if (_fusionCache.GetOrDefault<Guid>($"StudyUid_{trialId}_{studyInstanceUid}") != _userInfo.UserRoleId)
                 {
 
                     result.AllowUpload = false;
@@ -704,7 +720,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 {
                     if (result.AllowReUpload || result.AllowUpload)
                     {
-                        await _fusionCache.SetAsync($"StudyUid_{trialId}_{studyInstanceUid}", _userInfo.Id, TimeSpan.FromSeconds(30));
+                        await _fusionCache.SetAsync($"StudyUid_{trialId}_{studyInstanceUid}", _userInfo.UserRoleId, TimeSpan.FromSeconds(30));
 
                     }
                     else
@@ -800,7 +816,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var result = new VerifyStudyUploadResult();
 
-            if (cacheUserId.GetValueOrDefault() != _userInfo.Id && cacheUserId.HasValue)
+            if (cacheUserId.GetValueOrDefault() != _userInfo.UserRoleId && cacheUserId.HasValue)
             {
 
                 result.AllowUpload = false;
@@ -869,7 +885,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             {
                 if (result.AllowReUpload || result.AllowUpload)
                 {
-                    _fusionCache.Set(CacheKeys.TrialStudyUidUploading(trialId, studyInstanceUid), _userInfo.Id, TimeSpan.FromSeconds(30));
+                    _fusionCache.Set(CacheKeys.TrialStudyUidUploading(trialId, studyInstanceUid), _userInfo.UserRoleId, TimeSpan.FromSeconds(30));
                 }
                 else
                 {

IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs

@@ -40,8 +40,8 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<DicomStudy, StudyDTO>().IncludeMembers(t => t.Subject, u => u.SubjectVisit)
             .ForMember(d => d.SiteName, u => u.MapFrom(s => s.Subject.TrialSite.TrialSiteName))
-            .ForMember(d => d.UploaderFirstName, u => u.MapFrom(s => s.CreateUser.FirstName))
-            .ForMember(d => d.UploaderLastName, u => u.MapFrom(s => s.CreateUser.LastName))
+            .ForMember(d => d.UploaderFirstName, u => u.MapFrom(s => s.CreateUserRole.IdentityUser.FirstName))
+            .ForMember(d => d.UploaderLastName, u => u.MapFrom(s => s.CreateUserRole.IdentityUser.LastName))
               .ForMember(d => d.UploadedTime, u => u.MapFrom(s => s.CreateTime));
 
             CreateMap<Subject, StudyDTO>();
@@ -66,7 +66,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<DicomStudy, QAStudyInfoDTO>()
                 .ForMember(o => o.IsCompleteClinicalData, t => t.MapFrom(u => !u.ReadingClinicalDataList.Any(x => x.ReadingClinicalDataPDFList.Count() == 0)))
                 .ForMember(o => o.UploadedTime, t => t.MapFrom(u => u.CreateTime))
-                .ForMember(o => o.Uploader, t => t.MapFrom(u => u.CreateUser.LastName + " / " + u.CreateUser.FirstName))
+                .ForMember(o => o.Uploader, t => t.MapFrom(u => u.CreateUserRole.IdentityUser.FullName))
                 .ForMember(o => o.StudyId, t => t.MapFrom(u => u.Id))
                  .ForMember(o => o.IsHaveUploadFailed, t => t.MapFrom(u => u.DicomStudyMonitorList.Any(t => t.FailedFileCount > 0)))
                 .ForMember(o => o.Modalities, t => t.MapFrom(u => string.Join('、', u.SeriesList.Select(t => t.Modality).Distinct())));
@@ -141,9 +141,9 @@ namespace IRaCIS.Core.Application.Service
                 ;
 
             CreateMap<TrialImageDownload, TrialImageDownloadView>()
-                .ForMember(d => d.UserFullName, u => u.MapFrom(s => s.CreateUser.FullName))
-                 .ForMember(d => d.UserTypeEnum, u => u.MapFrom(s => s.CreateUser.UserTypeEnum))
-                .ForMember(d => d.UserName, u => u.MapFrom(s => s.CreateUser.UserName))
+                .ForMember(d => d.UserFullName, u => u.MapFrom(s => s.CreateUserRole.FullName))
+                 .ForMember(d => d.UserTypeEnum, u => u.MapFrom(s => s.CreateUserRole.UserTypeEnum))
+                .ForMember(d => d.UserName, u => u.MapFrom(s => s.CreateUserRole.IdentityUser.UserName))
                 .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.Subject.TrialSite.TrialSiteCode))
                 ;
 

IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs

@@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Service
         IRepository<QCChallenge> _qCChallengeRepository,
         IRepository<Dictionary> _dictionaryRepository,
         IRepository<Trial> _trialRepository,
-        IRepository<User> _userRepository,
+        IRepository<UserRole> _userRoleRepository,
 
         IRepository<CheckChallengeDialog> _checkChallengeDialogRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IFrontAuditConfigService
     {
@@ -60,19 +60,19 @@ namespace IRaCIS.Core.Application.Service
             {
                 case AccessToDialogueEnum.Question:
 
-                    AccessToDialogueOutDto title = (await _qCChallengeRepository.Where(x => x.Id == inDto.Id).Include(x => x.CreateUser).Select(x => new AccessToDialogueOutDto()
+                    AccessToDialogueOutDto title = (await _qCChallengeRepository.Where(x => x.Id == inDto.Id).Include(x => x.CreateUserRole).Select(x => new AccessToDialogueOutDto()
                     {
                         CreateTime = x.CreateTime,
-                        CreateUserName = x.CreateUser.UserName,
+                        CreateUserName = x.CreateUserRole.IdentityUser.UserName,
                         TalkContent = x.Content,
                         IsTitle = true,
                     }).FirstOrDefaultAsync()) ?? new AccessToDialogueOutDto();
 
-                    data = await _qCChallengeDialogRepository.Where(x => x.QCChallengeId == inDto.Id && x.CreateTime <= inDto.Createtime).Include(x => x.CreateUser).Select(
+                    data = await _qCChallengeDialogRepository.Where(x => x.QCChallengeId == inDto.Id && x.CreateTime <= inDto.Createtime).Include(x => x.CreateUserRole).Select(
                         x => new AccessToDialogueOutDto()
                         {
                             CreateTime = x.CreateTime,
-                            CreateUserName = x.CreateUser.UserName,
+                            CreateUserName = x.CreateUserRole.IdentityUser.UserName,
                             TalkContent = x.TalkContent
                         }
                         ).OrderBy(x => x.CreateTime).ToListAsync();
@@ -81,11 +81,11 @@ namespace IRaCIS.Core.Application.Service
 
                     break;
                 case AccessToDialogueEnum.Consistency:
-                    data = await _checkChallengeDialogRepository.Where(x => x.SubjectVisitId == inDto.Id && x.CreateTime <= inDto.Createtime).Include(x => x.CreateUser).Select(
+                    data = await _checkChallengeDialogRepository.Where(x => x.SubjectVisitId == inDto.Id && x.CreateTime <= inDto.Createtime).Include(x => x.CreateUserRole).Select(
                         x => new AccessToDialogueOutDto()
                         {
                             CreateTime = x.CreateTime,
-                            CreateUserName = x.CreateUser.UserName,
+                            CreateUserName = x.CreateUserRole.IdentityUser.UserName,
                             TalkContent = x.TalkContent
                         }
                         ).OrderBy(x => x.CreateTime).ToListAsync();
@@ -389,8 +389,6 @@ namespace IRaCIS.Core.Application.Service
                         objectLsit.Add(newNamepDic);
                     }
 
-
-
                     await AddJsonObjectToDic(relationParentInspection.Id, relationParentInspection.ObjectRelationParentId, relationParentInspection.CreateTime, relationParentInspection.BatchId, objectLsit);
                     await AddJsonObjectToDic(relationParentInspection.Id, relationParentInspection.ObjectRelationParentId2, relationParentInspection.CreateTime, relationParentInspection.BatchId, objectLsit);
                     await AddJsonObjectToDic(relationParentInspection.Id, relationParentInspection.ObjectRelationParentId3, relationParentInspection.CreateTime, relationParentInspection.BatchId, objectLsit);
@@ -401,7 +399,7 @@ namespace IRaCIS.Core.Application.Service
                     //用户的数据稽查没有  临时处理
 
 
-                    var userObj = await _userRepository.Where(t => t.Id == objectRelationParentId).Select(t => new { UserRealName = t.FullName, t.Phone, t.UserName, UserType = t.UserTypeRole.UserTypeShortName, t.EMail, t.OrganizationName }).FirstOrDefaultAsync();
+                    var userObj = await _userRoleRepository.Where(t => t.Id == objectRelationParentId).Select(t => new { UserRealName = t.IdentityUser.FullName, t.IdentityUser.Phone, t.IdentityUser.UserName, UserType = t.UserTypeRole.UserTypeShortName, t.IdentityUser.EMail, t.IdentityUser.OrganizationName }).FirstOrDefaultAsync();
 
                     if (userObj != null)
                     {
@@ -1074,14 +1072,14 @@ namespace IRaCIS.Core.Application.Service
                 //IsConfig = lst.Select(x => x.IsConfig).FirstOrDefault(),
                 IsShowParent = lst.Select(x => x.IsShowParent).FirstOrDefault(),
                 ParentId = item.AddItemGuid,
-                CreateUserId = _userInfo.Id,
+                CreateUserId = _userInfo.UserRoleId,
                 IsEnable = lst.Select(x => x.IsEnable).FirstOrDefault(),
                 DictionaryKey = lst.Select(x => x.DictionaryKey).FirstOrDefault(),
                 EnumType = lst.Select(x => x.EnumType).FirstOrDefault(),
                 UpdateTime = DateTime.Now,
                 ValueCN = lst.Select(x => x.ValueCN).FirstOrDefault(),
                 Value = lst.Max(x => x.Value),
-                UpdateUserId = _userInfo.Id,
+                UpdateUserId = _userInfo.UserRoleId,
                 ChildrenTypeId = additem?.ChildrenTypeId,
                 ModuleTypeId = additem?.ModuleTypeId,
                 ObjectTypeId = additem?.ObjectTypeId,

IRaCIS.Core.Application/Service/Inspection/InspectionService.cs

@@ -12,7 +12,8 @@ namespace IRaCIS.Core.Application.Service.Inspection
     public class InspectionService(IRepository<DataInspection> _dataInspectionRepository,
         IRepository<Dictionary> _dictionaryRepository,
         IRepository<TrialSign> _trialSignRepository,
-        IRepository<User> _userRepository,
+        IRepository<IdentityUser> _identityUserRepository,
+        IRepository<UserRole> _userRoleRepository,
         IRepository<TrialSite> _trialSiteRepository,
         IRepository<Trial> _trialRepository,
         IRepository<Subject> _subjectRepository,
@@ -53,7 +54,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
                         from leftsubjectVisit in subjectVisittemp.DefaultIfEmpty()
                         join parent in _dataInspectionRepository.Where() on data.ParentId equals parent.Id into parenttemp
                         from leftparent in parenttemp.DefaultIfEmpty()
-                        join user in _userRepository.Where().IgnoreQueryFilters() on data.CreateUserId equals user.Id into usertemp
+                        join user in _userRoleRepository.Where().IgnoreQueryFilters() on data.CreateUserId equals user.Id into usertemp
                         from leftuser in usertemp.DefaultIfEmpty()
                         join usertype in _userTypeRepository.Where().IgnoreQueryFilters() on leftuser.UserTypeId equals usertype.Id into usertypetemp
                         from leftusertype in usertypetemp.DefaultIfEmpty()
@@ -105,7 +106,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
                             //OptType = data.OptType,
                             IP = data.IP,
                             Reason = data.Reason,
-                            IsSign = leftfrontAuditConfig.IsHaveSign,
+                            IsSign = leftfrontAuditConfig.IsHaveSign && lefttrialSign.SignText!=null&& lefttrialSign.SignText!=string.Empty,
                             SignId = data.SignId,
                             ParentId = data.ParentId,
                             ChildrenTypeId = data.ChildrenTypeId,
@@ -257,7 +258,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
         /// <summary> 验证用户签名信息 </summary> ///  
         public async Task<IResponseOutput> VerifySignatureAsync(SignDTO signDTO)
         {
-            var user = await _userRepository.FirstOrDefaultAsync(u => u.UserName == signDTO.UserName && u.Password == signDTO.PassWord);
+            var user = await _identityUserRepository.FirstOrDefaultAsync(u => u.UserName == signDTO.UserName && u.Password == signDTO.PassWord);
             if (user == null)
             {
                 throw new BusinessValidationFailedException(_localizer["User_CheckNameOrPw"]);

IRaCIS.Core.Application/Service/Institution/CROService.cs

@@ -65,7 +65,7 @@ namespace IRaCIS.Core.Application.Service
                 //---该CRO已经参与项目，不能被删除。
                 return ResponseOutput.NotOk(_localizer["CRO_InProject"]);
             }
-            //if (_userRepository.Find().Any(t => t.OrganizationId == cROCompanyId))
+            //if (_userRoleRepository.Find().Any(t => t.OrganizationId == cROCompanyId))
             //{
             //    return ResponseOutput.NotOk("该CRO下存在用户，暂时无法删除。");
             //}

IRaCIS.Core.Application/Service/Institution/SiteService.cs

@@ -9,7 +9,7 @@ namespace IRaCIS.Core.Application.Service
 {
     [ApiExplorerSettings(GroupName = "Institution")]
     public class SiteService(IRepository<Site> _siteRepository,
-        IRepository<TrialSiteUser> _trialSiteUserRepository,
+        IRepository<TrialSiteUserRole> _trialSiteUserRoleRepository,
         IDistributedLockProvider _distributedLockProvider,
         IRepository<TrialSite> _trialSiteRepository,
         IRepository<Hospital> _hospitalRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISiteService
@@ -114,7 +114,7 @@ namespace IRaCIS.Core.Application.Service
         public async Task<IResponseOutput> DeleteSite(Guid siteId)
         {
 
-            if (await _trialSiteUserRepository.AnyAsync(t => t.TrialSite.SiteId == siteId))
+            if (await _trialSiteUserRoleRepository.AnyAsync(t => t.TrialSite.SiteId == siteId))
             {
                 //---该中心已经加入项目，不可以被删除。
                 return ResponseOutput.NotOk(_localizer["Site_InProject"]);

IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs

@@ -12,30 +12,33 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid? Id { get; set; }
         public string IP { get; set; }
 
-        public string LoginFaildName { get; set; }
+        public string ActionUserType { get; set; }
         public int OptType { get; set; }
 
+        public string? ActionUserName { get; set; }
 
-        public string? LoginUserName { get; set; }
-
-        public UserTypeEnum? LoginUserTypeEnum { get; set; }
+        //public string ActionUserRoleShortName { get; set; }
 
         public DateTime CreateTime { get; set; }
         public Guid CreateUserId { get; set; }
 
+        public string TargetIdentityUserName { get; set; }
 
+        public bool IsLoginUncommonly { get; set; }
 
-        public string? OptUserName { get; set; }
-
-        public UserTypeEnum? OptUserTypeEnum { get; set; }
-
-        public Guid? LoginUserId { get; set; }
-
-        public Guid? OptUserId { get; set; }
+        
+        public string JsonObj { get; set; }
 
         public string IPRegion { get; set; }
     }
 
+    public class SendMfaCommand
+    {
+        public Guid IdentityUserId { get; set; }
+
+        public UserMFAType MFAType { get; set; } = UserMFAType.Login;
+    }
+
     ///<summary>UserLogQuery  列表查询参数模型</summary>
     public class UserLogQuery : PageInput
     {
@@ -57,7 +60,9 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public Guid? UserTypeId { get; set; }
 
-        public Guid? UserId { get; set; }
+        public Guid? IdentityUserId { get; set; }
+
+        public bool? IsLoginUncommonly { get; set; }
 
     }
 

IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs

@@ -21,7 +21,41 @@ namespace IRaCIS.Application.Contracts
 
         public Guid? UserId { get; set; }
     }
+    public class IRCLoginDto
+    {
+        public string UserName { get; set; }
+        public string Password { get; set; }
+    }
+    public class LoginSelectRoleReturn
+    {
+        public string JwtStr { get; set; }
 
+        public bool IsMutiAccount => AccountList.Count > 1;
+
+        public List<UserAccountInfo> AccountList { get; set; } = new List<UserAccountInfo>();
+    }
+
+    public class UserAccountInfo
+    {
+        public Guid Id { get; set; }
+        public Guid IdentityUserId { get; set; }
+        public string UserName { get; set; } = string.Empty;
+        public string FullName { get; set; } = string.Empty;
+
+        public string Phone { get; set; } = string.Empty;
+        public string EMail { get; set; } = string.Empty;
+
+        public Guid UserTypeId { get; set; }
+
+        public UserTypeEnum UserTypeEnum { get; set; }
+
+        public string UserTypeShortName { get; set; }
+
+        public bool IsUserRoleDisabled { get; set; }
+
+
+
+    }
     public class LoginReturnDTO
     {
         public UserBasicInfo BasicInfo { get; set; } = new UserBasicInfo();
@@ -33,43 +67,51 @@ namespace IRaCIS.Application.Contracts
 
     }
 
+    public class IRCLoginReturnDTO
+    {
+        public UserBasicInfo BasicInfo { get; set; } = new UserBasicInfo();
+        public string JWTStr { get; set; } = string.Empty;
+
+        public bool IsMFA { get; set; } = false;
+
+        public SystemEmailSendConfigView CompanyInfo { get; set; }
+
+    }
+
     public class UserBasicInfo
     {
-        public Guid Id { get; set; }
+        public Guid IdentityUserId { get; set; }
+
+        public Guid UserRoleId { get; set; }
+
+        public bool IsMutiAccount => AccountList?.Count > 1;
+        public List<UserAccountInfo> AccountList { get; set; }
+
+
         public string UserName { get; set; } = string.Empty;
-        public string RealName { get; set; } = string.Empty;
+        public string FullName { get; set; } = string.Empty;
         public int? Sex { get; set; } // 1-男  2-女
+        public string UserCode { get; set; }
+        public string EMail { get; set; }
+
+        public int Status { get; set; }
+        public bool IsTestUser { get; set; }
+        public bool IsZhiZhun { get; set; }
+        public bool IsFirstAdd { get; set; }
+
+        public bool NeedChangePassWord { get; set; } = false;
 
 
-        /// <summary>
-        /// LastLoginIP
-        /// </summary>
+        public bool PasswordChanged { get; set; }
+
+        public int LoginState { get; set; } = 0;
         public string LastLoginIP { get; set; } = string.Empty;
-
-        public UserTypeEnum UserTypeEnum { get; set; }
-
+        public DateTime? LastLoginTime { get; set; }
         /// <summary>
         /// 上一次修改密码的时间
         /// </summary>
         public DateTime? LastChangePassWordTime { get; set; }
-        public bool IsTestUser { get; set; }
-        public bool IsAdmin { get; set; } = false;
-        public string UserTypeShortName { get; set; } = string.Empty;
-        public bool PasswordChanged { get; set; }
-        public int Status { get; set; }
-        public Guid UserTypeId { get; set; }
 
-        public string Code { get; set; } = String.Empty;
-
-        public string PermissionStr { get; set; } = String.Empty;
-
-        public string EMail { get; set; } = string.Empty;
-        public bool IsFirstAdd { get; set; }
-
-        public bool IsZhiZhun { get; set; }
-        public bool IsReviewer { get; set; } = false;
-
-        public int LoginState { get; set; } = 0;
 
     }
 
@@ -119,54 +161,41 @@ namespace IRaCIS.Application.Contracts
 
     public class UserDetailDTO : UserInfo
     {
-        public bool CanEditUserType { get; set; }
+        //public bool CanEditUserType { get; set; }
+
+        public string FullName { get; set; }
+
+        public Guid Id { get; set; }
+
+        public List<UserAccountInfo> AccountList { get; set; }
     }
 
     public class UserInfo
     {
-        public Guid Id { get; set; }
         public string UserName { get; set; } = string.Empty;
-        public string Password { get; set; } = string.Empty;
-        public string RealName { get; set; } = string.Empty;
-
 
         public string FirstName { get; set; } = string.Empty;
 
         public string LastName { get; set; } = string.Empty;
         public int? Sex { get; set; } // 1-男  2-女
 
-        public int Status { get; set; } = 1; // 0-已删除 1-正常
+        public UserStateEnum Status { get; set; } = UserStateEnum.Enable;
 
         public string Phone { get; set; } = string.Empty;
         public string EMail { get; set; } = string.Empty;
-        public Guid UserTypeId { get; set; } = Guid.Empty;
 
         public string UserCode { get; set; } = string.Empty;
 
         public bool IsZhiZhun { get; set; }
 
-        public string UserType { get; set; } = string.Empty;
-
-        public string UserTypeShortName { get; set; } = string.Empty;
-
-
-        public UserTypeEnum UserTypeEnum { get; set; }
-
-
-
-        //public Guid OrganizationTypeId { get; set; } = Guid.Empty;
-        //public string OrganizationType { get; set; } = String.Empty;
-        //public Guid OrganizationId { get; set; }
         public string OrganizationName { get; set; } = string.Empty;
 
-
-
         public string DepartmentName { get; set; } = String.Empty;
         public string PositionName { get; set; } = String.Empty;
 
         public bool IsTestUser { get; set; }
 
-        public DateTime? LastLoginTime { get; set; }
+
     }
 
     /// <summary>
@@ -179,13 +208,59 @@ namespace IRaCIS.Application.Contracts
     }
 
 
+    public class UserBasicInfoCommand : UserInfo
+    {
+        public Guid Id { get; set; }
+    }
+
+    public class UpdateUserRolesDto
+    {
+        public Guid Id { get; set; }
+
+        public List<UserAddUserType> UserRoleList { get; set; }
+    }
+
     public class UserCommand : UserInfo
     {
+        public Guid? Id { get; set; }
+
+        public List<UserAddUserType> UserRoleList { get; set; }
+
+
         public string BaseUrl { get; set; } = string.Empty;
         public string RouteUrl { get; set; } = string.Empty;
 
-        //public string FirstName { get; set; }
-        //public string LastName { get; set; }
+    }
+
+
+    public class NewUserSendEmailCommand
+    {
+        public Guid IdentityUserId { get; set; }
+        public string BaseUrl { get; set; } = string.Empty;
+        public string RouteUrl { get; set; } = string.Empty;
+
+    }
+
+    public class IdentityUserTypeDTO : UserAddUserType
+    {
+        public Guid Id { get; set; }
+        public string UserTypeShortName { get; set; }
+
+        public DateTime CreateTime { get; set; }
+
+        public DateTime UpdateTime { get; set; }
+    }
+
+    public class UserAddUserType
+    {
+
+        public UserTypeEnum UserTypeEnum { get; set; }
+
+        public Guid UserTypeId { get; set; }
+
+        public bool IsUserRoleDisabled { get; set; }
+
+
     }
 
     public class EditPasswordCommand
@@ -200,7 +275,7 @@ namespace IRaCIS.Application.Contracts
 
     public class UserAccountDto
     {
-        public Guid UserId { get; set; }
+        public Guid Id { get; set; }
 
         public string UserName { get; set; } = string.Empty;
 
@@ -231,6 +306,11 @@ namespace IRaCIS.Application.Contracts
         public DateTime? BeginLastLoginTime { get; set; }
 
         public DateTime? EndLastLoginTime { get; set; }
+
+
+        public DateTime? BeginLastChangePassWordTime { get; set; }
+
+        public DateTime? EndLastChangePassWordTime { get; set; }
     }
 
     public class UserRoleInfoDTO
@@ -241,26 +321,25 @@ namespace IRaCIS.Application.Contracts
 
     public class UserListDTO : UserInfo
     {
-        [JsonIgnore]
-        public Guid testGuid { get; set; }
-        public bool CanEditUserType { get; set; }
+        //public bool CanEditUserType { get; set; }
+
+        public bool IsFirstAdd { get; set; }
+
+        public DateTime? LastLoginTime { get; set; }
 
         public DateTime CreateTime { get; set; }
 
-        public List<string> RoleNameArray { get; set; } = new List<string>();
-        public IEnumerable<RoleDTO> RoleNameList { get; set; } = new List<RoleDTO>();
+        public Guid Id { get; set; }
+
+        public string FullName { get; set; }
+
+        public DateTime? LastChangePassWordTime { get; set; }
+
+        public List<IdentityUserTypeDTO> UserRoleList { get; set; }
     }
 
 
-    public class UserIdRoleName : RoleDTO
-    {
-        public Guid UserId { get; set; }
-    }
-    public class UserIdRoleNameList
-    {
-        public Guid UserId { get; set; }
-        public IEnumerable<RoleDTO> RoleList { get; set; } = new List<RoleDTO>();
-    }
+
 
 
     public class AllowAnonymousResetPasswordCommand

IRaCIS.Core.Application/Service/Management/Interface/IUserService.cs

@@ -1,4 +1,5 @@
 using IRaCIS.Application.Contracts;
+using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
 
 namespace IRaCIS.Core.Application.Service
@@ -6,19 +7,19 @@ namespace IRaCIS.Core.Application.Service
     public interface IUserService
     {
         Task<IResponseOutput<UserAddedReturnDTO>> AddUser(UserCommand userAddModel);
-        Task<IResponseOutput> DeleteUser(Guid userId);
-        Task<UserDetailDTO> GetUser(Guid id);
+        //Task<IResponseOutput> DeleteUser(Guid userId);
+        //Task<UserDetailDTO> GetUser(Guid id);
         Task<PageOutput<UserListDTO>> GetUserList(UserListQueryDTO param);
         Task<IResponseOutput<LoginReturnDTO>> Login(string userName, string password);
-        Task<IResponseOutput> VerifyMFACodeAsync(Guid userId, string Code);
+        Task<IResponseOutput> VerifyMFACodeAsync(string Code);
 
-        Task<IResponseOutput> SendMFAEmail(Guid userId, int mfaType = 0);
+        Task<IResponseOutput> SendMFAEmail(SendMfaCommand sendMfa);
         Task<UserBasicInfo> GetUserBasicInfo(Guid userId, string pwd);
         Task<IResponseOutput> ModifyPassword(EditPasswordCommand editPwModel);
         Task<IResponseOutput> ResetPassword(Guid userId);
 
         Task<IResponseOutput> UpdateUser(UserCommand model);
-        Task<IResponseOutput> UpdateUserState(Guid userId, UserStateEnum state);
+        //Task<IResponseOutput> UpdateUserState(Guid userId, UserStateEnum state);
 
         //Task<IResponseOutput> SendVerificationCode(string emailOrPhone, VerifyType verificationType, bool isReviewer = false);
         //Task<IResponseOutput> SetNewPassword(ResetPasswordCommand resetPwdModel);

IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs

@@ -48,7 +48,7 @@ namespace IRaCIS.Core.Application.Service
 
                 if (entity.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.HavePublished)
                 {
-                    entity.PublishedUserId = _userInfo.Id;
+                    entity.PublishedUserId = _userInfo.UserRoleId;
                     entity.PublishedTime = DateTime.Now;
                 }
                 await _systemNoticeRepository.SaveChangesAsync();
@@ -61,7 +61,7 @@ namespace IRaCIS.Core.Application.Service
 
                 if (addOrEditSystemNotice.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.HavePublished && systemNotice.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.NotPublish)
                 {
-                    systemNotice.PublishedUserId = _userInfo.Id;
+                    systemNotice.PublishedUserId = _userInfo.UserRoleId;
                     systemNotice.PublishedTime = DateTime.Now;
                 }
                 else if (addOrEditSystemNotice.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.NotPublish && systemNotice.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.HavePublished)
@@ -125,7 +125,7 @@ namespace IRaCIS.Core.Application.Service
                 .WhereIf(inQuery.NoticeTypeEnum != null, t => t.NoticeTypeEnum == inQuery.NoticeTypeEnum)
                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.FileName), t => t.FileName.Contains(inQuery.FileName))
                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.NoticeContent), t => t.NoticeContent.Contains(inQuery.NoticeContent))
-                .ProjectTo<SystemNoticeReadDTO>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, userId = _userInfo.Id });
+                .ProjectTo<SystemNoticeReadDTO>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, userId = _userInfo.UserRoleId });
 
             return await systemNoticeQueryable.ToPagedListAsync(inQuery);
         }
@@ -137,9 +137,9 @@ namespace IRaCIS.Core.Application.Service
             var appDateTimeNow = DateTime.Now;
 
             var query = _systemNoticeRepository
-                  .Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.HavePublished && !t.NoticeUserReadList.Any(t => t.CreateUserId == _userInfo.Id))
+                  .Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.HavePublished && !t.NoticeUserReadList.Any(t => t.CreateUserId == _userInfo.UserRoleId))
                   .Where(t => t.EndDate == null || t.EndDate != null && t.EndDate > appDateTimeNow)
-                  .ProjectTo<SystemNoticeView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, userId = _userInfo.Id });
+                  .ProjectTo<SystemNoticeView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, userId = _userInfo.UserRoleId });
 
             return await query.ToListAsync();
         }

IRaCIS.Core.Application/Service/Management/UserFeedBackService.cs

@@ -32,15 +32,15 @@ namespace IRaCIS.Core.Application.Service
             var isCRCOrIR = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer;
 
             var userFeedBackQueryable = _userFeedBackRepository
-                  .WhereIf(isCRCOrIR, t => t.CreateUserId == _userInfo.Id)
+                  .WhereIf(isCRCOrIR, t => t.CreateUserId == _userInfo.UserRoleId)
                   .WhereIf(inQuery.State != null, t => t.State == inQuery.State)
                    .WhereIf(inQuery.TrialId != null, t => t.TrialId == inQuery.TrialId)
                   .WhereIf(inQuery.QuestionType != null, t => t.QuestionType == inQuery.QuestionType)
                   .WhereIf(inQuery.BeginCreatime != null, t => t.CreateTime >= inQuery.BeginCreatime)
 
                   .WhereIf(inQuery.EndCreatime != null, t => t.CreateTime == inQuery.EndCreatime)
-                  .WhereIf(inQuery.UserTypeEnum != null, t => t.CreateUser.UserTypeEnum == inQuery.UserTypeEnum)
-                   .WhereIf(!string.IsNullOrEmpty(inQuery.FeedBackUserKeyInfo), t => t.CreateUser.FullName.Contains(inQuery.FeedBackUserKeyInfo) || t.CreateUser.UserName.Contains(inQuery.FeedBackUserKeyInfo))
+                  .WhereIf(inQuery.UserTypeEnum != null, t => t.CreateUserRole.UserTypeEnum == inQuery.UserTypeEnum)
+                   .WhereIf(!string.IsNullOrEmpty(inQuery.FeedBackUserKeyInfo), t => t.CreateUserRole.FullName.Contains(inQuery.FeedBackUserKeyInfo) || t.CreateUserRole.IdentityUser.UserName.Contains(inQuery.FeedBackUserKeyInfo))
                   .WhereIf(!string.IsNullOrEmpty(inQuery.QuestionDescription), t => t.QuestionDescription.Contains(inQuery.QuestionDescription))
                   .WhereIf(!string.IsNullOrEmpty(inQuery.TrialKeyInfo), t => t.Trial.ExperimentName.Contains(inQuery.TrialKeyInfo) || t.Trial.TrialCode.Contains(inQuery.TrialKeyInfo))
                   .WhereIf(!string.IsNullOrEmpty(inQuery.SubejctAndVisitKeyInfo), t => t.Subject.Code.Contains(inQuery.SubejctAndVisitKeyInfo) || t.SubjectVisit.VisitName.Contains(inQuery.SubejctAndVisitKeyInfo))
@@ -61,8 +61,10 @@ namespace IRaCIS.Core.Application.Service
                 throw new BusinessValidationFailedException("Id  或者VisitTaskId 必传一个");
             }
 
-            var result = await _userFeedBackRepository.WhereIf(inQuery.Id == null, t => t.VisitTaskId == inQuery.VisitTaskId)
-                .WhereIf(inQuery.VisitTaskId == null, t => t.Id == inQuery.Id).ProjectTo<UserFeedBackView>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
+            var result = await _userFeedBackRepository
+                 .WhereIf(inQuery.Id != null, t => t.Id == inQuery.Id)
+                .WhereIf(inQuery.VisitTaskId != null, t => t.VisitTaskId == inQuery.VisitTaskId)
+                .ProjectTo<UserFeedBackView>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();