Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRC.Core.SCP/Service/CStoreSCPService.cs

@@ -8,6 +8,7 @@ using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Infrastructure.Extention;
 using IRaCIS.Core.SCP.Service;
+using MassTransit;
 using Medallion.Threading;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
 using Microsoft.Extensions.DependencyInjection;
@@ -95,7 +96,7 @@ namespace IRaCIS.Core.SCP.Service
         public Task OnReceiveAssociationRequestAsync(DicomAssociation association)
         {
 
-            _upload = new SCPImageUpload() { StartTime = DateTime.Now, CallingAE = association.CallingAE, CalledAE = association.CalledAE, CallingAEIP = association.RemoteHost };
+            _upload = new SCPImageUpload() { Id = NewId.NextSequentialGuid(), StartTime = DateTime.Now, CallingAE = association.CallingAE, CalledAE = association.CalledAE, CallingAEIP = association.RemoteHost };
 
 
             Log.Logger.Warning($"接收到来自{association.CallingAE}的连接");
@@ -644,7 +645,7 @@ namespace IRaCIS.Core.SCP.Service
                 ms.Position = 0;
 
                 //irc 从路径最后一截取Guid
-                storeRelativePath = await ossService.UploadToOSSAsync(ms, ossFolderPath, instanceId.ToString(), false, uploadInfo: new FileUploadRecordAddOrEdit() { TrialId = _trialId, BatchDataType = BatchDataType.PACSReceive });
+                storeRelativePath = await ossService.UploadToOSSAsync(ms, ossFolderPath, instanceId.ToString(), false, uploadInfo: new FileUploadRecordAddOrEdit() { TrialId = _trialId, BatchDataType = BatchDataType.PACSReceive, UploadBatchId = _upload.Id.ToString() });
 
                 fileSize = ms.Length;
 

IRC.Core.SCP/Service/FileUploadRecordService.cs

@@ -63,6 +63,8 @@ public class FileUploadRecordAddOrEdit
     public bool? IsNeedSync { get; set; }
     public string UploadRegion { get; set; }
     public string TargetRegion { get; set; }
+
+    public bool? IsSync { get; set; }
 }
 public interface IFileUploadRecordService
 {
@@ -113,6 +115,19 @@ public class FileUploadRecordService(IRepository<FileUploadRecord> _fileUploadRe
             }
         }
 
+        //SCP推送过来IP为空，后端归档的，设置区域
+        if (_userInfo.IP.IsNullOrEmpty() && _userInfo.Domain.IsNullOrEmpty())
+        {
+            var apiDefalut = ObjectStoreServiceConfig.SyncConfigList.FirstOrDefault(t => t.UploadRegion == ObjectStoreServiceConfig.ApiDeployRegion);
+
+            if (apiDefalut != null)
+            {
+                addOrEditFileUploadRecord.UploadRegion = apiDefalut.UploadRegion;
+                addOrEditFileUploadRecord.TargetRegion = apiDefalut.TargetRegion;
+
+            }
+        }
+
         if (addOrEditFileUploadRecord.TrialId != null)
         {
 
@@ -129,9 +144,9 @@ public class FileUploadRecordService(IRepository<FileUploadRecord> _fileUploadRe
             {
                 addOrEditFileUploadRecord.IsNeedSync = true;
 
-                addOrEditFileUploadRecord.Priority = 0;
-
+                addOrEditFileUploadRecord.Priority = addOrEditFileUploadRecord.Priority ?? 0;
 
+                addOrEditFileUploadRecord.IsSync = false;
             }
             else
             {
@@ -147,7 +162,9 @@ public class FileUploadRecordService(IRepository<FileUploadRecord> _fileUploadRe
             //系统文件，默认同步
             addOrEditFileUploadRecord.IsNeedSync = true;
 
-            addOrEditFileUploadRecord.Priority = 0;
+            addOrEditFileUploadRecord.IsSync = false;
+
+            addOrEditFileUploadRecord.Priority = addOrEditFileUploadRecord.Priority ?? 0;
         }
 
         var entity = await _fileUploadRecordRepository.InsertOrUpdateAsync(addOrEditFileUploadRecord, true);

IRC.Core.SCP/Service/OSSService.cs

@@ -194,7 +194,7 @@ public interface IOSSService
 
     List<string> GetRootFolderNames();
 
-    public ObjectStoreDTO GetObjectStoreTempToken(string? domain = null, bool? isGetAllTempToken = null);
+    public ObjectStoreDTO GetObjectStoreTempToken(string? domain = null, bool? isGetAllTempToken = null, string? objectUse = null);
 
     public Task MoveObject(string sourcePath, string destPath, bool overwrite = true);
 
@@ -825,10 +825,12 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
 
         if (ObjectStoreServiceOptions.IsOpenStoreSync && uploadInfo != null)
         {
+            var fileType = Path.GetExtension(returnPath).TrimStart('.');
+
             uploadInfo.FileSize = fileStream.CanSeek ? fileStream.Length : 0;
             uploadInfo.Path = returnPath;
             uploadInfo.FileName = fileRealName;
-            uploadInfo.FileType = Path.GetExtension(returnPath);
+            uploadInfo.FileType = fileType.IsNullOrEmpty()?"dcm": fileType;
 
 
             await _fileUploadRecordService.AddOrUpdateFileUploadRecord(uploadInfo);
@@ -964,10 +966,14 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
 
         if (ObjectStoreServiceOptions.IsOpenStoreSync && uploadInfo != null)
         {
+
+            var fileType = Path.GetExtension(returnPath).TrimStart('.');
+
             uploadInfo.FileSize = fileSize;
             uploadInfo.Path = returnPath;
             uploadInfo.FileName = Path.GetFileName(localFilePath);
-            uploadInfo.FileType = Path.GetExtension(returnPath);
+            uploadInfo.FileType = fileType.IsNullOrEmpty() ? "dcm" : fileType;
+
 
 
             await _fileUploadRecordService.AddOrUpdateFileUploadRecord(uploadInfo);
@@ -1856,23 +1862,39 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
 
 
 
-    public ObjectStoreDTO GetObjectStoreTempToken(string? domain = null, bool? isGetAllTempToken = null)
+    public ObjectStoreDTO GetObjectStoreTempToken(string? domain = null, bool? isGetAllTempToken = null, string? objectUse = null)
+    {
+        string objectStoreUse = string.Empty;
+        //使用指定配置
+        if (objectUse != null)
+        {
+            objectStoreUse = objectUse?.Trim() ?? string.Empty;
+        }
+        //根据域名动态判断
+        else
         {
             //如果传递了域名，并且打开了存储同步，根据域名使用的具体存储覆盖之前的配置，否则就用固定的配置
-        if (ObjectStoreServiceOptions.IsOpenStoreSync && domain.IsNotNullOrEmpty())
+            if (ObjectStoreServiceOptions.IsOpenStoreSync && domain.IsNotNullOrEmpty() && ObjectStoreServiceOptions.SyncConfigList.Any(t => t.Domain == domain))
             {
-            var userDomain = domain?.Trim();
 
-            var find = ObjectStoreServiceOptions.SyncConfigList.FirstOrDefault(t => t.Domain == userDomain);
+                var find = ObjectStoreServiceOptions.SyncConfigList.FirstOrDefault(t => t.Domain == domain);
                 if (find != null)
                 {
-                ObjectStoreServiceOptions.ObjectStoreUse = find.Primary;
+                    objectStoreUse = find.Primary;
+                }
+
+            }
+            else
+            {
+                //兜底，如果是本地测试环境，那就使用部署默认配置
+                objectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse;
             }
         }
 
-        var objectStoreDTO = new ObjectStoreDTO() { ObjectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse, IsOpenStoreSync = ObjectStoreServiceOptions.IsOpenStoreSync, SyncConfigList = ObjectStoreServiceOptions.SyncConfigList };
 
-        if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS" || isGetAllTempToken == true)
+        var objectStoreDTO = new ObjectStoreDTO() { ObjectStoreUse = objectStoreUse, IsOpenStoreSync = ObjectStoreServiceOptions.IsOpenStoreSync, SyncConfigList = ObjectStoreServiceOptions.SyncConfigList };
+
+        if (objectStoreUse == "AliyunOSS" || isGetAllTempToken == true)
         {
             var ossOptions = ObjectStoreServiceOptions.AliyunOSS;
 
@@ -1920,11 +1942,11 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
             objectStoreDTO.AliyunOSS = tempToken;
 
         }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
+        if (objectStoreUse == "MinIO")
         {
             objectStoreDTO.MinIO = ObjectStoreServiceOptions.MinIO;
         }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS" || isGetAllTempToken == true)
+        if (objectStoreUse == "AWS" || isGetAllTempToken == true)
         {
             var awsOptions = ObjectStoreServiceOptions.AWS;
 
@@ -1969,7 +1991,8 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
 
             objectStoreDTO.AWS = tempToken;
         }
-        else
+
+        if (objectStoreUse.IsNullOrEmpty())
         {
             throw new BusinessValidationFailedException("未定义的存储介质类型");
         }
@@ -1980,7 +2003,7 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
 
     public async Task SyncFileAsync(string objectKey, ObjectStoreUse source, ObjectStoreUse destination, CancellationToken ct = default)
     {
-        GetObjectStoreTempToken(isGetAllTempToken: true);
+        var tempConfig = GetObjectStoreTempToken(isGetAllTempToken: true);
 
 
         var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
@@ -1999,36 +2022,76 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
 
         var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
 
+        // ⭐ 关键变量
+        IDisposable? owner = null;
+        Stream sourceStream;
+        long contentLength;
 
-        // 根据源选择流式下载
-        Stream sourceStream = source switch
+        // ========= 获取流 + 长度 =========
+        switch (source)
+        {
+            case ObjectStoreUse.AliyunOSS:
                 {
-            ObjectStoreUse.AliyunOSS => _ossClient.GetObject(aliConfig.BucketName, objectKey).Content,
-            ObjectStoreUse.AWS => (await amazonS3Client.GetObjectAsync(awsConfig.BucketName, objectKey, ct)).ResponseStream,
-            _ => throw new BusinessValidationFailedException("未定义的同步类型")
-        };
 
-        if (source == ObjectStoreUse.AliyunOSS)
+                    var obj = _ossClient.GetObject(
+                        aliConfig.BucketName,
+                        objectKey);
+
+                    owner = obj;
+                    sourceStream = obj.Content;
+                    contentLength = obj.ContentLength;
+                    break;
+                }
+
+            case ObjectStoreUse.AWS:
+                {
+                    var response = await amazonS3Client.GetObjectAsync(
+                        awsConfig.BucketName,
+                        objectKey,
+                        ct);
+
+                    owner = response;
+                    sourceStream = response.ResponseStream;
+                    contentLength = response.Headers.ContentLength;
+                    break;
+                }
+
+            default:
+                throw new BusinessValidationFailedException("未定义的同步类型");
+        }
+
+        try
+        {
+            // ========= 上传 =========
+            if (destination == ObjectStoreUse.AWS)
             {
                 var putRequest = new Amazon.S3.Model.PutObjectRequest
                 {
                     BucketName = awsConfig.BucketName,
                     Key = objectKey,
-                InputStream = sourceStream
+                    InputStream = sourceStream,
+                    Headers = { ContentLength = contentLength }
                 };
 
                 await amazonS3Client.PutObjectAsync(putRequest, ct);
             }
-        else if (source == ObjectStoreUse.AWS)
+            else if (destination == ObjectStoreUse.AliyunOSS)
             {
-            _ossClient.PutObject(aliConfig.BucketName, objectKey, sourceStream);
+                _ossClient.PutObject(
+                    aliConfig.BucketName,
+                    objectKey,
+                    sourceStream);
             }
             else
             {
                 throw new BusinessValidationFailedException("未定义的同步类型");
             }
-
-        await sourceStream.DisposeAsync(); // 释放流
+        }
+        finally
+        {
+            // ⭐⭐⭐ 真正释放 HTTP 连接
+            owner?.Dispose();
+        }
     }
 
 }

IRC.Core.SCP/Service/_MapConfig.cs

@@ -0,0 +1,16 @@
+using AutoMapper;
+using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.SCP.Service;
+
+
+namespace IRaCIS.Core.Application.Service
+{
+    public class CommonConfig : Profile
+    {
+        public CommonConfig()
+        {
+            CreateMap<FileUploadRecordAddOrEdit, FileUploadRecord>().ReverseMap();
+        }
+    }
+
+}

IRC.Core.SCP/appsettings.Prod_IRC_SCP.json

@@ -8,6 +8,26 @@
   },
   "ObjectStoreService": {
     "ObjectStoreUse": "AliyunOSS",
+    "IsOpenStoreSync": true,
+    "ApiDeployRegion": "CN",
+    "SyncConfigList": [
+      {
+        "Domain": "irc.extimaging.com",
+        "Primary": "AliyunOSS",
+        "Target": "AWS",
+        "UploadRegion": "CN",
+        "TargetRegion": "US",
+        "IsOpenSync": true
+      },
+      {
+        "Domain": "eiirc.extimaging.com",
+        "Primary": "AWS",
+        "Target": "AliyunOSS",
+        "UploadRegion": "US",
+        "TargetRegion": "CN",
+        "IsOpenSync": true
+      }
+    ],
     "AliyunOSS": {
       "RegionId": "cn-shanghai",
       "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
@@ -19,6 +39,18 @@
       "ViewEndpoint": "https://zy-irc-cache.oss-cn-shanghai.aliyuncs.com",
       "Region": "oss-cn-shanghai",
       "DurationSeconds": 7200
+    },
+
+    "AWS": {
+      "Region": "us-east-1",
+      "EndPoint": "s3.us-east-1.amazonaws.com",
+      "UseSSL": true,
+      "RoleArn": "arn:aws:iam::471112624751:role/lili_s3_access",
+      "AccessKeyId": "AKIAW3MEAFJXZ2TZK7GM",
+      "SecretAccessKey": "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",
+      "BucketName": "ei-med-s3-irc-store",
+      "ViewEndpoint": "https://ei-med-s3-irc-store.s3.amazonaws.com",
+      "DurationSeconds": 7200
     }
   },
 

IRC.Core.SCP/appsettings.Test_IRC_SCP.json

@@ -7,7 +7,28 @@
     }
   },
   "ObjectStoreService": {
+    // 使用的对象存储服务类型
     "ObjectStoreUse": "AliyunOSS",
+    "IsOpenStoreSync": true,
+    "ApiDeployRegion": "CN",
+    "SyncConfigList": [
+      {
+        "Domain": "irc.test.extimaging.com",
+        "Primary": "AliyunOSS",
+        "Target": "AWS",
+        "UploadRegion": "CN",
+        "TargetRegion": "US",
+        "IsOpenSync": true
+      },
+      {
+        "Domain": "lili.test.extimaging.com",
+        "Primary": "AWS",
+        "Target": "AliyunOSS",
+        "UploadRegion": "US",
+        "TargetRegion": "CN",
+        "IsOpenSync": true
+      }
+    ],
     "AliyunOSS": {
       "RegionId": "cn-shanghai",
       "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
@@ -29,6 +50,27 @@
       "secretKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
       "bucketName": "hir-test",
       "viewEndpoint": "http://106.14.89.110:9001/hir-test/"
+    },
+    // AWS S3 对象存储服务的配置
+    "AWS": {
+      // AWS S3 的Region
+      "Region": "us-east-1",
+      // AWS S3 的内部访问端点
+      "EndPoint": "s3.us-east-1.amazonaws.com",
+      // 是否使用 SSL
+      "UseSSL": true,
+      // AWS S3 的角色 ARN
+      "RoleArn": "arn:aws:iam::471112624751:role/uat_s3_access",
+      // AWS S3 的访问密钥 ID
+      "AccessKeyId": "AKIAW3MEAFJX7IPXISP4",
+      // AWS S3 的访问密钥 Secret
+      "SecretAccessKey": "Pgrg3le5jPxZQ7MR1yYNS30J0XRyJeKVyIIjElXc",
+      // AWS S3 的Bucket名称
+      "BucketName": "ei-med-s3-lili-uat-store",
+      // AWS S3 的访问端点
+      "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com",
+      // AWS S3 的持续数秒
+      "DurationSeconds": 7200
     }
 
   },

IRC.Core.SCP/appsettings.US_Prod_SCP.json

@@ -8,6 +8,38 @@
   },
   "ObjectStoreService": {
     "ObjectStoreUse": "AWS",
+    "IsOpenStoreSync": true,
+    "ApiDeployRegion": "US",
+    "SyncConfigList": [
+      {
+        "Domain": "eilili.elevateimaging.ai",
+        "Primary": "AliyunOSS",
+        "Target": "AWS",
+        "UploadRegion": "CN",
+        "TargetRegion": "US",
+        "IsOpenSync": true
+      },
+      {
+        "Domain": "lili.elevateimaging.ai",
+        "Primary": "AWS",
+        "Target": "AliyunOSS",
+        "UploadRegion": "US",
+        "TargetRegion": "CN",
+        "IsOpenSync": true
+      }
+    ],
+    "AliyunOSS": {
+      "RegionId": "cn-shanghai",
+      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
+      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
+      "AccessKeyId": "LTAI5tNRTsqL6aWmHkDmTwoH",
+      "AccessKeySecret": "7mtGz3qrYWI6JMMBZiLeC119VWicZH",
+      "RoleArn": "acs:ram::1899121822495495:role/irc-oss-access",
+      "BucketName": "zy-lili-store",
+      "ViewEndpoint": "https://zy-lili-cache.oss-cn-shanghai.aliyuncs.com",
+      "Region": "oss-cn-shanghai",
+      "DurationSeconds": 7200
+    },
     "AWS": {
       "Region": "us-east-1",
       "EndPoint": "s3.us-east-1.amazonaws.com",

IRC.Core.SCP/appsettings.Uat_IRC_SCP.json

@@ -8,17 +8,58 @@
   },
   "ObjectStoreService": {
     "ObjectStoreUse": "AliyunOSS",
+    "IsOpenStoreSync": true,
+    "ApiDeployRegion": "CN",
+    "SyncConfigList": [
+      {
+        "Domain": "irc.uat.extimaging.com",
+        "Primary": "AliyunOSS",
+        "Target": "AWS",
+        "UploadRegion": "CN",
+        "TargetRegion": "US",
+        "IsOpenSync": true
+      },
+      {
+        "Domain": "lili.uat.extimaging.com",
+        "Primary": "AWS",
+        "Target": "AliyunOSS",
+        "UploadRegion": "US",
+        "TargetRegion": "CN",
+        "IsOpenSync": true
+      }
+    ],
     "AliyunOSS": {
       "RegionId": "cn-shanghai",
       "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
       "EndPoint": "https://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",
+      "AccessKeyId": "LTAI5tRRZehUp2V9pyTPtAJm",
+      "AccessKeySecret": "FLizxkHsMm4CGYHtkV8E3PNJJZU7oV",
+      "RoleArn": "acs:ram::1899121822495495:role/dev-oss-access",
+      "BucketName": "zy-irc-test-store",
+      "ViewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
       "Region": "oss-cn-shanghai",
       "DurationSeconds": 7200
+    },
+    // AWS S3 对象存储服务的配置
+    "AWS": {
+      // AWS S3 的Region
+      "Region": "us-east-1",
+      // AWS S3 的内部访问端点
+      "EndPoint": "s3.us-east-1.amazonaws.com",
+      // 是否使用 SSL
+      "UseSSL": true,
+      // AWS S3 的角色 ARN
+      "RoleArn": "arn:aws:iam::471112624751:role/uat_s3_access",
+      // AWS S3 的访问密钥 ID
+      "AccessKeyId": "AKIAW3MEAFJX7IPXISP4",
+      // AWS S3 的访问密钥 Secret
+      "SecretAccessKey": "Pgrg3le5jPxZQ7MR1yYNS30J0XRyJeKVyIIjElXc",
+      // AWS S3 的Bucket名称
+      "BucketName": "ei-med-s3-lili-uat-store",
+      // AWS S3 的访问端点
+      "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com",
+      // AWS S3 的持续数秒
+      "DurationSeconds": 7200
     }
   },
   "ConnectionStrings": {

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -933,7 +933,7 @@ namespace IRaCIS.Core.API.Controllers
             }
             //处理好 用户类型  和用户类型枚举
             var sysUserTypeList = _usertypeRepository.Where(t => t.UserTypeEnum == UserTypeEnum.CRA || t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Select(t => new { UserTypeId = t.Id, t.UserTypeEnum }).ToList();
-            var siteList = _trialSiteRepository.Where(t => t.TrialId == trialId && siteCodeList.Contains(t.TrialSiteCode)).Select(t => new { t.TrialSiteCode, TrialSiteId = t.Id }).ToList();
+            var siteList = _trialSiteRepository.Where(t => t.TrialId == trialId && siteCodeList.Contains(t.TrialSiteCode)).Select(t => new { t.TrialSiteCode, TrialSiteId = t.Id, t.Country }).ToList();
 
             foreach (var item in excelList)
             {
@@ -955,6 +955,8 @@ namespace IRaCIS.Core.API.Controllers
                 }
 
                 item.TrialSiteId = siteList.FirstOrDefault(t => t.TrialSiteCode.Trim().ToUpper() == item.TrialSiteCode.Trim().ToUpper()).TrialSiteId;
+
+                item.Country = siteList.FirstOrDefault(t => t.TrialSiteCode.Trim().ToUpper() == item.TrialSiteCode.Trim().ToUpper()).Country;
             }
 
             var list = excelList.Where(t => t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserTypeEnum == UserTypeEnum.CRA).ToList();

IRaCIS.Core.API/Progranm.cs

@@ -65,7 +65,8 @@ SerilogExtension.AddSerilogSetup(enviromentName);
 var builder = WebApplication.CreateBuilder(new WebApplicationOptions
 {
 
-    EnvironmentName = enviromentName
+    EnvironmentName = enviromentName,
+    Args = args
 });
 
 #region 主机配置

IRaCIS.Core.API/Properties/launchSettings.json

@@ -33,11 +33,11 @@
       },
       "applicationUrl": "http://0.0.0.0:6100"
     },
-    "IRaCIS.Event_IRC": {
+    "IRaCIS.Prod_Event_IRC": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Event_IRC"
+        "ASPNETCORE_ENVIRONMENT": "Prod_Event_IRC"
       },
       "applicationUrl": "http://0.0.0.0:6100"
     },

IRaCIS.Core.API/_ServiceExtensions/SerilogSetup.cs

@@ -46,19 +46,19 @@ namespace IRaCIS.Core.API
             var emailConfig = new SystemEmailSendConfig();
             configuration.GetSection("SystemEmailSendConfig").Bind(emailConfig);
 
-            if (emailConfig.IsOpenErrorNoticeEmail)
-            {
-                config.WriteTo.Email(options: new Serilog.Sinks.Email.EmailSinkOptions()
-                {
-                    From = emailConfig.FromEmail,
-                    To = emailConfig.ErrorNoticeEmailList,
-                    Host = emailConfig.Host,
-                    Port = emailConfig.Port,
-                    Subject = new MessageTemplateTextFormatter("Log Alert - 系统发生了异常，请核查"),
-                    Credentials = new NetworkCredential(emailConfig.FromEmail, emailConfig.AuthorizationCode)
+            //if (emailConfig.IsOpenErrorNoticeEmail)
+            //{
+            //    config.WriteTo.Email(options: new Serilog.Sinks.Email.EmailSinkOptions()
+            //    {
+            //        From = emailConfig.FromEmail,
+            //        To = emailConfig.ErrorNoticeEmailList,
+            //        Host = emailConfig.Host,
+            //        Port = emailConfig.Port,
+            //        Subject = new MessageTemplateTextFormatter("Log Alert - 系统发生了异常，请核查"),
+            //        Credentials = new NetworkCredential(emailConfig.FromEmail, emailConfig.AuthorizationCode)
 
-                }, restrictedToMinimumLevel: Serilog.Events.LogEventLevel.Error);
-            }
+            //    }, restrictedToMinimumLevel: Serilog.Events.LogEventLevel.Error);
+            //}
             #endregion
 
             Log.Logger = config.CreateLogger();

IRaCIS.Core.API/appsettings.Prod_Event_IRC.json

@@ -7,8 +7,10 @@
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=101.132.253.119,1435;Database=irc_Prpd_bak;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=101.132.253.119,1435;Database=irc_Hangfire_bak;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+    "RemoteNew": "Server=101.132.193.237,1433;Database=Prod_IRC_pidr_restore;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=101.132.193.237,1433;Database=irc_Hangfire_bak;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+    //"RemoteNew": "Server=prod_mssql_standard,1433;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
+    //"Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
   },
   "WeComNoticeConfig": {
     "IsOpenWeComNotice": true,
@@ -17,48 +19,51 @@
     "VueNoticeUserList": [ "wangxiaoshuang", "6b7717a31647293621b97b96f74e6f3d" ]
   },
   "ObjectStoreService": {
-
     "ObjectStoreUse": "AliyunOSS",
-
+    "IsOpenStoreSync": true,
+    "ApiDeployRegion": "CN",
+    "SyncConfigList": [
+      {
+        "Domain": "irc.extimaging.com",
+        "Primary": "AliyunOSS",
+        "Target": "AWS",
+        "UploadRegion": "CN",
+        "TargetRegion": "US",
+        "IsOpenSync": true
+      },
+      {
+        "Domain": "eiirc.extimaging.com",
+        "Primary": "AWS",
+        "Target": "AliyunOSS",
+        "UploadRegion": "US",
+        "TargetRegion": "CN",
+        "IsOpenSync": true
+      }
+    ],
     "AliyunOSS": {
       "RegionId": "cn-shanghai",
       "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
       "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tFUCCmz5TwghZHsj45Y",
-      "AccessKeySecret": "8evrBy1fVfzJG25i67Jm0xqn9Xcw2T",
-      "RoleArn": "acs:ram::1078130221702011:role/uat-oss-access",
-      "BucketName": "tl-med-irc-event-store",
-      "ViewEndpoint": "https://tl-med-irc-event-store.oss-cn-shanghai.aliyuncs.com",
+      "AccessKeyId": "LTAI5tNRTsqL6aWmHkDmTwoH",
+      "AccessKeySecret": "7mtGz3qrYWI6JMMBZiLeC119VWicZH",
+      "RoleArn": "acs:ram::1899121822495495:role/irc-oss-access",
+      "BucketName": "zy-irc-store",
+      "ViewEndpoint": "https://zy-irc-cache.oss-cn-shanghai.aliyuncs.com",
       "Region": "oss-cn-shanghai",
       "DurationSeconds": 7200
     },
-
-    "MinIO": {
-      "endPoint": "hir-oss.uat.extimaging.com",
-      "port": "80",
-      "useSSL": false,
-      "viewEndpoint": "http://hir-oss.uat.extimaging.com/irc-uat",
-      //"port": "443",
-      //"useSSL": true,
-      //"viewEndpoint": "https://hir-oss.uat.extimaging.com/irc-uat",
-      "accessKey": "b9Ul0e98xPzt6PwRXA1Q",
-      "secretKey": "DzMaU2L4OXl90uytwOmDXF2encN0Jf4Nxu2XkYqQ",
-      "bucketName": "irc-uat"
-
-    },
     "AWS": {
       "Region": "us-east-1",
       "EndPoint": "s3.us-east-1.amazonaws.com",
       "UseSSL": true,
-      "RoleArn": "arn:aws:iam::471112624751:role/sts_s3_upload",
-      "AccessKeyId": "AKIAW3MEAFJXWRCGSX5Z",
-      "SecretAccessKey": "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",
-      "BucketName": "ei-med-s3-lili-uat-store",
-      "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com/",
+      "RoleArn": "arn:aws:iam::471112624751:role/lili_s3_access",
+      "AccessKeyId": "AKIAW3MEAFJXZ2TZK7GM",
+      "SecretAccessKey": "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",
+      "BucketName": "ei-med-s3-irc-store",
+      "ViewEndpoint": "https://ei-med-s3-irc-store.s3.amazonaws.com",
       "DurationSeconds": 7200
     }
   },
-
   "BasicSystemConfig": {
     // 启用质控风险控制功能
     "QCRiskControl": true,
@@ -67,7 +72,6 @@
 
     "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
-
     "LoginFailLockMinutes": 30,
     "AutoLoginOutMinutes": 120,
 
@@ -82,17 +86,17 @@
     "TemplateType": 2,
     //MFA免验证发送天数
     "UserMFAVerifyMinutes": 1440
-
   },
+
   "SystemEmailSendConfig": {
     "Port": 465,
     "Host": "smtp.qiye.aliyun.com",
     "Imap": "imap.qiye.aliyun.com",
     "ImapPort": 993,
-    "FromEmail": "uat@extimaging.com",
-    "FromName": "Uat IRC Imaging System",
-    "AuthorizationCode": "SHzyyl2021",
-    "SiteUrl": "http://irc.uat.extimaging.com/login",
+    "FromEmail": "irc@extimaging.com",
+    "FromName": "IRC Imaging System",
+    "AuthorizationCode": "ExtImg@2022",
+    "SiteUrl": "http://irc.extimaging.com/login",
 
     "PlatformName": "EICS",
     "PlatformNameCN": "展影云平台",
@@ -104,15 +108,12 @@
     "CompanyShortName": "Extensive Imaging",
     "CompanyShortNameCN": "展影医疗",
     "IsEnv_US": false,
-    "IsOpenErrorNoticeEmail": false,
     "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
-    "CronEmailDefaultCulture": "zh-CN",
-    "ErrorNoticeEmailList": [ "872297557@qq.com" ]
+    "CronEmailDefaultCulture": "zh-CN"
   },
-
   "SystemPacsConfig": {
-    "Port": "11116",
-    "IP": "101.132.253.119"
+    "Port": "11113",
+    "IP": "101.132.193.237"
   },
   "RequestDuplicationOptions": {
     "IsEnabled": true,

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -20,6 +20,26 @@
   },
   "ObjectStoreService": {
     "ObjectStoreUse": "AliyunOSS",
+    "IsOpenStoreSync": true,
+    "ApiDeployRegion": "CN",
+    "SyncConfigList": [
+      {
+        "Domain": "irc.extimaging.com",
+        "Primary": "AliyunOSS",
+        "Target": "AWS",
+        "UploadRegion": "CN",
+        "TargetRegion": "US",
+        "IsOpenSync": true
+      },
+      {
+        "Domain": "eiirc.extimaging.com",
+        "Primary": "AWS",
+        "Target": "AliyunOSS",
+        "UploadRegion": "US",
+        "TargetRegion": "CN",
+        "IsOpenSync": true
+      }
+    ],
     "AliyunOSS": {
       "RegionId": "cn-shanghai",
       "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
@@ -32,13 +52,16 @@
       "Region": "oss-cn-shanghai",
       "DurationSeconds": 7200
     },
-    "MinIO": {
-      "endpoint": "http://192.168.3.68",
-      "port": "8001",
-      "useSSL": false,
-      "accessKey": "IDFkwEpWej0b4DtiuThL",
-      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
-      "bucketName": "test"
+    "AWS": {
+      "Region": "us-east-1",
+      "EndPoint": "s3.us-east-1.amazonaws.com",
+      "UseSSL": true,
+      "RoleArn": "arn:aws:iam::471112624751:role/lili_s3_access",
+      "AccessKeyId": "AKIAW3MEAFJXZ2TZK7GM",
+      "SecretAccessKey": "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",
+      "BucketName": "ei-med-s3-irc-store",
+      "ViewEndpoint": "https://ei-med-s3-irc-store.s3.amazonaws.com",
+      "DurationSeconds": 7200
     }
   },
   "BasicSystemConfig": {
@@ -85,10 +108,8 @@
     "CompanyShortName": "Extensive Imaging",
     "CompanyShortNameCN": "展影医疗",
     "IsEnv_US": false,
-    "IsOpenErrorNoticeEmail": false,
     "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
-    "CronEmailDefaultCulture": "zh-CN",
-    "ErrorNoticeEmailList": [ "872297557@qq.com" ]
+    "CronEmailDefaultCulture": "zh-CN"
   },
   "SystemPacsConfig": {
     "Port": "11113",

IRaCIS.Core.API/appsettings.Test_IRC.json

@@ -149,14 +149,15 @@
   },
   // 邮件服务配置（用于系统通知、找回密码、错误报警等）
   "SystemEmailSendConfig": {
-    // SMTP端口
-    "Port": 465,
+
     // 企业邮箱SMTP服务器地址
     "Host": "smtp.qiye.aliyun.com",
+    // SMTP端口
+    "Port": 465,
 
     "Imap": "imap.qiye.aliyun.com",
-
     "ImapPort": 993,
+
     // 发件人邮箱地址
     "FromEmail": "test@extimaging.com",
     // 发件人显示名称
@@ -166,14 +167,16 @@
     // 系统对外访问地址
     "SiteUrl": "http://irc.test.extimaging.com/login",
 
-    "PlatformName": "EICS",
-    "PlatformNameCN": "展影云平台",
-    // 系统简称一致性核查使用
+
+    // 系统简称 - 一致性核查使用
     "SystemShortName": "IRC",
-    // 组织英文名称
+    // 组织英文名称-添加用户默认值
     "OrganizationName": "ExtImaging",
     // 组织中文名称
     "OrganizationNameCN": "ExtImaging",
+
+    "PlatformName": "EICS",
+    "PlatformNameCN": "展影云平台",
     // 公司英文全称
     "CompanyName": "Extensive Imaging",
     // 公司中文全称
@@ -182,15 +185,14 @@
     "CompanyShortName": "Extensive Imaging",
     // 公司中文简称
     "CompanyShortNameCN": "展影医疗",
-    // 是否为国际版环境
+
+    // 是否为国际版环境 方便前端区分，用于区分lili 还是irc 做一些事情
     "IsEnv_US": false,
-    // 是否开启系统异常邮件报警
-    "IsOpenErrorNoticeEmail": false,
     // 邮箱格式校验正则表达式
     "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
-    "CronEmailDefaultCulture": "zh-CN",
-    // 接收系统异常报警的邮箱列表
-    "ErrorNoticeEmailList": [ "872297557@qq.com" ]
+
+    //后端周期性邮件默认语言
+    "CronEmailDefaultCulture": "zh-CN"
   },
   // PACS 连接配置
   "SystemPacsConfig": {

IRaCIS.Core.API/appsettings.US_Prod_IRC.json

@@ -20,16 +20,38 @@
   },
   "ObjectStoreService": {
     "ObjectStoreUse": "AWS",
-    "MinIO": {
-      "endPoint": "44.210.231.169",
-      "port": "9001",
-      "useSSL": false,
-      "accessKey": "e9bT1isTOqSAUxb6wd4n",
-      "secretKey": "b5TaDzNdQCBtCvfm8eZ3dR6yY7tfZu2JYze2Po1i",
-      "bucketName": "prod-irc-us",
-      "viewEndpoint": "http://44.210.231.169:9001/prod-irc-us/"
+    "IsOpenStoreSync": true,
+    "ApiDeployRegion": "US",
+    "SyncConfigList": [
+      {
+        "Domain": "eilili.elevateimaging.ai",
+        "Primary": "AliyunOSS",
+        "Target": "AWS",
+        "UploadRegion": "CN",
+        "TargetRegion": "US",
+        "IsOpenSync": true
+      },
+      {
+        "Domain": "lili.elevateimaging.ai",
+        "Primary": "AWS",
+        "Target": "AliyunOSS",
+        "UploadRegion": "US",
+        "TargetRegion": "CN",
+        "IsOpenSync": true
+      }
+    ],
+    "AliyunOSS": {
+      "RegionId": "cn-shanghai",
+      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
+      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
+      "AccessKeyId": "LTAI5tNRTsqL6aWmHkDmTwoH",
+      "AccessKeySecret": "7mtGz3qrYWI6JMMBZiLeC119VWicZH",
+      "RoleArn": "acs:ram::1899121822495495:role/irc-oss-access",
+      "BucketName": "zy-lili-store",
+      "ViewEndpoint": "https://zy-lili-cache.oss-cn-shanghai.aliyuncs.com",
+      "Region": "oss-cn-shanghai",
+      "DurationSeconds": 7200
     },
-
     "AWS": {
       "Region": "us-east-1",
       "EndPoint": "s3.us-east-1.amazonaws.com",
@@ -90,10 +112,8 @@
     "CompanyShortNameCN": "展影医疗",
     "SiteUrl": "https://lili.elevateimaging.ai/login",
     "IsEnv_US": true,
-    "IsOpenErrorNoticeEmail": false,
     "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
-    "CronEmailDefaultCulture": "en-US",
-    "ErrorNoticeEmailList": [ "872297557@qq.com" ]
+    "CronEmailDefaultCulture": "en-US"
   },
 
   "SystemPacsConfig": {

IRaCIS.Core.API/appsettings.US_Test_IRC.json

@@ -93,9 +93,7 @@
     "CompanyShortName": "Elevate Imaging",
     "CompanyShortNameCN": "展影医疗",
     "SiteUrl": "https://lili.test.elevateimaging.ai/login",
-    "IsEnv_US": true,
-    "IsOpenErrorNoticeEmail": false,
-    "ErrorNoticeEmailList": [ "872297557@qq.com" ]
+    "IsEnv_US": true
   },
 
   "SystemPacsConfig": {

IRaCIS.Core.API/appsettings.US_Uat_IRC.json

@@ -97,10 +97,8 @@
     "CompanyShortNameCN": "展影医疗",
     "SiteUrl": "https://lili.uat.elevateimaging.ai/login",
     "IsEnv_US": true,
-    "IsOpenErrorNoticeEmail": false,
     "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
-    "CronEmailDefaultCulture": "en-US",
-    "ErrorNoticeEmailList": [ "872297557@qq.com" ]
+    "CronEmailDefaultCulture": "en-US"
   },
 
   "SystemPacsConfig": {

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -19,6 +19,26 @@
   "ObjectStoreService": {
 
     "ObjectStoreUse": "AliyunOSS",
+    "IsOpenStoreSync": true,
+    "ApiDeployRegion": "CN",
+    "SyncConfigList": [
+      {
+        "Domain": "irc.uat.extimaging.com",
+        "Primary": "AliyunOSS",
+        "Target": "AWS",
+        "UploadRegion": "CN",
+        "TargetRegion": "US",
+        "IsOpenSync": true
+      },
+      {
+        "Domain": "lili.uat.extimaging.com",
+        "Primary": "AWS",
+        "Target": "AliyunOSS",
+        "UploadRegion": "US",
+        "TargetRegion": "CN",
+        "IsOpenSync": true
+      }
+    ],
 
     "AliyunOSS": {
       "RegionId": "cn-shanghai",
@@ -50,9 +70,9 @@
       "Region": "us-east-1",
       "EndPoint": "s3.us-east-1.amazonaws.com",
       "UseSSL": true,
-      "RoleArn": "arn:aws:iam::471112624751:role/sts_s3_upload",
-      "AccessKeyId": "AKIAW3MEAFJXWRCGSX5Z",
-      "SecretAccessKey": "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",
+      "RoleArn": "arn:aws:iam::471112624751:role/uat_s3_access",
+      "AccessKeyId": "AKIAW3MEAFJX7IPXISP4",
+      "SecretAccessKey": "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",
       "BucketName": "ei-med-s3-lili-uat-store",
       "ViewEndpoint": "https://ei-med-s3-lili-uat-store.s3.amazonaws.com/",
       "DurationSeconds": 7200
@@ -104,10 +124,8 @@
     "CompanyShortName": "Extensive Imaging",
     "CompanyShortNameCN": "展影医疗",
     "IsEnv_US": false,
-    "IsOpenErrorNoticeEmail": false,
     "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
-    "CronEmailDefaultCulture": "zh-CN",
-    "ErrorNoticeEmailList": [ "872297557@qq.com" ]
+    "CronEmailDefaultCulture": "zh-CN"
   },
 
   "SystemPacsConfig": {

IRaCIS.Core.Application/Auth/TokenService.cs

@@ -39,7 +39,8 @@ namespace IRaCIS.Core.Application.Auth
                 new Claim(JwtIRaCISClaimType.UserTypeShortName,user.UserTypeShortName),
                 new Claim(JwtIRaCISClaimType.PermissionStr,user.PermissionStr),
                 new Claim(JwtIRaCISClaimType.IsZhiZhun,user.IsZhiZhun.ToString()),
-                new Claim(JwtIRaCISClaimType.IsTestUser,user.IsTestUser.ToString())
+                new Claim(JwtIRaCISClaimType.IsTestUser,user.IsTestUser.ToString()),
+                 new Claim(JwtIRaCISClaimType.UserWorkLanguage,user.UserWorkLanguage.ToString())
             };
 
             ////创建令牌

IRaCIS.Core.Application/Auth/UserTokenInfo.cs

@@ -23,5 +23,7 @@ namespace IRaCIS.Core.Application.Auth
         public bool IsZhiZhun { get; set; }
 
         public string UserTypeShortName { get; set; } = string.Empty;
+
+        public UserWorkLanguage UserWorkLanguage { get; set; }
     }
 }

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

@@ -79,11 +79,12 @@ public class SystemEmailSendConfig
 
     public bool IsEnv_US { get; set; }
 
-    public bool IsOpenErrorNoticeEmail { get; set; }
-
     public string EmailRegexStr { get; set; }
 
-    public List<string> ErrorNoticeEmailList { get; set; } = new List<string>();
+    //public bool IsOpenErrorNoticeEmail { get; set; }
+
+
+    //public List<string> ErrorNoticeEmailList { get; set; } = new List<string>();
 }
 
 public class SystemEmailSendConfigView

IRaCIS.Core.Application/Helper/DicomDIRHelper.cs

@@ -3,6 +3,7 @@ using FellowOakDicom;
 using FellowOakDicom.Media;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Models;
+using NPOI.Util;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -160,6 +161,91 @@ namespace IRaCIS.Core.Application.Helper
         }
 
 
+        public static async Task GenerateStudyDIR(List<StudyDIRInfo> list, Dictionary<string, string> dic, string? dirSavePath = null, Stream? outputStream = null)
+        {
+            var mappings = new List<string>();
+            int index = 1;
+
+            var trialId = Guid.Empty;
+
+
+            var studyUid = list.FirstOrDefault()?.StudyInstanceUid;
+
+            var dicomDir = new DicomDirectory();
+
+            foreach (var item in list.OrderBy(t => t.SeriesNumber).ThenBy(t => t.InstanceNumber))
+            {
+                var dicomUid = DicomUID.Enumerate().FirstOrDefault(uid => uid.UID == item.TransferSytaxUID);
+
+                if (dicomUid != null)
+                {
+                    var ts = DicomTransferSyntax.Query(dicomUid);
+
+                    var dataset = new DicomDataset(ts)
+                    {
+                        { DicomTag.PatientID, item.PatientId ?? string.Empty },
+                        { DicomTag.PatientName, item.PatientName ?? string.Empty },
+                        { DicomTag.PatientBirthDate, item.PatientBirthDate ?? string.Empty },
+                        { DicomTag.PatientSex, item.PatientSex ?? string.Empty },
+
+                        { DicomTag.StudyInstanceUID, item.StudyInstanceUid ?? string.Empty },
+                        { DicomTag.StudyID, item.StudyId ?? string.Empty },
+                        { DicomTag.StudyDate, item.DicomStudyDate ?? string.Empty },
+                        { DicomTag.StudyTime, item.DicomStudyTime ?? string.Empty },
+                        { DicomTag.AccessionNumber, item.AccessionNumber ?? string.Empty },
+                        { DicomTag.StudyDescription, item.StudyDescription ?? string.Empty },
+
+                        { DicomTag.SeriesInstanceUID, item.SeriesInstanceUid ?? string.Empty },
+                        { DicomTag.Modality, item.Modality ?? string.Empty },
+                        { DicomTag.SeriesDate, item.DicomSeriesDate ?? string.Empty },
+                        { DicomTag.SeriesTime, item.DicomSeriesTime ?? string.Empty },
+                        { DicomTag.SeriesNumber, item.SeriesNumber.ToString() ?? string.Empty },
+                        { DicomTag.SeriesDescription, item.SeriesDescription ?? string.Empty },
+
+                        { DicomTag.SOPInstanceUID, item.SopInstanceUid ?? string.Empty },
+                        { DicomTag.SOPClassUID, item.SOPClassUID ?? string.Empty },
+                        { DicomTag.InstanceNumber, item.InstanceNumber.ToString() ?? string.Empty },
+                        { DicomTag.MediaStorageSOPClassUID, item.MediaStorageSOPClassUID ?? string.Empty },
+                        { DicomTag.MediaStorageSOPInstanceUID, item.MediaStorageSOPInstanceUID ?? string.Empty },
+                        { DicomTag.TransferSyntaxUID, item.TransferSytaxUID ?? string.Empty },
+                    };
+
+                    var dicomFile = new DicomFile(dataset);
+
+                    // 文件名递增格式：IM_00001, IM_00002, ...
+                    string filename = $@"IMAGE\IM_{index:D5}";  // :D5 表示补足5位
+
+                    mappings.Add($"{filename} => {item.InstanceId}");
+
+                    dic.Add(item.InstanceId.ToString(), filename.TrimEnd('/', '\\').Split('/', '\\').Last());
+
+                    dicomDir.AddFile(dicomFile, filename);
+
+                    index++;
+                }
+
+
+            }
+
+            //有实际的文件
+            if (mappings.Count > 0)
+            {
+                // 保存 DICOMDIR 到临时文件  不能直接写入到流种
+
+                if (dirSavePath.IsNotNullOrEmpty())
+                {
+                    await dicomDir.SaveAsync(dirSavePath);
+
+                }
+                else
+                {
+                    await dicomDir.SaveAsync(outputStream);
+                }
+            }
+
+        }
+
+
 
         public static StudyDIRInfo ReadDicomDIRInfo(DicomFile dicomFile)
         {

IRaCIS.Core.Application/Helper/Email/SendEmailHelper.cs

@@ -62,8 +62,15 @@ public static class SendEmailHelper
     }
 
 
-
-    public static async Task<string> SendEmailAsync(MimeMessage messageToSend, Trial trial, EventHandler<MessageSentEventArgs>? messageSentSuccess = null)
+    /// <summary>
+    /// 发送项目邮件
+    /// </summary>
+    /// <param name="messageToSend"></param>
+    /// <param name="trial"></param>
+    /// <param name="messageSentSuccess"></param>
+    /// <returns></returns>
+    /// <exception cref="Exception"></exception>
+    public static async Task<string> SendTrialEmailAsync(MimeMessage messageToSend, Trial trial, EventHandler<MessageSentEventArgs>? messageSentSuccess = null)
     {
 
         // 项目的需要重设 发件地址与邮件地址
@@ -78,12 +85,39 @@ public static class SendEmailHelper
         string result = string.Empty;
         result = messageToSend.MessageId;
 
+
         //没有收件人 那么不发送
         if (messageToSend.To.Count == 0)
         {
             return string.Empty;
         }
 
+        // 替换邮件标题
+        if (!string.IsNullOrEmpty(messageToSend.Subject))
+        {
+            foreach (var item in trial.TrialObjectNameList)
+            {
+                // 把标题里的占位符替换成真实名称
+                messageToSend.Subject = messageToSend.Subject.Replace(item.Name, item.TrialName);
+            }
+        }
+
+        // 构建替换字典
+        var replacements = new Dictionary<string, string>();
+        foreach (var item in trial.TrialObjectNameList)
+        {
+            replacements[item.Name] = item.TrialName;
+        }
+
+        // 安全替换 HTML
+        ReplaceHtmlContent(messageToSend.Body, replacements);
+
+
+
+
+
+
+
         try
         {
             using (var smtp = new MailKit.Net.Smtp.SmtpClient())
@@ -128,6 +162,27 @@ public static class SendEmailHelper
         return result;
     }
 
+
+
+    // 遍历邮件体，找到 HTML 部分并替换
+    public static void ReplaceHtmlContent(MimeEntity entity, Dictionary<string, string> replacements)
+    {
+        if (entity is Multipart multipart)
+        {
+            foreach (var part in multipart)
+            {
+                ReplaceHtmlContent(part, replacements);
+            }
+        }
+        else if (entity is TextPart textPart && textPart.IsHtml)
+        {
+            // 只有这里才是真正的 HTML
+            foreach (var kv in replacements)
+            {
+                textPart.Text = textPart.Text.Replace(kv.Key, kv.Value);
+            }
+        }
+    }
     public static async Task<bool> TestEmailConfigAsync(SystemEmailSendConfig _systemEmailConfig)
     {
         using (var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5)))
@@ -161,8 +216,9 @@ public static class SendEmailHelper
 
         if (sMTPEmailConfig.ToMailAddressList.Count == 0)
         {
+            return;
             //---没有收件人
-            throw new ArgumentException(I18n.T("SendEmail_NoRecipient"));
+            //throw new ArgumentException(I18n.T("SendEmail_NoRecipient"));
         }
         else
         {

IRaCIS.Core.Application/Helper/OSSService.cs

@@ -220,7 +220,7 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
     public object result { get; private set; }
 
 
-
+    private static readonly object _tokenLock = new();
 
     /// <summary>
     /// 将指定前缀下的所有现有文件立即转为目标存储类型
@@ -934,32 +934,52 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
     //后端批量上传 或者下载，不每个文件获取临时token
     private void BackBatchGetToken()
     {
+
+
+       // 过期时间 ≤ 当前时间 + 15分钟 时需要续期
+
         if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
         {
-            if (AliyunOSSTempToken == null)
+            if (AliyunOSSTempToken != null && AliyunOSSTempToken.Expiration > DateTime.Now.AddMinutes(15))
             {
-                GetObjectStoreTempToken();
-            }
-            //token 过期了
-            if (AliyunOSSTempToken?.Expiration.AddSeconds(10) <= DateTime.Now)
-            {
-                GetObjectStoreTempToken();
+                return; // 还有15分钟以上，不需要续期
             }
 
+            lock (_tokenLock)
+            {
+                if (AliyunOSSTempToken == null ||
+                    AliyunOSSTempToken.Expiration <= DateTime.Now.AddMinutes(15))
+                {
+                    GetObjectStoreTempToken();
+
+                    Log.Logger.Warning("后端获取阿里云临时 Token");
+                }
+            }
 
         }
         else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
         {
-            if (AWSTempToken == null)
-            {
-                GetObjectStoreTempToken();
-            }
-            //token 过期了
-            if (AWSTempToken.Expiration?.AddSeconds(10) <= DateTime.Now)
+
+
+            if (AWSTempToken != null && AWSTempToken.Expiration > DateTime.Now.AddMinutes(15))
+            {
+                return;
+            }
+
+            lock (_tokenLock)
+            {
+                if (AWSTempToken == null ||
+                    AWSTempToken.Expiration <= DateTime.Now.AddMinutes(15))
                 {
                     GetObjectStoreTempToken();
+
+                    Log.Logger.Warning("后端获取s3 临时 Token");
                 }
             }
+
+        }
+
+
     }
 
 
@@ -1186,14 +1206,21 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
             }
             else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
             {
+                var httpClientHandler = new HttpClientHandler
+                {
+                    ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
+                };
+
                 var minIOConfig = ObjectStoreServiceOptions.MinIO;
 
                 var minioClient = new MinioClient()
                     .WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
                     .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey)
                     .WithSSL(minIOConfig.UseSSL)
+                     .WithHttpClient(new HttpClient(httpClientHandler))
                     .Build();
 
+
                 var pipe = new System.IO.Pipelines.Pipe();
 
                 _ = Task.Run(async () =>
@@ -1206,6 +1233,7 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
                             .WithCallbackStream(stream =>
                             {
                                 stream.CopyTo(pipe.Writer.AsStream());
+                                pipe.Writer.FlushAsync();
                             });
 
                         await minioClient.GetObjectAsync(args);
@@ -1213,6 +1241,7 @@ public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
                     }
                     catch (Exception ex)
                     {
+                        Log.Error($"minio 获取流错误：{ex.Message}");
                         await pipe.Writer.CompleteAsync(ex);
                     }
                 });

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -559,119 +559,32 @@
             系统模板文档配置表   
             </summary>	
         </member>
-        <member name="T:IRaCIS.Core.Application.Service.DictionaryService">
+        <member name="M:IRaCIS.Core.Application.Service.Common.DeployConfigService.GetSystemBasicConfigInfo(Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption})">
             <summary>
-            数据字典-基础数据维护
+            获取系统基础配置信息
             </summary>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DoctorDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Doctor},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemCriterionDictionaryCode},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialCriterionDictionaryCode},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTrialCriterionDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingSystemCriterionDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingSystemCriterionDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionSystem},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
-            <summary>
-            数据字典-基础数据维护
-            </summary>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.AddBoolDic(IRaCIS.Application.Contracts.AddOrEditBasicDic)">
-            <summary>
-            添加bool
-            </summary>
-            <param name="addOrEditBasic"></param>
+            <param name="options"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetAllDictionaryKey">
+        <member name="M:IRaCIS.Core.Application.Service.Common.DeployConfigService.UpdateSystemBasicConfig(IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption)">
             <summary>
-            获取所有字典的Key
+            更新系统基础配置
             </summary>
+            <param name="basicSystemConfigOption"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.AddBasicDicAndChild(IRaCIS.Application.Contracts.AddBasicDicAndChild)">
+        <member name="M:IRaCIS.Core.Application.Service.Common.DeployConfigService.GetEmailConfigInfo(Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
             <summary>
-            添加字典 的同时 一起添加子项  --New  
+            获取系统邮件配置信息
             </summary>
-            <param name="addBasicDicAndChild"></param>
+            <param name="options"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetBasicDicList(IRaCIS.Application.Contracts.BasicDicQuery)">
+        <member name="M:IRaCIS.Core.Application.Service.Common.DeployConfigService.UpdateSystemEmailConfig(IRaCIS.Core.Domain.Share.SystemEmailSendConfig)">
             <summary>
-            New  查询条件  
+            更新系统邮件配置
             </summary>
-            <param name="inQuery"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.AddOrUpdateBasicDic(IRaCIS.Application.Contracts.AddOrEditBasicDic)">
-            <summary>
-            添加和编辑
-            </summary>
-            <param name="addOrEditBasic"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetChildList(IRaCIS.Application.Contracts.ChildInQuery)">
-            <summary>
-            获取子项数组
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.DeleteDictionary(System.Guid)">
-            <summary> 删除字典数据 </summary>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetBasicDataSelect(System.String[])">
-            <summary>
-            传递父亲 code  字符串  数组  返回多个下拉框数据
-            </summary>
-            <param name="searchArray"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetBasicDataSelect(System.String)">
-            <summary>
-            根据父亲Code  获取单个下拉框数据
-            </summary>
-            <param name="searchKey"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetBasicConfigSelect(System.String)">
-            <summary>
-            根据父亲字典分组  获取子项
-            </summary>
-            <param name="searchKey"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetCriterionDictionaryList(IRaCIS.Application.Contracts.GetCriterionDictionaryListInDto)">
-            <summary>
-            获取标准字典
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetTrialCriterionDictionaryList(IRaCIS.Application.Contracts.GetTrialCriterionDictionaryListInDto)">
-            <summary>
-            获取标准字典
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetCriterionDictionary(IRaCIS.Application.Contracts.GetCriterionDictionaryInDto)">
-            <summary>
-            获取标准指定字典
-            </summary>
-            <param name="inDto"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetBasicDataAllSelect(IRaCIS.Application.Contracts.GetBasicDataAllSelectInDto)">
-            <summary>
-            获取所有下拉框 枚举  bool  数据
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetBoolValueState(System.Boolean)">
-            <summary>
-            获取是和否
-            </summary>
-            <param name="value"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetAuditState``1(System.Guid,``0)">
-            <summary>
-            获取审核状态
-            </summary>
-            <typeparam name="T"></typeparam>
-            <param name="trial"></param>
-            <param name="childCode"></param>
+            <param name="emailConfig"></param>
             <returns></returns>
         </member>
         <member name="P:IRaCIS.Core.Application.Service.Common.TU_TR_RSBaseModel.ResearchProgramNo">
@@ -1441,6 +1354,121 @@
              RSTEST   疗效评估全称
             </summary>
         </member>
+        <member name="T:IRaCIS.Core.Application.Service.DictionaryService">
+            <summary>
+            数据字典-基础数据维护
+            </summary>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DoctorDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Doctor},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemCriterionDictionaryCode},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialCriterionDictionaryCode},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTrialCriterionDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingSystemCriterionDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingSystemCriterionDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionSystem},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+            <summary>
+            数据字典-基础数据维护
+            </summary>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.AddBoolDic(IRaCIS.Application.Contracts.AddOrEditBasicDic)">
+            <summary>
+            添加bool
+            </summary>
+            <param name="addOrEditBasic"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetAllDictionaryKey">
+            <summary>
+            获取所有字典的Key
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.AddBasicDicAndChild(IRaCIS.Application.Contracts.AddBasicDicAndChild)">
+            <summary>
+            添加字典 的同时 一起添加子项  --New  
+            </summary>
+            <param name="addBasicDicAndChild"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetBasicDicList(IRaCIS.Application.Contracts.BasicDicQuery)">
+            <summary>
+            New  查询条件  
+            </summary>
+            <param name="inQuery"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.AddOrUpdateBasicDic(IRaCIS.Application.Contracts.AddOrEditBasicDic)">
+            <summary>
+            添加和编辑
+            </summary>
+            <param name="addOrEditBasic"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetChildList(IRaCIS.Application.Contracts.ChildInQuery)">
+            <summary>
+            获取子项数组
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.DeleteDictionary(System.Guid)">
+            <summary> 删除字典数据 </summary>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetBasicDataSelect(System.String[])">
+            <summary>
+            传递父亲 code  字符串  数组  返回多个下拉框数据
+            </summary>
+            <param name="searchArray"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetBasicDataSelect(System.String)">
+            <summary>
+            根据父亲Code  获取单个下拉框数据
+            </summary>
+            <param name="searchKey"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetBasicConfigSelect(System.String)">
+            <summary>
+            根据父亲字典分组  获取子项
+            </summary>
+            <param name="searchKey"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetCriterionDictionaryList(IRaCIS.Application.Contracts.GetCriterionDictionaryListInDto)">
+            <summary>
+            获取标准字典
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetTrialCriterionDictionaryList(IRaCIS.Application.Contracts.GetTrialCriterionDictionaryListInDto)">
+            <summary>
+            获取标准字典
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetCriterionDictionary(IRaCIS.Application.Contracts.GetCriterionDictionaryInDto)">
+            <summary>
+            获取标准指定字典
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetBasicDataAllSelect(IRaCIS.Application.Contracts.GetBasicDataAllSelectInDto)">
+            <summary>
+            获取所有下拉框 枚举  bool  数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetBoolValueState(System.Boolean)">
+            <summary>
+            获取是和否
+            </summary>
+            <param name="value"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.DictionaryService.GetAuditState``1(System.Guid,``0)">
+            <summary>
+            获取审核状态
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="trial"></param>
+            <param name="childCode"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.EmailLogService">
             <summary>
             邮件日志
@@ -1696,6 +1724,17 @@
             <param name="inCommand"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.MailVerificationService.GetEmailSubejctAndHtmlInfoAndBuildAsync(IRaCIS.Core.Domain.Share.EmailBusinessScenario,MimeKit.MimeMessage,System.Func{System.ValueTuple{System.String,System.String},System.ValueTuple{System.String,System.String}},System.Nullable{IRaCIS.Core.Domain.Models.UserWorkLanguage})">
+            <summary>
+            获取邮件主题和html 通用封装  以用户语言为主，没有的就用当前的请求语言_userInfo.IsEn_Us
+            </summary>
+            <param name="scenario"></param>
+            <param name="messageToSend"></param>
+            <param name="emailFunc"></param>
+            <param name="userWorkLanguage"></param>
+            <returns></returns>
+            <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.MailVerificationService.SendEmailVerification(System.String,System.Int32)">
             <summary>
             Reviewer简历录入 发送验证码
@@ -1721,18 +1760,20 @@
             <param name="_trialRepository"></param>
             <param name="_oSSService"></param>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TrialImageDownloadService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Application.Helper.IOSSService,Microsoft.AspNetCore.Hosting.IWebHostEnvironment,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomSeries},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance})">
+        <member name="M:IRaCIS.Core.Application.Service.TrialImageDownloadService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Application.Helper.IOSSService,Microsoft.AspNetCore.Hosting.IWebHostEnvironment,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomSeries},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance})">
             <summary>
             项目影像后台下载，不打包
             </summary>
             <param name="_trialRepository"></param>
             <param name="_oSSService"></param>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TrialImageDownloadService.DownloadTrialImage(System.Guid)">
+        <member name="M:IRaCIS.Core.Application.Service.TrialImageDownloadService.DownloadTrialImage(System.Guid,System.Int32,System.Int32)">
             <summary>
             后端api swagger 下载项目影像
             </summary>
             <param name="trialId"></param>
+            <param name="startIndex"></param>
+            <param name="endIndex"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.TrialImageDownloadService.DownloadAndUploadTrialData(System.Guid,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomSeries})">
@@ -2329,7 +2370,7 @@
             <param name="sendFileRelativePath"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.DealEnrollAnswer(System.Guid,System.Guid,IRaCIS.Core.Domain.Share.CriterionType,System.Guid)">
+        <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.DealEnrollAnswer(System.Guid,System.Guid,IRaCIS.Core.Domain.Share.CriterionType,System.Guid,IRaCIS.Core.Domain.Models.UserWorkLanguage)">
             <summary>
             获取入组结果
             </summary>
@@ -2337,9 +2378,10 @@
             <param name="subjectVisitId"></param>
             <param name="criterionType"></param>
             <param name="trialReadingCriterionId"></param>
+            <param name="userWorkLanguage"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.TranslatePdStateAsync(System.Guid,IRaCIS.Core.Domain.Share.ReadingCategory,IRaCIS.Core.Domain.Share.CriterionType,System.Nullable{System.Boolean})">
+        <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.TranslatePdStateAsync(System.Guid,IRaCIS.Core.Domain.Share.ReadingCategory,IRaCIS.Core.Domain.Share.CriterionType,IRaCIS.Core.Domain.Models.UserWorkLanguage,System.Nullable{System.Boolean})">
             <summary>
             获取PD 结果
             </summary>
@@ -2347,6 +2389,7 @@
             <param name="readingCategory"> 任务类型</param>
             <param name="criterionType">标准类型</param>
             <param name="IsGlobalGenerate">  是否是全局产生（区分裁判任务）</param>
+            <param name="userWorkLanguage"></param>
             <returns></returns>
             <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
         </member>
@@ -6009,7 +6052,7 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.MRIPDFFAdvanceCalculateService.CalculateAvg(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.MRIPDFFAdvanceCalculateService.GetReportVerify(IRaCIS.Core.Application.Service.Reading.Dto.GetReportVerifyInDto)">
             <summary>
             计算平均值
             </summary>
@@ -9717,6 +9760,36 @@
             单位
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReportsChartDataOutDto.ValueType">
+            <summary>
+            数值类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReportsChartDataOutDto.CustomUnit">
+            <summary>
+            自定义单位
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReportsChartDataOutDto.Type">
+            <summary>
+            类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ChartItem.ValueType">
+            <summary>
+            数值类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ChartItem.CustomUnit">
+            <summary>
+            自定义单位
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ChartItem.Type">
+            <summary>
+            类型
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.Reading.Dto.SaveTableQuestionMarkInDto">
             <summary>
             保存表格问题标记
@@ -15913,7 +15986,7 @@
             <param name="inQuery"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.PatientService.SubmitVisitStudyBinding(IRaCIS.Application.Contracts.SubmitVisitStudyBindingCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomSeries},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance})">
+        <member name="M:IRaCIS.Core.Application.Service.PatientService.SubmitVisitStudyBinding(IRaCIS.Application.Contracts.SubmitVisitStudyBindingCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomSeries},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.FileUploadRecord})">
             <summary>
               提交 患者检查和访视的绑定
             </summary>
@@ -16071,6 +16144,18 @@
             <param name="outEnrollTime"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.TestService.SiteSuveryEquipment">
+            <summary>
+            维护中心调研设备默认配置
+            </summary>
+            <param name="modelVerify"></param>
+            <returns></returns>
+        </member>
+        <member name="T:IRaCIS.Core.Application.Service.TestService.SubjectVisitExcel">
+            <summary>
+            访视数据模型
+            </summary>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.TestService.MaskImage">
             <summary>
             遮挡影像
@@ -16236,6 +16321,16 @@
             <param name="email"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Helper.SendEmailHelper.SendTrialEmailAsync(MimeKit.MimeMessage,IRaCIS.Core.Domain.Models.Trial,System.EventHandler{MailKit.MessageSentEventArgs})">
+            <summary>
+            发送项目邮件
+            </summary>
+            <param name="messageToSend"></param>
+            <param name="trial"></param>
+            <param name="messageSentSuccess"></param>
+            <returns></returns>
+            <exception cref="T:System.Exception"></exception>
+        </member>
         <member name="M:IRaCIS.Core.Application.Helper.FileConvertHelper.ConvertWordToPdf(System.String,System.String)">
             <summary>
             镜像里面打入libreoffice 的方案
@@ -16425,23 +16520,25 @@
             全量一致性核查
             </summary>
         </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(IRaCIS.Core.Domain.Models.EmailNoticeConfig,MimeKit.MimeMessage,System.Func{System.ValueTuple{System.String,System.String},System.ValueTuple{System.String,System.String}})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(IRaCIS.Core.Domain.Models.EmailNoticeConfig,MimeKit.MimeMessage,System.Func{System.ValueTuple{System.String,System.String},System.ValueTuple{System.String,System.String}},System.Nullable{IRaCIS.Core.Domain.Models.UserWorkLanguage})">
             <summary>
             系统默认邮件  + 项目默认邮件  （不用添加到项目邮件配置中，才发送）
             </summary>
             <param name="configInfo"></param>
             <param name="messageToSend"></param>
             <param name="emailFunc"></param>
+            <param name="userWorkLanguage"></param>
             <returns></returns>
             <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
         </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(IRaCIS.Core.Domain.Models.TrialEmailNoticeConfig,MimeKit.MimeMessage,System.Func{System.ValueTuple{System.String,System.String},System.ValueTuple{System.String,System.String}})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(IRaCIS.Core.Domain.Models.TrialEmailNoticeConfig,MimeKit.MimeMessage,System.Func{System.ValueTuple{System.String,System.String},System.ValueTuple{System.String,System.String}},System.Nullable{IRaCIS.Core.Domain.Models.UserWorkLanguage})">
             <summary>
             项目手动邮件  （需要添加到项目邮件配置中，才发送）
             </summary>
             <param name="configInfo"></param>
             <param name="messageToSend"></param>
             <param name="emailFunc"></param>
+            <param name="userWorkLanguage"></param>
             <returns></returns>
             <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
         </member>
@@ -16812,12 +16909,12 @@
             定时过期提醒
             </summary>
         </member>
-        <member name="T:IRaCIS.Core.Application.MassTransit.Recurring.SystemDocumentPublishEventConsumer">
+        <member name="T:IRaCIS.Core.Application.MassTransit.Recurring.SystemDocumentErverDayEventConsumer.SystemDocumentPublishEventConsumer">
             <summary>
             生效通知
             </summary>
         </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Recurring.SystemDocumentPublishEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocConfirmedIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Recurring.SystemDocumentErverDayEventConsumer.SystemDocumentPublishEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocConfirmedIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
             <summary>
             生效通知
             </summary>
@@ -18212,6 +18309,16 @@
             文件大小，单位字节
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.SegmentationAddOrEdit.SEGUpdateTime">
+            <summary>
+            SEGUpdateTime 更新时间
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.SegmentationVersionView.StartTime">
+            <summary>
+            版本开始时间
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.SegmentBindingView.IsLock">
             <summary>
             是否锁定
@@ -18843,6 +18950,11 @@
             受试者ID
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.TrialVisitQADTO.IsSupportQCDownloadImage">
+            <summary>
+            QC质控下载
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.DTO.QAStudyInfoDTO.PatientSex">
             <summary>
             性别
@@ -19303,7 +19415,17 @@
             检查名称列表
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.TrialProcessConfig.IsImageQualityControl">
+        <member name="P:IRaCIS.Core.Application.Contracts.BasicTrialConfig.IsSupportQCDownloadImage">
+            <summary>
+            QC质控下载
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.BasicTrialConfig.IsOpenLostVistRead">
+            <summary>
+            打开失访可读
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.BasicTrialConfig.IsImageQualityControl">
             <summary>
             影像质控风险控制
             </summary>
@@ -19935,7 +20057,7 @@
             TrialDocumentService
             </summary>	
         </member>
-        <member name="M:IRaCIS.Core.Application.Services.TrialDocumentService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.AuditRecord},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocumentAttachment},IRaCIS.Core.Application.Contracts.ISystemDocumentService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocConfirmedIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocNeedConfirmedUserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocNeedConfirmedUserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocument},Microsoft.Extensions.DependencyInjection.IServiceScopeFactory,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocConfirmedIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Services.TrialDocumentService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},MassTransit.Mediator.IScopedMediator,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.AuditRecord},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocumentAttachment},IRaCIS.Core.Application.Contracts.ISystemDocumentService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocConfirmedIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocNeedConfirmedUserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocNeedConfirmedUserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocument},Microsoft.Extensions.DependencyInjection.IServiceScopeFactory,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocConfirmedIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
             <summary>
             TrialDocumentService
             </summary>	

IRaCIS.Core.Application/MassTransit/Command/ConsistenCheckCommand.cs

@@ -34,6 +34,8 @@ namespace IRaCIS.Core.Application.MassTransit.Command
         public Guid SubjectVisitId { get; set; }
 
         public Guid StudyId { get; set; }
+
+        public string SiteCounty { get; set; }
     }
 
     public class FullCheckResult: CheckViewModel

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

@@ -21,12 +21,14 @@ public static class CommonEmailHelper
     /// <param name="configInfo"></param>
     /// <param name="messageToSend"></param>
     /// <param name="emailFunc"></param>
+    /// <param name="userWorkLanguage"></param>
     /// <returns></returns>
     /// <exception cref="BusinessValidationFailedException"></exception>
     public static async Task<EmailNoticeConfig> GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailNoticeConfig configInfo, MimeMessage messageToSend,
-Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailFunc)
+Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailFunc, UserWorkLanguage? userWorkLanguage = null)
     {
-        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+
+        bool isEn_US = userWorkLanguage.HasValue ? userWorkLanguage.Value == UserWorkLanguage.US : CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
         var (topicStr, htmlBodyStr) = isEn_US ? (configInfo.EmailTopic, configInfo.EmailHtmlContent) : (configInfo.EmailTopicCN, configInfo.EmailHtmlContentCN);
 
@@ -60,13 +62,14 @@ Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr
     /// <param name="configInfo"></param>
     /// <param name="messageToSend"></param>
     /// <param name="emailFunc"></param>
+    /// <param name="userWorkLanguage"></param>
     /// <returns></returns>
     /// <exception cref="BusinessValidationFailedException"></exception>
     public static async Task<TrialEmailNoticeConfig> GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(TrialEmailNoticeConfig configInfo, MimeMessage messageToSend,
-   Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailFunc)
+   Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailFunc, UserWorkLanguage? userWorkLanguage = null)
     {
-        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
+        bool isEn_US = userWorkLanguage.HasValue ? userWorkLanguage.Value == UserWorkLanguage.US : CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
         var (topicStr, htmlBodyStr) = isEn_US ? (configInfo.EmailTopic, configInfo.EmailHtmlContent) : (configInfo.EmailTopicCN, configInfo.EmailHtmlContentCN);
 
@@ -94,12 +97,20 @@ Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr
         return configInfo;
     }
 
-
-
-
-    public static string ReplaceCompanyName(SystemEmailSendConfig _systemEmailConfig, string needDealtxt)
+    public static string ReplacePlatformName(SystemEmailSendConfig _systemEmailConfig, string needDealtxt, UserWorkLanguage? userWorkLanguage = null)
     {
-        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+        var isEn_US = userWorkLanguage.HasValue ? userWorkLanguage.Value == UserWorkLanguage.US : CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+
+        var platformName = isEn_US ? _systemEmailConfig.PlatformName : _systemEmailConfig.PlatformNameCN;
+
+        var str = needDealtxt.Replace("{platformName}", platformName);
+        return str;
+    }
+
+
+    public static string ReplaceCompanyName(SystemEmailSendConfig _systemEmailConfig, string needDealtxt, UserWorkLanguage? userWorkLanguage = null)
+    {
+        var isEn_US = userWorkLanguage.HasValue ? userWorkLanguage.Value == UserWorkLanguage.US : CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
         var str = needDealtxt.Replace("{company}", isEn_US ? _systemEmailConfig.CompanyName : _systemEmailConfig.CompanyNameCN)
             .Replace("{company abbreviation}", isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN);

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

@@ -10,12 +10,14 @@ using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using MassTransit;
+using MaxMind.GeoIP2.Model;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
+using System.Globalization;
 using System.IO;
 using System.Text;
 
@@ -79,6 +81,8 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
                                  Modality = study.ModalityForEdit,
                                  SubjectCode = subject.Code,
                                  VisitName = sv.VisitName,
+
+                                 SiteCounty = sv.TrialSite.Country,
                              };
 
             var noneDicomQuey = from sv in _subjectVisitRepository.Where(subjectVisitLambda)
@@ -93,6 +97,8 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
                                     Modality = noneDicomStudy.Modality,
                                     SubjectCode = subject.Code,
                                     VisitName = sv.VisitName,
+
+                                    SiteCounty = sv.TrialSite.Country,
                                 };
 
             var dbList = (await dicomQuery.ToListAsync()).Union(await noneDicomQuey.ToListAsync()).ToList();
@@ -120,6 +126,21 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
 
                     var dbVisitStudyList = dbList.Where(t => t.SubjectCode == sv.SubjectCode && t.SiteCode == sv.SiteCode && t.VisitName == sv.VisitName).ToList();
 
+                    //设置当前中心语言
+
+                    var isEn_us = dbVisitStudyList.First().SiteCounty == StaticData.SiteCountry.US;
+
+                    var cultureInfoName = StaticData.CultureInfo.en_US;
+
+                    if (isEn_us == false)
+                    {
+                        cultureInfoName = StaticData.CultureInfo.zh_CN;
+                    }
+
+                    CultureInfo.CurrentCulture = new CultureInfo(cultureInfoName);
+                    CultureInfo.CurrentUICulture = new CultureInfo(cultureInfoName);
+
+
                     //找到etc 当前visit  site  和subject 一致的检查列表
                     var etcVisitStudyList = etcList.Where(t => t.SubjectCode == sv.SubjectCode && t.SiteCode == sv.SiteCode && t.VisitName == sv.VisitName).ToList();
 

IRaCIS.Core.Application/MassTransit/Consumer/Dto/SendImageReuploadEmailDto.cs

@@ -27,5 +27,16 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer.Dto
 
 
 
+    }
+
+    public class SendEmailUserDto
+    {
+        public UserTypeEnum UserTypeEnum { get; set; }
+
+        public string FullName { get; set; }
+
+        public UserWorkLanguage UserWorkLanguage { get; set; }
+
+        public string EMail { get; set; }
     }
 }

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

@@ -273,15 +273,30 @@ public class ImageConsumer(
         };
 
         // 根据不同场景获取不同角色的用户  先排除CRC和CRA  
-        var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == inDto.TrialId && !x.TrialUser.IsDeleted && !filterUserTypeList.Contains(x.UserRole.UserTypeEnum) ).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+        var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == inDto.TrialId && !x.TrialUser.IsDeleted && !filterUserTypeList.Contains(x.UserRole.UserTypeEnum) ).Include(x => x.UserRole).Select(x => x.UserRole)
+            .Select(x => new SendEmailUserDto()
+            {
+                UserTypeEnum = x.UserTypeEnum,
+                FullName = x.FullName,
+                UserWorkLanguage = x.IdentityUser.UserWorkLanguage,
+                EMail=x.EMail,
+            })
+            .ToListAsync();
 
         // CRC和CRA单独取
-        var crcAndcraUserList = await _trialSiteRepository.Where(x => x.Id == inDto.SubjectVisit.TrialSiteId).SelectMany(x => x.CRCUserList.Select(y => y.UserRole)).ToListAsync();
+        var crcAndcraUserList = await _trialSiteRepository.Where(x => x.Id == inDto.SubjectVisit.TrialSiteId).SelectMany(x => x.CRCUserList.Select(y => y.UserRole))
+                 .Select(x => new SendEmailUserDto()
+                 {
+                     UserTypeEnum = x.UserTypeEnum,
+                     FullName = x.FullName,
+                     UserWorkLanguage = x.IdentityUser.UserWorkLanguage,
+                        EMail = x.EMail,
+                 }).ToListAsync();
         trialUserList.AddRange(crcAndcraUserList);
 
         // 根据场景确定收件人
-        List<UserRole> toUserList = new List<UserRole>();
-        List<UserRole> ccUserList = new List<UserRole>();
+        List<SendEmailUserDto> toUserList = new List<SendEmailUserDto>();
+        List<SendEmailUserDto> ccUserList = new List<SendEmailUserDto>();
 
         var emailNoticeUserList = await _emailNoticeUserTypeRepository.Where(x => x.EmailNoticeConfigId == inDto.EmailNoticeConfig.Id).ToListAsync();
         var userTypeEnumList = emailNoticeUserList.Select(x => x.UserType).ToList();
@@ -334,26 +349,39 @@ public class ImageConsumer(
             DictionaryList = dictionaryDtos
         });
 
-        foreach (var userinfo in toUserList)
+
+        var userWorkLanguageList = toUserList.Select(x => x.UserWorkLanguage).Distinct().ToList();
+
+        foreach (var workLanguage in userWorkLanguageList)
         {
+
+            var userinfoList = toUserList.Where(x => x.UserWorkLanguage == workLanguage).ToList();
             var messageToSend = new MimeMessage();
             // 发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+
+            foreach (var userinfo in userinfoList)
+            {
                 messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+            }
+               
 
             // 添加抄送
             foreach (var ccUser in ccUserList)
             {
                 messageToSend.Cc.Add(new MailboxAddress(ccUser.FullName, ccUser.EMail));
             }
+
+            var userNames = userinfoList.Select(x => x.FullName).ToList();
+
             // 格式化邮件内容
             Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
             {
                 var subjectCode = inDto.SubjectVisit.Subject.Code;
                 var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, inDto.SubjectVisit.VisitName);
                 var htmlBodyStr = string.Format(
-                        CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                        userinfo.FullName,              // 用户名  {0}
+                    CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
+                     string.Join(',', userNames),              // 用户名  {0}
                     trialInfo.ExperimentName,       // 项目   {1}
                     subjectCode,                    // 受试者 {2}
                     inDto.SubjectVisit.VisitName,         // 访视  {3}
@@ -367,9 +395,9 @@ public class ImageConsumer(
 
 
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(inDto.EmailNoticeConfig, messageToSend, emailConfigFunc);
+            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(inDto.EmailNoticeConfig, messageToSend, emailConfigFunc, workLanguage);
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+            await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
         }
     }
 
@@ -446,11 +474,19 @@ public class ImageConsumer(
         var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
 
         // 根据不同场景获取不同角色的用户
-        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == trialId && !x.TrialUser.IsDeleted).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == trialId && !x.TrialUser.IsDeleted).Include(x => x.UserRole).Select(x => x.UserRole)
+            .Select(x => new SendEmailUserDto()
+            {
+                UserTypeEnum = x.UserTypeEnum,
+                FullName = x.FullName,
+                UserWorkLanguage = x.IdentityUser.UserWorkLanguage,
+                EMail = x.EMail,
+            })
+            .ToListAsync();
 
         // 根据场景确定收件人
-        List<UserRole> toUserList = new List<UserRole>();
-        List<UserRole> ccUserList = new List<UserRole>();
+        List<SendEmailUserDto> toUserList = new List<SendEmailUserDto>();
+        List<SendEmailUserDto> ccUserList = new List<SendEmailUserDto>();
 
         var emailNoticeUserList = await _emailNoticeUserTypeRepository.Where(x => x.EmailNoticeConfigId == emailNoticeConfig.Id).ToListAsync();
 
@@ -469,12 +505,19 @@ public class ImageConsumer(
             return;
         }
 
-        foreach (var userinfo in toUserList)
+        var userWorkLanguageList = toUserList.Select(x => x.UserWorkLanguage).Distinct().ToList();
+
+        foreach (var workLanguage in userWorkLanguageList)
         {
+            var userinfoList = toUserList.Where(x => x.UserWorkLanguage == workLanguage).ToList();
             var messageToSend = new MimeMessage();
             // 发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+
+            foreach (var userinfo in userinfoList)
+            {
                 messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+            }
 
             // 添加抄送
             foreach (var ccUser in ccUserList)
@@ -482,13 +525,15 @@ public class ImageConsumer(
                 messageToSend.Cc.Add(new MailboxAddress(ccUser.FullName, ccUser.EMail));
             }
 
+            var userNames = userinfoList.Select(x => x.FullName).ToList();
+
             // 格式化邮件内容
             Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
             {
                 var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo);
                 var htmlBodyStr = string.Format(
-                    CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                    userinfo.FullName,              // 用户名  {0}
+                    CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
+                    string.Join(',', userNames),    // 用户名  {0}
                     trialInfo.ExperimentName,       // 项目   {1}
                     "",                             // 受试者 {2} - 阅片人筛选不涉及受试者
                     "",                             // 访视  {3} - 阅片人筛选不涉及访视
@@ -500,9 +545,9 @@ public class ImageConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailNoticeConfig, messageToSend, emailConfigFunc);
+            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailNoticeConfig, messageToSend, emailConfigFunc, workLanguage);
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+            await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
         }
     }
 }

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

@@ -1,5 +1,6 @@
-using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.MassTransit.Command;
+using IRaCIS.Core.Application.MassTransit.Consumer.Dto;
 using IRaCIS.Core.Domain;
 using IRaCIS.Core.Domain.BaseModel;
 using IRaCIS.Core.Domain.Models;
@@ -68,7 +69,7 @@ public class UrgentMedicalReviewAddedEventConsumer(
 
 
             var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == medicalReview.VisitTask.TrialReadingCriterionId);
-            var userinfo = await _userRoleRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();
+            var userinfo = await _userRoleRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).Include(x => x.IdentityUser).FirstOrDefaultAsync();
 
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReview.VisitTaskId).Include(x => x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();
 
@@ -78,7 +79,8 @@ public class UrgentMedicalReviewAddedEventConsumer(
 
             var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == visitid).FirstOrDefaultAsync();
 
-
+            var workLanguage = userinfo.IdentityUser?.UserWorkLanguage;
+            var userIsEn_US = workLanguage.HasValue ? workLanguage.Value == UserWorkLanguage.US : isEn_US;
 
             var messageToSend = new MimeMessage();
             //发件地址
@@ -86,14 +88,14 @@ public class UrgentMedicalReviewAddedEventConsumer(
             messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
 
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId);
-            var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = userIsEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
 
             var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
             {
 
                 DictionaryRepository = _dictionaryRepository,
-                IsEn_US = isEn_US,
+                IsEn_US = userIsEn_US,
 
 
                 DictionaryList = new List<DictionaryDto>()
@@ -110,7 +112,7 @@ public class UrgentMedicalReviewAddedEventConsumer(
                 var subjectName = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode;
                 var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectName, taskInfo.TaskBlindName);
                 var htmlBodyStr = string.Format(
-                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                    userinfo.FullName,              // 用户名  {0}
                    trialInfo.ExperimentName,        // 项目   {1}
                    criterion.CriterionName,  // 阅片标准       {2}
@@ -126,9 +128,9 @@ public class UrgentMedicalReviewAddedEventConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
+             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc, workLanguage);
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+            await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
 
         }
 
@@ -177,7 +179,7 @@ public class UrgentIRRepliedMedicalReviewConsumer(
 
           
             var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == medicalReview.VisitTask.TrialReadingCriterionId);
-            var userinfo = await _userRoleRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();
+            var userinfo = await _userRoleRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).Include(x => x.IdentityUser).FirstOrDefaultAsync();
 
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReview.VisitTaskId).Include(x => x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();
 
@@ -187,6 +189,8 @@ public class UrgentIRRepliedMedicalReviewConsumer(
 
             var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == visitid).FirstOrDefaultAsync();
 
+            var workLanguage = userinfo.IdentityUser?.UserWorkLanguage;
+            var userIsEn_US = workLanguage.HasValue ? workLanguage.Value == UserWorkLanguage.US : isEn_US;
 
 
             var messageToSend = new MimeMessage();
@@ -195,14 +199,14 @@ public class UrgentIRRepliedMedicalReviewConsumer(
             messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
 
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId);
-            var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = userIsEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
 
             var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
             {
 
                 DictionaryRepository = _dictionaryRepository,
-                IsEn_US = isEn_US,
+                IsEn_US = userIsEn_US,
 
 
                 DictionaryList = new List<DictionaryDto>()
@@ -219,7 +223,7 @@ public class UrgentIRRepliedMedicalReviewConsumer(
                 var subjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode;
                 var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, taskInfo.TaskBlindName);
                 var htmlBodyStr = string.Format(
-                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                    userinfo.FullName,              // 用户名  {0}
                    trialInfo.ExperimentName,        // 项目   {1}
                    criterion.CriterionName,  // 阅片标准       {2}
@@ -234,9 +238,9 @@ public class UrgentIRRepliedMedicalReviewConsumer(
 
                 return (topicStr, htmlBodyStr);
             };
-             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
+             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc, workLanguage);
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+            await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
         }
 
     }
@@ -293,7 +297,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 _userRoleRepository.Where(x => x.Id == taskInfo.DoctorUserId).FirstOrDefaultAsync();
+            var userinfo = await _userRoleRepository.Where(x => x.Id == taskInfo.DoctorUserId).Include(x => x.IdentityUser).FirstOrDefaultAsync();
 
 
 
@@ -303,6 +307,9 @@ public class UrgentMIMRepliedMedicalReviewConsumer(
 
             var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == visitid).FirstOrDefaultAsync();
 
+            var workLanguage = userinfo.IdentityUser?.UserWorkLanguage;
+            var userIsEn_US = workLanguage.HasValue ? workLanguage.Value == UserWorkLanguage.US : isEn_US;
+
 
 
             var messageToSend = new MimeMessage();
@@ -311,14 +318,14 @@ public class UrgentMIMRepliedMedicalReviewConsumer(
             messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
 
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId);
-            var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = userIsEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
 
             var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
             {
 
                 DictionaryRepository = _dictionaryRepository,
-                IsEn_US = isEn_US,
+                IsEn_US = userIsEn_US,
 
 
                 DictionaryList = new List<DictionaryDto>()
@@ -335,7 +342,7 @@ public class UrgentMIMRepliedMedicalReviewConsumer(
                 var subjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode;
                 var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, taskInfo.TaskBlindName);
                 var htmlBodyStr = string.Format(
-                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                    userinfo.FullName,              // 用户名  {0}
                    trialInfo.ExperimentName,        // 项目   {1}
                    subjectCode, // 受试者 {2}
@@ -352,8 +359,8 @@ public class UrgentMIMRepliedMedicalReviewConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc, workLanguage);
+            await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
         }
     }
 }
@@ -399,7 +406,15 @@ public class UrgentIRApplyedReReadingConsumer(
 
             var doctorInfo = await _userRoleRepository.Where(x => x.Id == taskInfo.DoctorUserId).FirstOrDefaultAsync();
 
-            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == taskInfo.TrialId && x.TrialUser.IsDeleted==false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == taskInfo.TrialId && x.TrialUser.IsDeleted==false).Include(x => x.UserRole).Select(x => x.UserRole)
+                .Select(x => new SendEmailUserDto()
+                {
+                    UserTypeEnum = x.UserTypeEnum,
+                    FullName = x.FullName,
+                    UserWorkLanguage = x.IdentityUser.UserWorkLanguage,
+                    EMail = x.EMail,
+                })
+                .ToListAsync();
 
             var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.ProjectManager || x.UserTypeEnum == UserTypeEnum.APM).ToList();
             if (context.Message.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
@@ -412,23 +427,21 @@ public class UrgentIRApplyedReReadingConsumer(
 
             var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == visitid).FirstOrDefaultAsync();
 
-
-            foreach (var userinfo in userinfoList)
-            {
-                var messageToSend = new MimeMessage();
-                //发件地址
-                messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-                messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
-
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == taskInfo.TrialId);
-                var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
+            var userWorkLanguageList = userinfoList.Select(x => x.UserWorkLanguage).Distinct().ToList();
+
+            foreach (var workLanguage in userWorkLanguageList)
+            {
+                var langUserinfoList = userinfoList.Where(x => x.UserWorkLanguage == workLanguage).ToList();
+                if (!langUserinfoList.Any()) continue;
+
+                var userIsEn_US =  workLanguage == UserWorkLanguage.US;
 
                 var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
                 {
-
                     DictionaryRepository = _dictionaryRepository,
-                    IsEn_US = isEn_US,
+                    IsEn_US = userIsEn_US,
                     DictionaryList = new List<DictionaryDto>()
                     {
                         new DictionaryDto (){DictionaryCode= "ReadingCategory",EnumValue=taskInfo.ReadingCategory.GetEnumInt(), }, //任务类型
@@ -436,13 +449,26 @@ public class UrgentIRApplyedReReadingConsumer(
                     }
                 });
 
+                var messageToSend = new MimeMessage();
+                //发件地址
+                messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+                
+                foreach (var userinfo in langUserinfoList)
+                {
+                    messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+                }
+
+                var companyName = userIsEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+
+                var userNames = langUserinfoList.Select(x => x.FullName).ToList();
+
                 Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                 {
                     var subjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode;
                     var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, taskInfo.TaskBlindName);
                     var htmlBodyStr = string.Format(
-                       CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                       userinfo.FullName,              // 用户名  {0}
+                       CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
+                       string.Join(',', userNames),              // 用户名  {0}
                        trialInfo.ExperimentName,        // 项目   {1}
                        subjectCode, // 受试者 {2}
                        taskInfo.TaskBlindName,             // 访视  {3}
@@ -451,18 +477,14 @@ public class UrgentIRApplyedReReadingConsumer(
                        criterion.CriterionName,                      // 阅片标准 {6}
                        dictionValue[1],                                               // 审批结果 {7}
                        _systemEmailConfig.SiteUrl             // 链接                  {8}
-
-
-
-
                         );
 
                     return (topicStr, htmlBodyStr);
                 };
 
-                 await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
+                 await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc, workLanguage);
 
-                await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+                await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
             }
         }
 

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

@@ -57,14 +57,23 @@ public class UserSiteSurveySubmitedEventConsumer(
         if (emailConfig != null)
         {
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
+            var siteInfo = await _trialSiteRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.Id == siteSurveyInfo.TrialSiteId, true);
+
 
             var trialUserList = await _trialUserRoleRepository.Where(t => t.TrialId == siteSurveyInfo.TrialId && t.TrialUser.IsDeleted == false)
                 .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();
+                .Select(t => new { t.UserRole.FullName, t.UserRole.IdentityUser.EMail, t.UserRole.UserTypeEnum, t.UserRole.IdentityUser.UserWorkLanguage }).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();
 
+
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
+            {
+                //重新设置当前发送邮件的语言
+                isEn_US = workLanguage == UserWorkLanguage.US;
+
                 var messageToSend = new MimeMessage();
 
                 var toUserName = string.Empty;
@@ -72,12 +81,14 @@ public class UserSiteSurveySubmitedEventConsumer(
                 //有SPM 并且参与
                 if (trialInfo.IsSPMJoinSiteSurvey && sPMOrCPMList.Count > 0)
                 {
-                foreach (var user in sPMOrCPMList)
+                    var lan_SPMOrCPMList = sPMOrCPMList.Where(t => t.UserWorkLanguage == workLanguage);
+
+                    foreach (var user in lan_SPMOrCPMList)
                     {
                         messageToSend.To.Add(new MailboxAddress(user.FullName, user.EMail));
                     }
 
-                toUserName = string.Join('、', sPMOrCPMList.Select(t => t.FullName));
+                    toUserName = string.Join('、', lan_SPMOrCPMList.Select(t => t.FullName));
 
                     foreach (var user in pmAndAPMList)
                     {
@@ -87,26 +98,26 @@ public class UserSiteSurveySubmitedEventConsumer(
                 }
                 else
                 {
-                foreach (var user in pmAndAPMList)
+                    var lan_pmAndAPMList = pmAndAPMList.Where(t => t.UserWorkLanguage == workLanguage);
+
+                    foreach (var user in lan_pmAndAPMList)
                     {
                         messageToSend.To.Add(new MailboxAddress(user.FullName, user.EMail));
                     }
 
-                toUserName = string.Join('、', pmAndAPMList.Select(t => t.FullName));
+                    toUserName = string.Join('、', lan_pmAndAPMList.Select(t => t.FullName));
                 }
 
                 //发件地址
                 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
 
 
-            var siteInfo = await _trialSiteRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.Id == siteSurveyInfo.TrialSiteId, true);
-
                 var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
                 Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                 {
                     var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo);
-                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                         toUserName,
                     siteInfo.TrialSiteCode,
                     siteInfo.TrialSiteAliasName,
@@ -121,9 +132,10 @@ public class UserSiteSurveySubmitedEventConsumer(
                 };
 
 
-             await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
+                await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc, workLanguage);
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+                await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
+            }
         }
 
     }
@@ -152,45 +164,54 @@ public class SiteSurveySPMSubmitedEventConsumer(
 
         var trialId = siteSurveyInfo.TrialId;
 
+        var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
+
+        var siteInfo = await _trialSiteRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.Id == siteSurveyInfo.TrialSiteId, true);
+
+        var trialUserList = _trialUserRoleRepository.Where(t => t.TrialId == trialId && t.TrialUser.IsDeleted == false)
+    .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, t.UserRole.IdentityUser.UserWorkLanguage }).ToList();
+
         var scenario = EmailBusinessScenario.Approval_SubmitSiteSurvey;
 
         var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
         if (emailConfig != null)
         {
-            var messageToSend = new MimeMessage();
 
-            var trialUserList = _trialUserRoleRepository.Where(t => t.TrialId == trialId && t.TrialUser.IsDeleted == false)
-                .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();
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
+            {
+                //重新设置当前发送邮件的语言
+                isEn_US = workLanguage == UserWorkLanguage.US;
+
 
                 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();
 
+                var messageToSend = new MimeMessage();
+
                 var toUserName = string.Empty;
 
-            foreach (var item in pmAndAPMList)
+                var lan_pmAndAPMList = pmAndAPMList.Where(t => t.UserWorkLanguage == workLanguage);
+
+                foreach (var item in lan_pmAndAPMList)
                 {
                     messageToSend.To.Add(new MailboxAddress(item.FullName, item.EMail));
 
-                toUserName = string.Join('、', pmAndAPMList.Select(t => t.FullName));
+                    toUserName = string.Join('、', lan_pmAndAPMList.Select(t => t.FullName));
                 }
 
                 //发件地址
                 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
 
-            var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
-
-            var siteInfo = await _trialSiteRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.Id == siteSurveyInfo.TrialSiteId, true);
-
-
                 var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
 
                 Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                 {
                     var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo);
-                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                     toUserName,
                     siteInfo.TrialSiteCode,  //中心编号
                     siteInfo.TrialSiteAliasName,//中心名称
@@ -204,9 +225,13 @@ public class SiteSurveySPMSubmitedEventConsumer(
                     return (topicStr, htmlBodyStr);
                 };
 
-             await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
+                await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc, workLanguage);
+
+                await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
+
+            }
+
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
         }
 
 
@@ -239,12 +264,21 @@ public class SiteSurverRejectedEventConsumer(
 
         var trialId = siteSurveyInfo.TrialId;
 
+        var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
+
+        var siteInfo = await _trialSiteRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.Id == siteSurveyInfo.TrialSiteId, true);
+
         var scenario = EmailBusinessScenario.SiteSurveyReject;
 
         var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
         if (emailConfig != null)
         {
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
+            {
+                //重新设置当前发送邮件的语言
+                isEn_US = workLanguage == UserWorkLanguage.US;
 
 
                 var messageToSend = new MimeMessage();
@@ -256,27 +290,31 @@ public class SiteSurverRejectedEventConsumer(
                     //PM 驳回到SPM
                     if (siteSurveyInfo.State == TrialSiteSurveyEnum.CRCSubmitted)
                     {
-                    //var user = await _userRoleRepository.FirstOrDefaultAsync(t => t.Id == siteSurveyInfo.PreliminaryUserId);
-
-                    //name = user.FullName;
 
                         var sPMOrCPMList = _trialUserRoleRepository.Where(t => t.TrialId == trialId && t.TrialUser.IsDeleted == false)
                           .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();
+                          .Select(t => new { t.UserRole.IdentityUser.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum, t.UserRole.IdentityUser.UserWorkLanguage }).ToList();
 
+                        var lan_SPMOrCPMList = sPMOrCPMList.Where(t => t.UserWorkLanguage == workLanguage);
 
-                    foreach (var user in sPMOrCPMList)
+                        foreach (var user in lan_SPMOrCPMList)
                         {
                             messageToSend.To.Add(new MailboxAddress(user.FullName, user.EMail));
                         }
 
-                    toUserName = string.Join('、', sPMOrCPMList.Select(t => t.FullName));
+                        toUserName = string.Join('、', lan_SPMOrCPMList.Select(t => t.FullName));
 
                     }
                     //SPM 驳回到CRC
                     else if (siteSurveyInfo.State == TrialSiteSurveyEnum.ToSubmit)
+                    {
+                        //使用中心国家语言 一致才发送
+                        if ((siteInfo.Country == StaticData.SiteCountry.US && isEn_US) || (siteInfo.Country == StaticData.SiteCountry.CN && isEn_US == false))
                         {
                             messageToSend.To.Add(new MailboxAddress(toUserName, siteSurveyInfo.Email));
+
+                        }
+
                     }
 
                 }
@@ -284,25 +322,24 @@ public class SiteSurverRejectedEventConsumer(
                 {
                     //没有SPM  PM驳回到CRC
 
-                messageToSend.To.Add(new MailboxAddress(siteSurveyInfo.UserName, siteSurveyInfo.Email));
+                    //使用中心国家语言 一致才发送
+                    if ((siteInfo.Country == StaticData.SiteCountry.US && isEn_US) || (siteInfo.Country == StaticData.SiteCountry.CN && isEn_US == false))
+                    {
+                        messageToSend.To.Add(new MailboxAddress(toUserName, siteSurveyInfo.Email));
+
+                    }
                 }
 
                 //发件地址
                 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
 
-
-            var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
-
-            var siteInfo = await _trialSiteRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.Id == siteSurveyInfo.TrialSiteId, true);
-
-
                 var companyName = 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(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                    toUserName,
                     trialInfo.TrialCode,
                     trialInfo.ResearchProgramNo,
@@ -320,7 +357,11 @@ public class SiteSurverRejectedEventConsumer(
 
                 await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+                await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
+
+            }
+
+
         }
 
 

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

@@ -36,7 +36,7 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
     public async Task Consume(ConsumeContext<CRCSubmitedAndQCToAuditEvent> context)
     {
-        Console.WriteLine("发送(005,006) 【加急项目所有IQC待领取质控任务】邮件！！！");
+        Log.Logger.Warning("发送(005,006) 【加急项目所有IQC待领取质控任务】邮件！！！");
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
         var subjectVisitId = context.Message.SubjectVisitId;
@@ -49,17 +49,25 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
 
         var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
+        var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false)
+            .Select(t => new { t.UserRole.IdentityUser.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum, t.UserRole.IdentityUser.UserWorkLanguage }).ToListAsync();
+
+        var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
+
         if (trialEmailConfig != null)
         {
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
+            {
+                //重新设置当前发送邮件的语言
+                isEn_US = workLanguage == UserWorkLanguage.US;
 
-            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
 
-            var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.IQC).ToList();
+                var iqcList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.IQC).Where(t => t.UserWorkLanguage == workLanguage).ToList();
 
 
                 var pmandAPm = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).ToList();
 
-            var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
 
                 var auditStateCode = "AuditStatePE";
 
@@ -68,8 +76,6 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
                     auditStateCode = "AuditStateRC";
                 }
 
-
-
                 var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
                 {
 
@@ -87,12 +93,12 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
                 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
 
 
-            foreach (var userinfo in userinfoList)
+                foreach (var userinfo in iqcList)
                 {
                     messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
                 }
 
-            var userNames = userinfoList.Select(x => x.FullName).ToList();
+                var userNames = iqcList.Select(x => x.FullName).ToList();
 
                 foreach (var pm in pmandAPm)
                 {
@@ -108,7 +114,7 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
                     var subjectCode = subjectVisit.Subject.Code;
                     var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
                     var htmlBodyStr = string.Format(
-                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                       CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                        string.Join(',', userNames),  // 用户名  {0}
                        trialInfo.ExperimentName,        // 项目   {1}
                        subjectCode, // 受试者 {2}
@@ -120,9 +126,14 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
                     return (topicStr, htmlBodyStr);
                 };
 
-            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc, workLanguage);
+
+                await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
+
+
+            }
+
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
         }
 
     }
@@ -147,7 +158,7 @@ public class CRCRepliedQCChallengeEventConsumer(
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
     public async Task Consume(ConsumeContext<CRCRepliedQCChallengeEvent> context)
     {
-        Console.WriteLine("发送(Code012，013) 【CRC 回复质控质疑 通知QC】邮件！！！");
+        Log.Logger.Warning("发送(Code012，013) 【CRC 回复质控质疑 通知QC】邮件！！！");
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
         var subjectVisitId = context.Message.SubjectVisitId;
@@ -158,26 +169,29 @@ public class CRCRepliedQCChallengeEventConsumer(
 
         var scenario = context.Message.IsPd ? EmailBusinessScenario.PDVerification_UnderQCQuery : EmailBusinessScenario.EligibilityVerification_Pending;
 
+
+
         var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
         if (trialEmailConfig != null)
         {
-
-
             var qCChallengeDialog = await _qCChallengeDialogRepository.Where(x => x.Id == context.Message.QCChallengeDialogId).Include(x => x.QCChallenge).FirstNotNullAsync();
 
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false)
+                .Select(t => new { t.UserRole.IdentityUser.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum, t.UserRole.IdentityUser.UserWorkLanguage }).ToListAsync();
 
-            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
 
             var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.IQC).ToList();
             var pmandAPm = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).ToList();
-
-
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
 
 
             var userinfo = subjectVisit.CurrentActionUser;
 
+            //重新设置当前发送邮件的语言
+            var workLanguage = _userRoleRepository.Where(t => t.Id == userinfo.Id).Select(t => t.IdentityUser.UserWorkLanguage).First();
+            isEn_US = workLanguage == UserWorkLanguage.US;
+
             var messageToSend = new MimeMessage();
             //发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -207,7 +221,7 @@ public class CRCRepliedQCChallengeEventConsumer(
                 var subjectCode = subjectVisit.Subject.Code;
                 var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
                 var htmlBodyStr = string.Format(
-                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                    userinfo.FullName,              // 用户名  {0}
                    trialInfo.ExperimentName,        // 项目   {1}
                    subjectCode, // 受试者 {2}
@@ -219,9 +233,9 @@ public class CRCRepliedQCChallengeEventConsumer(
 
                 return (topicStr, htmlBodyStr);
             };
-            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
+            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc, workLanguage);
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+            await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
         }
     }
 }
@@ -244,7 +258,7 @@ public class QCRepliedQCChallengeEventConsumer(
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
     public async Task Consume(ConsumeContext<QCRepliedQCChallengeEvent> context)
     {
-        Console.WriteLine("发送(014，015) 【  QC回复 质控质疑，通知CRC】邮件！！！");
+        Log.Logger.Warning("发送(014，015) 【  QC回复 质控质疑，通知CRC】邮件！！！");
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
         var subjectVisitId = context.Message.SubjectVisitId;
@@ -277,18 +291,23 @@ public class QCRepliedQCChallengeEventConsumer(
             }
 
 
-
-            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
-
-            var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).ToList();
-
-            var craInfo = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.CRA).FirstOrDefault();
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false)
+            .Select(t => new { t.UserRole.IdentityUser.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum, t.UserRole.IdentityUser.UserWorkLanguage }).ToListAsync();
 
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
 
 
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
+            {
+                //重新设置当前发送邮件的语言
+                isEn_US = workLanguage == UserWorkLanguage.US;
 
 
+                var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Where(t => t.UserWorkLanguage == workLanguage).ToList();
+
+                var craInfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.CRA).ToList();
+
                 var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
                 {
 
@@ -302,29 +321,31 @@ public class QCRepliedQCChallengeEventConsumer(
                 });
 
 
-            foreach (var userinfo in userinfoList)
-            {
                 var messageToSend = new MimeMessage();
                 //发件地址
                 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-                messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
-                if (craInfo != null)
+
+                var toUserName = string.Join('、', userinfoList.Select(t => t.FullName));
+
+                foreach (var userinfo in userinfoList)
                 {
-                    messageToSend.Cc.Add(new MailboxAddress(craInfo.FullName, craInfo.EMail));
+                    messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+                }
+
+                foreach (var user in craInfoList)
+                {
+                    messageToSend.Cc.Add(new MailboxAddress(user.FullName, user.EMail));
                 }
 
                 var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
-
-
-
                 Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                 {
                     var subjectCode = subjectVisit.Subject.Code;
                     var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
                     var htmlBodyStr = string.Format(
-                       CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                       userinfo.FullName,              // 用户名  {0}
+                       CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
+                       toUserName,              // 用户名  {0}
                        trialInfo.ExperimentName,        // 项目   {1}
                        subjectCode, // 受试者 {2}
                        subjectVisit.VisitName,             // 访视  {3}
@@ -337,10 +358,13 @@ public class QCRepliedQCChallengeEventConsumer(
                 };
 
 
-                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc, workLanguage);
+
+                await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
 
-                await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
             }
+
+
         }
     }
 }
@@ -364,7 +388,7 @@ public class CRCRepliedCheckChallengeEventConsumer(
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
     public async Task Consume(ConsumeContext<CRCRepliedCheckChallengeEvent> context)
     {
-        Console.WriteLine("发送(019,020) 【 CRC 回复一致性核查质疑 通知PM】邮件！！！");
+        Log.Logger.Warning("发送(019,020) 【 CRC 回复一致性核查质疑 通知PM】邮件！！！");
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
 
@@ -383,13 +407,18 @@ public class CRCRepliedCheckChallengeEventConsumer(
         {
 
 
-            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false)
+               .Select(t => new { t.UserRole.IdentityUser.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum, t.UserRole.IdentityUser.UserWorkLanguage }).ToListAsync();
 
-            var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).ToList();
 
 
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
 
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
+            {
+                //重新设置当前发送邮件的语言
+                isEn_US = workLanguage == UserWorkLanguage.US;
 
 
 
@@ -405,27 +434,31 @@ public class CRCRepliedCheckChallengeEventConsumer(
                      }
                 });
 
+                var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager)
+                    .Where(t => t.UserWorkLanguage == workLanguage).ToList();
+
 
-            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));
 
+                var toUserName = string.Join('、', userinfoList.Select(t => t.FullName));
+                foreach (var userinfo in userinfoList)
+                {
+                    messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+                }
 
                 var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
 
-
-
                 Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                 {
                     var subjectCode = subjectVisit.Subject.Code;
                     var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
                     var htmlBodyStr = string.Format(
-                       CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                       userinfo.FullName,              // 用户名  {0}
+                       CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
+                       toUserName,              // 用户名  {0}
                        trialInfo.ExperimentName,        // 项目   {1}
                        subjectCode, // 受试者 {2}
                        subjectVisit.VisitName,             // 访视  {3}
@@ -437,10 +470,17 @@ public class CRCRepliedCheckChallengeEventConsumer(
                 };
 
 
-                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc, workLanguage);
+
+                await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
 
-                await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
             }
+
+
+
+
+
+
         }
     }
 }
@@ -466,12 +506,12 @@ public class PMRepliedCheckChallengeEventConsumer(
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
     public async Task Consume(ConsumeContext<PMRepliedCheckChallengeEvent> context)
     {
-        Console.WriteLine("发送(016，017) 【  PM 一致性核查 通知CRC】邮件！！！");
+        Log.Logger.Warning("发送(016，017) 【  PM 一致性核查 通知CRC】邮件！！！");
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
         var subjectVisitId = context.Message.SubjectVisitId;
 
-        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.NoneDicomStudyList).Include(x => x.StudyList).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).Include(t => t.TrialSite).FirstNotNullAsync();
 
         var trialId = subjectVisit.TrialId;
 
@@ -486,11 +526,11 @@ public class PMRepliedCheckChallengeEventConsumer(
             var checkChallengeDialog = await _checkChallengeDialogRepository.Where(x => x.Id == context.Message.CheckChallengeDialogId).FirstNotNullAsync();
 
 
-            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false)
+                .Select(t => new { t.UserRole.IdentityUser.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum, t.UserRole.IdentityUser.UserWorkLanguage }).ToListAsync();
 
-            var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).ToList();
 
-            var craInfo = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.CRA).FirstOrDefault();
+            var craInfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.CRA).ToList();
 
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
 
@@ -499,6 +539,20 @@ public class PMRepliedCheckChallengeEventConsumer(
             modalities = subjectVisit.NoneDicomStudyList.Select(t => t.Modality)
      .Union(subjectVisit.StudyList.Select(k => k.ModalityForEdit)).ToList();
 
+
+
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            //foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
+            {
+                //重新设置当前发送邮件的语言
+
+                isEn_US = subjectVisit.TrialSite.Country == StaticData.SiteCountry.US;
+
+                var workLanguage = isEn_US ? UserWorkLanguage.US : UserWorkLanguage.CN;
+
+                var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Where(t => t.UserWorkLanguage == workLanguage).ToList();
+
+
                 var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
                 {
 
@@ -511,16 +565,20 @@ public class PMRepliedCheckChallengeEventConsumer(
                  }
                 });
 
-
-            foreach (var userinfo in userinfoList)
-            {
                 var messageToSend = new MimeMessage();
+
                 //发件地址
                 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-                messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
-                if (craInfo != null)
+
+                var toUserName = string.Join('、', userinfoList.Select(t => t.FullName));
+                foreach (var userinfo in userinfoList)
                 {
-                    messageToSend.Cc.Add(new MailboxAddress(craInfo.FullName, craInfo.EMail));
+                    messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+                }
+
+                foreach (var user in craInfoList)
+                {
+                    messageToSend.Cc.Add(new MailboxAddress(user.FullName, user.EMail));
                 }
 
                 var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
@@ -531,8 +589,8 @@ public class PMRepliedCheckChallengeEventConsumer(
                     var subjectCode = subjectVisit.Subject.Code;
                     var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
                     var htmlBodyStr = string.Format(
-                       CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                       userinfo.FullName,              // 用户名  {0}
+                       CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
+                       toUserName,              // 用户名  {0}
                        trialInfo.ExperimentName,        // 项目   {1}
 
                        subjectCode, // 受试者 {2}
@@ -547,10 +605,11 @@ public class PMRepliedCheckChallengeEventConsumer(
                 };
 
 
-                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc, workLanguage);
 
-                await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+                await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
             }
+
         }
     }
 }
@@ -592,15 +651,22 @@ public class CheckStateChangedToAuditEventConsumer(
 
 
 
-            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false)
+                 .Select(t => new { t.UserRole.IdentityUser.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum, t.UserRole.IdentityUser.UserWorkLanguage }).ToListAsync();
 
-            var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).ToList();
 
 
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
 
 
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
+            {
+                //重新设置当前发送邮件的语言
+                isEn_US = workLanguage == UserWorkLanguage.US;
 
+                var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager)
+                    .Where(t => t.UserWorkLanguage == workLanguage).ToList();
 
                 var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
                 {
@@ -615,26 +681,27 @@ public class CheckStateChangedToAuditEventConsumer(
                 });
 
 
-            foreach (var userinfo in userinfoList)
-            {
                 var messageToSend = new MimeMessage();
                 //发件地址
                 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+
+                var toUserName = string.Join('、', userinfoList.Select(t => t.FullName));
+
+                foreach (var userinfo in userinfoList)
+                {
                     messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+                }
 
 
                 var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
-
-
-
                 Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                 {
                     var subjectCode = subjectVisit.Subject.Code;
                     var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
                     var htmlBodyStr = string.Format(
-                       CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                        userinfo.FullName,   // 姓名  {0}
+                       CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
+                        toUserName,   // 姓名  {0}
                         trialInfo.ExperimentName,        // 项目   {1}                       
                        subjectCode, // 受试者 {2}
                        subjectVisit.VisitName,             // 访视  {3}
@@ -646,10 +713,11 @@ public class CheckStateChangedToAuditEventConsumer(
                 };
 
 
-                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc, workLanguage);
 
-                await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+                await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
             }
+
         }
     }
 }
@@ -671,7 +739,7 @@ public class QCClaimTaskEventConsumer(
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
     public async Task Consume(ConsumeContext<QCClaimTaskEvent> context)
     {
-        Console.WriteLine("发送(Code007，008) 【QC 领取了质控任务】邮件！！！");
+        Log.Logger.Warning("发送(Code007，008) 【QC 领取了质控任务】邮件！！！");
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
 
@@ -708,6 +776,10 @@ public class QCClaimTaskEventConsumer(
                 return;
             }
 
+            //重新设置当前发送邮件的语言
+            var workLanguage = _userRoleRepository.Where(t => t.Id == userinfo.Id).Select(t => t.IdentityUser.UserWorkLanguage).First();
+            isEn_US = workLanguage == UserWorkLanguage.US;
+
             var messageToSend = new MimeMessage();
             //发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -745,7 +817,7 @@ public class QCClaimTaskEventConsumer(
                 var subjectCode = subjectVisit.Subject.Code;
                 var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
                 var htmlBodyStr = string.Format(
-                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                    userinfo.FullName,              // 用户名  {0}
                    trialInfo.ExperimentName,        // 项目   {1}
                    string.Join(',', subjectcodes), // 受试者 {2}
@@ -759,9 +831,9 @@ public class QCClaimTaskEventConsumer(
             };
 
 
-            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
+            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc, workLanguage);
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+            await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
         }
     }
 }

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

@@ -74,13 +74,17 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                     t.UserRole.IdentityUser.EMail,
                     t.UserRole.IdentityUser.UserName,
                     t.Trial.TrialCode,
-                    t.Trial.ResearchProgramNo
+                    t.Trial.ResearchProgramNo,
+                    t.UserRole.IdentityUser.UserWorkLanguage
                     //TrialReadingCriterionList = t.Trial.TrialReadingCriterionList.Select(t => new { t.CriterionName, TrialReadingCriterionId = t.Id }).ToList()
                 });
 
 
                 foreach (var trialUser in trialUserList)
                 {
+                    //重新设置当前发送邮件的语言
+                    var workLanguage = trialUser.UserWorkLanguage;
+                    isEn_US = workLanguage == UserWorkLanguage.US;
 
                     var userId = trialUser.UserId;
 
@@ -153,7 +157,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
 
 
 
-                            var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, emailContent),
+                            var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, emailContent, workLanguage),
                                 trialUser.FullName,
 
                             DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
@@ -167,9 +171,9 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                             return (topicStr, htmlBodyStr);
                         };
 
-                         await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
+                         await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc, workLanguage);
 
-                        await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+                        await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
 
                         //处理标记已通知的任务
 

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

@@ -44,12 +44,17 @@ 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 _trialUserRoleRepository.Where(t => t.TrialId == trialId).Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Select(t => new { t.UserId, t.UserRole.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, t.UserRole.IdentityUser.UserWorkLanguage }).ToListAsync();
 
         //判断是否任务可以领取 ，可以的话 发送邮件
 
         foreach (var user in userList)
         {
+
+            //重新设置当前发送邮件的语言
+            var workLanguage = user.UserWorkLanguage;
+            isEn_us = workLanguage == UserWorkLanguage.US;
+
             var userId = user.UserId;
             //过滤项目  并且 将 _userInfo.Id 换位 当前发送邮件的Id
             var query = _trialRepository.Where(t => t.Id == trialId)
@@ -72,7 +77,7 @@ public class QCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRepo
                 {
                     var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, trialInfo.ResearchProgramNo);
                     var htmlContent = isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN;
-                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlContent),
+                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlContent, workLanguage),
                                    user.FullName, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), sendStat.ToBeDealedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
 
                     return (topicStr, htmlBodyStr, isEn_us, userId);
@@ -116,12 +121,17 @@ 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 _trialUserRoleRepository.Where(t => t.TrialId == trialId).Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.IQC).Select(t => new { t.UserId, t.UserRole.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, t.UserRole.IdentityUser.UserWorkLanguage }).ToListAsync();
 
         //判断是否任务可以领取 ，可以的话 发送邮件
 
         foreach (var user in userList)
         {
+
+            //重新设置当前发送邮件的语言
+            var workLanguage = user.UserWorkLanguage;
+            isEn_us = workLanguage == UserWorkLanguage.US;
+
             var userId = user.UserId;
 
             //过滤项目  并且 将 _userInfo.Id 换位 当前发送邮件的Id
@@ -147,7 +157,7 @@ public class CRCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRep
                 {
                     var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, trialInfo.ResearchProgramNo);
                     var htmlContent = isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN;
-                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlContent),
+                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlContent, workLanguage),
 
                                    user.FullName, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), sendStat.ToBeDealedCount - sendStat.ReUploadTobeDealedCount, sendStat.ReUploadTobeDealedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
 
@@ -192,13 +202,17 @@ 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 _trialUserRoleRepository.Where(t => t.TrialId == trialId).Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.IQC).Select(t => new { t.UserId, t.UserRole.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, t.UserRole.IdentityUser.UserWorkLanguage }).ToListAsync();
 
         //判断是否任务可以领取 ，可以的话 发送邮件
         var userIdList = userList.Select(t => t.UserId).ToList();
 
         foreach (var user in userList)
         {
+            //重新设置当前发送邮件的语言
+            var workLanguage = user.UserWorkLanguage;
+            isEn_us = workLanguage == UserWorkLanguage.US;
+
             var userId = user.UserId;
 
             //过滤项目  并且 将 _userInfo.Id 换位 当前发送邮件的Id
@@ -226,7 +240,7 @@ public class ImageQCRecurringEventConsumer(IRepository<Trial> _trialRepository,
                     var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, trialInfo.ResearchProgramNo);
 
                     var htmlContent = isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN;
-                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlContent),
+                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlContent, workLanguage),
                         user.FullName, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), sendStat.ToBeClaimedCount, sendStat.ToBeReviewedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
 
                     return (topicStr, htmlBodyStr, false, userId);

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

@@ -5,6 +5,7 @@ using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.MassTransit.Consumer;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Domain.Share;
 using MassTransit;
 using Microsoft.Extensions.Options;
 using MimeKit;
@@ -84,58 +85,61 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
             var userinfoList = await _identityUserRepository.Where(x => confirmUserIdList.Contains(x.Id)).ToListAsync();
 
             Console.WriteLine("发送定时过期提醒:人员数量" + userinfoList.Count);
-            int index = 1;
-            foreach (var userinfo in userinfoList)
+
+            var scenario = EmailBusinessScenario.GeneralTraining_ExpirationNotification;
+            var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+            if (emailConfig == null)
+            {
+                return;
+            }
+
+            var userWorkLanguageList = userinfoList.Select(x => x.UserWorkLanguage).Distinct().ToList();
+            foreach (var workLanguage in userWorkLanguageList)
             {
                 try
                 {
-                    Console.WriteLine($"{index}发送定时过期提醒,邮箱：{userinfo.EMail}，姓名{userinfo.UserName}");
-                    index++;
+                    var langUserInfoList = userinfoList.Where(x => x.UserWorkLanguage == workLanguage).ToList();
+                    if (!langUserInfoList.Any())
+                    {
+                        continue;
+                    }
+
+                    var userIsEn_US = workLanguage == UserWorkLanguage.US;
+
                     var messageToSend = new MimeMessage();
-                    //发件地址
                     messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+
+                    foreach (var userinfo in langUserInfoList)
+                    {
                         messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+                    }
 
+                    var companyName = userIsEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+                    var userNames = langUserInfoList.Select(x => x.UserName).ToList();
 
-
-                    var companyName = 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(
-                           CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                           userinfo.UserName,  // 用户名  {0}
+                           CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
+                           string.Join(',', userNames),
                                  _systemEmailConfig.SiteUrl
                             );
 
                         return (topicStr, htmlBodyStr);
                     };
 
-                    var scenario = EmailBusinessScenario.GeneralTraining_ExpirationNotification;
-
-                    var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
-
-                    if (emailConfig != null)
-                    {
-                        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
-                  
+                    await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc, workLanguage);
                     await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
                 }
-
-
-                }
                 catch (Exception)
                 {
-
+                }
             }
 
         }
 
-
-        }
-    }
-
         /// <summary>
         /// 生效通知
         /// </summary>
@@ -228,47 +232,53 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
 
                 var confirmUserIdList = datalist.Select(t => t.ConfirmUserId).Distinct().ToList();
                 var userinfoList = await _identityUserRepository.Where(x => confirmUserIdList.Contains(x.Id)).ToListAsync();
-            int index = 1;
-            foreach (var userinfo in userinfoList)
+
+                var scenario = EmailBusinessScenario.GeneralTraining_EffectiveNotification;
+                var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+                if (emailConfig == null)
                 {
-                string msg = $"{index}生效通知,邮箱：{userinfo.EMail}，姓名{userinfo.UserName},";
-                index++;
+                    return;
+                }
+
+                var userWorkLanguageList = userinfoList.Select(x => x.UserWorkLanguage).Distinct().ToList();
+                foreach (var workLanguage in userWorkLanguageList)
+                {
+                    var langUserInfoList = userinfoList.Where(x => x.UserWorkLanguage == workLanguage).ToList();
+                    if (!langUserInfoList.Any())
+                    {
+                        continue;
+                    }
+
+                    string msg = $"{langUserInfoList.Count}生效通知,";
                     try
                     {
-
                         var messageToSend = new MimeMessage();
-                    //发件地址
                         messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+
+                        foreach (var userinfo in langUserInfoList)
+                        {
                             messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+                        }
 
+                        var userIsEn_US = workLanguage == UserWorkLanguage.US;
+                        var companyName = userIsEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+                        var userNames = langUserInfoList.Select(x => x.UserName).ToList();
 
-
-                    var companyName = 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(
-                           CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                           userinfo.UserName,  // 用户名  {0}
+                               CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
+                               string.Join(',', userNames),
                                _systemEmailConfig.SiteUrl
                                 );
 
                             return (topicStr, htmlBodyStr);
                         };
-
-                    var scenario = EmailBusinessScenario.GeneralTraining_EffectiveNotification;
-
-                    var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
-
-                    if (emailConfig != null)
-                    {
-                        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
-
+                        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc, workLanguage);
                         await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
                         msg += "发送成功";
-                    }
-
 
                     }
                     catch (Exception)
@@ -284,3 +294,4 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
             }
         }
     }
+}

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

@@ -5,6 +5,7 @@ using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.MassTransit.Consumer;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Domain.Share;
 using MassTransit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -108,46 +109,65 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
             var userinfoList = await _identityUserRepository.Where(x => confirmUserIdList.Contains(x.Id)).ToListAsync();
 
             Console.WriteLine("发送定时项目过期提醒:人员数量" + userinfoList.Count);
-            int index = 1;
-            foreach (var userinfo in userinfoList)
+
+            var scenario = EmailBusinessScenario.TrialTraining_ExpirationNotification;
+            var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+            if (emailConfig == null)
+            {
+                return;
+            }
+
+            var userTrialIdList = datalist.Select(t => new { t.ConfirmUserId, t.TrialId }).Distinct().ToList();
+            var userWithTrialList = (from ut in userTrialIdList
+                                     join u in userinfoList on ut.ConfirmUserId equals u.Id
+                                     select new { ut.TrialId, User = u }).ToList();
+
+            var groupedList = userWithTrialList.GroupBy(x => new { x.TrialId, x.User.UserWorkLanguage }).ToList();
+            foreach (var groupItem in groupedList)
             {
                 try
                 {
-                    Console.WriteLine($"{index}发送定时过期提醒,邮箱：{userinfo.EMail}，姓名{userinfo.UserName}");
-                    index++;
-                    var trialInfo =  _trialRepository.Where(x => x.Id == userinfo.TrialId).FirstOrDefault();
+                    var langUserInfoList = groupItem.Select(x => x.User).Distinct().ToList();
+                    if (!langUserInfoList.Any())
+                    {
+                        continue;
+                    }
+
+                    Console.WriteLine($"发送定时过期提醒,数量：{langUserInfoList.Count}");
+
+                    var trialInfo = await _trialRepository.Where(x => x.Id == groupItem.Key.TrialId).FirstOrDefaultAsync();
+                    if (trialInfo == null)
+                    {
+                        continue;
+                    }
+
+                    var workLanguage = groupItem.Key.UserWorkLanguage;
+                    var userIsEn_US = workLanguage == UserWorkLanguage.US;
                     var messageToSend = new MimeMessage();
-                    //发件地址
                     messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+
+                    foreach (var userinfo in langUserInfoList)
+                    {
                         messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+                    }
 
-
-
-                    var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+                    var companyName = userIsEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+                    var userNames = langUserInfoList.Select(x => x.UserName).ToList();
                     Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                     {
                         var topicStr = string.Format(input.topicStr, companyName);
 
                         var htmlBodyStr = string.Format(
-                           CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                           userinfo.UserName,  // 用户名  {0}
+                           CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
+                           string.Join(',', userNames),
                                  _systemEmailConfig.SiteUrl
                             );
 
                         return (topicStr, htmlBodyStr);
                     };
 
-                    var scenario = EmailBusinessScenario.TrialTraining_ExpirationNotification;
-
-                    var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
-
-                    if (emailConfig != null)
-                    {
-                        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
-                     
-                        await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
-                    }
-
+                    await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc, workLanguage);
+                    await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
 
                 }
                 catch (Exception)
@@ -264,52 +284,65 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
 
             var confirmUserIdList = datalist.Select(t => t.ConfirmUserId).Distinct().ToList();
             var userinfoList = await _identityUserRepository.Where(x => confirmUserIdList.Contains(x.Id)).ToListAsync();
-            int index = 1;
-            foreach (var userinfo in userinfoList)
+
+            var scenario = EmailBusinessScenario.TrialTraining_EffectiveNotification;
+            var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable).FirstOrDefault();
+            if (emailConfig == null)
             {
-                string msg = $"{index}项目生效通知,邮箱：{userinfo.EMail}，姓名{userinfo.UserName},";
-                index++;
+                return;
+            }
+
+            var userTrialIdList = datalist.Select(t => new { t.ConfirmUserId, t.TrialId }).Distinct().ToList();
+            var userWithTrialList = (from ut in userTrialIdList
+                                     join u in userinfoList on ut.ConfirmUserId equals u.Id
+                                     select new { ut.TrialId, User = u }).ToList();
+
+            var groupedList = userWithTrialList.GroupBy(x => new { x.TrialId, x.User.UserWorkLanguage }).ToList();
+            foreach (var groupItem in groupedList)
+            {
+                var langUserInfoList = groupItem.Select(x => x.User).Distinct().ToList();
+                if (!langUserInfoList.Any())
+                {
+                    continue;
+                }
+
+                string msg = $"{langUserInfoList.Count}项目生效通知,";
                 try
                 {
-
                     var messageToSend = new MimeMessage();
-                    //发件地址
                     messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+
+                    foreach (var userinfo in langUserInfoList)
+                    {
                         messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+                    }
 
-
-
-                    var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+                    var workLanguage = groupItem.Key.UserWorkLanguage;
+                    var userIsEn_US = workLanguage == UserWorkLanguage.US;
+                    var companyName = userIsEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+                    var userNames = langUserInfoList.Select(x => x.UserName).ToList();
                     Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                     {
                         var topicStr = string.Format(input.topicStr, companyName);
 
                         var htmlBodyStr = string.Format(
-                           CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                           userinfo.UserName,  // 用户名  {0}
+                           CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
+                           string.Join(',', userNames),
                            _systemEmailConfig.SiteUrl
                             );
 
                         return (topicStr, htmlBodyStr);
                     };
+                    await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc, workLanguage);
 
-                    var scenario = EmailBusinessScenario.TrialTraining_EffectiveNotification;
-
-                    var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable).FirstOrDefault();
-
-                    if (emailConfig != null)
+                    var trialInfo = await _trialRepository.Where(x => x.Id == groupItem.Key.TrialId).FirstOrDefaultAsync();
+                    if (trialInfo == null)
                     {
-                        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
-
-                        var trial = datalist.Where(x => x.ConfirmUserId == userinfo.Id).FirstOrDefault();
-
-                        var trialInfo = await _trialRepository.Where(x=>x.Id==trial.TrialId).FirstNotNullAsync();
-
- 
-                        await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
-                        msg += "发送成功";
+                        continue;
                     }
 
+                    await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
+                    msg += "发送成功";
 
                 }
                 catch (Exception)

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

@@ -873,7 +873,7 @@ namespace IRaCIS.Core.Application.Service
                                                                 {
                                                                     arm1.TaskAllocationState = TaskAllocationState.Allocated;
                                                                     arm1.AllocateTime = DateTime.Now;
-                                                                    arm1.DoctorUserId = task1.DoctorUserId;
+                                                                    arm1.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm1)!.DoctorUserId;
                                                                     arm1.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
                                                                 }
 
@@ -913,7 +913,7 @@ namespace IRaCIS.Core.Application.Service
                                                                 {
                                                                     taskOne.TaskAllocationState = TaskAllocationState.Allocated;
                                                                     taskOne.AllocateTime = DateTime.Now;
-                                                                    taskOne.DoctorUserId = task1!.DoctorUserId;
+                                                                    taskOne.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm1)!.DoctorUserId;
                                                                     taskOne.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
                                                                 }
 
@@ -944,7 +944,7 @@ namespace IRaCIS.Core.Application.Service
                                                                 {
                                                                     arm2.TaskAllocationState = TaskAllocationState.Allocated;
                                                                     arm2.AllocateTime = DateTime.Now;
-                                                                    arm2.DoctorUserId = task2.DoctorUserId;
+                                                                    arm2.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm2)!.DoctorUserId;
                                                                     arm2.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
                                                                 }
 
@@ -986,7 +986,7 @@ namespace IRaCIS.Core.Application.Service
                                                                 {
                                                                     taskTwo.TaskAllocationState = TaskAllocationState.Allocated;
                                                                     taskTwo.AllocateTime = DateTime.Now;
-                                                                    taskTwo.DoctorUserId = task2!.DoctorUserId;
+                                                                    taskTwo.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm2)!.DoctorUserId;
                                                                     taskTwo.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
                                                                 }
 

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

@@ -1016,9 +1016,9 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
         if (critrion.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
         {
-            var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr }).FirstOrDefault();
+            var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.IsOpenLostVistRead }).FirstOrDefault();
 
-            var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig();
+            //var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig();
 
             var visitQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.UserRoleId && x.TaskState == TaskState.Effect && x.Subject.IsSubjectQuit == false)
 
@@ -1027,7 +1027,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             .WhereIf(critrion.IsAutoCreate == false, t => !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum))
 
            // 前序 不存在 未一致性核查未通过的
-           .Where(t => !t.Subject.SubjectVisitList.Where(t => extralConfig.IsOpenLostVistRead ? t.IsLostVisit == false : true).Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum >= sv.VisitNum))
+           .Where(t => !t.Subject.SubjectVisitList.Where(t => extralObj.IsOpenLostVistRead ? t.IsLostVisit == false : true).Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum >= sv.VisitNum))
            //.WhereIf(critrion.IsAutoCreate == false, t => t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(t => t.IsGeneratedTask == false) ?
            //t.VisitTaskNum <= t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.IsGeneratedTask == false).Min(t => t.SubjectVisit.VisitNum) : true)
            //.Where(t => t.Subject.SubjectVisitList.Any(t => t.CheckState != CheckStateEnum.CVPassed) ? t.VisitTaskNum <= t.Subject.SubjectVisitList.Where(t => t.CheckState != CheckStateEnum.CVPassed).Min(t => t.VisitNum) : true)
@@ -1050,14 +1050,14 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                 UnReadTaskCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned).Count(),
 
                 //未读 里可读任务量   
-                UnReadCanReadTaskCount = x.Where(t => extralConfig.IsOpenLostVistRead ? true : t.IsFrontTaskNeedSignButNotSign == false).Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)
+                UnReadCanReadTaskCount = x.Where(t => extralObj.IsOpenLostVistRead ? true : t.IsFrontTaskNeedSignButNotSign == false).Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)
                 //不能对包含聚合或子查询的表达式执行聚合函数
                 //&& !x.Any(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.IsNeedClinicalDataSign == true && t.IsClinicalDataSign == false && t.VisitTaskNum<y.VisitTaskNum )
                 ).Count(),
 
 
                 UnReadCanReadTaskList = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned)
-                .Where(t => extralConfig.IsOpenLostVistRead ? true : t.IsFrontTaskNeedSignButNotSign == false)
+                .Where(t => extralObj.IsOpenLostVistRead ? true : t.IsFrontTaskNeedSignButNotSign == false)
                 .Where(y => /*y.IsFrontTaskNeedSignButNotSign == false &&*/ (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
                 .OrderBy(x => x.VisitTaskNum)
                 .Select(u => new IRUnreadTaskView()

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

@@ -0,0 +1,130 @@
+using DocumentFormat.OpenXml.Spreadsheet;
+using IRaCIS.Application.Contracts;
+using Medallion.Threading;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Service.Common;
+
+[ApiExplorerSettings(GroupName = "Common")]
+public class DeployConfigService(IMapper _mapper, IUserInfo _userInfo, IWebHostEnvironment _hostEnvironment, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService
+{
+
+    /// <summary>
+    /// 获取系统基础配置信息
+    /// </summary>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    public async Task<ServiceVerifyConfigOption> GetSystemBasicConfigInfo([FromServices] IOptionsMonitor<ServiceVerifyConfigOption> options)
+    {
+        return options.CurrentValue;
+    }
+
+    /// <summary>
+    /// 更新系统基础配置
+    /// </summary>
+    /// <param name="basicSystemConfigOption"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public async Task<IResponseOutput> UpdateSystemBasicConfig(ServiceVerifyConfigOption basicSystemConfigOption)
+    {
+        var path = $"appsettings.{_hostEnvironment.EnvironmentName}.json";
+
+        string text = System.IO.File.ReadAllText(path);
+
+        // 修改
+        JObject obj = JObject.Parse(text);
+        // QCRiskControl 相关配置
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.QCRiskControl)] = basicSystemConfigOption.QCRiskControl;
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.OpenUserComplexPassword)] = basicSystemConfigOption.OpenUserComplexPassword;
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.OpenSignDocumentBeforeWork)] = basicSystemConfigOption.OpenSignDocumentBeforeWork;
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.OpenTrialRelationDelete)] = basicSystemConfigOption.OpenTrialRelationDelete;
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.OpenLoginLimit)] = basicSystemConfigOption.OpenLoginLimit;
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.LoginMaxFailCount)] = basicSystemConfigOption.LoginMaxFailCount;
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.LoginFailLockMinutes)] = basicSystemConfigOption.LoginFailLockMinutes;
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.AutoLoginOutMinutes)] = basicSystemConfigOption.AutoLoginOutMinutes;
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.OpenLoginMFA)] = basicSystemConfigOption.OpenLoginMFA;
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.ContinuousReadingTimeMin)] = basicSystemConfigOption.ContinuousReadingTimeMin;
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.ReadingRestTimeMin)] = basicSystemConfigOption.ReadingRestTimeMin;
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.IsNeedChangePassWord)] = basicSystemConfigOption.IsNeedChangePassWord;
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.ChangePassWordDays)] = basicSystemConfigOption.ChangePassWordDays;
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.TemplateType)] = ((int)basicSystemConfigOption.TemplateType); // 枚举需要转换为字符串
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.ThirdPdfUrl)] = basicSystemConfigOption.ThirdPdfUrl;
+        obj["BasicSystemConfig"][nameof(ServiceVerifyConfigOption.UserMFAVerifyMinutes)] = basicSystemConfigOption.UserMFAVerifyMinutes;
+
+
+        // 重新写入appsettings.json
+        string result = obj.ToString();
+        System.IO.File.WriteAllText(path, result);
+
+
+        return ResponseOutput.Ok();
+    }
+
+    /// <summary>
+    /// 获取系统邮件配置信息
+    /// </summary>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    public async Task<SystemEmailSendConfig> GetEmailConfigInfo([FromServices] IOptionsMonitor<SystemEmailSendConfig> options)
+    {
+        return options.CurrentValue;
+    }
+
+
+    /// <summary>
+    /// 更新系统邮件配置
+    /// </summary>
+    /// <param name="emailConfig"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public async Task<IResponseOutput> UpdateSystemEmailConfig(SystemEmailSendConfig emailConfig)
+    {
+        var path = $"appsettings.{_hostEnvironment.EnvironmentName}.json";
+
+        string text = System.IO.File.ReadAllText(path);
+
+        // 修改
+        JObject obj = JObject.Parse(text);
+
+        // SystemEmailSendConfig 相关配置
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.Port)] = emailConfig.Port;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.Host)] = emailConfig.Host;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.Imap)] = emailConfig.Imap;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.ImapPort)] = emailConfig.ImapPort;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.FromEmail)] = emailConfig.FromEmail;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.FromName)] = emailConfig.FromName;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.AuthorizationCode)] = emailConfig.AuthorizationCode;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.SiteUrl)] = emailConfig.SiteUrl;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.PlatformName)] = emailConfig.PlatformName;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.PlatformNameCN)] = emailConfig.PlatformNameCN;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.SystemShortName)] = emailConfig.SystemShortName;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.OrganizationName)] = emailConfig.OrganizationName;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.OrganizationNameCN)] = emailConfig.OrganizationNameCN;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.CompanyName)] = emailConfig.CompanyName;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.CompanyNameCN)] = emailConfig.CompanyNameCN;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.CompanyShortName)] = emailConfig.CompanyShortName;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.CompanyShortNameCN)] = emailConfig.CompanyShortNameCN;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.IsEnv_US)] = emailConfig.IsEnv_US;
+        obj["SystemEmailSendConfig"][nameof(SystemEmailSendConfig.EmailRegexStr)] = emailConfig.EmailRegexStr;
+
+
+
+        // 重新写入appsettings.json
+        string result = obj.ToString();
+        System.IO.File.WriteAllText(path, result);
+
+
+        return ResponseOutput.Ok();
+    }
+
+}

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

@@ -1,6 +1,8 @@
-using IRaCIS.Application.Contracts;
+using DocumentFormat.OpenXml.Spreadsheet;
+using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Auth;
 using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.MassTransit.Consumer;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
@@ -105,9 +107,17 @@ namespace IRaCIS.Core.Application.Service
         private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
 
 
-
+        /// <summary>
+        /// 获取邮件主题和html 通用封装  以用户语言为主，没有的就用当前的请求语言_userInfo.IsEn_Us
+        /// </summary>
+        /// <param name="scenario"></param>
+        /// <param name="messageToSend"></param>
+        /// <param name="emailFunc"></param>
+        /// <param name="userWorkLanguage"></param>
+        /// <returns></returns>
+        /// <exception cref="BusinessValidationFailedException"></exception>
         private async Task<EmailNoticeConfig> GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario scenario, MimeMessage messageToSend,
-            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailFunc)
+            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailFunc, UserWorkLanguage? userWorkLanguage = null)
         {
             var configInfo = await _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario).FirstOrDefaultAsync();
 
@@ -119,7 +129,9 @@ namespace IRaCIS.Core.Application.Service
             }
 
 
-            var (topicStr, htmlBodyStr) = _userInfo.IsEn_Us ? (configInfo.EmailTopic, configInfo.EmailHtmlContent) : (configInfo.EmailTopicCN, configInfo.EmailHtmlContentCN);
+            bool isEn_Us = userWorkLanguage.HasValue ? userWorkLanguage.Value == UserWorkLanguage.US : _userInfo.IsEn_Us;
+
+            var (topicStr, htmlBodyStr) = isEn_Us ? (configInfo.EmailTopic, configInfo.EmailHtmlContent) : (configInfo.EmailTopicCN, configInfo.EmailHtmlContentCN);
 
             try
             {
@@ -182,24 +194,16 @@ namespace IRaCIS.Core.Application.Service
             return sucessHandle;
         }
 
-        private string ReplaceCompanyName(string needDealtxt)
-        {
-            var str = needDealtxt.Replace("{company}", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyName : _systemEmailConfig.CompanyNameCN)
-                .Replace("{company abbreviation}", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN);
-            return str;
-        }
 
-        private string ReplacePlatformName(string needDealtxt)
-        {
-            var platformName = _userInfo.IsEn_Us ? _systemEmailConfig.PlatformName : _systemEmailConfig.PlatformNameCN;
-
-            var str = needDealtxt.Replace("{platformName}", platformName);
-            return str;
-        }
 
         //MFA 
         public async Task SenMFAVerifyEmail(Guid userId, string userName, string emailAddress, int verificationCode, UserMFAType mfaType = UserMFAType.Login)
         {
+
+            //设置工作语言
+            var workLanguage = _identityUserRepository.Where(t => t.Id == userId).Select(t => t.UserWorkLanguage).First();
+            var isEn_US = workLanguage == UserWorkLanguage.US;
+
             var messageToSend = new MimeMessage();
             //发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -207,13 +211,13 @@ namespace IRaCIS.Core.Application.Service
             messageToSend.To.Add(new MailboxAddress(userName, emailAddress));
             //主题---[来自{0}] 关于MFA邮箱验证的提醒
 
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = 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),
+                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                     userName,
                     verificationCode
                     );
@@ -222,7 +226,7 @@ namespace IRaCIS.Core.Application.Service
             };
 
 
-            await GetEmailSubejctAndHtmlInfoAndBuildAsync(mfaType == UserMFAType.Login ? EmailBusinessScenario.MFALogin : EmailBusinessScenario.MFAUnlock, messageToSend, emailConfigFunc);
+            await GetEmailSubejctAndHtmlInfoAndBuildAsync(mfaType == UserMFAType.Login ? EmailBusinessScenario.MFALogin : EmailBusinessScenario.MFAUnlock, messageToSend, emailConfigFunc, workLanguage);
 
 
             var sucessHandle = GetEmailSuccessHandle(userId, verificationCode, emailAddress);
@@ -245,6 +249,11 @@ namespace IRaCIS.Core.Application.Service
         public async Task SendEmailVerification(string emailAddress, int verificationCode)
         {
 
+            //设置工作语言
+            var isEn_US = _userInfo.IsEn_Us;
+            var workLanguage = isEn_US ? UserWorkLanguage.US : UserWorkLanguage.CN;
+
+
             var messageToSend = new MimeMessage();
             //发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -253,13 +262,13 @@ namespace IRaCIS.Core.Application.Service
             //主题
             //---[来自展影IRC]的提醒
 
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = 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),
+                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
 
                    "Sir/Madam",
                 //---您正在参与展影医疗IRC项目
@@ -271,7 +280,7 @@ namespace IRaCIS.Core.Application.Service
             };
 
 
-            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.ReviewerLogin, messageToSend, emailConfigFunc);
+            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.ReviewerLogin, messageToSend, emailConfigFunc, workLanguage);
 
             //此时不知道用户
             var sucessHandle = GetEmailSuccessHandle(Guid.Empty, verificationCode, emailAddress);
@@ -286,8 +295,10 @@ namespace IRaCIS.Core.Application.Service
         //中心调研 登陆 发送验证码
         public async Task AnolymousSendEmail(Guid trialId, string emailAddress, int verificationCode)
         {
-            //throw new BusinessValidationFailedException("模拟邮件取数据或者发送异常！！！");
 
+            //设置工作语言
+            var isEn_US = _userInfo.IsEn_Us;
+            var workLanguage = isEn_US ? UserWorkLanguage.US : UserWorkLanguage.CN;
 
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
 
@@ -299,13 +310,13 @@ namespace IRaCIS.Core.Application.Service
             //主题
             //$"[来自展影IRC] [{researchProgramNo}] 关于中心调研的提醒";
 
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = 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),
+                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
 
                     "Sir/Madam",
                 //---您正在参与展影医疗IRC项目中心调研工作
@@ -317,13 +328,13 @@ namespace IRaCIS.Core.Application.Service
             };
 
 
-            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.SiteSurveyLogin, messageToSend, emailConfigFunc);
+            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.SiteSurveyLogin, messageToSend, emailConfigFunc, workLanguage);
 
             //此时不知道用户
             var sucessHandle = GetEmailSuccessHandle(Guid.Empty, verificationCode, emailAddress);
 
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo, sucessHandle);
+            await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo, sucessHandle);
 
         }
 
@@ -335,6 +346,9 @@ namespace IRaCIS.Core.Application.Service
 
             var sysUserInfo = (await _identityUserRepository.Where(t => t.Id == userId).Include(t => t.UserRoleList).ThenInclude(c => c.UserTypeRole).FirstOrDefaultAsync()).IfNullThrowException();
 
+            //设置工作语言
+            var workLanguage = sysUserInfo.UserWorkLanguage;
+            var isEn_US = workLanguage == UserWorkLanguage.US;
 
             var messageToSend = new MimeMessage();
             //发件地址
@@ -349,20 +363,19 @@ namespace IRaCIS.Core.Application.Service
 
             await _identityUserRepository.BatchUpdateNoTrackingAsync(t => t.Id == sysUserInfo.Id, u => new IdentityUser() { EmailToken = token });
 
-            routeUrl = routeUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&lang=" + (_userInfo.IsEn_Us ? "en" : "zh") + "&access_token=" + token;
+            routeUrl = routeUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&lang=" + (isEn_US ? "en" : "zh") + "&access_token=" + token;
 
             var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
 
             var redirectUrl = $"{domain}/api/User/UserRedirect?url={System.Web.HttpUtility.UrlEncode(routeUrl)}";
 
-
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = 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),
+                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
 
                   sysUserInfo.FullName,
                    sysUserInfo.EMail,
@@ -374,7 +387,7 @@ namespace IRaCIS.Core.Application.Service
             };
 
 
-            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.SysCreateUser, messageToSend, emailConfigFunc);
+            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.SysCreateUser, messageToSend, emailConfigFunc, sysUserInfo.UserWorkLanguage);
 
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
@@ -385,6 +398,11 @@ namespace IRaCIS.Core.Application.Service
         {
             var sysUserInfo = (await _identityUserRepository.Where(t => t.Id == userId).Include(t => t.UserRoleList).ThenInclude(c => c.UserTypeRole).FirstOrDefaultAsync()).IfNullThrowException();
 
+
+            //设置工作语言
+            var workLanguage = sysUserInfo.UserWorkLanguage;
+            var isEn_US = workLanguage == UserWorkLanguage.US;
+
             var messageToSend = new MimeMessage();
             //发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -393,13 +411,13 @@ namespace IRaCIS.Core.Application.Service
             //主题
             //---[来自展影IRC] 关于重置账户密码的提醒
 
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = 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),
+                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
 
                     sysUserInfo.FullName,
                    sysUserInfo.UserName,
@@ -413,7 +431,7 @@ namespace IRaCIS.Core.Application.Service
             };
 
 
-            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.SysResetPassword, messageToSend, emailConfigFunc);
+            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.SysResetPassword, messageToSend, emailConfigFunc, sysUserInfo.UserWorkLanguage);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
@@ -421,6 +439,10 @@ namespace IRaCIS.Core.Application.Service
         //用户重置邮箱 
         public async Task SendMailEditEmail(Guid userId, string userName, string emailAddress, int verificationCode)
         {
+            //设置工作语言
+            var workLanguage = _identityUserRepository.Where(t => t.Id == userId).Select(t => t.UserWorkLanguage).First();
+            var isEn_US = workLanguage == UserWorkLanguage.US;
+
 
             var messageToSend = new MimeMessage();
             //发件地址
@@ -430,13 +452,13 @@ namespace IRaCIS.Core.Application.Service
             //主题
             //---[来自展影IRC] 关于重置邮箱的提醒
 
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = 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),
+                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
 
                     userName,
                     //---您正在进行邮箱重置操作
@@ -447,7 +469,7 @@ namespace IRaCIS.Core.Application.Service
             };
 
 
-            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.UserResetEmail, messageToSend, emailConfigFunc);
+            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.UserResetEmail, messageToSend, emailConfigFunc, workLanguage);
 
 
             var sucessHandle = GetEmailSuccessHandle(userId, verificationCode, emailAddress);
@@ -460,6 +482,11 @@ namespace IRaCIS.Core.Application.Service
         //不登录  通过邮箱重置密码
         public async Task AnolymousSendEmailForResetAccount(string emailAddress, int verificationCode)
         {
+
+            //设置工作语言
+            var isEn_US = _userInfo.IsEn_Us;
+            var workLanguage = isEn_US ? UserWorkLanguage.US : UserWorkLanguage.CN;
+
             var messageToSend = new MimeMessage();
             //发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -467,13 +494,13 @@ namespace IRaCIS.Core.Application.Service
             messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress));
 
 
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = 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),
+                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
 
                        "Sir/Madam",
                 //---您正在进行邮箱重置密码操作
@@ -484,7 +511,7 @@ namespace IRaCIS.Core.Application.Service
             };
 
 
-            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.UnloginUseEmailResetPassword, messageToSend, emailConfigFunc);
+            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.UnloginUseEmailResetPassword, messageToSend, emailConfigFunc, workLanguage);
 
             ////此时不知道用户
             var sucessHandle = GetEmailSuccessHandle(Guid.Empty, verificationCode, emailAddress);
@@ -500,6 +527,11 @@ namespace IRaCIS.Core.Application.Service
 
             var sysUserInfo = (await _identityUserRepository.Where(t => t.Id == userId).FirstOrDefaultAsync()).IfNullThrowException();
 
+            //设置工作语言
+            var workLanguage = sysUserInfo.UserWorkLanguage;
+            var isEn_US = workLanguage == UserWorkLanguage.US;
+
+
             var messageToSend = new MimeMessage();
             //发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -518,18 +550,18 @@ namespace IRaCIS.Core.Application.Service
 
             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 routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&lang=" + (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;
+            var companyName = 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),
+                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
 
                     sysUserInfo.FullName,
                     trialInfo.ExperimentName,
@@ -544,9 +576,9 @@ namespace IRaCIS.Core.Application.Service
             };
 
 
-            await GetEmailSubejctAndHtmlInfoAndBuildAsync(sysUserInfo.IsFirstAdd ? EmailBusinessScenario.SiteUseOrExternalUserFirstrJoinTrial : EmailBusinessScenario.SiteUserOrExternalUserExistJoinTrial, messageToSend, emailConfigFunc);
+            await GetEmailSubejctAndHtmlInfoAndBuildAsync(sysUserInfo.IsFirstAdd ? EmailBusinessScenario.SiteUseOrExternalUserFirstrJoinTrial : EmailBusinessScenario.SiteUserOrExternalUserExistJoinTrial, messageToSend, emailConfigFunc, workLanguage);
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo, null);
+            await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
 
         }
 
@@ -555,10 +587,12 @@ namespace IRaCIS.Core.Application.Service
         {
             var sysUserInfo = (await _identityUserRepository.Where(t => t.Id == userId).FirstOrDefaultAsync()).IfNullThrowException();
 
-
-
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
 
+            //设置工作语言
+            var workLanguage = sysUserInfo.UserWorkLanguage;
+            var isEn_US = workLanguage == UserWorkLanguage.US;
+
             var messageToSend = new MimeMessage();
             //发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -575,20 +609,20 @@ namespace IRaCIS.Core.Application.Service
                 await _identityUserRepository.BatchUpdateNoTrackingAsync(t => t.Id == sysUserInfo.Id, u => new Domain.Models.IdentityUser() { EmailToken = token });
             }
 
-            var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&lang=" + (_userInfo.IsEn_Us ? "en" : "zh") + "&access_token=" + token;
+            var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&lang=" + (isEn_US ? "en" : "zh") + "&access_token=" + token;
 
             var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
 
             var redirectUrl = $"{domain}/api/User/UserRedirect?url={System.Web.HttpUtility.UrlEncode(routeUrl)}";
 
 
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = 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),
+                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
 
                     sysUserInfo.FullName,
                     trialInfo.ExperimentName,
@@ -603,9 +637,9 @@ namespace IRaCIS.Core.Application.Service
             };
 
 
-            await GetEmailSubejctAndHtmlInfoAndBuildAsync(sysUserInfo.IsFirstAdd ? EmailBusinessScenario.SiteUseOrExternalUserFirstrJoinTrial : EmailBusinessScenario.SiteUserOrExternalUserExistJoinTrial, messageToSend, emailConfigFunc);
+            await GetEmailSubejctAndHtmlInfoAndBuildAsync(sysUserInfo.IsFirstAdd ? EmailBusinessScenario.SiteUseOrExternalUserFirstrJoinTrial : EmailBusinessScenario.SiteUserOrExternalUserExistJoinTrial, messageToSend, emailConfigFunc, workLanguage);
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+            await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
 
         }
 
@@ -644,6 +678,12 @@ namespace IRaCIS.Core.Application.Service
                         saveItem.IsTestUser = true;
                     }
 
+
+                    //通过医生信息，设置工作语言
+                    var nation = _doctorTypeRepository.Where(t => t.Id == doctorId).Select(t => t.Nation).FirstOrDefault();
+                    saveItem.UserWorkLanguage = nation == DoctorNation.CN ? UserWorkLanguage.CN : UserWorkLanguage.US;
+
+
                     saveItem.UserCeateSource = UserCeateSource.ReviewerSelect;
                     saveItem.TrialId = trialId;
 
@@ -686,6 +726,11 @@ namespace IRaCIS.Core.Application.Service
 
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
 
+
+            //设置工作语言
+            var workLanguage = sysUserInfo.UserWorkLanguage;
+            var isEn_US = workLanguage == UserWorkLanguage.US;
+
             var messageToSend = new MimeMessage();
             //发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -701,7 +746,7 @@ namespace IRaCIS.Core.Application.Service
                 await _identityUserRepository.BatchUpdateNoTrackingAsync(t => t.Id == sysUserInfo.Id, u => new Domain.Models.IdentityUser() { EmailToken = token });
             }
 
-            var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&lang=" + (_userInfo.IsEn_Us ? "en" : "zh") + "&access_token=" + token;
+            var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&lang=" + (isEn_US ? "en" : "zh") + "&access_token=" + token;
 
             var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
 
@@ -711,13 +756,13 @@ namespace IRaCIS.Core.Application.Service
             // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信";
 
 
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = 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),
+                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
 
                    sysUserInfo.FullName,
                     trialInfo.ExperimentName,
@@ -732,9 +777,9 @@ namespace IRaCIS.Core.Application.Service
             };
 
 
-            await GetEmailSubejctAndHtmlInfoAndBuildAsync(sysUserInfo.IsFirstAdd ? EmailBusinessScenario.DoctorUserFirstJoinTrial : EmailBusinessScenario.DoctorUserExistJoinTrial, messageToSend, emailConfigFunc);
+            await GetEmailSubejctAndHtmlInfoAndBuildAsync(sysUserInfo.IsFirstAdd ? EmailBusinessScenario.DoctorUserFirstJoinTrial : EmailBusinessScenario.DoctorUserExistJoinTrial, messageToSend, emailConfigFunc,workLanguage);
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo, null);
+            await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo, null);
 
             //创建账号 和创建角色 一条，更新的时候才记录更新角色
             if (isNeedCreateNewUser == false)
@@ -754,6 +799,10 @@ namespace IRaCIS.Core.Application.Service
         {
             var feedBack = await _userFeedBackRepository.Where(t => t.Id == feedBackId).Include(t => t.CreateUserRole.UserTypeRole).Include(t => t.CreateUserRole.IdentityUser).FirstNotNullAsync();
 
+            //设置工作语言
+            var workLanguage = _identityUserRepository.Where(t => t.Id == _userInfo.IdentityUserId).Select(t => t.UserWorkLanguage).First();
+            var isEn_US = workLanguage == UserWorkLanguage.US;
+
             var messageToSend = new MimeMessage();
             //发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -762,7 +811,7 @@ namespace IRaCIS.Core.Application.Service
 
             var trialinfo = await _trialRepository.Where(x => x.Id == feedBack.TrialId).FirstOrDefaultAsync();
 
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
             var emialScenario = feedBack.VisitTaskId != null ? EmailBusinessScenario.IRImageError : (feedBack.SubjectVisitId != null ? EmailBusinessScenario.TrialSubjectVisitFeedBack : (feedBack.TrialId != null ? EmailBusinessScenario.TrialFeedBack : EmailBusinessScenario.SysFeedBack));
 
@@ -785,7 +834,7 @@ namespace IRaCIS.Core.Application.Service
             if (feedBack.VisitTaskId != null)
             {
 
-                var emailType = await _dictionaryRepository.Where(t => t.Parent.Code == "FeedBackTypeToIR" && t.ParentId != null && t.Code == ((int)feedBack.QuestionType).ToString()).Select(t => _userInfo.IsEn_Us ? t.Value : t.ValueCN).FirstOrDefaultAsync();
+                var emailType = await _dictionaryRepository.Where(t => t.Parent.Code == "FeedBackTypeToIR" && t.ParentId != null && t.Code == ((int)feedBack.QuestionType).ToString()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefaultAsync();
 
 
                 var info = await _visitTaskRepository.Where(t => t.Id == feedBack.VisitTaskId).Select(t => new { t.Trial.ResearchProgramNo, t.Trial.TrialCode, SubejctCode = t.Subject.Code, t.SourceSubjectVisit.VisitName }).FirstNotNullAsync();
@@ -794,7 +843,7 @@ namespace IRaCIS.Core.Application.Service
                 {
                     var topicStr = string.Format(input.topicStr, info.ResearchProgramNo, info.SubejctCode, info.VisitName);
 
-                    var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),
+                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                          userNames,
                         info.TrialCode,
                         info.SubejctCode,
@@ -810,12 +859,12 @@ namespace IRaCIS.Core.Application.Service
                 };
 
 
-                await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.IRImageError, messageToSend, emailConfigFunc);
+                await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.IRImageError, messageToSend, emailConfigFunc, workLanguage);
 
             }
             else if (feedBack.SubjectVisitId != null)
             {
-                var emailType = await _dictionaryRepository.Where(t => t.Parent.Code == "Email_BusinessScenario" && t.ParentId != null && t.Code == ((int)EmailBusinessScenario.TrialSubjectVisitFeedBack).ToString()).Select(t => _userInfo.IsEn_Us ? t.Value : t.ValueCN).FirstOrDefaultAsync();
+                var emailType = await _dictionaryRepository.Where(t => t.Parent.Code == "Email_BusinessScenario" && t.ParentId != null && t.Code == ((int)EmailBusinessScenario.TrialSubjectVisitFeedBack).ToString()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefaultAsync();
 
 
                 var info = await _subjectVisitRepository.Where(t => t.Id == feedBack.SubjectVisitId).Select(t => new { t.Trial.ResearchProgramNo, t.Trial.TrialCode, SubejctCode = t.Subject.Code, t.VisitName }).FirstNotNullAsync();
@@ -824,7 +873,7 @@ namespace IRaCIS.Core.Application.Service
                 {
                     var topicStr = string.Format(input.topicStr, info.ResearchProgramNo, info.SubejctCode, info.VisitName);
 
-                    var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),
+                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                          userNames,
                         info.TrialCode,
                         info.SubejctCode,
@@ -840,13 +889,13 @@ namespace IRaCIS.Core.Application.Service
                 };
 
 
-                await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.TrialSubjectVisitFeedBack, messageToSend, emailConfigFunc);
+                await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.TrialSubjectVisitFeedBack, messageToSend, emailConfigFunc, workLanguage);
             }
             //项目相关的反馈  pm  admin
             else if (feedBack.TrialId != null)
             {
 
-                var emailType = await _dictionaryRepository.Where(t => t.Parent.Code == "Email_BusinessScenario" && t.ParentId != null && t.Code == ((int)EmailBusinessScenario.TrialFeedBack).ToString()).Select(t => _userInfo.IsEn_Us ? t.Value : t.ValueCN).FirstOrDefaultAsync();
+                var emailType = await _dictionaryRepository.Where(t => t.Parent.Code == "Email_BusinessScenario" && t.ParentId != null && t.Code == ((int)EmailBusinessScenario.TrialFeedBack).ToString()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefaultAsync();
 
 
                 var info = await _trialRepository.Where(t => t.Id == feedBack.TrialId).Select(t => new { t.ResearchProgramNo, t.TrialCode }).FirstNotNullAsync();
@@ -855,7 +904,7 @@ namespace IRaCIS.Core.Application.Service
                 {
                     var topicStr = string.Format(input.topicStr, info.ResearchProgramNo);
 
-                    var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),
+                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                        userNames,
                         info.TrialCode,
                         feedBack.CreateUserRole.UserTypeRole.UserTypeShortName,
@@ -869,7 +918,7 @@ namespace IRaCIS.Core.Application.Service
                 };
 
 
-                await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.TrialFeedBack, messageToSend, emailConfigFunc);
+                await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.TrialFeedBack, messageToSend, emailConfigFunc, workLanguage);
 
             }
             //项目无关的反馈  admin  
@@ -881,7 +930,7 @@ namespace IRaCIS.Core.Application.Service
                 {
                     var topicStr = string.Format(input.topicStr);
 
-                    var htmlBodyStr = string.Format(ReplaceCompanyName(input.htmlBodyStr),
+                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                         userNames,
                         feedBack.CreateUserRole.UserTypeRole.UserTypeShortName,
                          feedBack.CreateUserRole.IdentityUser.FullName,
@@ -893,7 +942,7 @@ namespace IRaCIS.Core.Application.Service
                 };
 
 
-                await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.SysFeedBack, messageToSend, emailConfigFunc);
+                await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.SysFeedBack, messageToSend, emailConfigFunc, workLanguage);
             }
 
             if (trialinfo == null)
@@ -902,7 +951,7 @@ namespace IRaCIS.Core.Application.Service
             }
             else
             {
-                await SendEmailHelper.SendEmailAsync(messageToSend, trialinfo);
+                await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialinfo);
             }
 
 
@@ -915,6 +964,10 @@ namespace IRaCIS.Core.Application.Service
 
             var sysUserInfo = (await _identityUserRepository.Where(t => t.Id == userId).FirstOrDefaultAsync()).IfNullThrowException();
 
+            //设置工作语言
+            var workLanguage = sysUserInfo.UserWorkLanguage;
+            var isEn_US = workLanguage == UserWorkLanguage.US;
+
             var messageToSend = new MimeMessage();
             //发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -923,22 +976,23 @@ namespace IRaCIS.Core.Application.Service
             //主题
             //---[来自展影IRC] 关于重置邮箱的提醒
 
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = 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(ReplacePlatformName(ReplaceCompanyName(input.htmlBodyStr)) ,
+                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
 
-                    sysUserInfo.FullName
+                    sysUserInfo.FullName,
+                    _systemEmailConfig.PlatformName
                     );
 
                 return (topicStr, htmlBodyStr);
             };
 
 
-            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.IdentityUser_ModifyPassword, messageToSend, emailConfigFunc);
+            await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.IdentityUser_ModifyPassword, messageToSend, emailConfigFunc, workLanguage);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
@@ -948,6 +1002,10 @@ namespace IRaCIS.Core.Application.Service
         {
             var trialInfo = await _trialRepository.Where(t => t.Id == trialId).FirstOrDefaultAsync();
 
+            //设置工作语言
+            var isEn_US = _userInfo.IsEn_Us;
+            var workLanguage = isEn_US ? UserWorkLanguage.US : UserWorkLanguage.CN;
+
             var messageToSend = new MimeMessage();
             //发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -956,14 +1014,14 @@ namespace IRaCIS.Core.Application.Service
             //主题
             //---[来自展影IRC] 关于重置邮箱的提醒
 
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = 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),
+                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                     name,
                     trialInfo.TrialCode,
                      trialInfo.ResearchProgramNo
@@ -974,7 +1032,7 @@ namespace IRaCIS.Core.Application.Service
 
 
             await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.SiteSurvey_CheckUser, messageToSend, emailConfigFunc);
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+            await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
         }
 
         public async Task SiteSuervyUpdateUser(Guid trialSiteId, string email, string name, string url)
@@ -982,6 +1040,12 @@ namespace IRaCIS.Core.Application.Service
             var siteInfo = await _trialSiteRepository.Where(t => t.Id == trialSiteId).Include(x => x.Trial).FirstOrDefaultAsync();
 
             var trialInfo = siteInfo.Trial;
+
+
+            //设置工作语言
+            var isEn_US = _userInfo.IsEn_Us;
+            var workLanguage = isEn_US ? UserWorkLanguage.US : UserWorkLanguage.CN;
+
             var messageToSend = new MimeMessage();
             //发件地址
             messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -990,14 +1054,14 @@ namespace IRaCIS.Core.Application.Service
             //主题
             //---[来自展影IRC] 关于重置邮箱的提醒
 
-            var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+            var companyName = 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),
+                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
                     name,
                     trialInfo.TrialCode,
                     siteInfo.TrialSiteCode,
@@ -1010,7 +1074,7 @@ namespace IRaCIS.Core.Application.Service
 
 
             await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.SiteSurvey_UpdateUser, messageToSend, emailConfigFunc);
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+            await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
         }
 
     }

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

@@ -149,7 +149,7 @@ namespace IRaCIS.Application.Contracts
 
         public bool? AcceptingNewTrial { get; set; }//是否接受新的项目
         public bool? ActivelyReading { get; set; }// 是否接受新的读片任务
-        public int? Nation { get; set; }// 0-中国医生，2-美国医生，3-全部
+        public DoctorNation? Nation { get; set; }// 0-中国医生，2-美国医生，3-全部
     }
 
     /// <summary>

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

@@ -50,6 +50,7 @@ namespace IRaCIS.Core.Application.Contracts
         public bool? OffLine { get; set; }
 
         public Guid? SystemDocumentId { get; set; }
+
     }
 
 
@@ -205,7 +206,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public DateTime? EndCreateTime { get; set; }
 
-
+        public DocLanguageType? DocLanguageType { get; set; }
     }
 
     public class GetNextUnSignDocumentInDto
@@ -362,6 +363,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public bool IsPublish { get; set; } = false;
 
+        public DocLanguageType DocLanguageType { get; set; }
+
     }
 
 

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

@@ -62,10 +62,18 @@ namespace IRaCIS.Core.Application.Service
 
             }).FirstNotNullAsync();
 
-            var isEn_us = _userInfo.IsEn_Us;
+            //找到当前收件人语言
+            var workLanguageList = _trialUserRoleRepository.Where(t => t.TrialId == taskInfo.TrialId && t.UserRole.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Select(t => t.UserRole.IdentityUser.UserWorkLanguage).Distinct().ToList();
+
+            foreach (var workLanguage in workLanguageList)
+            {
+                //设置工作语言
+                var isEn_us = workLanguage == UserWorkLanguage.US;
 
                 var resultStr = isEn_us ? (result == true ? "Yes" : "No") : (result == true ? "是" : "否");
 
+
+
                 if (isEnrollment == true)
                 {
                     Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc = trialEmailConfig =>
@@ -97,6 +105,7 @@ namespace IRaCIS.Core.Application.Service
                     await SendTrialEmailAsync(taskInfo.TrialId, taskInfo.CriterionType, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
                 }
 
+            }
 
         }
 
@@ -133,8 +142,12 @@ namespace IRaCIS.Core.Application.Service
 
                 var (topicStr, htmlBodyStr, isEn_us, onlyToUserId) = topicAndHtmlFunc(trialEmailConfig);
 
+                //设置工作语言
+                var workLanguage = isEn_us ? UserWorkLanguage.US : UserWorkLanguage.CN;
+
+
                 //处理替换公司名
-                htmlBodyStr = CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlBodyStr);
+                htmlBodyStr = CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlBodyStr, workLanguage);
 
 
                 sendEmailConfig.TopicDescription = topicStr;
@@ -150,10 +163,10 @@ namespace IRaCIS.Core.Application.Service
 
                 var allUserTypeEnumList = toUserTypeEnumList.Union(copyUserTypeEnumList).Distinct().ToList();
 
-                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 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, t.UserRole.IdentityUser.UserWorkLanguage }).ToListAsync();
 
-
-                var toUserList = allUserList.Where(t => toUserTypeEnumList.Contains(t.UserTypeEnum))
+                //过滤当前语言
+                var toUserList = allUserList.Where(t => toUserTypeEnumList.Contains(t.UserTypeEnum)).Where(t=>t.UserWorkLanguage==workLanguage)
                    .ToList();
 
                 //收件人 有CRC  CRA  ， CRC  CRA的账户要按照中心发送
@@ -191,11 +204,6 @@ namespace IRaCIS.Core.Application.Service
                     sendEmailConfig.HtmlBodyStr = htmlBodyStr.Replace(EmailNamePlaceholder, string.Join(isEn_us ? ", " : "、", toUserList.Select(t => t.FullName).ToList()));
                 }
 
-                if (toUserList.Count == 0)
-                {
-                    //---没有收件人，无法发送邮件
-                    throw new BusinessValidationFailedException(_localizer["TrialEmailN_NoRecipient"]);
-                }
 
 
                 if (trialEmailConfig.FromEmail.Contains("@") && !string.IsNullOrEmpty(trialEmailConfig.FromEmail))
@@ -235,20 +243,7 @@ namespace IRaCIS.Core.Application.Service
                     }
                 }
 
-                //邮件附件  这里是原格式发送，不是PDF
 
-                //if (trialEmailConfig.AttachCNPath != string.Empty && trialEmailConfig.AttachPath != string.Empty)
-                //{
-                //    var phyPath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, isEn_us? trialEmailConfig.AttachName: trialEmailConfig.AttachNameCN);
-
-                //    //先预先生成了邮件，发送预先生成的邮件
-                //    sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
-                //    {
-                //        FileName = $"{attachPrefix}_{Path.GetFileName(_userInfo.IsEn_Us ? trialEmailConfig.AttachName : trialEmailConfig.AttachNameCN)}",
-
-                //        FileStream = File.OpenRead(phyPath),
-                //    });
-                //}
 
                 return (trialEmailConfig, sendEmailConfig);
 

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

@@ -42,6 +42,7 @@ namespace IRaCIS.Core.Application.Services
                            .WhereIf(inQuery.OffLine != null, t => t.OffLine == inQuery.OffLine)
                               .WhereIf(inQuery.FileName != null, t => t.FileName == inQuery.FileName)
                                     .WhereIf(inQuery.FileFormat != null, t => t.FileFormat == inQuery.FileFormat)
+                                    
                                         .ProjectTo<SystemDocumentAttachmentView>(_mapper.ConfigurationProvider);
 
             var pageList = await systemDocumentAttachmentQueryable.ToPagedListAsync(inQuery);
@@ -95,6 +96,7 @@ namespace IRaCIS.Core.Application.Services
                .WhereIf(inQuery.EndCreateTime != null, t => t.CreateTime <= inQuery.EndCreateTime)
                 .WhereIf(inQuery.UserTypeId != null, t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId))
                .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted)
+               .WhereIf(inQuery.DocLanguageType != null, t => t.DocLanguageType == inQuery.DocLanguageType)
                .ProjectTo<SystemDocumentView>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us, userId = _userInfo.UserRoleId });
 
             return await systemDocumentQueryable.ToPagedListAsync(inQuery);
@@ -171,23 +173,16 @@ namespace IRaCIS.Core.Application.Services
                     if (newUserTypeIds.Any()&& newUserTypeIds.Count()>0)
                     {
                         // 发送邮件给新增的角色
-                        Console.WriteLine("开始 发送系统文档更新邮件给新增角色");
-                        Console.WriteLine(string.Join(",", newUserTypeIds));
+                        Log.Logger.Warning("开始 发送系统文档更新邮件给新增角色");
+                        Log.Logger.Warning(string.Join(",", newUserTypeIds));
 
-                        Task.Run(async () =>
-                        {
-                            // 创建独立作用域
-                            using (var scope = serviceScopeFactory.CreateScope())
-                            {
-                                // 从新作用域解析服务
-                                var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
                         // 只发送给新增的角色
-                                await mediator.Publish(new SystemDocumentPublishEvent {
+                        await _mediatorScoped.Publish(new SystemDocumentPublishEvent
+                        {
                             Ids = new List<Guid> { document.Id },
                             NewUserTypeIds = newUserTypeIds
                         });
-                            }
-                        });
+
                     }
                 }
 
@@ -212,18 +207,10 @@ namespace IRaCIS.Core.Application.Services
                 IsDeleted = false,
             });
 
-            Console.WriteLine("开始 发布系统文档");
+            Log.Logger.Warning("开始 发布系统文档");
+
+            await _mediatorScoped.Publish(new SystemDocumentPublishEvent { Ids = inDto.Ids });
 
-            Task.Run(async () =>
-            {
-                // 创建独立作用域
-                using (var scope = serviceScopeFactory.CreateScope())
-                {
-                    // 从新作用域解析服务
-                    var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
-                    await mediator.Publish(new SystemDocumentPublishEvent { Ids = inDto.Ids });
-                }
-            });
 
 
             return ResponseOutput.Result(true);
@@ -286,8 +273,11 @@ namespace IRaCIS.Core.Application.Services
         {
 
             var isInternal = _userInfo.IsZhiZhun;
+            var workLanguage = _userInfo.UserWorkLanguage;
 
             var query = from sysDoc in _systemDocumentRepository.Where(t=>t.IsPublish)
+                      .WhereIf(workLanguage == UserWorkLanguage.CN, t => t.DocLanguageType == DocLanguageType.CN || t.DocLanguageType == DocLanguageType.CN_US)
+                      .WhereIf(workLanguage == UserWorkLanguage.US, t => t.DocLanguageType == DocLanguageType.US || t.DocLanguageType == DocLanguageType.CN_US)
                      .Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                     .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
                     //外部人员 只签署 外部需要签署的

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

@@ -27,6 +27,7 @@ namespace IRaCIS.Core.Application.Services
     [ApiExplorerSettings(GroupName = "Trial")]
     public class TrialDocumentService(IRepository<TrialDocument> _trialDocumentRepository,
         IRepository<Trial> _trialRepository,
+         IScopedMediator _mediatorScoped,
         IRepository<AuditRecord> _auditRecordRepository,
         IRepository<TrialDocumentAttachment> _trialDocumentAttachmentRepository,
         ISystemDocumentService _systemDocumentService,
@@ -105,18 +106,11 @@ namespace IRaCIS.Core.Application.Services
                 IsDeleted = false,
             }, false, true);
             await _trialDocumentRepository.SaveChangesAsync();
-            Console.WriteLine("开始 发布项目文档");
+            Serilog.Log.Logger.Warning("开始 发布项目文档");
+
+            await _mediatorScoped.Publish(new TrialDocumentPublishEvent { Ids = inDto.Ids });
+
            
-            Task.Run(async () =>
-            {
-                // 创建独立作用域
-                using (var scope = serviceScopeFactory.CreateScope())
-                {
-                    // 从新作用域解析服务
-                    var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
-                    await mediator.Publish(new TrialDocumentPublishEvent { Ids = inDto.Ids });
-                }
-            });
 
 
             return ResponseOutput.Result(true);
@@ -128,32 +122,20 @@ namespace IRaCIS.Core.Application.Services
         /// <returns></returns>
         public async Task<IResponseOutput> TestPush()
         {
-            Task.Run(async () =>
-            {
-                // 创建独立作用域
-                using (var scope = serviceScopeFactory.CreateScope())
-                {
-                    // 从新作用域解析服务
-                    var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
-                    await mediator.Publish(new TrialDocumentErverDayEvent { });
-                }
-            });
+
+
+            await _mediatorScoped.Publish(new TrialDocumentErverDayEvent {  });
+           
             return ResponseOutput.Result(true);
         }
 
 
         public async Task<IResponseOutput> TestSendEmail()
         {
-            Task.Run(async () =>
-            {
-                // 创建独立作用域
-                using (var scope = serviceScopeFactory.CreateScope())
-                {
-                    // 从新作用域解析服务
-                    var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
-                    await mediator.Publish(new ImageQCRecurringEvent { TrialId = Guid.Parse("08de2254-5d7d-581a-0242-0a0001000000") });
-                }
-            });
+
+            await _mediatorScoped.Publish(new ImageQCRecurringEvent { TrialId = Guid.Parse("08de2254-5d7d-581a-0242-0a0001000000") });
+
+
             return ResponseOutput.Result(true);
         }
 
@@ -351,12 +333,16 @@ namespace IRaCIS.Core.Application.Services
 
             var isInternal = _userInfo.IsZhiZhun;
 
+            var workLanguage = _userInfo.UserWorkLanguage;
+
             #region 统一用户修改 
 
             var systemDocQuery =
                  from sysDoc in _systemDocumentRepository.Where(t => t.IsPublish).Where(t => t.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                     //外部人员 只签署 外部需要签署的
                     .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
+                    .WhereIf(workLanguage == UserWorkLanguage.CN, t => t.DocLanguageType == DocLanguageType.CN || t.DocLanguageType == DocLanguageType.CN_US)
+                    .WhereIf(workLanguage == UserWorkLanguage.US, t => t.DocLanguageType == DocLanguageType.US || t.DocLanguageType == DocLanguageType.CN_US)
                  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)))
@@ -584,6 +570,7 @@ namespace IRaCIS.Core.Application.Services
 
 
             var needSignTrialDocCount = await _trialDocumentRepository.AsQueryable(true).Where(t => t.IsPublish)
+
                        .Where(t => t.TrialId == inQuery.TrialId && t.Trial.TrialStatusStr != StaticData.TrialState.TrialStopped)
                        .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))
@@ -591,6 +578,8 @@ namespace IRaCIS.Core.Application.Services
 
 
             var needSignSystemDocCount = await _systemDocumentRepository.AsQueryable(true).Where(t => t.IsPublish)
+                      .WhereIf(workLanguage == UserWorkLanguage.CN, t => t.DocLanguageType == DocLanguageType.CN || t.DocLanguageType == DocLanguageType.CN_US)
+                      .WhereIf(workLanguage == UserWorkLanguage.US, t => t.DocLanguageType == DocLanguageType.US || t.DocLanguageType == DocLanguageType.CN_US)
                       .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();
@@ -1163,21 +1152,13 @@ namespace IRaCIS.Core.Application.Services
                         Console.WriteLine("开始 发送项目文档更新邮件给新增角色");
                         Console.WriteLine(string.Join(",", newUserTypeIds));
 
-                        Task.Run(async () =>
-                        {
-                            // 创建独立作用域
-                            using (var scope = serviceScopeFactory.CreateScope())
-                            {
-                                // 从新作用域解析服务
-                                var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
-                                // 只发送给新增的角色
-                                await mediator.Publish(new TrialDocumentPublishEvent
+                        await _mediatorScoped.Publish(new TrialDocumentPublishEvent
                         {
                             Ids = new List<Guid> { document.Id },
                             NewUserTypeIds = newUserTypeIds
                         });
-                            }
-                        });
+
+                      
                     }
                 }
                 return ResponseOutput.Ok(document.Id.ToString());

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

@@ -24,6 +24,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Spire.Doc;
 using System.Linq.Dynamic.Core;
+using System.Runtime;
 using System.Runtime.InteropServices;
 
 namespace IRaCIS.Core.Application.Service
@@ -137,7 +138,7 @@ namespace IRaCIS.Core.Application.Service
             var isNeedSend = true;
 
             //手动发送的时候，也有可能答案是是  此时是 这里不发送，发送已经生成的文件
-            if (answer == "是" && isHandSend == null)
+            if ((answer == "是" || answer == "Yes") && isHandSend == null)
             {
                 isNeedSend = true;
 
@@ -194,7 +195,15 @@ namespace IRaCIS.Core.Application.Service
         /// <exception cref="BusinessValidationFailedException"></exception>
         public async Task<string> BaseBusinessScenarioSendEmailAsync(Guid visitTaskId, bool? isHandSend, EmailStoreSendMode emailStoreMode, string sendFileRelativePath)
         {
-            var isEn_us = _userInfo.IsEn_Us;
+
+            //简单处理，找到该中心的语言 设置工作语言
+
+            var country = _visitTaskRepository.Where(t => t.Id == visitTaskId).Select(t => t.Subject.TrialSite.Country).First();
+
+            var isEn_us = country == StaticData.SiteCountry.US;
+
+            var workLanguage = isEn_us ? UserWorkLanguage.US : UserWorkLanguage.CN;
+
             EmailBusinessScenario businessScenarioEnum = EmailBusinessScenario.None;
 
             var enrollReplace = "";
@@ -330,7 +339,7 @@ namespace IRaCIS.Core.Application.Service
                 {
                     var findItem = (await _dictionaryService.GetBasicDataSelect("Trial_Enroll_Report")).Where(t => t.Code == ((int)taskInfo.CriterionType).ToString()).FirstOrDefault();
 
-                    enrollReplace = _userInfo.IsEn_Us ? findItem.Value : findItem.ValueCN;
+                    enrollReplace = isEn_us ? findItem.Value : findItem.ValueCN;
 
                     //如果其他阅片人已经做了，说明发送了入组确认报告，第二个人做完就不发送了
 
@@ -348,7 +357,7 @@ namespace IRaCIS.Core.Application.Service
                     {
                         bool isEnroll = false;
 
-                        (answer, isEnroll) = await DealEnrollAnswer(visitTaskId, (Guid)taskInfo.SourceSubjectVisitId, taskInfo.CriterionType, taskInfo.TrialReadingCriterionId);
+                        (answer, isEnroll) = await DealEnrollAnswer(visitTaskId, (Guid)taskInfo.SourceSubjectVisitId, taskInfo.CriterionType, taskInfo.TrialReadingCriterionId, workLanguage);
 
                         isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, new List<Guid>() { visitTaskId }, minUserIdList);
                     }
@@ -357,7 +366,7 @@ namespace IRaCIS.Core.Application.Service
                 {
                     var findItem = (await _dictionaryService.GetBasicDataSelect("Trial_PD_Report")).Where(t => t.Code == ((int)taskInfo.CriterionType).ToString()).FirstOrDefault();
 
-                    PdReplace = _userInfo.IsEn_Us ? findItem.Value : findItem.ValueCN;
+                    PdReplace = isEn_us ? findItem.Value : findItem.ValueCN;
 
                     //有序
 
@@ -384,7 +393,7 @@ namespace IRaCIS.Core.Application.Service
                                 if (taskList.Count == 2 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit) == 2)
                                 {
 
-                                    answer = await TranslatePdStateAsync(visitTaskId, taskInfo.ReadingCategory, taskInfo.CriterionType);
+                                    answer = await TranslatePdStateAsync(visitTaskId, taskInfo.ReadingCategory, taskInfo.CriterionType, workLanguage);
 
 
                                     isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Select(t => t.Id).ToList(), minUserIdList);
@@ -394,7 +403,7 @@ namespace IRaCIS.Core.Application.Service
                                 else if (taskList.Count == 3 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned) == 3 && taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Count() == 1)
                                 {
                                     var judgeResultId = taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).First()!.JudgeResultTaskId!.Value;
-                                    answer = await TranslatePdStateAsync(judgeResultId, ReadingCategory.Visit, taskInfo.CriterionType);
+                                    answer = await TranslatePdStateAsync(judgeResultId, ReadingCategory.Visit, taskInfo.CriterionType, workLanguage);
 
                                     isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Select(t => t.Id).ToList(), minUserIdList);
 
@@ -431,7 +440,7 @@ namespace IRaCIS.Core.Application.Service
                                     if (taskList.Count == 2 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Global) == 2)
                                     {
 
-                                        answer = await TranslatePdStateAsync(visitTaskId, taskInfo.ReadingCategory, taskInfo.CriterionType);
+                                        answer = await TranslatePdStateAsync(visitTaskId, taskInfo.ReadingCategory, taskInfo.CriterionType, workLanguage);
 
                                         isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Select(t => t.Id).ToList(), minUserIdList);
                                     }
@@ -440,7 +449,7 @@ namespace IRaCIS.Core.Application.Service
                                     {
 
                                         var judgeResultId = taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).First().JudgeResultTaskId!.Value;
-                                        answer = await TranslatePdStateAsync(judgeResultId, ReadingCategory.Global, taskInfo.CriterionType);
+                                        answer = await TranslatePdStateAsync(judgeResultId, ReadingCategory.Global, taskInfo.CriterionType, workLanguage);
 
                                         isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Select(t => t.Id).ToList(), minUserIdList);
 
@@ -613,7 +622,7 @@ namespace IRaCIS.Core.Application.Service
                     //先预先生成了邮件，发送预先生成的邮件
                     sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
                     {
-                        FileName = $"{attachPrefix}_{Path.GetFileNameWithoutExtension(_userInfo.IsEn_Us ? trialEmailConfig.AttachName : trialEmailConfig!.AttachNameCN)}.pdf",
+                        FileName = $"{attachPrefix}_{Path.GetFileNameWithoutExtension(isEn_us ? trialEmailConfig.AttachName : trialEmailConfig!.AttachNameCN)}.pdf",
 
                         FileStream = File.OpenRead(phyPath),
                     });
@@ -639,7 +648,7 @@ namespace IRaCIS.Core.Application.Service
 
                 };
 
-                var path = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, _userInfo.IsEn_Us ? trialEmailConfig.AttachPath : trialEmailConfig.AttachCNPath);
+                var path = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, isEn_us ? trialEmailConfig.AttachPath : trialEmailConfig.AttachCNPath);
 
                 //获取从word 到 PDF的路径
                 var (serverFilePath, relativePath, fileRealName) = FileStoreHelper.GetSubjectEnrollConfirmOrPDEmailPath(_hostEnvironment, Path.GetFileName(path), taskInfo.TrialId, taskInfo.TrialSiteId, taskInfo.SubjectId, true);
@@ -729,7 +738,7 @@ namespace IRaCIS.Core.Application.Service
                     pdfMemoryStream.Seek(0, SeekOrigin.Begin);
                     sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
                     {
-                        FileName = $"{taskInfo.SubjectCode}_{Path.GetFileNameWithoutExtension(_userInfo.IsEn_Us ? trialEmailConfig.AttachName : trialEmailConfig.AttachNameCN)}.pdf",
+                        FileName = $"{taskInfo.SubjectCode}_{Path.GetFileNameWithoutExtension(isEn_us ? trialEmailConfig.AttachName : trialEmailConfig.AttachNameCN)}.pdf",
 
                         FileStream = pdfMemoryStream
                     });
@@ -1067,11 +1076,14 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="subjectVisitId"></param>
         /// <param name="criterionType"></param>
         /// <param name="trialReadingCriterionId"></param>
+        /// <param name="userWorkLanguage"></param>
         /// <returns></returns>
-        private async Task<(string enrollAnswer, bool isEnroll)> DealEnrollAnswer(Guid visitTaskId, Guid subjectVisitId, CriterionType criterionType, Guid trialReadingCriterionId)
+        private async Task<(string enrollAnswer, bool isEnroll)> DealEnrollAnswer(Guid visitTaskId, Guid subjectVisitId, CriterionType criterionType, Guid trialReadingCriterionId, UserWorkLanguage userWorkLanguage)
         {
 
-            var enrollAnswer = _userInfo.IsEn_Us ? "No" : "否";
+            var isEn_us = userWorkLanguage == UserWorkLanguage.US;
+
+            var enrollAnswer = isEn_us ? "No" : "否";
             var isEnroll = false;
 
             switch (criterionType)
@@ -1088,7 +1100,7 @@ namespace IRaCIS.Core.Application.Service
                     if (await _readingTableQuestionAnswerRepository.Where().AnyAsync(x => x.VisitTaskId == visitTaskId && x.Answer == TargetState.Exist.GetEnumInt() &&
                x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State && x.ReadingQuestionTrial.LesionType == LesionType.TargetLesion))
                     {
-                        enrollAnswer = _userInfo.IsEn_Us ? "Yes" : "是";
+                        enrollAnswer = isEn_us ? "Yes" : "是";
                         isEnroll = true;
                     }
 
@@ -1102,7 +1114,7 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
                     bool exists = list.Any(s => int.TryParse(s, out var n) && n >= 1);
                     if (exists)
                     {
-                        enrollAnswer = _userInfo.IsEn_Us ? "Yes" : "是";
+                        enrollAnswer = isEn_us ? "Yes" : "是";
                         isEnroll = true;
                     }
 
@@ -1168,9 +1180,10 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
         /// <param name="readingCategory"> 任务类型</param>
         /// <param name="criterionType">标准类型</param>
         /// <param name="IsGlobalGenerate">  是否是全局产生（区分裁判任务）</param>
+        /// <param name="userWorkLanguage"></param>
         /// <returns></returns>
         /// <exception cref="BusinessValidationFailedException"></exception>
-        private async Task<string> TranslatePdStateAsync(Guid visitTaskId, ReadingCategory readingCategory, CriterionType criterionType, bool? IsGlobalGenerate = null)
+        private async Task<string> TranslatePdStateAsync(Guid visitTaskId, ReadingCategory readingCategory, CriterionType criterionType, UserWorkLanguage userWorkLanguage, bool? IsGlobalGenerate = null)
         {
 
             var answer = string.Empty;
@@ -1361,6 +1374,7 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
                 throw new BusinessValidationFailedException(_localizer["TrialEmailN_InvalidTaskTypeForEmailSending"]);
             }
 
+            var isEn_us = userWorkLanguage == UserWorkLanguage.US;
 
             switch (criterionType)
             {
@@ -1372,11 +1386,11 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
 
                     if (answer == OverallAssessment.PD.GetEnumInt())
                     {
-                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
+                        answer = isEn_us ? "Yes" : "是";
                     }
                     else
                     {
-                        answer = _userInfo.IsEn_Us ? "No" : "否";
+                        answer = isEn_us ? "No" : "否";
                     }
 
                     break;
@@ -1384,11 +1398,11 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
 
                     if (answer == OverallAssessment.iCPD.GetEnumInt())
                     {
-                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
+                        answer = isEn_us ? "Yes" : "是";
                     }
                     else
                     {
-                        answer = _userInfo.IsEn_Us ? "No" : "否";
+                        answer = isEn_us ? "No" : "否";
                     }
 
                     break;
@@ -1396,11 +1410,11 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
 
                     if (answer == CTMRIOverallAssessment.PD.GetEnumInt())
                     {
-                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
+                        answer = isEn_us ? "Yes" : "是";
                     }
                     else
                     {
-                        answer = _userInfo.IsEn_Us ? "No" : "否";
+                        answer = isEn_us ? "No" : "否";
                     }
 
                     break;
@@ -1408,11 +1422,11 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
 
                     if (answer == ImagingOverallAssessment_Lugano.PMDPD.GetEnumInt())
                     {
-                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
+                        answer = isEn_us ? "Yes" : "是";
                     }
                     else
                     {
-                        answer = _userInfo.IsEn_Us ? "No" : "否";
+                        answer = isEn_us ? "No" : "否";
                     }
 
                     break;
@@ -1423,11 +1437,11 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
 
                     if (answer == VisitTumorEvaluation.PD.GetEnumInt())
                     {
-                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
+                        answer = isEn_us ? "Yes" : "是";
                     }
                     else
                     {
-                        answer = _userInfo.IsEn_Us ? "No" : "否";
+                        answer = isEn_us ? "No" : "否";
                     }
                     break;
 

IRaCIS.Core.Application/Service/Financial/DTO/PaymentDetailModel.cs

@@ -105,7 +105,7 @@
         public string Reviewer { get; set; } = String.Empty;
         public DateTime BeginMonth { get; set; }
         public DateTime EndMonth { get; set; }
-        public int? Nation { get; set; }
+        public DoctorNation? Nation { get; set; }
     }
     public class MonthlyPaymentDTO
     {

IRaCIS.Core.Application/Service/Financial/DTO/PaymentModel.cs

@@ -59,7 +59,7 @@
     {
         public DateTime StatisticsDate { get; set; }
         public string KeyWord { get; set; } = String.Empty;
-        public int? Nation { get; set; }
+        public DoctorNation? Nation { get; set; }
     }
 
     public class MonthlyPaymentDetailQuery
@@ -162,7 +162,7 @@
         public DateTime BeginDate { get; set; }
         public DateTime EndDate { get; set; }
 
-        public int? Nation { get; set; }
+        public DoctorNation? Nation { get; set; }
     }
 
     public class TrialAnalysisQueryDTO

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

@@ -776,6 +776,9 @@ namespace IRaCIS.Core.Application.Contracts
         public List<Guid> DicomStudyIdList { get; set; }
 
         public List<Guid> NoneDicomStudyIdList { get; set; }
+
+        // true 导出阅片，null 就是所有影像
+        public bool? IsExportReading { get; set; }
     }
 
     public class IRReadingDownloadQuery : SortInput

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

@@ -1141,6 +1141,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             var isQueryDicom = inQuery.DicomStudyIdList.Count > 0;
             var isQueryNoneDicom = inQuery.NoneDicomStudyIdList.Count > 0;
 
+            var isExportReading = inQuery.IsExportReading == true;
+
             var imageType = (isQueryDicom && isQueryNoneDicom) ? ImageType.DicomAndNoneDicom : (isQueryDicom ? ImageType.Dicom : ImageType.NoneDicom);
 
             var dirDic = new Dictionary<string, string>();
@@ -1150,11 +1152,12 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             //有传输语法值的导出 才生成DIR
             //if (_subjectVisitRepository.Where(t => t.Id == inQuery.SubjectVisitId).SelectMany(t => t.StudyList.SelectMany(t => t.InstanceList)).All(c => c.TransferSytaxUID != string.Empty))
-            if (!_instanceRepository.Where(t => inQuery.SubjectVisitId == t.SubjectVisitId).Any(c => c.TransferSytaxUID == string.Empty))
+            if (!_instanceRepository.Where(t => isExportReading ? (t.IsReading && t.DicomSerie.IsReading) : true)
+                .Where(t => inQuery.SubjectVisitId == t.SubjectVisitId).Any(c => c.TransferSytaxUID == string.Empty))
             {
                 var list = _subjectVisitRepository.Where(t => t.Id == inQuery.SubjectVisitId).SelectMany(t => t.StudyList)
                     .Where(t => isQueryDicom ? inQuery.DicomStudyIdList.Contains(t.Id) : false)
-                    .SelectMany(t => t.InstanceList)
+                    .SelectMany(t => t.InstanceList.Where(t => isExportReading ? (t.IsReading && t.DicomSerie.IsReading) : true))
                     .Select(t => new StudyDIRInfo()
                     {
 
@@ -1235,11 +1238,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                                 StudyInstanceUid = u.StudyInstanceUid,
                                 StudyDIRPath = u.StudyDIRPath,
 
-                                SeriesList = u.SeriesList.Select(z => new DownloadDicomSeriesDto()
+                                SeriesList = u.SeriesList.Where(t => isExportReading ? t.IsReading : true).Select(z => new DownloadDicomSeriesDto()
                                 {
                                     Modality = z.Modality,
 
-                                    InstanceList = z.DicomInstanceList.Select(k => new DownloadDicomInstanceDto()
+                                    InstanceList = z.DicomInstanceList.Where(t => isExportReading ? t.IsReading : true).Select(k => new DownloadDicomInstanceDto()
                                     {
                                         IsEncapsulated = k.IsEncapsulated,
                                         InstanceId = k.Id,
@@ -1251,7 +1254,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                             }).ToList(),
 
-                            NoneDicomStudyList = sv.NoneDicomStudyList.Where(t => isQueryNoneDicom ? inQuery.NoneDicomStudyIdList.Contains(t.Id) : false)
+                            NoneDicomStudyList = sv.NoneDicomStudyList.Where(t => isExportReading ? t.IsReading : true).Where(t => isQueryNoneDicom ? inQuery.NoneDicomStudyIdList.Contains(t.Id) : false)
 
                             .Select(nd => new DownloadNoneDicomStudyDto()
                             {
@@ -1259,7 +1262,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                                 StudyCode = nd.StudyCode,
                                 ImageDate = nd.ImageDate,
 
-                                FileList = nd.NoneDicomFileList.Select(file => new DownloadNoneDicomFileDto()
+                                FileList = nd.NoneDicomFileList.Where(t => isExportReading ? t.IsReading : true).Select(file => new DownloadNoneDicomFileDto()
                                 {
                                     FileName = file.FileName,
                                     Path = file.Path,

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

@@ -82,9 +82,35 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         {
             try
             {
+                #region 方式一  有的必须在内存中，不能用这种
+                //await using var source = await sourceFactory();
+                //// 如果你是从 stream 打开
+                //var dicomFile = await DicomFile.OpenAsync(source);
+                #endregion
+
+                #region 方式二
+
                 await using var source = await sourceFactory();
+
+                // 【关键修复】将 OSS 流缓冲到 MemoryStream
+                using var bufferedStream = new MemoryStream();
+
+                if (source.CanSeek)
+                {
+                    source.Position = 0;
+
+                }
+                else
+                {
+                    // 完全复制到内存流
+                    await source.CopyToAsync(bufferedStream);
+                    bufferedStream.Position = 0; // 重置位置
+                }
+
                 // 如果你是从 stream 打开
-                var dicomFile = await DicomFile.OpenAsync(source);
+                var dicomFile = await DicomFile.OpenAsync(source.CanSeek ? source : bufferedStream);
+
+                #endregion
 
                 //获取像素是否为封装形式
                 var syntax = dicomFile.Dataset.InternalTransferSyntax;
@@ -104,11 +130,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                         newFragments.Fragments.Add(new MemoryByteBuffer(frameData.Data));
                     }
 
-                    var frag = dicomFile.Dataset.GetDicomItem<DicomOtherByteFragment>(DicomTag.PixelData);
+                    //var frag = dicomFile.Dataset.GetDicomItem<DicomOtherByteFragment>(DicomTag.PixelData);
 
-                    var originOffsetTable = frag?.OffsetTable;
+                    //var originOffsetTable = frag?.OffsetTable;
 
-                    newFragments.OffsetTable.AddRange(originOffsetTable?.ToArray());
+                    //newFragments.OffsetTable.AddRange(originOffsetTable?.ToArray());
                     // 替换原有的片段序列
                     dicomFile.Dataset.AddOrUpdate(newFragments);
                 }

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

@@ -207,7 +207,7 @@ namespace IRaCIS.Application.Contracts
 
         public bool IsTestUser { get; set; }
 
-
+        public UserWorkLanguage UserWorkLanguage { get; set; }
     }
 
     /// <summary>
@@ -338,6 +338,8 @@ namespace IRaCIS.Application.Contracts
         public Guid? AuditRecordId { get; set; }
 
         public bool? IsAuditRecordUserSelect { get; set; }
+
+        public UserWorkLanguage? UserWorkLanguage { get; set; }
     }
 
     public class UserRoleInfoDTO

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

@@ -442,7 +442,16 @@ namespace IRaCIS.Core.Application.Service
 
             await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = identityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = identityUserId, OptType = UserOptType.UnloginModifyPasswoed }, true);
 
+            try
+            {
                 await _mailVerificationService.AfterUserModifyPasswordSendEmailAsync(identityUserId);
+            }
+            catch (Exception)
+            {
+
+              
+            }
+         
 
 
             var find = await _identityUserRepository.FindAsync(identityUserId);
@@ -534,6 +543,7 @@ namespace IRaCIS.Core.Application.Service
                  .WhereIf(inQuery.UserCeateSource != null, t => t.UserCeateSource == inQuery.UserCeateSource)
                  .WhereIf(inQuery.AuditRecordId != null && inQuery.IsAuditRecordUserSelect == true, t => t.AuditRecordList.Any(t => t.AuditRecordId == inQuery.AuditRecordId))
                  .WhereIf(inQuery.AuditRecordId != null && inQuery.IsAuditRecordUserSelect == false, t => !t.AuditRecordList.Any(t => t.AuditRecordId == inQuery.AuditRecordId))
+                  .WhereIf(inQuery.UserWorkLanguage != null, t => t.UserWorkLanguage == inQuery.UserWorkLanguage)
                  .ProjectTo<UserListDTO>(_mapper.ConfigurationProvider);
 
             var pageList = await userQueryable.ToPagedListAsync(inQuery);
@@ -1269,6 +1279,7 @@ namespace IRaCIS.Core.Application.Service
                 PermissionStr = t.UserTypeRole.PermissionStr,
                 UserName = t.IdentityUser.UserName,
                 UserTypeShortName = t.UserTypeRole.UserTypeShortName,
+                UserWorkLanguage=t.IdentityUser.UserWorkLanguage
             }).FirstOrDefaultAsync();
 
             await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = userTokenInfo.IdentityUserId, ActionUserName = $"{userTokenInfo.UserName}", ActionUserType = userTokenInfo.UserTypeShortName, OptType = UserOptType.LoginSelectRole }, true);

IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs

@@ -263,6 +263,12 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
     public class TrialVisitQADTO
     {
+
+        /// <summary>
+        /// QC质控下载
+        /// </summary>
+        public bool IsSupportQCDownloadImage { get; set; } = false;
+
         public bool ExistsManual { get; set; }
         public bool IsHaveStudyClinicalData { get; set; }
         public bool QCRiskControl { get; set; }

IRaCIS.Core.Application/Service/QC/QCListService.cs

@@ -421,6 +421,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
             List<SecondReviewDto> secondReviewList = new List<SecondReviewDto>();
 
+            var isSupportQCImageDownload = _trialRepository.Where(t => t.Id == sv.TrialId).Select(t => t.IsSupportQCDownloadImage).FirstOrDefault();
 
             if (sv.SecondReviewState != SecondReviewState.None)
             {
@@ -459,6 +460,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
             return new TrialVisitQADTO
             {
+                IsSupportQCDownloadImage = isSupportQCImageDownload,
                 QCQuestionAnswerList = qacheckList,
                 QCRiskControl = _verifyConfig.CurrentValue.QCRiskControl,
                 SecondReviewList = secondReviewList,

IRaCIS.Core.Application/Service/QC/QCOperationService.cs

@@ -1189,7 +1189,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
                 await _scpStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == id, u => new SCPStudy() { SubjectVisitId = null });
 
-                if (fisrtPath.IsNotNullOrEmpty())
+                if (fisrtPath.IsNotNullOrEmpty() && study.IsFromPACS == false)
                 {
                     var prefix = fisrtPath.Substring(1, fisrtPath.LastIndexOf('/') - 1);
 

IRaCIS.Core.Application/Service/Reading/Dto/SegmentationViewModel.cs

@@ -59,6 +59,11 @@ public class SegmentationAddOrEdit
     /// </summary>
     public long FileSize { get; set; } = 0;
 
+    /// <summary>
+    /// SEGUpdateTime 更新时间
+    /// </summary>
+    public DateTime? SEGUpdateTime { get; set; }
+
 }
 
 public class SegmentationQuery:PageInput
@@ -94,11 +99,20 @@ public class SegmentationVersionView
     public long FileSize { get; set; }
     public DateTime CreateTime { get; set; }
     public string CreateUserName { get; set; }
+
+    /// <summary>
+    /// 版本开始时间
+    /// </summary>
+    public DateTime? StartTime { get; set; }
 }
 
 public class SaveSegmentationVersionAsyncInDto
 {
     public Guid SegmentationId { get; set; }
+
+    public string SEGUrl { get; set; }
+
+    public bool IsRestore { get; set; } = false;
 }
 
 public class SegmentationVersionQuery : PageInput

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs

@@ -1174,7 +1174,8 @@ namespace IRaCIS.Core.Application.Service
                 throw new BusinessValidationFailedException(_localizer["ReadModule_TumorExists"]);
             }
 
-            if (await _visitTaskRepository.AnyAsync(x => readModuleId == x.SouceReadModuleId))
+
+            if (await _visitTaskRepository.AnyAsync(x => readModuleId == x.SouceReadModuleId && (x.TaskState==TaskState.Effect||x.ReadingTaskState==ReadingTaskState.HaveSigned)))
             {
                 //---当前阅片已生成任务,操作失败。
                 throw new BusinessValidationFailedException(_localizer["ReadModule_TaskGenerated"]);
@@ -1183,7 +1184,7 @@ namespace IRaCIS.Core.Application.Service
             // 如果生成了 访视级别的阅片期裁判 不让删除
             if (criterionInfo.IsArbitrationReading && criterionInfo.IsReadingPeriod && !criterionInfo.IsGlobalReading && criterionInfo.ArbitrationRule == ArbitrationRule.Reading)
             {
-                if (await _visitTaskRepository.AnyAsync(x => x.SourceSubjectVisitId == readModule.SubjectVisitId && x.ReadingCategory == ReadingCategory.Judge))
+                if (await _visitTaskRepository.AnyAsync(x => x.SourceSubjectVisitId == readModule.SubjectVisitId && x.ReadingCategory == ReadingCategory.Judge && (x.TaskState == TaskState.Effect || x.ReadingTaskState == ReadingTaskState.HaveSigned)))
                 {
                     //---当前阅片已生成裁判任务,操作失败。
                     throw new BusinessValidationFailedException(_localizer["ReadModule_JudgeTaskGenerated"]);

IRaCIS.Core.Application/Service/Reading/Segment/SegmentationService.cs

@@ -77,8 +77,17 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
 
         if (addOrEditSegmentation.Id != null)
         {
+           var data=  await  _segmentationRepository.FirstOrDefaultNoTrackingAsync(x => x.Id == addOrEditSegmentation.Id);
+            if (addOrEditSegmentation.SEGUrl != data.SEGUrl)
+            {
+                addOrEditSegmentation.SEGUpdateTime = DateTime.Now;
+            }
+            else
+            {
+                addOrEditSegmentation.SEGUpdateTime = data.SEGUpdateTime;
+            }
 
-            await SaveSegmentationVersionAsync(new SaveSegmentationVersionAsyncInDto() { SegmentationId = addOrEditSegmentation.Id.Value });
+                await SaveSegmentationVersionAsync(new SaveSegmentationVersionAsyncInDto() { SegmentationId = addOrEditSegmentation.Id.Value, SEGUrl = addOrEditSegmentation.SEGUrl });
         }
         var entity = await _segmentationRepository.InsertOrUpdateAsync(addOrEditSegmentation, true);
         return ResponseOutput.Ok(entity.Id.ToString());
@@ -89,21 +98,30 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
     /// </summary>
     /// <param name="inDto"></param>
     /// <returns></returns>
-    private async Task SaveSegmentationVersionAsync(SaveSegmentationVersionAsyncInDto inDto)
+    public async Task SaveSegmentationVersionAsync(SaveSegmentationVersionAsyncInDto inDto)
     {
         var data = await _segmentationRepository.FirstOrDefaultNoTrackingAsync(x => x.Id == inDto.SegmentationId);
-        var segmentList = await _segmentRepository.Where(x => x.SegmentationId == inDto.SegmentationId).OrderBy(x=>x.SegmentNumber).ProjectTo<SegmentVersionData>(_mapper.ConfigurationProvider).ToListAsync();
-
-        if (data.SEGUrl != string.Empty)
-        {
         // 如果是新增或修改，记录一条版本信息
         var maxVersion = await _segmentationVersionRepository
             .Where(x => x.SegmentationId == data.Id)
             .OrderByDescending(x => x.Version)
-                .Select(x => x.Version)
             .FirstOrDefaultAsync();
 
-            var newVersion = maxVersion + 1;
+
+        var startTime = maxVersion != null ? maxVersion.CreateTime :(data.SEGUpdateTime==null? DateTime.MinValue: data.SEGUpdateTime.Value);
+
+        var segmentList = await _segmentRepository
+            .Where(x=>x.CreateTime<= startTime && (!x.IsDeleted||x.DeletedTime> startTime))
+          
+            .Where(x => x.SegmentationId == inDto.SegmentationId).OrderBy(x=>x.SegmentNumber).IgnoreQueryFilters().ProjectTo<SegmentVersionData>(_mapper.ConfigurationProvider).ToListAsync();
+
+        if (data.SEGUrl != string.Empty&&(inDto.SEGUrl!=data.SEGUrl||inDto.IsRestore))
+        {
+        
+
+            var newVersion = maxVersion == null ? 1 : maxVersion.Version + 1;
+          
+
 
             var versionEntity = new SegmentationVersion
             {
@@ -113,6 +131,7 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
                 SEGUrl = data.SEGUrl,
                 FileSize = data.FileSize,
                 SegmentList= segmentList,
+                StartTime= startTime,
             };
 
             await _segmentationVersionRepository.AddAsync(versionEntity);
@@ -151,7 +170,7 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
         var version = await _segmentationVersionRepository.Where(x => x.Id == inDto.VersionId && x.SegmentationId == inDto.SegmentationId).FirstNotNullAsync();
         var segmentation = await _segmentationRepository.Where(x => x.Id == inDto.SegmentationId).FirstNotNullAsync();
 
-        await SaveSegmentationVersionAsync(new SaveSegmentationVersionAsyncInDto() { SegmentationId=inDto.SegmentationId});
+        await SaveSegmentationVersionAsync(new SaveSegmentationVersionAsyncInDto() { SegmentationId=inDto.SegmentationId,IsRestore=true,});
         await _segmentationRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.SegmentationId, t => new Segmentation
         {
             SegmentationJson = version.SegmentationJson,
@@ -250,7 +269,7 @@ public class SegmentationService(IRepository<Segmentation> _segmentationReposito
     public async Task<IResponseOutput> DeleteSegment(Guid segmentId)
     {
         await DeleteBindingsAndAnswersAsync(null, segmentId);
-        var success = await _segmentRepository.DeleteFromQueryAsync(t => t.Id == segmentId, true);
+        var success = await _segmentRepository.SoftDeleteFromQueryAsync(t => t.Id == segmentId, true);
         return ResponseOutput.Ok();
     }
 

IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFAdvanceCalculateService.cs

@@ -170,7 +170,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             
 
 
-                var dictionList = await _dictionaryRepository.Where(x => x.Parent.Code == "LiverSegmentation").OrderBy(x => x.ShowOrder).ToListAsync();
+                var dictionList = await _dictionaryRepository.Where(x => x.Parent.Code == "Liver4Segmentation").OrderBy(x => x.ShowOrder).ToListAsync();
 
 
                 var tableQuestion = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == taskinfo.TrialReadingCriterionId && x.LesionType == LesionType.FatFraction).FirstNotNullAsync();
@@ -297,7 +297,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         public async Task ReadingCalculate(ReadingCalculateDto inDto, List<QuestionType>? calculateType = null)
         {
 
-            await this.CalculateAvg(inDto);
+            //await this.CalculateAvg(inDto);
             inDto = await _generalCalculateService.GetReadingCalculateDto(inDto.VisitTaskId);
             var needAddList = new List<ReadingTaskQuestionAnswer>();
             List<ReadingCalculateData> calculateList = new List<ReadingCalculateData>()
@@ -408,7 +408,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             var tableQuestionList = rowInfo.Where(x=>x.TableQuestionList.Any(x=>x.QuestionMark== QuestionMark.IsMeasurable && x.Answer.EqEnum(YesOrNoOrNa.Yes))).SelectMany(x => x.TableQuestionList).ToList();
 
-            if (rowInfo.Any(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.AverageValue && x.Answer.IsNullOrEmpty())))
+            if (rowInfo.Any(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.MRIPDFF && x.Answer.IsNullOrEmpty())))
             {
                 return string.Empty;
             }
@@ -416,7 +416,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             {
                 return "NE";
             }
-            result = tableQuestionList.Where(x => x.QuestionMark == QuestionMark.AverageValue).Average(x => x.Answer.IsNullOrEmptyReturn0());
+            result = tableQuestionList.Where(x => x.QuestionMark == QuestionMark.MRIPDFF).Average(x => x.Answer.IsNullOrEmptyReturn0());
             return decimal.Round(result, inDto.DigitPlaces, MidpointRounding.AwayFromZero).ToString("F" + inDto.DigitPlaces.ToString()); ;
 
         }
@@ -456,54 +456,54 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// 计算平均值
         /// </summary>
         /// <returns></returns>
-        public async Task CalculateAvg(ReadingCalculateDto inDto)
-        {
-            // 脂肪分数的表格问题Id
-            var questionInfo = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.FatFraction).FirstOrDefault();
+        //public async Task CalculateAvg(ReadingCalculateDto inDto)
+        //{
+        //    // 脂肪分数的表格问题Id
+        //    var questionInfo = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.FatFraction).FirstOrDefault();
 
-            List<ReadingTableQuestionAnswer> tableAnswers = new List<ReadingTableQuestionAnswer>();
+        //    List<ReadingTableQuestionAnswer> tableAnswers = new List<ReadingTableQuestionAnswer>();
 
 
-            foreach (var item in questionInfo.TableRowInfoList)
-            {
-                var avg = item.TableQuestionList.Where(x => x.QuestionMark == QuestionMark.AverageValue).FirstOrDefault();
-                var avgAnswer = string.Empty;
-                List<QuestionMark?> questionMarks = new List<QuestionMark?>()
-                {
-                    QuestionMark.FirstMeasurement,
-                    QuestionMark.SecondMeasurement,
-                    QuestionMark.ThirdMeasurement,
-                    QuestionMark.FourthMeasurement,
-                };
-                var answers = item.TableQuestionList.Where(x => questionMarks.Contains(x.QuestionMark)).Select(x=>x.Answer).ToList();
-                if (answers.Count() == 4 && !answers.Any(x => x.IsNullOrEmpty()))
-                {
-                   var  avgAnswernum= answers.Select(x=>x.IsNullOrEmptyReturn0()).Average(x=>x);
-                   avgAnswer = decimal.Round(avgAnswernum, inDto.DigitPlaces, MidpointRounding.AwayFromZero).ToString("F" + inDto.DigitPlaces.ToString());
-                }
-                if(item.TableQuestionList.Where(x => x.QuestionMark== QuestionMark.IsMeasurable).Select(x => x.Answer).FirstOrDefault().EqEnum(YesOrNoOrNa.No))
-                {
-                    avgAnswer = "NE";
-                }
-                tableAnswers.Add(new ReadingTableQuestionAnswer()
-                {
-                    Answer = avgAnswer,
-                    VisitTaskId = inDto.VisitTaskId,
-                    QuestionId = avg.QuestionId,
-                    TableQuestionId = avg.TableQuestionId,
-                    TrialId = inDto.TrialId,
-                    RowIndex = avg.RowIndex,
-                    RowId = avg.RowId,
+        //    foreach (var item in questionInfo.TableRowInfoList)
+        //    {
+        //        var avg = item.TableQuestionList.Where(x => x.QuestionMark == QuestionMark.AverageValue).FirstOrDefault();
+        //        var avgAnswer = string.Empty;
+        //        List<QuestionMark?> questionMarks = new List<QuestionMark?>()
+        //        {
+        //            QuestionMark.FirstMeasurement,
+        //            QuestionMark.SecondMeasurement,
+        //            QuestionMark.ThirdMeasurement,
+        //            QuestionMark.FourthMeasurement,
+        //        };
+        //        var answers = item.TableQuestionList.Where(x => questionMarks.Contains(x.QuestionMark)).Select(x=>x.Answer).ToList();
+        //        if (answers.Count() == 4 && !answers.Any(x => x.IsNullOrEmpty()))
+        //        {
+        //           var  avgAnswernum= answers.Select(x=>x.IsNullOrEmptyReturn0()).Average(x=>x);
+        //           avgAnswer = decimal.Round(avgAnswernum, inDto.DigitPlaces, MidpointRounding.AwayFromZero).ToString("F" + inDto.DigitPlaces.ToString());
+        //        }
+        //        if(item.TableQuestionList.Where(x => x.QuestionMark== QuestionMark.IsMeasurable).Select(x => x.Answer).FirstOrDefault().EqEnum(YesOrNoOrNa.No))
+        //        {
+        //            avgAnswer = "NE";
+        //        }
+        //        tableAnswers.Add(new ReadingTableQuestionAnswer()
+        //        {
+        //            Answer = avgAnswer,
+        //            VisitTaskId = inDto.VisitTaskId,
+        //            QuestionId = avg.QuestionId,
+        //            TableQuestionId = avg.TableQuestionId,
+        //            TrialId = inDto.TrialId,
+        //            RowIndex = avg.RowIndex,
+        //            RowId = avg.RowId,
 
-                });
+        //        });
 
-                await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.RowId == item.RowId && x.TableQuestionId == avg.TableQuestionId);
-            }
+        //        await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.RowId == item.RowId && x.TableQuestionId == avg.TableQuestionId);
+        //    }
 
-            await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
-            await _readingTableQuestionAnswerRepository.SaveChangesAsync();
+        //    await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
+        //    await _readingTableQuestionAnswerRepository.SaveChangesAsync();
 
-        }
+        //}
 
 
 
@@ -523,38 +523,45 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var rowInfo = readingData.QuestionInfo.Where(x => x.LesionType == LesionType.FatFraction)
               .SelectMany(x => x.TableRowInfoList).ToList();
 
-            var tableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.AverageValue && x.Answer.IsNotNullOrEmpty())).ToList();
+            var tableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.MRIPDFF && x.Answer.IsNotNullOrEmpty())).ToList();
 
-            if (tableQuestionList.Count() != 8)
+            if (tableQuestionList.Count() != 4)
             {
                 throw new BusinessValidationFailedException(_localizer["MRIPDFF_AllNeedToBeMark"]);
             }
 
-            try
-            {
-                List<QuestionMark?> questionMarkList = new List<QuestionMark?>() { QuestionMark.FirstMeasurement, QuestionMark.SecondMeasurement, QuestionMark.ThirdMeasurement, QuestionMark.FourthMeasurement };
-                var measuredValueList = rowInfo.SelectMany(x => x.TableQuestionList).Where(x =>x.Answer.IsNotNullOrEmpty()&& questionMarkList.Contains(x.QuestionMark)).Select(x => decimal.Parse(x.Answer)).ToList();
-                if (measuredValueList.Any(x => x > 100))
-                {
-                    throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
-                }
-            }
-            catch (Exception)
-            {
+            var instanceCount = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.InstanceId != null).Select(x => x.InstanceId).Distinct().CountAsync();
 
-                throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
+            if (instanceCount > 1)
+            {
+                throw new BusinessValidationFailedException(_localizer["MRIPDFFAdvance_MarkMustBeSameInstance"]);
             }
 
-            var notableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.IsMeasurable && x.Answer.EqEnum(YesOrNoOrNa.No))).ToList();
+            //try
+            //{
+            //    List<QuestionMark?> questionMarkList = new List<QuestionMark?>() { QuestionMark.FirstMeasurement, QuestionMark.SecondMeasurement, QuestionMark.ThirdMeasurement, QuestionMark.FourthMeasurement };
+            //    var measuredValueList = rowInfo.SelectMany(x => x.TableQuestionList).Where(x =>x.Answer.IsNotNullOrEmpty()&& questionMarkList.Contains(x.QuestionMark)).Select(x => decimal.Parse(x.Answer)).ToList();
+            //    if (measuredValueList.Any(x => x > 100))
+            //    {
+            //        throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
+            //    }
+            //}
+            //catch (Exception)
+            //{
+
+            //    throw new BusinessValidationFailedException(_localizer["MRIPDFF_MeasurementGT100"]);
+            //}
+
+            //var notableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.IsMeasurable && x.Answer.EqEnum(YesOrNoOrNa.No))).ToList();
 
 
-            foreach (var item in notableQuestionList)
-            {
-                if (markList.Any(x => x.RowId == item.RowId && x.MeasureData.IsNotNullOrEmpty()))
-                {
-                    throw new BusinessValidationFailedException(_localizer["MRIPDFF_NeedClearMark"]);
-                }
-            }
+            //foreach (var item in notableQuestionList)
+            //{
+            //    if (markList.Any(x => x.RowId == item.RowId && x.MeasureData.IsNotNullOrEmpty()))
+            //    {
+            //        throw new BusinessValidationFailedException(_localizer["MRIPDFF_NeedClearMark"]);
+            //    }
+            //}
 
         }
     }

IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs

@@ -408,7 +408,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             var tableQuestionList = rowInfo.Where(x=>x.TableQuestionList.Any(x=>x.QuestionMark== QuestionMark.IsMeasurable && x.Answer.EqEnum(YesOrNoOrNa.Yes))).SelectMany(x => x.TableQuestionList).ToList();
 
-            if (rowInfo.Any(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.AverageValue && x.Answer.IsNullOrEmpty())))
+            if (rowInfo.Any(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.MRIPDFF && x.Answer.IsNullOrEmpty())))
             {
                 return string.Empty;
             }
@@ -416,7 +416,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             {
                 return "NE";
             }
-            result = tableQuestionList.Where(x => x.QuestionMark == QuestionMark.AverageValue).Average(x => x.Answer.IsNullOrEmptyReturn0());
+            result = tableQuestionList.Where(x => x.QuestionMark == QuestionMark.MRIPDFF).Average(x => x.Answer.IsNullOrEmptyReturn0());
             return decimal.Round(result, inDto.DigitPlaces, MidpointRounding.AwayFromZero).ToString("F" + inDto.DigitPlaces.ToString()); ;
 
         }
@@ -466,7 +466,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             foreach (var item in questionInfo.TableRowInfoList)
             {
-                var avg = item.TableQuestionList.Where(x => x.QuestionMark == QuestionMark.AverageValue).FirstOrDefault();
+                var avg = item.TableQuestionList.Where(x => x.QuestionMark == QuestionMark.MRIPDFF).FirstOrDefault();
                 var avgAnswer = string.Empty;
                 List<QuestionMark?> questionMarks = new List<QuestionMark?>()
                 {
@@ -522,7 +522,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var rowInfo = readingData.QuestionInfo.Where(x => x.LesionType == LesionType.FatFraction)
               .SelectMany(x => x.TableRowInfoList).ToList();
 
-            var tableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.AverageValue && x.Answer.IsNotNullOrEmpty())).ToList();
+            var tableQuestionList = rowInfo.Where(x => x.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.MRIPDFF && x.Answer.IsNotNullOrEmpty())).ToList();
 
             if (tableQuestionList.Count() != 8)
             {

IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteEquipmentSurveyViewModel.cs

@@ -6,17 +6,9 @@
 namespace IRaCIS.Core.Application.Contracts
 {
     /// <summary> TrialSiteEquipmentSurveyView  列表视图模型 </summary>
-    public class TrialSiteEquipmentSurveyView
+    public class TrialSiteEquipmentSurveyView: TrialSiteEquipmentSurveyAddOrEdit
     {
-        public Guid Id { get; set; }
-        public Guid TrialSiteSurveyId { get; set; }
-        public string EquipmentType { get; set; } = string.Empty;
-        public Guid? EquipmentTypeId { get; set; }
       
-        public string Parameters { get; set; } = string.Empty;
-        public string ManufacturerName { get; set; } = string.Empty;
-        public string ScannerType { get; set; } = string.Empty;
-        public string Note { get; set; } = string.Empty;
         public DateTime CreateTime { get; set; }
         public Guid CreateUserId { get; set; }
         public DateTime UpdateTime { get; set; }
@@ -56,6 +48,36 @@ namespace IRaCIS.Core.Application.Contracts
         public string ManufacturerName { get; set; } = string.Empty;
         public string ScannerType { get; set; } = string.Empty;
         public string Note { get; set; } = string.Empty;
+
+
+        [Comment("扫描设备-New")]
+        public int? EquipmentTypeEnum { get; set; }
+
+        public string OtherEquipmentType { get; set; }
+
+        [Comment("扫描设备厂商")]
+        public int? ManufacturerType { get; set; }
+
+        [Comment("磁场强度 (1.5T / 3.0T)")]
+        public int? MagneticFieldStrengthType { get; set; }
+
+        [Comment("体部线圈通道数 (≥16 或 ＜16)")]
+        public int? BodyCoilChannelCount { get; set; }
+
+        [Comment("是否具备专用的PDFF脂肪定量序列（CSE-MRI序列）")]
+        public bool? HasDedicatedPdfFatQuantificationSequence { get; set; }
+
+        [Comment("专用的PDFF脂肪定量序列类型 (当 HasDedicatedPdfFatQuantificationSequence = true 时有效)")]
+        public int? PdfFatQuantificationSequenceType { get; set; }
+
+        [Comment("其他序列详细说明 (当 PdfFatQuantificationSequenceType = Other 时建议填写)")]
+        public string OtherSequenceSpecification { get; set; }
+
+        [Comment("是否包含 T2/R2 校正（用于铁沉积校正）")]
+        public bool? HasT2R2Correction { get; set; }
+
+        [Comment("是否可完整导出 PDFF 参数图及全部原始 DICOM 数据")]
+        public bool? CanFullyExportPdfParameterMapsAndRawDicom { get; set; }
     }
 
 

IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs

@@ -130,7 +130,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
     /// <summary> TrialSiteSurveyView  列表视图模型 </summary>
-    public class TrialSiteSurveyView
+    public class TrialSiteSurveyView: TrialSiteSurveyAddOrEdit
     {
 
         public string TrialSiteCode { get; set; } = String.Empty;
@@ -138,22 +138,12 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string SiteName { get; set; } = string.Empty;
         public bool IsDeleted { get; set; }
-        public Guid Id { get; set; }
-        public Guid TrialId { get; set; }
-        public Guid? TrialSiteId { get; set; }
+      
         public DateTime CreateTime { get; set; }
         public Guid CreateUserId { get; set; }
         public DateTime UpdateTime { get; set; }
         public Guid UpdateUserId { get; set; }
-        public string UserName { get; set; } = string.Empty;
-        public string Phone { get; set; } = string.Empty;
-        public string Email { get; set; } = string.Empty;
-        public int AverageEngravingCycle { get; set; }
-        public bool IsConfirmImagingTechnologist { get; set; }
-        public string NotConfirmReson { get; set; } = string.Empty;
-        public int EfficacyEvaluatorType { get; set; }
-        public bool IsFollowStudyParameters { get; set; }
-        public string NotFollowReson { get; set; } = string.Empty;
+       
 
         public TrialSiteSurveyEnum State { get; set; }
 
@@ -343,6 +333,34 @@ namespace IRaCIS.Core.Application.Contracts
         public string NotFollowReson { get; set; } = string.Empty;
 
 
+        [Comment("MRI-PDEE 是否为本中心该适应症的常规诊疗检查项目")]
+        public bool? IsRoutineMRIPDEE { get; set; }
+
+        [Comment("MRI-PDFF 单次检查时长")]
+        public string MRIPDFFScanTime { get; set; }
+
+        [Comment("MRI-PDFF 预约等待时长")]
+        public string MRIPDFFLeadTime { get; set; }
+
+        [Comment("MRI-PDEE 其他")]
+        public string MRIPDFFOther { get; set; }
+
+
+        [Comment("是否授权影像科老师参与")]
+
+        public bool? IsAuthorizeRadiologistsParticipate { get; set; }
+
+        [Comment("保持 1-2 名固定技师")]
+        public bool? AssignFixedTechnologists { get; set; }
+
+
+        [Comment("是否严格按照影像手册参数完成刻盘")]
+        public bool? ISStrictManualBurnFlag { get; set; }
+
+        [Comment("不严格按照影像手册参数完成刻盘原因")]
+        public string NotStrictManualBurnFlagReason { get; set; }
+
+
     }
 
 

IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteUserSurveyViewModel.cs

@@ -139,6 +139,7 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class SiteSurveyUserImportDto
     {
+        public string Country { get; set; }
         public string TrialSiteCode { get; set; } = string.Empty;
         public string FirstName { get; set; } = string.Empty;
         public string LastName { get; set; } = string.Empty;

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -678,7 +678,7 @@ namespace IRaCIS.Core.Application.Contracts
                 if (currentLatest.Email != userInfo.ReplaceUserEmailOrPhone)
                 {
                     //---该中心不存在该交接人的中心调研记录表,不允许选择更新。
-                    return ResponseOutput.NotOk(_localizer["TrialSiteSurvey_NoRecordToUpdate"]);
+                    return ResponseOutput.NotOk(_localizer["TrialSiteSurvey_NoRecordToUpdate", currentLatest.Email]);
                 }
 
 
@@ -995,6 +995,10 @@ namespace IRaCIS.Core.Application.Contracts
                         generateUser.IsTestUser = true;
                     }
 
+                    //通过中心国家，设置工作语言
+                    var trialSiteCountry = _trialSiteRepository.Where(t => t.Id == trialSiteId).Select(t => t.Country).FirstOrDefault();
+                    generateUser.UserWorkLanguage = trialSiteCountry == StaticData.SiteCountry.CN ? UserWorkLanguage.CN : UserWorkLanguage.US;
+
                     generateUser.Id = NewId.NextSequentialGuid();
                     // 外部人员生成账号 都是外部的
                     generateUser.IsZhiZhun = false;
@@ -1187,7 +1191,7 @@ namespace IRaCIS.Core.Application.Contracts
             {
                 var addUserRoleList = item.ToList();
 
-                var first = addUserRoleList.FirstOrDefault();
+                var first = addUserRoleList.First();
 
                 var userEmail = item.Key;
 
@@ -1238,6 +1242,10 @@ namespace IRaCIS.Core.Application.Contracts
                         generateUser.IsTestUser = true;
                     }
 
+                    //通过中心国家，设置工作语言
+
+                    generateUser.UserWorkLanguage = first.Country == StaticData.SiteCountry.CN ? UserWorkLanguage.CN : UserWorkLanguage.US;
+
                     generateUser.Id = NewId.NextSequentialGuid();
 
                     // 外部人员生成账号 都是外部的

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

@@ -39,8 +39,7 @@ namespace IRaCIS.Core.Application.AutoMapper
 
 
             //列表
-            CreateMap<TrialSiteEquipmentSurvey, TrialSiteEquipmentSurveyView>()
-                .ForMember(t => t.EquipmentType, u => u.MapFrom(d => isEn_Us ? d.EquipmentType.Value : d.EquipmentType.ValueCN));
+            CreateMap<TrialSiteEquipmentSurvey, TrialSiteEquipmentSurveyView>();
 
 
 

IRaCIS.Core.Application/Service/Stat/DTO/StatisticsViewModel.cs

@@ -142,7 +142,7 @@
         public int StatType { get; set; }
 
         //医生付费类型  CN  US
-        public int? Nation { get; set; }
+        public DoctorNation? Nation { get; set; }
 
         //public AttendedReviewerType? AttendedReviewerType { get; set; }
     }

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs

@@ -87,6 +87,23 @@ namespace IRaCIS.Core.Application.Contracts
         public List<TrialObjectNameConfig> TrialObjectNameList { get; set; }
 
 
+        /// <summary>
+        /// QC质控下载
+        /// </summary>
+        public bool IsSupportQCDownloadImage { get; set; } = false;
+
+        /// <summary>
+        /// 打开失访可读
+        /// </summary>
+        public bool IsOpenLostVistRead { get; set; } = true;
+
+
+        /// <summary>
+        /// 影像质控风险控制
+        /// </summary>
+        public bool? IsImageQualityControl { get; set; }
+
+
     }
 
     public class ConfigTrialProcessInfoVerificationInDto
@@ -108,11 +125,6 @@ namespace IRaCIS.Core.Application.Contracts
         public List<Guid> TrialCriterionIds { get; set; } = new List<Guid>();
 
 
-        /// <summary>
-        /// 影像质控风险控制
-        /// </summary>
-        public bool? IsImageQualityControl { get; set; }
-
         public Guid TrialId { get; set; }
 
         /// <summary>

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialSiteViewModel.cs

@@ -17,6 +17,9 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
         public string UserKeyInfo { get; set; } = String.Empty;
 
+
+        public string? Country { get; set; }
+
     }
 
     public class SiteCRCExportQueryDTO
@@ -43,6 +46,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
         public string TrialSiteAliasName { get; set; } = String.Empty;
 
+        public string Country { get; set; }
+
         public bool IsDeleted { get; set; } = true;
 
     }
@@ -62,6 +67,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
         public string TrialSiteCode { get; set; } = String.Empty;
 
+        public string Country { get; set; }
+
         public bool IsDeleted { get; set; }
 
     }
@@ -119,6 +126,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO
         public string SiteName { get; set; } = String.Empty;
 
         public string AliasName { get; set; } = string.Empty;
+
+        public string Country { get; set; }
     }
 
     public class TrialSiteScreeningDTO

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs

@@ -88,6 +88,8 @@ namespace IRaCIS.Application.Contracts
 
         public string CriterionName { get; set; } = string.Empty;
 
+        public DateTime CreateTime { get; set; }
+
         public List<TrialObjectNameConfig> TrialObjectNameList { get; set; } = new List<TrialObjectNameConfig>();
     }
 
@@ -243,11 +245,16 @@ namespace IRaCIS.Application.Contracts
     }
     public class TrialExtraConfig
     {
-        #region QC 影像下载
+        #region QC 影像下载--下个版本删除
 
-        //QC质控
+        //QC质控下载
         public bool IsSupportQCDownloadImage { get; set; } = false;
 
+        /// <summary>
+        /// 打开失访可读
+        /// </summary>
+        public bool IsOpenLostVistRead { get; set; } = true;
+
         #endregion
 
 
@@ -260,13 +267,12 @@ namespace IRaCIS.Application.Contracts
 
         public List<SiteSurveyModifyFiled> ModifyFiledList { get; set; } = new List<SiteSurveyModifyFiled>();
 
+        public List<SiteSurveyEquipmentField> EquipmentControlFieldList { get; set; } = new List<SiteSurveyEquipmentField>();
+
         #endregion
 
 
-        /// <summary>
-        /// 打开失访可读
-        /// </summary>
-        public bool IsOpenLostVistRead { get; set; } = true;
+
 
 
 
@@ -311,6 +317,14 @@ namespace IRaCIS.Application.Contracts
     }
 
 
+    public class SiteSurveyEquipmentField
+    {
+        public string FiledName { get; set; }
 
+        public int ShowOrder { get; set; }
+
+        public bool IsView { get; set; }
+
+    }
 
 }

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs

@@ -441,6 +441,8 @@ namespace IRaCIS.Application.Contracts
 
         public Guid TrialSiteId { get; set; }
 
+        public string Country { get; set; }
+
         public string TrialSiteCode { get; set; } = String.Empty;
 
         public string TrialSiteName { get; set; } = String.Empty;

IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialSiteService.cs

@@ -11,7 +11,7 @@ namespace IRaCIS.Core.Application.Interfaces
         Task<IResponseOutput> DeleteSiteCRC(Guid id, bool isDelete);
         Task<IResponseOutput> DeleteTrialSite(Guid id);
         Task<PageOutput<SiteStatDTO>> GetSiteCRCList(SiteCrcQueryDTO param);
-        Task<(PageOutput<SiteStatSimpleDTO>,object)> GetSiteCRCSimpleList(SiteCrcQueryDTO param);
+        Task<IResponseOutput<PageOutput<SiteStatSimpleDTO>> > GetSiteCRCSimpleList(SiteCrcQueryDTO param);
         Task<PageOutput<TrialSiteScreeningDTO>> GetTrialSiteScreeningList(TrialSiteQuery trialSiteQuery);
         Task<IEnumerable<TrialSiteForSelect>> GetTrialSiteSelect(Guid trialId);
     }

IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs

@@ -1146,6 +1146,8 @@ namespace IRaCIS.Core.Application
 
             var isInternal = _userInfo.IsZhiZhun;
 
+            var workLanguage = _userInfo.UserWorkLanguage;
+
             var needSignTrialCount = await _trialRepository.Where(t => t.TrialStatusStr == StaticData.TrialState.TrialOngoing)
                 .Where(t => t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.TrialUserRoleList.Any(t => t.UserRole.UserTypeId == _userInfo.UserTypeId)))
                .Where(c => c.TrialDocumentList.Where(t => t.IsDeleted == false && t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId)
@@ -1153,6 +1155,8 @@ namespace IRaCIS.Core.Application
 
             var needSignSysDocCont = await _systemDocumentRepository.Where(t => t.IsPublish)
                         .Where(t => t.IsDeleted == false && !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null))
+                    .WhereIf(workLanguage == UserWorkLanguage.CN, t => t.DocLanguageType == DocLanguageType.CN || t.DocLanguageType == DocLanguageType.CN_US)
+                    .WhereIf(workLanguage == UserWorkLanguage.US, t => t.DocLanguageType == DocLanguageType.US || t.DocLanguageType == DocLanguageType.CN_US)
                     //外部人员 只签署 外部需要签署的
                     .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
                         .SelectMany(t => t.NeedConfirmedUserTypeList)

IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs

@@ -17,6 +17,7 @@ using DocumentFormat.OpenXml.Spreadsheet;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Application.Contracts;
 using MassTransit;
+using System.Globalization;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -271,6 +272,11 @@ namespace IRaCIS.Core.Application.Service
                         generateUser.IsTestUser = true;
                     }
 
+                    //外部人员语言类型，根据PM创建时界面语言决定
+                    var isEn_US = _userInfo.IsEn_Us;
+                    generateUser.UserWorkLanguage = isEn_US ? UserWorkLanguage.US : UserWorkLanguage.CN;
+
+
                     // 外部人员生成账号 都是外部的
                     generateUser.IsZhiZhun = false;
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs

@@ -35,7 +35,10 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<IdentityUserJoinedTrialView>>> GetUserJoinedTrialList(IdentityUserJoinedTrialQuery inQuery)
         {
-            var list = await _trialIdentityUserRepository.Where(t => t.IdentityUserId == inQuery.IdentityUserId, false, true)
+
+            var defalutSortArray = new string[] { nameof(IdentityUserJoinedTrialView.TrialCreateTime) + " desc" };
+
+            var list = await _trialIdentityUserRepository.Where(t => t.IdentityUserId == inQuery.IdentityUserId && t.Trial.IsDeleted==false, false, true)
               .WhereIf(!string.IsNullOrEmpty(inQuery.TrialCode), o => o.Trial.TrialCode.Contains(inQuery.TrialCode))
               .WhereIf(!string.IsNullOrEmpty(inQuery.ResearchProgramNo), o => o.Trial.ResearchProgramNo.Contains(inQuery.ResearchProgramNo))
               .WhereIf(!string.IsNullOrWhiteSpace(inQuery.ExperimentName), o => o.Trial.ExperimentName.Contains(inQuery.ExperimentName))
@@ -62,7 +65,7 @@ namespace IRaCIS.Core.Application.Service
                         UpdateTime = t.UpdateTime,
                     }).ToList(),
 
-                }).ToPagedListAsync(inQuery);
+                }).ToPagedListAsync(inQuery, defalutSortArray);
 
             var info = await _identityUserRepository.Where(t => t.Id == inQuery.IdentityUserId).Select(t =>
             new { t.CreateTime, t.UserCeateSource, t.Trial.ResearchProgramNo, t.Trial.ExperimentName, t.Trial.TrialCode }).FirstOrDefaultAsync();

IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs

@@ -144,7 +144,8 @@ namespace IRaCIS.Core.Application.Service
                 .WhereIf(!other.Contains(_userInfo.UserTypeEnumInt), t => t.TrialIdentityUserList.Any(t => t.IdentityUserId == _userInfo.IdentityUserId && t.IsDeleted == false
                  && t.TrialUserRoleList.Any(t => t.UserId == _userInfo.UserRoleId && t.IsDeleted == false))
                  && t.IsDeleted == false && t.TrialStatusStr == StaticData.TrialState.TrialOngoing)
-                .ProjectTo<TrialSelectDTO>(_mapper.ConfigurationProvider).ToListAsync();
+                .ProjectTo<TrialSelectDTO>(_mapper.ConfigurationProvider)
+                .OrderByDescending(x=>x.CreateTime).ToListAsync();
         }
 
 
@@ -222,7 +223,9 @@ namespace IRaCIS.Core.Application.Service
                 //var test = _trialRepository.Where(t => t.CreateTime.Year == DateTime.Now.Year + 1).Select(t => t.Code).DefaultIfEmpty(1).ToList();
 
                 var trial = _mapper.Map<Trial>(trialAddModel);
+
                 //trial.Id = NewId.NextGuid();
+
                 var yearStr = DateTime.Now.Year.ToString();
 
                 trial.Code = currentYearMaxCodeNext;
@@ -255,6 +258,32 @@ namespace IRaCIS.Core.Application.Service
                 trial.IsConfigureEmail = true;
                 #endregion
 
+                #region 中心调研默认值
+
+                var trialExtalConfig = new TrialExtraConfig()
+                {
+                    EquipmentControlFieldList = new List<SiteSurveyEquipmentField> {
+                     new SiteSurveyEquipmentField() { FiledName = "EquipmentTypeEnum", ShowOrder = 0, IsView = true },
+                     new SiteSurveyEquipmentField() { FiledName = "OtherEquipmentType", ShowOrder = 1, IsView = true },
+
+                     new SiteSurveyEquipmentField() { FiledName = "Parameters", ShowOrder = 2, IsView = true },
+
+                     new SiteSurveyEquipmentField() { FiledName = "ManufacturerType", ShowOrder = 3, IsView = true },
+                     new SiteSurveyEquipmentField() { FiledName = "ManufacturerName", ShowOrder = 4, IsView = true },
+
+                     new SiteSurveyEquipmentField() { FiledName = "ScannerType", ShowOrder = 5, IsView = true },
+
+                     new SiteSurveyEquipmentField() { FiledName = "Note", ShowOrder = 6, IsView = true },
+
+
+                        },
+                    NotShowFieldList = new List<string>() { "IsRoutineMRIPDEE", "MRIPDFFScanTime", "MRIPDFFLeadTime", "MRIPDFFOther", "IsAuthorizeRadiologistsParticipate", "AssignFixedTechnologists", "ISStrictManualBurnFlag", "NotStrictManualBurnFlagReason" }
+
+                };
+
+                trial.TrialExtraConfigJsonStr = trialExtalConfig.ToJsonStr();
+                #endregion
+
                 //如果是PM， 则需要将该人员添加到 运维人员表
                 //添加运维人员PM 
                 await _trialIdentityUserRepository.AddAsync(new TrialIdentityUser()

IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs

@@ -101,7 +101,7 @@ namespace IRaCIS.Core.Application.Services
 
         /// <summary>[new] setting页面Site列表，和getSiteCRCList对比 没有统计数据，增加了一些site信息 </summary>
         [HttpPost]
-        public async Task<(PageOutput<SiteStatSimpleDTO>,object)> GetSiteCRCSimpleList(SiteCrcQueryDTO inQuery)
+        public async Task<IResponseOutput<PageOutput<SiteStatSimpleDTO>>> GetSiteCRCSimpleList(SiteCrcQueryDTO inQuery)
         {
 
             var trialinfo = await _trialRepository.Where(x => x.Id == inQuery.TrialId).FirstNotNullAsync();
@@ -110,6 +110,7 @@ namespace IRaCIS.Core.Application.Services
                             .WhereIf(!string.IsNullOrWhiteSpace(inQuery.SiteName), t => t.TrialSiteName.Contains(inQuery.SiteName) || t.TrialSiteAliasName.Contains(inQuery.TrialSiteAliasName))
                             .WhereIf(!string.IsNullOrWhiteSpace(inQuery.TrialSiteAliasName), t => t.TrialSiteAliasName.Contains(inQuery.TrialSiteAliasName))
                              .WhereIf(!string.IsNullOrWhiteSpace(inQuery.TrialSiteCode), t => t.TrialSiteCode.Contains(inQuery.TrialSiteCode))
+                             .WhereIf(!string.IsNullOrWhiteSpace(inQuery.Country), t => t.Country.Contains(inQuery.Country))
                             .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator, t => t.CRCUserList.Any(k => k.UserId == _userInfo.UserRoleId))
                              .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserKeyInfo), t => t.CRCUserList.Any(k => (k.UserRole.FullName).Contains(inQuery.UserKeyInfo)
                              || k.UserRole.IdentityUser.UserName.Contains(inQuery.UserKeyInfo) || k.UserRole.IdentityUser.EMail.Contains(inQuery.UserKeyInfo)))
@@ -119,7 +120,8 @@ namespace IRaCIS.Core.Application.Services
 
             var result = await siteStatQuery.ToPagedListAsync(inQuery);
 
-            return (result,new {
+            return ResponseOutput.Ok(result, new
+            {
                 IsPACSConnectAndIsTrialPACSConfirmed = trialinfo.IsPACSConnect && trialinfo.IsTrialPACSConfirmed,
             });
         }
@@ -150,7 +152,7 @@ namespace IRaCIS.Core.Application.Services
         {
             var list = _siteRepository
             .WhereIf(!string.IsNullOrWhiteSpace(siteName), t => t.SiteName.Contains(siteName) || t.SiteNameCN.Contains(siteName) || t.AliasName.Contains(siteName))
-            .Select(t => new TrialSiteSelect() { SiteId = t.Id, SiteName = _userInfo.IsEn_Us ? t.SiteName : t.SiteNameCN, AliasName = t.AliasName }).ToList()
+            .Select(t => new TrialSiteSelect() { SiteId = t.Id, SiteName = _userInfo.IsEn_Us ? t.SiteName : t.SiteNameCN, AliasName = t.AliasName, Country = t.Country }).ToList()
                  .OrderBy(x => x.SiteName)
                  .ToList();
 

IRaCIS.Core.Application/Service/Visit/PatientService.cs

@@ -5,6 +5,7 @@ using IRaCIS.Core.Application.Contracts.Dicom.DTO;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
+using MassTransit;
 using Microsoft.AspNetCore.Mvc;
 using Pipelines.Sockets.Unofficial.Arenas;
 using System.Linq.Dynamic.Core;
@@ -382,7 +383,8 @@ namespace IRaCIS.Core.Application.Service
         public async Task<IResponseOutput> SubmitVisitStudyBinding(SubmitVisitStudyBindingCommand inCommand,
             [FromServices] IRepository<DicomStudy> _dicomstudyRepository,
             [FromServices] IRepository<DicomSeries> _dicomSeriesRepository,
-             [FromServices] IRepository<DicomInstance> _dicomInstanceRepository)
+             [FromServices] IRepository<DicomInstance> _dicomInstanceRepository,
+            [FromServices] IRepository<FileUploadRecord> _fileUploadRecordRepository)
         {
 
             //这里要做校验 + 同时验证本地系统里面的影像是否存在pacs推过来的
@@ -403,11 +405,14 @@ namespace IRaCIS.Core.Application.Service
             var subjectVisitId = inCommand.SubjectVisitId;
             var trialId = inCommand.TrialId;
 
+            var studyCode = "";
+            var studyUid = "";
+
             var @lock = _distributedLockProvider.CreateLock($"StudyCode");
 
             using (await @lock.AcquireAsync())
             {
-                var dbStudyCodeIntMax = _dicomStudyRepository.Where(s => s.TrialId == inCommand.TrialId).Select(t => t.Code).DefaultIfEmpty().Max();
+                var dbStudyCodeIntMax = _trialRepository.Where(s => s.Id == trialId, ignoreQueryFilters: true).Select(t => t.MaxDicomCode).DefaultIfEmpty().Max();
 
                 int currentNextCodeInt = dbStudyCodeIntMax + 1;
 
@@ -430,6 +435,8 @@ namespace IRaCIS.Core.Application.Service
                         newStuty.SubjectId = subjectId;
                         newStuty.SubjectVisitId = subjectVisitId;
 
+                        studyCode = newStuty.StudyCode;
+
                         await _dicomStudyRepository.AddAsync(newStuty);
 
 
@@ -457,12 +464,22 @@ namespace IRaCIS.Core.Application.Service
 
                         }
                         await _dicomInstanceRepository.AddRangeAsync(newInstanceList);
+
+
+                        //回更StudyCode
+                        await _fileUploadRecordRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == trialId && t.Path.Contains(newStuty.StudyInstanceUid), u => new FileUploadRecord() { StudyCode = studyCode, SubjectId = newStuty.SubjectId, SubjectVisitId = newStuty.SubjectVisitId });
+
+                        await _trialRepository.BatchUpdateNoTrackingAsync(t => t.Id == trialId, u => new Trial() { MaxDicomCode = currentNextCodeInt });
+                        await _scpPatientRepository.BatchUpdateNoTrackingAsync(t => t.Id == find.SCPStudy.PatientId, u => new SCPPatient() { SubjectId = subjectId });
+                        await _scpStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == scpStudyId, u => new SCPStudy() { SubjectVisitId = subjectVisitId });
+
                     }
 
+
                     currentNextCodeInt++;
 
-                    await _scpPatientRepository.BatchUpdateNoTrackingAsync(t => t.Id == find.SCPStudy.PatientId, u => new SCPPatient() { SubjectId = subjectId });
-                    await _scpStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == scpStudyId, u => new SCPStudy() { SubjectVisitId = subjectVisitId });
+
+
 
 
                 }
@@ -549,6 +566,10 @@ namespace IRaCIS.Core.Application.Service
                         }
                     }
 
+
+                    //回更StudyCode
+                    await _fileUploadRecordRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == trialId && t.Path.Contains(study.StudyInstanceUid), u => new FileUploadRecord() { StudyCode = studyCode, SubjectId = study.SubjectId, SubjectVisitId = study.SubjectVisitId });
+
                     await _scpPatientRepository.BatchUpdateNoTrackingAsync(t => t.Id == scpStudy.PatientId, u => new SCPPatient() { SubjectId = subjectId });
                     await _scpStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == scpStudyId, u => new SCPStudy() { SubjectVisitId = subjectVisitId });
                 }

IRaCIS.Core.Application/TestService.cs

@@ -1,30 +1,17 @@
 using Aliyun.OSS;
-using DocumentFormat.OpenXml.Spreadsheet;
 using FellowOakDicom;
 using FellowOakDicom.Imaging;
 using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Application.BusinessFilter;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Helper;
-using IRaCIS.Core.Application.Helper.OtherTool;
-using IRaCIS.Core.Application.Service.BusinessFilter;
 using IRaCIS.Core.Application.ViewModel;
-using IRaCIS.Core.Domain;
-using IRaCIS.Core.Domain.Models;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Infra.EFCore.Context;
 using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Infrastructure.Encryption;
 using IRaCIS.Core.Infrastructure.NewtonsoftJson;
 using MassTransit;
-using MassTransit.Caching.Internals;
-using MassTransit.Mediator;
-using MathNet.Numerics;
-using MaxMind.GeoIP2;
 using Medallion.Threading;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -32,24 +19,15 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using MiniExcelLibs;
-using Minio.DataModel;
-using NPOI.SS.Formula.Functions;
+using Newtonsoft.Json;
 using NPOI.XWPF.UserModel;
-using SharpCompress.Common;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Processing;
-using System.Collections.Concurrent;
 using System.ComponentModel.DataAnnotations;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
 using System.Linq.Dynamic.Core;
-using System.Reactive.Subjects;
-using System.Reflection.Metadata.Ecma335;
 using System.Runtime.InteropServices;
 using System.Text;
-using static IRaCIS.Core.Domain.Share.StaticData;
 
 
 
@@ -107,6 +85,212 @@ namespace IRaCIS.Core.Application.Service
             public DateTime? DateTimeNUllValue { get; set; }
         }
 
+        /// <summary>
+        /// 维护中心调研设备默认配置
+        /// </summary>
+        /// <param name="modelVerify"></param>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpPost]
+        public async Task<IResponseOutput> SiteSuveryEquipment()
+        {
+            //默认配置
+            var trialExtalConfig = new TrialExtraConfig()
+            {
+                EquipmentControlFieldList = new List<SiteSurveyEquipmentField> {
+                     new SiteSurveyEquipmentField() { FiledName = "EquipmentTypeEnum", ShowOrder = 0, IsView = true },
+                     new SiteSurveyEquipmentField() { FiledName = "OtherEquipmentType", ShowOrder = 1, IsView = true },
+
+                     new SiteSurveyEquipmentField() { FiledName = "Parameters", ShowOrder = 2, IsView = true },
+
+                     new SiteSurveyEquipmentField() { FiledName = "ManufacturerType", ShowOrder = 3, IsView = true },
+                     new SiteSurveyEquipmentField() { FiledName = "ManufacturerName", ShowOrder = 4, IsView = true },
+
+                     new SiteSurveyEquipmentField() { FiledName = "ScannerType", ShowOrder = 5, IsView = true },
+
+                     new SiteSurveyEquipmentField() { FiledName = "Note", ShowOrder = 6, IsView = true },
+    }
+            };
+
+            var fixedFields = new List<string>() { "IsRoutineMRIPDEE", "MRIPDFFScanTime", "MRIPDFFLeadTime", "MRIPDFFOther", "IsAuthorizeRadiologistsParticipate", "AssignFixedTechnologists", "ISStrictManualBurnFlag", "NotStrictManualBurnFlagReason" };
+
+            //已有配置处理
+            var list = _trialRepository.Where(t => t.TrialExtraConfigJsonStr != "").Select(t => new { t.Id, t.TrialExtraConfigJsonStr }).ToList();
+
+            foreach (var item in list)
+            {
+                var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(item.TrialExtraConfigJsonStr);
+
+                //额外配置的中心调研，
+                if (extralConfig.ModifyFiledList.Count > 0)
+                {
+                    extralConfig.EquipmentControlFieldList = trialExtalConfig.EquipmentControlFieldList.Where(t => t.ShowOrder != 2).ToList();
+
+                }
+                else
+                {
+                    extralConfig.EquipmentControlFieldList = trialExtalConfig.EquipmentControlFieldList;
+
+                }
+
+                if (extralConfig.NotShowFieldList.Count == 0)
+                {
+                    extralConfig.NotShowFieldList.AddRange(fixedFields);
+                    extralConfig.NotShowFieldList = extralConfig.NotShowFieldList.Distinct().ToList();
+                }
+                else
+                {
+                    //判断固定数组中是否有任意一个元素存在于 NotShowFieldList 中
+                    if (!fixedFields.Any(t => extralConfig.NotShowFieldList.Any(c => c == t)))
+                    {
+                        extralConfig.NotShowFieldList.AddRange(fixedFields);
+                    }
+                }
+
+
+
+
+                var jsonInfo = extralConfig.ToJsonStr();
+
+
+
+                await _trialRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new Trial() { TrialExtraConfigJsonStr = jsonInfo });
+            }
+
+
+            //默认配置更新
+            var info = trialExtalConfig.ToJsonStr();
+
+            var idQuery = _trialRepository.Where(t => t.TrialExtraConfigJsonStr == "").Select(t => t.Id);
+
+            await _trialRepository.BatchUpdateNoTrackingAsync(t => idQuery.Contains(t.Id), u => new Trial() { TrialExtraConfigJsonStr = info });
+
+
+
+
+
+            return ResponseOutput.Ok();
+        }
+
+
+        /// <summary>
+        /// 访视数据模型
+        /// </summary>
+        public class SubjectVisitExcel
+        {
+            public string SubjectCode { get; set; }
+
+            public Guid? SubjectVisitId { get; set; }
+            public decimal VisitNum { get; set; }
+            public string VisitName { get; set; }
+
+            public string R1 { get; set; }
+
+            public string R1阅片状态 { get; set; }
+
+            public string R2 { get; set; }
+
+            public string R2阅片状态 { get; set; }
+        }
+
+        [AllowAnonymous]
+        public async Task<IResponseOutput> ExtralUndownloadImages(Guid trialId)
+        {
+            var newVisits = MiniExcel.Query<SubjectVisitExcel>(@"C:\Users\PC\Desktop\New.xlsx").ToList();
+
+            var oldVisits = MiniExcel.Query<SubjectVisitExcel>(@"C:\Users\PC\Desktop\Old.xlsx").ToList();
+
+            var downloadVisit = new List<SubjectVisitExcel>();
+
+            foreach (var item in newVisits)
+            {
+                if (oldVisits.Any(t => t.VisitNum == item.VisitNum && t.SubjectCode.Trim() == item.SubjectCode.Trim()))
+                {
+                    continue;
+                }
+                else
+                {
+                    downloadVisit.Add(item);
+                }
+            }
+
+
+            string exportPath = @$"C:\Users\PC\Desktop\newDownload.xlsx";
+            MiniExcel.SaveAs(exportPath, downloadVisit);
+
+
+            #region 数据库查询
+//            var downloadInfo = _trialRepository.Where(t => t.Id == trialId).Select(t => new
+//            {
+//                t.ResearchProgramNo,
+//                t.TrialCode,
+
+//                VisitList = t.SubjectVisitList.Where(t => t.VisitTaskList.Any(t => t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.SourceSubjectVisitId != null && t.DoctorUserId != null))
+//    //.Where(t=>subjectCodeList.Contains(t.Subject.Code))
+//    .Select(sv => new
+//    {
+//        SubjectVisitId = sv.Id,
+//        TrialSiteCode = sv.TrialSite.TrialSiteCode,
+//        SubjectCode = sv.Subject.Code,
+//        VisitName = sv.VisitName,
+//        VisitNum = sv.VisitNum,
+//        StudyList = sv.StudyList.Select(u => new
+//        {
+//            StudyId = u.Id,
+//            u.PatientId,
+//            u.StudyTime,
+//            u.StudyCode,
+//            u.StudyInstanceUid,
+//            u.StudyDIRPath,
+
+//            SeriesList = u.SeriesList.Where(t => t.IsReading).Select(z => new
+//            {
+//                z.Modality,
+
+//                InstancePathList = z.DicomInstanceList.Where(t => t.IsReading).Select(k => new
+//                {
+//                    InstanceId = k.Id,
+//                    k.Path,
+//                    k.IsEncapsulated,
+//                    k.NumberOfFrames,
+//                }).ToList()
+//            })
+
+//        }).ToList(),
+
+//        NoneDicomStudyList = sv.NoneDicomStudyList.Where(t => t.IsReading).Select(nd => new
+//        {
+//            nd.Modality,
+//            nd.StudyCode,
+//            nd.ImageDate,
+
+//            FileList = nd.NoneDicomFileList.Where(t => t.IsReading).Select(file => new
+//            {
+//                file.FileName,
+//                file.Path,
+//                file.FileType
+//            }).ToList()
+//        }).ToList()
+//    }).OrderBy(t => t.SubjectCode).ThenBy(t => t.VisitNum).ToList()
+
+//            }).FirstOrDefault();
+
+//            var acturalDownList = downloadInfo.VisitList.Where(t => !oldVisits.Any(old => old.VisitNum == t.VisitNum && old.SubjectCode == t.SubjectCode &&
+//old.VisitName.Trim().ToLower() == t.VisitName.Trim().ToLower())).ToList();
+
+
+//            var diffList = downloadVisit.Where(t => !acturalDownList.Any(old => old.SubjectCode.Trim() == t.SubjectCode.Trim() &&
+//old.VisitName.Trim().ToLower() == t.VisitName.Trim().ToLower())).ToList();
+
+
+
+//            string diffPath = @$"C:\Users\PC\Desktop\diff.xlsx";
+//            MiniExcel.SaveAs(diffPath, diffList);
+
+            #endregion
+
+            return ResponseOutput.Ok(downloadVisit);
+        }
 
         //创建一个模型验证的方法
         [AllowAnonymous]

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -2514,7 +2514,7 @@ namespace IRaCIS.Core.Domain.Share
         /// <summary>
         /// 平均值
         /// </summary>
-        AverageValue = 1104,
+        MRIPDFF = 1104,
 
         /// <summary>
         /// 是否可测量
@@ -3237,6 +3237,11 @@ namespace IRaCIS.Core.Domain.Share
         /// 保存eCRF
         /// </summary>
         SaveEICRFQuestions = 12,
+
+        /// <summary>
+        /// 保存Advance肝脏分段
+        /// </summary>
+        SaveAdvanceLiverSegments = 13,
     }
 
     /// <summary>

IRaCIS.Core.Domain/Dcotor/Doctor.cs

@@ -113,7 +113,7 @@ public class Doctor : BaseFullAuditEntity
 
     public string LastName { get; set; } = string.Empty;
 
-    public int Nation { get; set; }
+    public DoctorNation Nation { get; set; }
 
     public Guid OrganizationId { get; set; }
     [MaxLength]
@@ -281,3 +281,12 @@ public class Doctor : BaseFullAuditEntity
     /// </summary>
     public string HospitalNameCN { get; set; } = string.Empty;
 }
+
+public enum DoctorNation
+{
+    CN = 0,
+    US = 1,
+    Europe = 2,
+    Other = 3
+
+}

IRaCIS.Core.Domain/Document/SystemDocument.cs

@@ -52,6 +52,9 @@ public class SystemDocument : BaseFullDeleteAuditEntity
     public DateTime? PublishDate { get; set; }
 
 
+    public DocLanguageType DocLanguageType { get; set; }
+
+
 
 }
 
@@ -107,3 +110,14 @@ public enum DocUserSignType
 
 
 }
+
+public enum DocLanguageType
+{
+    CN = 0,
+
+    US = 1,
+
+    //共用
+    CN_US = 2
+
+}

IRaCIS.Core.Domain/Management/User.cs

@@ -157,6 +157,17 @@ public class IdentityUser : BaseFullAuditEntity
     /// 隐私政策Id
     /// </summary>
     public Guid? PrivacyPolicyId { get; set; }
+
+
+    public UserWorkLanguage UserWorkLanguage { get; set; }
+
+}
+
+
+public enum UserWorkLanguage
+{
+    CN = 0,
+    US = 1,
 }
 
 public enum UserCeateSource

IRaCIS.Core.Domain/Reading/Segment/Segmentation.cs

@@ -60,6 +60,11 @@ public class Segmentation : BaseFullDeleteAuditEntity
     [MaxLength]
     public string SEGUrl { get; set; } = string.Empty;
 
+    /// <summary>
+    /// SEGUpdateTime 更新时间
+    /// </summary>
+    public DateTime? SEGUpdateTime { get; set; }
+
     /// <summary>
     /// 文件大小，单位字节
     /// </summary>

IRaCIS.Core.Domain/Reading/Segment/SegmentationVersion.cs

@@ -39,6 +39,11 @@ public class SegmentationVersion : BaseAddAuditEntity
     /// </summary>
     public long FileSize { get; set; } = 0;
 
+    /// <summary>
+    /// 版本开始时间
+    /// </summary>
+    public DateTime? StartTime { get; set; }
+
     /// <summary>
     /// SgenmentList
     /// </summary>
@@ -51,6 +56,11 @@ public class SegmentationVersion : BaseAddAuditEntity
 
 public class SegmentVersionData: ISegment
 {
+    /// <summary>
+    /// 这个时间很总要要记录
+    /// </summary>
+    public DateTime CreateTime { get; set; }
+
     /// <summary>
     /// 分割Id
     /// </summary>

IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs

@@ -14,12 +14,52 @@ public class TrialSiteEquipmentSurvey : BaseFullAuditEntity
     #endregion
     public Guid TrialSiteSurveyId { get; set; }
 
+    [Comment("扫描设备-废弃")]
     public Guid EquipmentTypeId { get; set; }
+
+    [Comment("扫描设备参数")]
     public string Parameters { get; set; } = string.Empty;
 
+    [Comment("扫描设备厂商其他补充")]
     public string ManufacturerName { get; set; } = string.Empty;
+
+    [Comment("扫描设备型号")]
     public string ScannerType { get; set; } = string.Empty;
 
     public string Note { get; set; } = string.Empty;
+
+    #region 新增
+
+    [Comment("扫描设备-New")]
+    public int EquipmentTypeEnum { get; set; }
+
+    public string OtherEquipmentType { get; set; }
+
+    [Comment("扫描设备厂商")]
+    public int? ManufacturerType { get; set; }
+
+    [Comment("磁场强度 (1.5T / 3.0T)")]
+    public int? MagneticFieldStrengthType { get; set; }
+
+    [Comment("体部线圈通道数 (≥16 或 ＜16)")]
+    public int? BodyCoilChannelCount { get; set; }
+
+    [Comment("是否具备专用的PDFF脂肪定量序列（CSE-MRI序列）")]
+    public bool? HasDedicatedPdfFatQuantificationSequence { get; set; }
+
+    [Comment("专用的PDFF脂肪定量序列类型 (当 HasDedicatedPdfFatQuantificationSequence = true 时有效)")]
+    public int? PdfFatQuantificationSequenceType { get; set; }
+
+    [Comment("其他序列详细说明 (当 PdfFatQuantificationSequenceType = Other 时建议填写)")]
+    public string OtherSequenceSpecification { get; set; }
+
+    [Comment("是否包含 T2/R2 校正（用于铁沉积校正）")]
+    public bool? HasT2R2Correction { get; set; }
+
+    [Comment("是否可完整导出 PDFF 参数图及全部原始 DICOM 数据")]
+    public bool? CanFullyExportPdfParameterMapsAndRawDicom { get; set; }
+
+    #endregion
+
 }
 

IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs

@@ -51,5 +51,35 @@ public class TrialSiteSurvey : BaseFullDeleteAuditEntity
     public DateTime? PreliminaryTime { get; set; }
 
     public DateTime? ReviewerTime { get; set; }
+
+
+
+
+    [Comment("MRI-PDEE 是否为本中心该适应症的常规诊疗检查项目")]
+    public bool? IsRoutineMRIPDEE { get; set; }
+
+    [Comment("MRI-PDFF 单次检查时长")]
+    public string MRIPDFFScanTime { get; set;  }
+
+    [Comment("MRI-PDFF 预约等待时长")]
+    public string MRIPDFFLeadTime { get; set; }
+
+    [Comment("MRI-PDEE 其他")]
+    public string MRIPDFFOther { get; set; }
+
+
+    [Comment("是否授权影像科老师参与")]
+   
+    public bool? IsAuthorizeRadiologistsParticipate { get; set; }
+
+    [Comment("保持 1-2 名固定技师")]
+    public bool? AssignFixedTechnologists { get; set; }
+
+
+    [Comment("是否严格按照影像手册参数完成刻盘")]
+    public bool? ISStrictManualBurnFlag { get; set; }
+
+    [Comment("不严格按照影像手册参数完成刻盘原因")]
+    public string NotStrictManualBurnFlagReason { get; set; }
 }
 

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -307,14 +307,14 @@ public partial class Trial : BaseFullDeleteAuditEntity
     /// <summary>
     /// IQC自动下一个任务
     /// </summary>
-    public bool IsIQCAutoNextTask { get; set; }
+    public bool IsIQCAutoNextTask { get; set; } = true;
 
-    public bool IsIQCAutoTaskDistinguishType { get; set; }
+    public bool IsIQCAutoTaskDistinguishType { get; set; } = true;
 
     /// <summary>
     /// 影像质控风险控制
     /// </summary>
-    public bool? IsImageQualityControl { get; set; }
+    public bool? IsImageQualityControl { get; set; } = true;
 
     public TrialDataStore TrialDataStoreType { get; set; }
 
@@ -324,6 +324,16 @@ public partial class Trial : BaseFullDeleteAuditEntity
     [Comment("最大的NoneDicom检查编号 整型")]
     public int MaxNoneDicomCode { get; set; }
 
+    /// <summary>
+    /// QC质控下载
+    /// </summary>
+    public bool IsSupportQCDownloadImage { get; set; }
+
+    /// <summary>
+    /// 打开失访可读
+    /// </summary>
+    public bool IsOpenLostVistRead { get; set; } = true;
+
 }
 
 public enum TrialDataStore

IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs

@@ -1,4 +1,6 @@
-namespace IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Domain.Share;
+
+namespace IRaCIS.Core.Domain.Models;
 
 [Comment("项目 - 项目中心表")]
 [Table("TrialSite")]
@@ -40,4 +42,9 @@ public class TrialSite : BaseFullDeleteAuditEntity
 
     public string TrialSiteAliasName { get; set; } = String.Empty;
     public DateTime? EnabledTime { get; set; }
+
+    /// <summary>
+    /// 使用 StaticData.SiteCountry.CN;
+    /// </summary>
+    public string Country { get; set; } 
 }

IRaCIS.Core.Infra.EFCore/AuthUser/IUserInfo.cs

@@ -1,4 +1,6 @@
-namespace IRaCIS.Core.Domain.Share
+using IRaCIS.Core.Domain.Models;
+
+namespace IRaCIS.Core.Domain.Share
 {
     /// <summary>
     /// 用户信息接口
@@ -59,5 +61,7 @@
         string TimeZoneId { get; }
 
         string BrowserFingerprint { get; }
+
+        UserWorkLanguage UserWorkLanguage { get; }
     }
 }

IRaCIS.Core.Infra.EFCore/AuthUser/UserInfo.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Http;
+using IRaCIS.Core.Domain.Models;
+using Microsoft.AspNetCore.Http;
 
 namespace IRaCIS.Core.Domain.Share
 {
@@ -328,6 +329,25 @@ namespace IRaCIS.Core.Domain.Share
             }
         }
 
+        public UserWorkLanguage UserWorkLanguage
+        {
+            get
+            {
+                var userWorkLanguage = _accessor?.HttpContext?.User?.FindFirst(JwtIRaCISClaimType.UserWorkLanguage);
+
+                if (userWorkLanguage != null && !string.IsNullOrEmpty(userWorkLanguage.Value))
+                {
+                    return Enum.Parse<UserWorkLanguage>(userWorkLanguage.Value);
+                }
+                else
+                {
+                    return UserWorkLanguage.US;
+
+                }
+            }
+
+        }
+
 
         public Guid? SignId
         {
@@ -397,6 +417,7 @@ namespace IRaCIS.Core.Domain.Share
 
         public const string PermissionStr = "permissionStr";
 
+        public const string  UserWorkLanguage = "userWorkLanguage";
 
     }
 

IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -3708,6 +3708,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     var questionAnswer= entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)).Select(x => x.Entity as ReadingTaskQuestionAnswer)
                     .Where(x => x.VisitTaskId == entity.VisitTaskId && x.ReadingQuestionTrialId == entity.QuestionId).FirstOrDefault();
 
+                    if (questionAnswer != null)
+                    {
                         var quesionInfo = await _dbContext.ReadingQuestionTrial.Where(t => t.Id == questionAnswer.ReadingQuestionTrialId).Select(t =>
                        new
                        {
@@ -3725,6 +3727,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                         answer = Translationunit(quesionInfo.AnswerType, quesionInfo.Unit, quesionInfo.CustomUnit, unitDataList, questionAnswer.Answer);
                     }
+                }
 
                 var rowMark = await _dbContext.ReadingTableAnswerRowInfo.Where(x => x.Id == entity.RowId).Select(x => x.RowMark).FirstOrDefaultAsync();
 

IRaCIS.Core.Infra.EFCore/Migrations/20260511073220_maxVersionStartTime.cs

@@ -0,0 +1,29 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class maxVersionStartTime : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "StartTime",
+                table: "SegmentationVersion",
+                type: "datetime2",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "StartTime",
+                table: "SegmentationVersion");
+        }
+    }
+}

IRaCIS.Core.Infra.EFCore/Migrations/20260512034342_addWorkLanguage.cs

@@ -0,0 +1,52 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addWorkLanguage : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Country",
+                table: "TrialSite",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AddColumn<int>(
+                name: "DocLanguageType",
+                table: "SystemDocument",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "UserWorkLanguage",
+                table: "IdentityUser",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Country",
+                table: "TrialSite");
+
+            migrationBuilder.DropColumn(
+                name: "DocLanguageType",
+                table: "SystemDocument");
+
+            migrationBuilder.DropColumn(
+                name: "UserWorkLanguage",
+                table: "IdentityUser");
+        }
+    }
+}