添加任务名称

This reverts commit e045302d38.

IRC.Core.Dicom/IRC.Core.Dicom.csproj

@@ -12,8 +12,9 @@
 	  <PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.5" />
 	  <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
 	  <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
-	  <PackageReference Include="AWSSDK.S3" Version="3.7.416.8" />
-	  <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.401.81" />
+	  <PackageReference Include="AWSSDK.S3" Version="4.0.21" />
+	  <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.5.19" />
+
 	  <PackageReference Include="DistributedLock.Core" Version="1.0.8" />
 	  <PackageReference Include="DistributedLock.SqlServer" Version="1.0.6" />
 	  <PackageReference Include="fo-dicom" Version="5.2.1" />

IRC.Core.Dicom/Service/OSSService.cs

@@ -118,7 +118,7 @@ public class AWSTempToken
     public string SecretAccessKey { get; set; }
     public string BucketName { get; set; }
     public string ViewEndpoint { get; set; }
-    public DateTime Expiration { get; set; }
+    public DateTime? Expiration { get; set; }
 }
 
 public enum ObjectStoreUse
@@ -231,8 +231,8 @@ public class OSSService : IOSSService
                     //提供awsEndPoint（域名）进行访问配置
                     var clientConfig = new AmazonS3Config
                     {
-                        RegionEndpoint = RegionEndpoint.USEast1,
-                        UseHttp = true,
+                        RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
+                        //,UseHttp = true,
                     };
 
                     var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@@ -320,8 +320,8 @@ public class OSSService : IOSSService
             //提供awsEndPoint（域名）进行访问配置
             var clientConfig = new AmazonS3Config
             {
-                RegionEndpoint = RegionEndpoint.USEast1,
-                UseHttp = true,
+                RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
+                //,UseHttp = true,
             };
 
             var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@@ -397,8 +397,8 @@ public class OSSService : IOSSService
                 //提供awsEndPoint（域名）进行访问配置
                 var clientConfig = new AmazonS3Config
                 {
-                    RegionEndpoint = RegionEndpoint.USEast1,
-                    UseHttp = true,
+                    RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
+                    //,UseHttp = true,
                 };
 
                 var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@@ -493,8 +493,8 @@ public class OSSService : IOSSService
                 //提供awsEndPoint（域名）进行访问配置
                 var clientConfig = new AmazonS3Config
                 {
-                    RegionEndpoint = RegionEndpoint.USEast1,
-                    UseHttp = true,
+                    RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
+                    //,UseHttp = true,
                 };
 
                 var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@@ -625,8 +625,8 @@ public class OSSService : IOSSService
             //提供awsEndPoint（域名）进行访问配置
             var clientConfig = new AmazonS3Config
             {
-                RegionEndpoint = RegionEndpoint.USEast1,
-                UseHttp = true,
+                RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
+                //,UseHttp = true,
             };
 
             var amazonS3Client = new AmazonS3Client(credentials, clientConfig);

IRC.Core.SCP/HostConfig/SyncFileRecoveryService.cs

@@ -0,0 +1,175 @@
+using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.Service;
+using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Core.SCP.Service;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.SCP;
+
+
+public class SyncFileRecoveryService(IServiceScopeFactory _scopeFactory, FileSyncQueue _fileSyncQueue) : BackgroundService
+{
+
+    private readonly int _pageSize = 500;
+
+    /// <summary>
+    /// 多个程序，如果恢复同一份数据，造成重复同步，SCP服务不恢复任务
+    /// </summary>
+    /// <param name="stoppingToken"></param>
+    /// <returns></returns>
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        //在本地调试的时候，不干涉部署同步任务
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            return;
+        }
+
+
+        await Task.CompletedTask;
+
+        //using var scope = _scopeFactory.CreateScope();
+        //var fileUploadRecordRepository = scope.ServiceProvider.GetRequiredService<IRepository<FileUploadRecord>>();
+
+        //// 延迟启动，保证主机快速启动
+        //await Task.Delay(5000, stoppingToken);
+
+        //int page = 0;
+
+
+        //while (!stoppingToken.IsCancellationRequested)
+        //{
+        //    // 分页获取未入队任务
+        //    var pending = await fileUploadRecordRepository
+        //        .Where(x => x.IsNeedSync == true && (x.IsSync == false || x.IsSync == null))
+        //        .OrderByDescending(x => x.Priority)
+        //        .Select(t => new { t.Id, t.Priority })
+        //        .Skip(page * _pageSize)
+        //        .Take(_pageSize)
+        //        .ToListAsync(stoppingToken);
+
+        //    if (!pending.Any())
+        //        break; // 扫描完毕，退出循环
+
+        //    foreach (var file in pending)
+        //    {
+        //        //file.IsQueued = true;      // 避免重复入队
+        //        _fileSyncQueue.Enqueue(file.Id, file.Priority ?? 0);  // 放入队列
+        //    }
+
+        //    page++;                       // 下一页
+        //    await Task.Delay(200, stoppingToken); // 缓解数据库压力
+        //}
+
+
+    }
+}
+
+public class FileSyncWorker(IServiceScopeFactory _scopeFactory, ILogger<FileSyncWorker> _logger, FileSyncQueue _fileSyncQueue) : BackgroundService
+{
+
+    // ⭐ 自动根据服务器CPU
+    private readonly int _workerCount = Math.Max(1, Environment.ProcessorCount - 1);
+
+
+
+    protected override Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        for (int i = 0; i < _workerCount; i++)
+            Task.Run(() => WorkerLoop(stoppingToken));
+
+        return Task.CompletedTask;
+    }
+
+
+    private async Task WorkerLoop(CancellationToken stoppingToken)
+    {
+        while (!stoppingToken.IsCancellationRequested)
+        {
+            var id = await _fileSyncQueue.DequeueAsync(stoppingToken);
+
+            try
+            {
+                using var scope = _scopeFactory.CreateScope();
+                var _fileUploadRecordRepository = scope.ServiceProvider.GetRequiredService<IRepository<FileUploadRecord>>();
+                var _uploadFileSyncRecordRepository = scope.ServiceProvider.GetRequiredService<IRepository<UploadFileSyncRecord>>();
+
+                var syncConfig = (scope.ServiceProvider.GetRequiredService<IOptionsMonitor<ObjectStoreServiceOptions>>()).CurrentValue;
+
+                var oss = scope.ServiceProvider.GetRequiredService<IOSSService>();
+
+                var file = await _fileUploadRecordRepository.FirstOrDefaultAsync(t => t.Id == id);
+
+                // ✅ 不要 return
+                if (file == null || file.IsNeedSync != true || syncConfig.IsOpenStoreSync == false)
+                {
+                    continue;
+                }
+
+                if (syncConfig.SyncConfigList.Any(t => t.UploadRegion == file.UploadRegion && t.IsOpenSync == false))
+                {
+                    continue;
+                }
+
+                //如果发现系统配置某一边同步进行了关闭，那么就直接返回，不执行任务
+                if (syncConfig.SyncConfigList.Any(t => t.UploadRegion == file.UploadRegion && t.IsOpenSync == false))
+                {
+                    return;
+                }
+
+                var log = new UploadFileSyncRecord
+                {
+                    FileUploadRecordId = id,
+                    StartTime = DateTime.Now,
+                    JobState = jobState.RUNNING
+                };
+
+                await _uploadFileSyncRecordRepository.AddAsync(log);
+                await _uploadFileSyncRecordRepository.SaveChangesAsync(stoppingToken);
+
+                try
+                {
+                    await oss.SyncFileAsync(file.Path.TrimStart('/'), file.UploadRegion == "CN" ? ObjectStoreUse.AliyunOSS : ObjectStoreUse.AWS, file.UploadRegion == "CN" ? ObjectStoreUse.AWS : ObjectStoreUse.AliyunOSS);
+
+                    file.IsSync = true;
+                    file.SyncFinishedTime = DateTime.Now;
+
+                    log.JobState = jobState.SUCCESS;
+                }
+                catch (Exception ex)
+                {
+                    log.JobState = jobState.FAILED;
+
+                    log.Msg = ex.Message.Length > 300 ? ex.Message.Substring(0, 300) : ex.Message;
+                }
+
+                log.EndTime = DateTime.Now;
+
+                await _uploadFileSyncRecordRepository.SaveChangesAsync(stoppingToken);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Sync failed {Id}", id);
+            }
+            finally
+            {
+                // ⭐⭐⭐ 永远执行
+                _fileSyncQueue.Complete(id);
+            }
+        }
+
+
+    }
+}
+
+

IRC.Core.SCP/IRC.Core.SCP.csproj

@@ -7,28 +7,28 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.5" />
-	  <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
+	  <PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.2.0" />
+	  <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="11.0.0" />
 	  <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
-	  <PackageReference Include="AWSSDK.S3" Version="3.7.416.8" />
-	  <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.401.81" />
-	  <PackageReference Include="DistributedLock.Core" Version="1.0.8" />
-	  <PackageReference Include="DistributedLock.SqlServer" Version="1.0.6" />
-	  <PackageReference Include="fo-dicom" Version="5.2.4" />
-	  <PackageReference Include="fo-dicom.Codecs" Version="5.16.4" />
-	  <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.4" />
+	  <PackageReference Include="AWSSDK.S3" Version="4.0.21" />
+	  <PackageReference Include="AWSSDK.SecurityToken" Version="4.0.5.19" />
+	  <PackageReference Include="DistributedLock.Core" Version="1.0.9" />
+	  <PackageReference Include="DistributedLock.SqlServer" Version="1.0.7" />
+	  <PackageReference Include="fo-dicom" Version="5.2.6" />
+	  <PackageReference Include="fo-dicom.Codecs" Version="5.16.7" />
+	  <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.6" />
 	  <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
-	  <PackageReference Include="AutoMapper" Version="13.0.1" />
-	  <PackageReference Include="Minio" Version="6.0.3" />
+	  <PackageReference Include="AutoMapper" Version="16.1.1" />
+	  <PackageReference Include="Minio" Version="7.0.0" />
 	  <PackageReference Include="My.Extensions.Localization.Json" Version="3.3.0">
 		  <TreatAsUsed>true</TreatAsUsed>
 	  </PackageReference>
 	  <PackageReference Include="Panda.DynamicWebApi" Version="1.2.2" />
-	  <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.1.2" />
-	  <PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
-	  <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-	  <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-	  <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
+	  <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.9.0" />
+	  <PackageReference Include="Serilog.Extensions.Hosting" Version="10.0.0" />
+	  <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
+	  <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
+	  <PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.7" />
   </ItemGroup>
 
   <ItemGroup>

IRC.Core.SCP/Program.cs

@@ -63,6 +63,10 @@ builder.Host
 #region 配置服务
 var _configuration = builder.Configuration;
 
+builder.Services.AddSingleton<FileSyncQueue>();
+builder.Services.AddHostedService<SyncFileRecoveryService>();
+builder.Services.AddHostedService<FileSyncWorker>();
+
 //健康检查
 builder.Services.AddHealthChecks();
 

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}的连接");
@@ -540,12 +541,12 @@ namespace IRaCIS.Core.SCP.Service
 
                                 //保留原始偏移表
 
-                                if (originOffsetTable.Count == pixelData.NumberOfFrames)
-                                {
-                                    newFragments.OffsetTable.AddRange(originOffsetTable.ToArray());
+                                //if (originOffsetTable.Count == pixelData.NumberOfFrames)
+                                //{
+                                //    newFragments.OffsetTable.AddRange(originOffsetTable.ToArray());
 
-                                }
-                                else
+                                //}
+                                //else
                                 {
                                     newFragments.OffsetTable.AddRange(bot.ToArray());
 
@@ -644,7 +645,7 @@ namespace IRaCIS.Core.SCP.Service
                 ms.Position = 0;
 
                 //irc 从路径最后一截取Guid
-                storeRelativePath = await ossService.UploadToOSSAsync(ms, ossFolderPath, instanceId.ToString(), false);
+                storeRelativePath = await ossService.UploadToOSSAsync(ms, ossFolderPath, instanceId.ToString(), false, uploadInfo: new FileUploadRecordAddOrEdit() { TrialId = _trialId, BatchDataType = BatchDataType.PACSReceive, UploadBatchId = _upload.Id.ToString() });
 
                 fileSize = ms.Length;
 
@@ -674,7 +675,7 @@ namespace IRaCIS.Core.SCP.Service
 
                                 // 上传缩略图到 OSS
 
-                                var seriesPath = await ossService.UploadToOSSAsync(memoryStream, ossFolderPath, $"{seriesId.ToString()}_{instanceId.ToString()}.preview.jpg", false);
+                                var seriesPath = await ossService.UploadToOSSAsync(memoryStream, ossFolderPath, $"{seriesId.ToString()}_{instanceId.ToString()}.preview.jpg", false, uploadInfo: new FileUploadRecordAddOrEdit() { TrialId = _trialId, BatchDataType = BatchDataType.PACSReceive });
 
 
                                 series.ImageResizePath = seriesPath;

IRC.Core.SCP/Service/CacheHelper.cs

@@ -69,6 +69,8 @@ public static class CacheKeys
     public static string UserMFAVerifyPass(Guid userId, string browserFingerprint) => $"UserMFAVerifyPass:{userId}:{browserFingerprint}";
 
     public static string TrialSiteInfo(Guid trialSiteId) => $"{trialSiteId}TrialSiteInfo";
+
+    public static string TrialDataStoreType(Guid trialId) => $"TrialDataStoreType:{trialId}";
 }
 
 public static class CacheHelper

IRC.Core.SCP/Service/DicomArchiveService.cs

@@ -204,6 +204,12 @@ namespace IRaCIS.Core.SCP.Service
                         AcquisitionNumber = dataset.GetSingleValueOrDefault(DicomTag.AcquisitionNumber, string.Empty),
                         TriggerTime = dataset.GetSingleValueOrDefault(DicomTag.TriggerTime, string.Empty),
 
+                        RadionuclideTotalDose= dataset.GetSingleValueOrDefault(DicomTag.RadionuclideTotalDose, string.Empty),
+
+                        RadionuclideHalfLife= dataset.GetSingleValueOrDefault(DicomTag.RadionuclideHalfLife, string.Empty),
+                        RadiopharmaceuticalStartTime = dataset.GetSingleValueOrDefault(DicomTag.RadiopharmaceuticalStartTime, string.Empty),
+
+
                         Manufacturer = dataset.GetSingleValueOrDefault(DicomTag.Manufacturer, string.Empty),
                         ManufacturerModelName = dataset.GetSingleValueOrDefault(DicomTag.ManufacturerModelName, string.Empty),
                         DeviceSerialNumber = dataset.GetSingleValueOrDefault(DicomTag.DeviceSerialNumber, string.Empty),

IRC.Core.SCP/Service/FileUploadRecordService.cs

@@ -0,0 +1,334 @@
+
+//--------------------------------------------------------------------
+//     此代码由liquid模板自动生成  byzhouhang 20240909
+//     生成时间 2026-03-10 06:15:17Z 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using AutoMapper;
+using IRaCIS.Core.Application.Helper;
+
+using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Core.Infra.EFCore.Common;
+using IRaCIS.Core.Infrastructure.Extention;
+using IRaCIS.Core.SCP;
+using IRaCIS.Core.SCP.Service;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
+using System.Drawing;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using ZiggyCreatures.Caching.Fusion;
+
+namespace IRaCIS.Core.SCP.Service;
+
+public class FileUploadRecordAddOrEdit
+{
+    public Guid? Id { get; set; }
+
+
+    public string FileName { get; set; }
+
+    public long FileSize { get; set; }
+
+    public string FileType { get; set; }
+
+    public string Path { get; set; }
+
+
+    public string UploadBatchId { get; set; }
+    public BatchDataType BatchDataType { get; set; }
+
+    public string StudyCode { get; set; }
+
+    public Guid? TrialId { get; set; }
+
+    public Guid? SubjectId { get; set; }
+
+    public Guid? SubjectVisitId { get; set; }
+
+    public Guid? DicomStudyId { get; set; }
+
+    public Guid? NoneDicomStudyId { get; set; }
+
+
+
+    public string FileMarkId { get; set; }
+
+    public int? Priority { get; set; }
+    public string IP { get; set; }
+    public bool? IsNeedSync { get; set; }
+    public string UploadRegion { get; set; }
+    public string TargetRegion { get; set; }
+
+    public bool? IsSync { get; set; }
+}
+public interface IFileUploadRecordService
+{
+
+   
+    Task<IResponseOutput> AddOrUpdateFileUploadRecord(FileUploadRecordAddOrEdit addOrEditFileUploadRecord);
+
+}
+
+[ApiExplorerSettings(GroupName = "Common")]
+public class FileUploadRecordService(IRepository<FileUploadRecord> _fileUploadRecordRepository,
+                                  IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IOptionsMonitor<ObjectStoreServiceOptions> options,
+                                  IFusionCache _fusionCache, IRepository<Trial> _trialRepository, FileSyncQueue _fileSyncQueue) : BaseService, IFileUploadRecordService
+{
+
+    ObjectStoreServiceOptions ObjectStoreServiceConfig = options.CurrentValue;
+
+
+
+
+
+
+    public async Task<IResponseOutput> AddOrUpdateFileUploadRecord(FileUploadRecordAddOrEdit addOrEditFileUploadRecord)
+    {
+
+        addOrEditFileUploadRecord.IP = _userInfo.IP;
+
+        if (ObjectStoreServiceConfig.IsOpenStoreSync && _userInfo.Domain.IsNotNullOrEmpty())
+        {
+            var find = ObjectStoreServiceConfig.SyncConfigList.FirstOrDefault(t => t.Domain == _userInfo.Domain);
+            if (find != null)
+            {
+                addOrEditFileUploadRecord.UploadRegion = find.UploadRegion;
+                addOrEditFileUploadRecord.TargetRegion = find.TargetRegion;
+
+            }
+            else
+            {
+                //前后端调试的时候，上传的时候域名不对应，自动按照后端配置设置上传区域和同步区域
+                var apiDefalut = ObjectStoreServiceConfig.SyncConfigList.FirstOrDefault(t => t.UploadRegion == ObjectStoreServiceConfig.ApiDeployRegion);
+
+                if (apiDefalut != null)
+                {
+                    addOrEditFileUploadRecord.UploadRegion = apiDefalut.UploadRegion;
+                    addOrEditFileUploadRecord.TargetRegion = apiDefalut.TargetRegion;
+
+                }
+            }
+        }
+
+        //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)
+        {
+
+            var trialDataStore = await _fusionCache.GetOrSetAsync(CacheKeys.TrialDataStoreType(addOrEditFileUploadRecord.TrialId.Value), async _ =>
+            {
+                return await _trialRepository.Where(t => t.Id == addOrEditFileUploadRecord.TrialId).Select(t => t.TrialDataStoreType)
+                    .FirstOrDefaultAsync();
+            },
+                      TimeSpan.FromDays(7)
+                  );
+
+            //项目配置了，那么就设置需要同步
+            if (trialDataStore == TrialDataStore.MUtiCenter)
+            {
+                addOrEditFileUploadRecord.IsNeedSync = true;
+
+                addOrEditFileUploadRecord.Priority = addOrEditFileUploadRecord.Priority ?? 0;
+
+                addOrEditFileUploadRecord.IsSync = false;
+            }
+            else
+            {
+                addOrEditFileUploadRecord.IsNeedSync = false;
+
+                //addOrEditFileUploadRecord.TargetRegion = "";
+
+            }
+
+        }
+        else
+        {
+            //系统文件，默认同步
+            addOrEditFileUploadRecord.IsNeedSync = true;
+
+            addOrEditFileUploadRecord.IsSync = false;
+
+            addOrEditFileUploadRecord.Priority = addOrEditFileUploadRecord.Priority ?? 0;
+        }
+
+        var entity = await _fileUploadRecordRepository.InsertOrUpdateAsync(addOrEditFileUploadRecord, true);
+
+        if (addOrEditFileUploadRecord.IsNeedSync == true)
+        {
+            _fileSyncQueue.Enqueue(entity.Id, addOrEditFileUploadRecord.Priority ?? 0);
+        }
+
+        return ResponseOutput.Ok(entity.Id.ToString());
+
+    }
+
+
+
+
+}
+
+
+
+
+public sealed class FileSyncQueue
+{
+    /// <summary>
+    /// 优先级队列（仅负责排序）
+    /// </summary>
+    private readonly PriorityQueue<Guid, int> _queue = new();
+
+    /// <summary>
+    /// 当前等待中的任务（唯一真实数据）
+    /// key = Guid
+    /// value = 最新 priority
+    /// </summary>
+    private readonly Dictionary<Guid, int> _waiting = new();
+
+    /// <summary>
+    /// 正在执行的任务（防止重复执行）
+    /// </summary>
+    private readonly HashSet<Guid> _running = new();
+
+    /// <summary>
+    /// worker 等待信号
+    /// </summary>
+    private readonly SemaphoreSlim _signal = new(0);
+
+
+    private readonly object _lock = new();
+
+    // ============================================================
+    // Enqueue
+    // ============================================================
+
+    /// <summary>
+    /// 入队（同 Guid 会覆盖优先级）
+    /// </summary>
+    public void Enqueue(Guid id, int priority)
+    {
+        bool needSignal = false;
+
+        lock (_lock)
+        {
+            // 如果正在执行，忽略（防止重复）
+            if (_running.Contains(id))
+                return;
+
+            // 是否新任务（用于减少 signal 风暴）
+            if (!_waiting.ContainsKey(id))
+                needSignal = true;
+
+            // 更新为最新优先级（最后一次为准）
+            _waiting[id] = priority;   //等价于添加或者更新
+
+            // PriorityQueue 无法更新节点
+            // 允许旧节点存在，Dequeue 时过滤
+            _queue.Enqueue(id, -priority);
+        }
+
+        // 只有新增任务才唤醒 worker
+        if (needSignal)
+            _signal.Release();
+    }
+
+    // ============================================================
+    // Dequeue
+    // ============================================================
+
+    /// <summary>
+    /// 获取一个待执行任务（无任务时自动等待）
+    /// </summary>
+    public async Task<Guid> DequeueAsync(CancellationToken ct)
+    {
+        while (true)
+        {
+            await _signal.WaitAsync(ct);
+
+            lock (_lock)
+            {
+                while (_queue.Count > 0)
+                {
+                    var id = _queue.Dequeue();
+
+                    // 已被覆盖或取消
+                    if (!_waiting.TryGetValue(id, out _))
+                        continue;
+
+                    // 标记为运行中
+                    _waiting.Remove(id);
+                    _running.Add(id);
+
+                    return id;
+                }
+            }
+        }
+    }
+
+    // ============================================================
+    // Complete
+    // ============================================================
+
+    /// <summary>
+    /// 任务执行完成（必须调用）
+    /// </summary>
+    public void Complete(Guid id)
+    {
+        lock (_lock)
+        {
+            _running.Remove(id);
+        }
+    }
+
+    // ============================================================
+    // Snapshot
+    // ============================================================
+
+    /// <summary>
+    /// 当前等待中的任务快照
+    /// </summary>
+    public Guid[] Snapshot()
+    {
+        lock (_lock)
+        {
+            return _waiting.Keys.ToArray();
+        }
+    }
+
+    // ============================================================
+    // 状态信息（调试用）
+    // ============================================================
+
+    public int WaitingCount
+    {
+        get
+        {
+            lock (_lock)
+                return _waiting.Count;
+        }
+    }
+
+    public int RunningCount
+    {
+        get
+        {
+            lock (_lock)
+                return _running.Count;
+        }
+    }
+}

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_Event_IRC_SCP.json

@@ -0,0 +1,37 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ObjectStoreService": {
+    "ObjectStoreUse": "AliyunOSS",
+    "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",
+      "Region": "oss-cn-shanghai",
+      "DurationSeconds": 7200
+    }
+  },
+
+  "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"
+  },
+
+  "DicomSCPServiceConfig": {
+    "CalledAEList": [
+      "STORESCP"
+    ],
+    "ServerPort": 11112
+  }
+
+}

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/ExtraController.cs

@@ -25,6 +25,7 @@ using Microsoft.Extensions.Options;
 using Org.BouncyCastle.Tls;
 using RestSharp;
 using RestSharp.Authenticators;
+using Serilog;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -137,9 +138,14 @@ namespace IRaCIS.Api.Controllers
         public async Task<IResponseOutput> GetObjectStoreTokenAsync([FromServices] IOptionsMonitor<ObjectStoreServiceOptions> options, [FromServices] IOSSService _oSSService)
         {
 
-            var result = _oSSService.GetObjectStoreTempToken();
+            var domain = HttpContext.Request.Host.Host;
 
-            //result.AWS = await GetAWSTemToken(options.CurrentValue);
+
+            var result = _oSSService.GetObjectStoreTempToken(domain);
+
+  
+
+            Log.Logger.Information($"使用域名:{domain}请求token.返回{result.ToJsonStr()}");
 
             return ResponseOutput.Ok(result);
 

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -26,6 +26,7 @@ namespace IRaCIS.Core.API.Controllers
         ITrialDocumentService _trialDocumentService,
         IReadingImageTaskService _iReadingImageTaskService,
         ITrialConfigService _trialConfigService,
+           IStudyService _studyService,
         IClinicalAnswerService _clinicalAnswerService,
         IReadingClinicalDataService _readingClinicalDataService,
         IQCOperationService _qCOperationService,
@@ -146,6 +147,26 @@ namespace IRaCIS.Core.API.Controllers
         }
 
 
+
+
+        /// <summary>
+        /// 修正患者基本信息
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns> 
+        [HttpPost, Route("Inspection/Study/AmendmentPatientInfo")]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> AmendmentPatientInfo(DataInspectionDto<EditPatientInfoCommand> opt)
+        {
+
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _studyService.AmendmentPatientInfo(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
         /// <summary>
         /// 医学审核完成
         /// </summary>
@@ -155,10 +176,19 @@ namespace IRaCIS.Core.API.Controllers
         [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [UnitOfWork]
-        public async Task<IResponseOutput> FinishMedicalReview(DataInspectionDto<FinishMedicalReviewInDto> opt)
+        public async Task<IResponseOutput> FinishMedicalReview(DataInspectionDto<CloseAndFinishMedicalReview> opt)
         {
             var singid = await _inspectionService.RecordSing(opt.SignInfo);
-            var result = await _readingMedicalReviewService.FinishMedicalReview(opt.Data);
+
+             await _readingMedicalReviewService.ClosedMedicalReviewDialog(new ClosedMedicalReviewDialogInDto() { 
+             DialogCloseReason=opt.Data.DialogCloseReason,
+             IsClosedDialog=opt.Data.IsClosedDialog,
+             MedicalDialogCloseEnum=opt.Data.MedicalDialogCloseEnum,
+             TaskMedicalReviewId=opt.Data.TaskMedicalReviewId
+             });
+            var result = await _readingMedicalReviewService.FinishMedicalReview(new FinishMedicalReviewInDto() { 
+            TaskMedicalReviewId=opt.Data.TaskMedicalReviewId
+            });
             await _inspectionService.CompletedSign(singid, result);
             return result;
         }

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -9,6 +9,7 @@ using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.MassTransit.Command;
 using IRaCIS.Core.Application.Service;
+using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore;
@@ -598,7 +599,7 @@ namespace IRaCIS.Core.API.Controllers
                 templateFileStream.Seek(0, SeekOrigin.Begin);
 
 
-                var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, $"{trialId.ToString()}/InspectionUpload/DataReconciliation", realFileName);
+                var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, $"{trialId.ToString()}/InspectionUpload/DataReconciliation", realFileName, uploadInfo: new FileUploadRecordAddOrEdit() { TrialId = trialId, BatchDataType = BatchDataType.DataReconciliation });
 
                 var addEntity = await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId }, true);
 
@@ -856,7 +857,7 @@ namespace IRaCIS.Core.API.Controllers
                     throw new BusinessValidationFailedException(_localizer["UploadDownLoad_TemplateUploadData"]);
                 }
 
-                var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, $"{trialId.ToString()}/InspectionUpload/SiteSurvey", realFileName);
+                var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, $"{trialId.ToString()}/InspectionUpload/SiteSurvey", realFileName, uploadInfo: new FileUploadRecordAddOrEdit() { TrialId = trialId, BatchDataType = BatchDataType.SiteUserSurvey });
 
                 await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId }, true);
 
@@ -932,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)
             {
@@ -954,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();
@@ -1008,7 +1011,7 @@ namespace IRaCIS.Core.API.Controllers
 
             Other = 6,
 
-          
+
         }
 
         /// <summary>

IRaCIS.Core.API/HostService/SyncFileRecoveryService.cs

@@ -0,0 +1,168 @@
+using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.Service;
+using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Infra.EFCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.API.HostService;
+
+
+public class SyncFileRecoveryService(IServiceScopeFactory _scopeFactory, FileSyncQueue _fileSyncQueue) : BackgroundService
+{
+
+    private readonly int _pageSize = 500;
+
+    /// <summary>
+    /// 多个程序，如果恢复同一份数据，造成重复同步，SCP服务不恢复任务
+    /// </summary>
+    /// <param name="stoppingToken"></param>
+    /// <returns></returns>
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        //在本地调试的时候，不干涉部署同步任务
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            return;
+        }
+
+        using var scope = _scopeFactory.CreateScope();
+        var fileUploadRecordRepository = scope.ServiceProvider.GetRequiredService<IRepository<FileUploadRecord>>();
+
+        // 延迟启动，保证主机快速启动
+        await Task.Delay(5000, stoppingToken);
+
+        int page = 0;
+
+
+        while (!stoppingToken.IsCancellationRequested)
+        {
+            // 分页获取未入队任务
+            var pending = await fileUploadRecordRepository
+                .Where(x => x.IsNeedSync == true && (x.IsSync == false || x.IsSync == null))
+                .OrderByDescending(x => x.Priority)
+                .Select(t => new { t.Id, t.Priority })
+                .Skip(page * _pageSize)
+                .Take(_pageSize)
+                .ToListAsync(stoppingToken);
+
+            if (!pending.Any())
+                break; // 扫描完毕，退出循环
+
+            foreach (var file in pending)
+            {
+                //file.IsQueued = true;      // 避免重复入队
+                _fileSyncQueue.Enqueue(file.Id, file.Priority ?? 0);  // 放入队列
+            }
+
+            page++;                       // 下一页
+            await Task.Delay(200, stoppingToken); // 缓解数据库压力
+        }
+    }
+}
+
+public class FileSyncWorker(IServiceScopeFactory _scopeFactory, ILogger<FileSyncWorker> _logger, FileSyncQueue _fileSyncQueue) : BackgroundService
+{
+
+    // ⭐ 自动根据服务器CPU
+    private readonly int _workerCount = Math.Max(1, Environment.ProcessorCount - 1);
+
+
+
+    protected override Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        for (int i = 0; i < _workerCount; i++)
+            Task.Run(() => WorkerLoop(stoppingToken));
+
+        return Task.CompletedTask;
+    }
+
+    private async Task WorkerLoop(CancellationToken stoppingToken)
+    {
+        while (!stoppingToken.IsCancellationRequested)
+        {
+            var id = await _fileSyncQueue.DequeueAsync(stoppingToken);
+
+            try
+            {
+                using var scope = _scopeFactory.CreateScope();
+                var _fileUploadRecordRepository = scope.ServiceProvider.GetRequiredService<IRepository<FileUploadRecord>>();
+                var _uploadFileSyncRecordRepository = scope.ServiceProvider.GetRequiredService<IRepository<UploadFileSyncRecord>>();
+
+                var syncConfig = (scope.ServiceProvider.GetRequiredService<IOptionsMonitor<ObjectStoreServiceOptions>>()).CurrentValue;
+
+                var oss = scope.ServiceProvider.GetRequiredService<IOSSService>();
+
+                var file = await _fileUploadRecordRepository.FirstOrDefaultAsync(t => t.Id == id);
+
+                // ✅ 不要 return
+                if (file == null || file.IsNeedSync != true || syncConfig.IsOpenStoreSync == false)
+                {
+                    continue;
+                }
+
+                if (syncConfig.SyncConfigList.Any(t => t.UploadRegion == file.UploadRegion && t.IsOpenSync == false))
+                {
+                    continue;
+                }
+
+                //如果发现系统配置某一边同步进行了关闭，那么就直接返回，不执行任务
+                if (syncConfig.SyncConfigList.Any(t => t.UploadRegion == file.UploadRegion && t.IsOpenSync == false))
+                {
+                    return;
+                }
+
+                var log = new UploadFileSyncRecord
+                {
+                    FileUploadRecordId = id,
+                    StartTime = DateTime.Now,
+                    JobState = jobState.RUNNING
+                };
+
+                await _uploadFileSyncRecordRepository.AddAsync(log);
+                await _uploadFileSyncRecordRepository.SaveChangesAsync(stoppingToken);
+
+                try
+                {
+                    await oss.SyncFileAsync(file.Path.TrimStart('/'), file.UploadRegion == "CN" ? ObjectStoreUse.AliyunOSS : ObjectStoreUse.AWS, file.UploadRegion == "CN" ? ObjectStoreUse.AWS : ObjectStoreUse.AliyunOSS);
+
+                    file.IsSync = true;
+                    file.SyncFinishedTime = DateTime.Now;
+
+                    log.JobState = jobState.SUCCESS;
+                }
+                catch (Exception ex)
+                {
+                    log.JobState = jobState.FAILED;
+
+                    log.Msg = ex.Message.Length > 300 ? ex.Message.Substring(0, 300) : ex.Message;
+                }
+
+                log.EndTime = DateTime.Now;
+
+                await _uploadFileSyncRecordRepository.SaveChangesAsync(stoppingToken);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Sync failed {Id}", id);
+            }
+            finally
+            {
+                // ⭐⭐⭐ 永远执行
+                _fileSyncQueue.Complete(id);
+            }
+        }
+
+
+    }
+}
+
+

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

@@ -136,7 +136,14 @@
             <param name="opt"></param>
             <returns></returns> 
         </member>
-        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.FinishMedicalReview(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.FinishMedicalReviewInDto})">
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.AmendmentPatientInfo(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.EditPatientInfoCommand})">
+            <summary>
+            修正患者基本信息
+            </summary>
+            <param name="opt"></param>
+            <returns></returns> 
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.FinishMedicalReview(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.CloseAndFinishMedicalReview})">
             <summary>
             医学审核完成
             </summary>
@@ -344,6 +351,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.API.HostService.SyncFileRecoveryService.ExecuteAsync(System.Threading.CancellationToken)">
+            <summary>
+            多个程序，如果恢复同一份数据，造成重复同步，SCP服务不恢复任务
+            </summary>
+            <param name="stoppingToken"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.API.IpPolicyRateLimitSetup">
             <summary>
             IPLimit限流 启动服务

IRaCIS.Core.API/Progranm.cs

@@ -1,4 +1,5 @@
-using IRaCIS.Core.API;
+using FellowOakDicom;
+using IRaCIS.Core.API;
 using IRaCIS.Core.API.HostService;
 using IRaCIS.Core.Application.BusinessFilter;
 using IRaCIS.Core.Application.BusinessFilter.LegacyController.Database.Api;
@@ -14,6 +15,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -63,7 +65,8 @@ SerilogExtension.AddSerilogSetup(enviromentName);
 var builder = WebApplication.CreateBuilder(new WebApplicationOptions
 {
 
-    EnvironmentName = enviromentName
+    EnvironmentName = enviromentName,
+    Args = args
 });
 
 #region 主机配置
@@ -88,6 +91,10 @@ builder.Services.ConfigureServices(_configuration);
 
 builder.Services.AddHostedService<HangfireHostService>();
 
+builder.Services.AddSingleton<FileSyncQueue>();
+builder.Services.AddHostedService<SyncFileRecoveryService>();
+builder.Services.AddHostedService<FileSyncWorker>();
+
 //minimal api 异常处理
 builder.Services.AddExceptionHandler<GlobalExceptionHandler>();
 //builder.Services.AddProblemDetails();
@@ -173,6 +180,7 @@ var env = app.Environment;
 
 #region 配置中间件
 
+DicomSetupBuilder.UseServiceProvider(app.Services);
 
 app.UseMiddleware<EncryptionRequestMiddleware>();
 

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/DicomSetup.cs

@@ -8,13 +8,21 @@ namespace IRaCIS.Core.API
     {
         public static void AddDicomSetup(this IServiceCollection services)
         {
+
+            // ⭐ 先做全局 DICOM 配置
             new DicomSetupBuilder()
-            .RegisterServices(s => s.AddFellowOakDicom()
-           .AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
-             .AddImageManager<ImageSharpImageManager>()
-            )
-            .SkipValidation()
-            .Build();
+                .SkipValidation()   // 👈 在这里设置
+                .Build();
+
+            services.AddFellowOakDicom().AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>().AddImageManager<ImageSharpImageManager>();
+
+           // new DicomSetupBuilder()
+           // .RegisterServices(s => s.AddFellowOakDicom()
+           //.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
+           //  .AddImageManager<ImageSharpImageManager>()
+           // )
+           // .SkipValidation()
+           // .Build();
         }
     }
 }

IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs

@@ -40,12 +40,12 @@ namespace IRaCIS.Core.API
                 var dbType = configuration.GetSection("ConnectionStrings:Db_Type").Value;
                 if (!string.IsNullOrWhiteSpace(dbType) && dbType == "pgsql")
                 {
-                    options.UseNpgsql(configuration.GetSection("ConnectionStrings:RemoteNew").Value, contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure());
+                    options.UseNpgsql(configuration.GetSection("ConnectionStrings:RemoteNew").Value, contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure().CommandTimeout(90));
 
                 }
                 else
                 {
-                    options.UseSqlServer(configuration.GetSection("ConnectionStrings:RemoteNew").Value, contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure()/*.CommandTimeout(60)*/);
+                    options.UseSqlServer(configuration.GetSection("ConnectionStrings:RemoteNew").Value, contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure().CommandTimeout(90));
                 }
 
 

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/_ServiceExtensions/SwaggerSetup.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
@@ -116,6 +116,9 @@ public static class SwaggerSetup
             //DocExpansion设置为none可折叠所有方法
             options.DocExpansion(DocExpansion.None);
 
+            // 开启Swagger UI的搜索/过滤功能
+            options.EnableFilter();
+
             //DefaultModelsExpandDepth设置为 - 1 可不显示models
             options.DefaultModelsExpandDepth(-1);
         });

IRaCIS.Core.API/appsettings.Event_IRC.json

@@ -1,86 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "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"
-  },
-  "ObjectStoreService": {
-    "ObjectStoreUse": "AliyunOSS",
-    "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",
-      "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
-    },
-    "MinIO": {
-      "endpoint": "http://192.168.3.68",
-      "port": "8001",
-      "useSSL": false,
-      "accessKey": "IDFkwEpWej0b4DtiuThL",
-      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
-      "bucketName": "test"
-    }
-  },
-
-  "BasicSystemConfig": {
-    // 启用质控风险控制功能
-    "QCRiskControl": true,
-    "OpenUserComplexPassword": true,
-
-    "OpenSignDocumentBeforeWork": true,
-
-    "OpenLoginLimit": true,
-    "LoginMaxFailCount": 5,
-
-    "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 60,
-
-    "ContinuousReadingTimeMin": 120,
-
-    "ReadingRestTimeMin": 10,
-
-    "IsNeedChangePassWord": true,
-
-    "ChangePassWordDays": 90,
-
-    // 模板类型 1 Elevate  2 Extensive
-    "TemplateType": 2,
-
-    "UserMFAVerifyMinutes": 1440
-  },
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "Imap": "imap.qiye.aliyun.com",
-    "ImapPort": 993,
-    "FromEmail": "uat@extimaging.com",
-    "FromName": "UAT_IRC",
-    "AuthorizationCode": "SHzyyl2021",
-    "SiteUrl": "http://irc.event.extimaging.com/login",
-    "CompanyName": "Extensive Imaging",
-    "CompanyNameCN": "上海展影医疗科技有限公司",
-    "CompanyShortName": "Extensive Imaging",
-    "CompanyShortNameCN": "展影医疗",
-    "IsEnv_US": false
-  },
-  "RequestDuplicationOptions": {
-    "IsEnabled": true,
-    "DuplicationWindowMs": 200,
-    "CacheTimeSeconds": 5,
-    "ExcludedPaths": [
-    ]
-  }
-
-}

IRaCIS.Core.API/appsettings.Prod_Event_IRC.json

@@ -0,0 +1,125 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ConnectionStrings": {
+    "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,
+    "WebhookUrl": "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=4355b98e-1e72-4678-8dfb-2fc6ad0bf449", //4355b98e-1e72-4678-8dfb-2fc6ad0bf449 //cdd97aab-d256-4f07-9145-a0a2b1555322
+    "APINoticeUserList": [ "u", "wait..." ],
+    "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": "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
+    },
+    "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": {
+    // 启用质控风险控制功能
+    "QCRiskControl": true,
+    "OpenUserComplexPassword": true,
+    "OpenSignDocumentBeforeWork": true,
+
+    "OpenLoginLimit": true,
+    "LoginMaxFailCount": 5,
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 120,
+
+    "OpenLoginMFA": false,
+
+    "ContinuousReadingTimeMin": 120,
+    "ReadingRestTimeMin": 10,
+
+    "IsNeedChangePassWord": true,
+    "ChangePassWordDays": 90,
+    // 模板类型 1 Elevate  2 Extensive
+    "TemplateType": 2,
+    //MFA免验证发送天数
+    "UserMFAVerifyMinutes": 1440
+  },
+
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "Imap": "imap.qiye.aliyun.com",
+    "ImapPort": 993,
+    "FromEmail": "irc@extimaging.com",
+    "FromName": "IRC Imaging System",
+    "AuthorizationCode": "ExtImg@2022",
+    "SiteUrl": "http://irc.extimaging.com/login",
+
+    "PlatformName": "EICS",
+    "PlatformNameCN": "展影云平台",
+    "SystemShortName": "IRC",
+    "OrganizationName": "ExtImaging",
+    "OrganizationNameCN": "ExtImaging",
+    "CompanyName": "Extensive Imaging",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Extensive Imaging",
+    "CompanyShortNameCN": "展影医疗",
+    "IsEnv_US": false,
+    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
+    "CronEmailDefaultCulture": "zh-CN"
+  },
+  "SystemPacsConfig": {
+    "Port": "11113",
+    "IP": "101.132.193.237"
+  },
+  "RequestDuplicationOptions": {
+    "IsEnabled": true,
+    "DuplicationWindowMs": 200,
+    "CacheTimeSeconds": 5,
+    "ExcludedPaths": [
+    ]
+  }
+}

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -7,19 +7,39 @@
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=101.132.193.237,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
-    "Hangfire": "Server=101.132.193.237,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;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"
+    //"RemoteNew": "Server=10.10.10.49,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
+    //"Hangfire": "Server=10.10.10.49,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;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,
     "WebhookUrl": "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=4355b98e-1e72-4678-8dfb-2fc6ad0bf449", //4355b98e-1e72-4678-8dfb-2fc6ad0bf449 //cdd97aab-d256-4f07-9145-a0a2b1555322
     "APINoticeUserList": [ "u", "wait..." ],
-    "VueNoticeUserList": [ "wangxiaoshuang", "6b7717a31647293621697b96f74e6f3d" ]
+    "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",
@@ -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

@@ -22,12 +22,32 @@
     "IsOpenWeComNotice": true,
     "WebhookUrl": "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=4355b98e-1e72-4678-8dfb-2fc6ad0bf449", //4355b98e-1e72-4678-8dfb-2fc6ad0bf449 //cdd97aab-d256-4f07-9145-a0a2b1555322
     "APINoticeUserList": [ "u", "wait..." ],
-    "VueNoticeUserList": [ "wangxiaoshuang", "6b7717a31647293621697b96f74e6f3d" ]
+    "VueNoticeUserList": [ "wangxiaoshuang", "6b7717a31647293621b97b96f74e6f3d" ]
   },
   // 对象存储服务配置
   "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": {
       // 阿里云 OSS 的 Region ID
@@ -129,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",
     // 发件人显示名称
@@ -146,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",
     // 公司中文全称
@@ -162,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

@@ -16,20 +16,42 @@
     "IsOpenWeComNotice": true,
     "WebhookUrl": "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=4355b98e-1e72-4678-8dfb-2fc6ad0bf449", //4355b98e-1e72-4678-8dfb-2fc6ad0bf449 //cdd97aab-d256-4f07-9145-a0a2b1555322
     "APINoticeUserList": [ "u", "wait..." ],
-    "VueNoticeUserList": [ "wangxiaoshuang", "6b7717a31647293621697b96f74e6f3d" ]
+    "VueNoticeUserList": [ "wangxiaoshuang", "6b7717a31647293621b97b96f74e6f3d" ]
   },
   "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

@@ -17,7 +17,7 @@
     "IsOpenWeComNotice": true,
     "WebhookUrl": "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=4355b98e-1e72-4678-8dfb-2fc6ad0bf449", //4355b98e-1e72-4678-8dfb-2fc6ad0bf449 //cdd97aab-d256-4f07-9145-a0a2b1555322
     "APINoticeUserList": [ "u", "wait..." ],
-    "VueNoticeUserList": [ "wangxiaoshuang", "6b7717a31647293621697b96f74e6f3d" ]
+    "VueNoticeUserList": [ "wangxiaoshuang", "6b7717a31647293621b97b96f74e6f3d" ]
   },
 
   "ObjectStoreService": {
@@ -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

@@ -14,11 +14,31 @@
     "IsOpenWeComNotice": true,
     "WebhookUrl": "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=4355b98e-1e72-4678-8dfb-2fc6ad0bf449", //4355b98e-1e72-4678-8dfb-2fc6ad0bf449 //cdd97aab-d256-4f07-9145-a0a2b1555322
     "APINoticeUserList": [ "u", "wait..." ],
-    "VueNoticeUserList": [ "wangxiaoshuang", "6b7717a31647293621697b96f74e6f3d" ]
+    "VueNoticeUserList": [ "wangxiaoshuang", "6b7717a31647293621b97b96f74e6f3d" ]
   },
   "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.API/wwwroot/swagger/ui/Index.html

@@ -1,4 +1,4 @@
-<!-- HTML for static distribution bundle build -->
+<!-- HTML for static distribution bundle build -->
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -112,8 +112,23 @@
                             }, info: function () {
                                 return null;
                             }
+                        },
+                        fn: {
+                            opsFilter: function (taggedOps, phrase) {
+                                var normalPhrase = phrase.toLowerCase();
+                                return taggedOps.map(function (tagObj, tag) {
+                                    var operations = tagObj.get("operations").filter(function (op) {
+                                        var summary = op.getIn(["operation", "summary"]) || "";
+                                        var path = op.get("path") || "";
+                                        var tagMatch = tag.toLowerCase().indexOf(normalPhrase) !== -1;
+                                        return tagMatch || summary.toLowerCase().indexOf(normalPhrase) !== -1 || path.toLowerCase().indexOf(normalPhrase) !== -1;
+                                    });
+                                    return tagObj.set("operations", operations);
+                                }).filter(function (tagObj) {
+                                    return tagObj.get("operations").size > 0;
+                                });
+                            }
                         }
-
                     }
                 }
             ];

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/LegacyController/RequestDuplicationFilter.cs

@@ -70,6 +70,10 @@ namespace IRaCIS.Core.Application.BusinessFilter.LegacyController
                     {
                         this.RequestDuplication();
                     }
+                    catch (BusinessValidationFailedException)
+                    {
+                        throw;
+                    }
                     catch (Exception)
                     {
                       
@@ -91,6 +95,8 @@ namespace IRaCIS.Core.Application.BusinessFilter.LegacyController
 
                 // 验证请求频繁情况
                 if (
+                    requestPath == "/ReadingImageTask/changeDicomReadingQuestionAnswer"&&
+
                     !requestPath
                     .Split("/", StringSplitOptions.RemoveEmptyEntries)
                     .Any(segment => segment.StartsWith("get", StringComparison.OrdinalIgnoreCase)) &&
@@ -106,17 +112,14 @@ namespace IRaCIS.Core.Application.BusinessFilter.LegacyController
                         RequestTime = DateTime.Now
                     };
 
-                    IRCSystemInfo.RequestRecordList= IRCSystemInfo.RequestRecordList.Where(x => x.RequestTime >= DateTime.Now.AddSeconds(-RequestDuplicationOptionsMonitor.CurrentValue.CacheTimeSeconds)).ToList();
-
-                   
-                    var requestsTimes = IRCSystemInfo.RequestRecordList.Any(x=>
-                   x.RequestTime>= requestInfo.RequestTime.AddMilliseconds(-RequestDuplicationOptionsMonitor.CurrentValue.DuplicationWindowMs)&&
-                    x.RequestKey== requestInfo.RequestKey);
-                    if (requestsTimes)
+                    var isAdded = IRCSystemInfo.TryAddRequestRecord(
+                        requestInfo,
+                        RequestDuplicationOptionsMonitor.CurrentValue.CacheTimeSeconds,
+                        RequestDuplicationOptionsMonitor.CurrentValue.DuplicationWindowMs);
+                    if (!isAdded)
                     {
                         throw new BusinessValidationFailedException(_localizer["RequestDuplicationFilter_RequestDuplication"], ApiResponseCodeEnum.BusinessValidationFailed);
                     }
-                    IRCSystemInfo.RequestRecordList.Add(requestInfo);
                 }
             }
 

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

@@ -29,11 +29,11 @@ public class TrialGlobalLimitActionFilter(IFusionCache _fusionCache, IUserInfo _
             var requestHost = context.HttpContext.Request.Host;
 
             // 检查请求是否来自 localhost:6100
-            //if (requestHost.Host == "localhost" && (requestHost.Port == 6100 || requestHost.Port == 3305))
-            //{
-            //    await next();
-            //    return;
-            //}
+            if (requestHost.Host == "localhost" && (requestHost.Port == 6100 || requestHost.Port == 3305))
+            {
+                await next();
+                return;
+            }
 
             #region 特殊用户类型拦截
             // 用户类型检查  

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
@@ -145,6 +146,31 @@ public class RequestDuplicationOptions
 public static class IRCSystemInfo
 {
     public static List<RequestInfo> RequestRecordList { get; set; } = new List<RequestInfo>();
+
+    private static readonly object requestRecordLock = new object();
+
+    public static bool TryAddRequestRecord(RequestInfo requestInfo, int cacheTimeSeconds, int duplicationWindowMs)
+    {
+        lock (requestRecordLock)
+        {
+            var now = DateTime.Now;
+            RequestRecordList = RequestRecordList
+                .Where(x => x.RequestTime >= now.AddSeconds(-cacheTimeSeconds))
+                .ToList();
+
+            var isDuplicate = RequestRecordList.Any(x =>
+                x.RequestTime >= requestInfo.RequestTime.AddMilliseconds(-duplicationWindowMs) &&
+                x.RequestKey == requestInfo.RequestKey);
+
+            if (isDuplicate)
+            {
+                return false;
+            }
+
+            RequestRecordList.Add(requestInfo);
+            return true;
+        }
+    }
 }
 
 public class RequestInfo
@@ -235,4 +261,4 @@ public static class AppSettings
 
     }
 
-}
+}

IRaCIS.Core.Application/Helper/CacheHelper.cs

@@ -1,4 +1,6 @@
-namespace IRaCIS.Core.Application.Helper;
+using DocumentFormat.OpenXml.Spreadsheet;
+
+namespace IRaCIS.Core.Application.Helper;
 
 
 public static class CacheKeys
@@ -66,6 +68,10 @@ public static class CacheKeys
 
     public static string UserMFATag(Guid userId) => $"UserMFAVerifyPass:{userId}";
 
+    public static string TrialDataStoreType(Guid trialId) => $"TrialDataStoreType:{trialId}";
+
+
+    public static string UserQCSkipTask(Guid userId) => $"UserSKipQCTask:{userId}";
 }
 
 public static class CacheHelper
@@ -77,6 +83,9 @@ public static class CacheHelper
         return statusStr;
     }
 
+
+
+
     public static async Task<List<SystemAnonymization>> GetSystemAnonymizationListAsync(IRepository<SystemAnonymization> _systemAnonymizationRepository)
     {
         var list = await _systemAnonymizationRepository.Where(t => t.IsEnable).ToListAsync();

IRaCIS.Core.Application/Helper/DicomDIRHelper.cs

@@ -1,6 +1,9 @@
 using DocumentFormat.OpenXml.Office.CustomUI;
 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;
@@ -58,7 +61,11 @@ namespace IRaCIS.Core.Application.Helper
             var mappings = new List<string>();
             int index = 1;
 
-            var studyUid=list.FirstOrDefault()?.StudyInstanceUid;
+            var trialId = Guid.Empty;
+
+            Guid.TryParse(ossFolder.Split('/', StringSplitOptions.RemoveEmptyEntries)[0], out trialId);
+
+            var studyUid = list.FirstOrDefault()?.StudyInstanceUid;
 
             var dicomDir = new DicomDirectory();
 
@@ -130,9 +137,9 @@ namespace IRaCIS.Core.Application.Helper
                     // 重置流位置
                     memoryStream.Position = 0;
 
-                   var relativePath= await _oSSService.UploadToOSSAsync(memoryStream, ossFolder, "DICOMDIR", true);
+                    var relativePath = await _oSSService.UploadToOSSAsync(memoryStream, ossFolder, "DICOMDIR", true, uploadInfo: new FileUploadRecordAddOrEdit() { TrialId = trialId, BatchDataType = BatchDataType.DICOMDIR });
 
-                    dic.Add($"{studyUid}_DICOMDIR" , relativePath.Split('/').Last());
+                    dic.Add($"{studyUid}_DICOMDIR", relativePath.Split('/').Last());
                 }
 
                 //清理临时文件
@@ -146,7 +153,7 @@ namespace IRaCIS.Core.Application.Helper
                 var mappingText = string.Join(Environment.NewLine, mappings);
                 await using var mappingStream = new MemoryStream(Encoding.UTF8.GetBytes(mappingText));
 
-                await _oSSService.UploadToOSSAsync(mappingStream, ossFolder, $"Download_{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}", false);
+                await _oSSService.UploadToOSSAsync(mappingStream, ossFolder, $"Download_{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}", false, uploadInfo: new FileUploadRecordAddOrEdit() { TrialId = trialId, BatchDataType = BatchDataType.DICOMDIR });
 
                 #endregion
             }
@@ -154,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

@@ -17,7 +17,7 @@ public static class SendEmailHelper
 
         //没有收件人 那么不发送
         if (messageToSend.To.Count == 0)
-        { 
+        {
             return string.Empty;
         }
 
@@ -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)))
@@ -147,7 +202,7 @@ public static class SendEmailHelper
         return true;
     }
 
-    public static async Task SendEmailAsync(SMTPEmailConfig sMTPEmailConfig,Trial? trial, EventHandler<MessageSentEventArgs>? messageSentSuccess = null)
+    public static async Task SendEmailAsync(SMTPEmailConfig sMTPEmailConfig, Trial? trial, EventHandler<MessageSentEventArgs>? messageSentSuccess = null)
     {
         var messageToSend = new MimeMessage();
 
@@ -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

@@ -7,6 +7,10 @@ using Amazon.S3;
 using Amazon.S3.Model;
 using Amazon.SecurityToken;
 using Amazon.SecurityToken.Model;
+using DocumentFormat.OpenXml.Bibliography;
+using IRaCIS.Application.Contracts;
+using IRaCIS.Core.Application.Interfaces;
+using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Infrastructure.NewtonsoftJson;
 using MassTransit;
@@ -16,6 +20,8 @@ using Minio;
 using Minio.DataModel;
 using Minio.DataModel.Args;
 using Minio.Exceptions;
+using Serilog.Parsing;
+using SkiaSharp;
 using System.IO;
 using System.Reactive.Linq;
 using System.Runtime.InteropServices;
@@ -80,6 +86,28 @@ public class ObjectStoreServiceOptions
 
     public AWSOptions AWS { get; set; }
 
+    public bool IsOpenStoreSync { get; set; }
+
+    public string ApiDeployRegion { get; set; }
+
+    public List<SyncStoreConfig> SyncConfigList { get; set; } = new List<SyncStoreConfig>();
+
+}
+
+public class SyncStoreConfig
+{
+    public string Domain { get; set; }
+
+    public string UploadRegion { get; set; }
+
+    public string TargetRegion { get; set; }
+
+    public string Primary { get; set; }
+
+    public string Target { get; set; }
+
+    public bool IsOpenSync { get; set; }
+
 }
 
 public class ObjectStoreDTO
@@ -93,6 +121,10 @@ public class ObjectStoreDTO
 
     public AWSTempToken AWS { get; set; }
 
+    public bool IsOpenStoreSync { get; set; }
+
+    public List<SyncStoreConfig> SyncConfigList { get; set; }
+
 }
 
 [LowerCamelCaseJson]
@@ -137,6 +169,7 @@ public enum ObjectStoreUse
     AWS = 2,
 }
 
+
 #endregion
 
 // aws 参考链接 https://github.com/awsdocs/aws-doc-sdk-examples/tree/main/dotnetv3/S3/S3_Basics
@@ -147,8 +180,8 @@ public interface IOSSService
     public Task RestoreFilesByPrefixAsync(string prefix, int restoreDays = 3, int batchSize = 100);
 
 
-    public Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true);
-    public Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true, bool randomFileName = false);
+    public Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true, FileUploadRecordAddOrEdit? uploadInfo = null);
+    public Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true, bool randomFileName = false, FileUploadRecordAddOrEdit? uploadInfo = null);
 
     public Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath);
 
@@ -164,28 +197,30 @@ public interface IOSSService
 
     List<string> GetRootFolderNames();
 
-    public ObjectStoreDTO GetObjectStoreTempToken();
+    public ObjectStoreDTO GetObjectStoreTempToken(string? domain = null, bool? isGetAllTempToken = null, string? objectUse = null);
 
     public Task MoveObject(string sourcePath, string destPath, bool overwrite = true);
 
     public Task<long> GetObjectSizeAsync(string sourcePath);
+
+    public Task SyncFileAsync(string objectKey, ObjectStoreUse source, ObjectStoreUse destination, CancellationToken ct = default);
+
+    public void ConvertPrefixToStandard(string prefix);
 }
 
 
-public class OSSService : IOSSService
+public class OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options,
+                                  IFileUploadRecordService _fileUploadRecordService) : IOSSService
 {
-    public ObjectStoreServiceOptions ObjectStoreServiceOptions { get; set; }
+    public ObjectStoreServiceOptions ObjectStoreServiceOptions { get; set; } = options.CurrentValue;
 
     private AliyunOSSTempToken AliyunOSSTempToken { get; set; }
 
     private AWSTempToken AWSTempToken { get; set; }
+    public object result { get; private set; }
 
 
-    public OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options)
-    {
-        ObjectStoreServiceOptions = options.CurrentValue;
-
-    }
+    private static readonly object _tokenLock = new();
 
     /// <summary>
     /// 将指定前缀下的所有现有文件立即转为目标存储类型
@@ -506,8 +541,8 @@ public class OSSService : IOSSService
 
             var clientConfig = new AmazonS3Config
             {
-                RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region),
-                UseHttp = true,
+                RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
+                //,UseHttp = true,
             };
 
             using var client = new AmazonS3Client(credentials, clientConfig);
@@ -620,6 +655,90 @@ public class OSSService : IOSSService
     }
 
 
+    /// <summary>
+    /// 将某个路径下的归档的文件 转为标准存储
+    /// </summary>
+    /// <param name="prefix"></param>
+    public void ConvertPrefixToStandard(string prefix)
+    {
+
+        BackBatchGetToken();
+
+        if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+        {
+
+            var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+            var _ossClient = new OssClient(
+                RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint,
+                AliyunOSSTempToken.AccessKeyId,
+                AliyunOSSTempToken.AccessKeySecret,
+                AliyunOSSTempToken.SecurityToken
+            );
+            var bucketName = aliConfig.BucketName;
+
+            try
+            {
+                ObjectListing objectListing = null;
+                string nextMarker = null;
+                do
+                {
+                    // 使用 prefix 模拟目录结构，设置 MaxKeys 和 NextMarker
+                    objectListing = _ossClient.ListObjects(new Aliyun.OSS.ListObjectsRequest(bucketName)
+                    {
+                        Prefix = prefix,
+                        MaxKeys = 1000,
+                        Marker = nextMarker
+                    });
+
+
+                    foreach (var obj in objectListing.ObjectSummaries)
+                    {
+                        try
+                        {
+                            // 👇 跳过已经是标准存储的（优化）
+                            if (obj.StorageClass == StorageClass.Standard.ToString())
+                                continue;
+
+                            var metadata = new ObjectMetadata();
+
+                            // 👇 关键：手动加 Header
+                            metadata.AddHeader("x-oss-storage-class", "Standard");
+
+                            var copyRequest = new Aliyun.OSS.CopyObjectRequest(bucketName, obj.Key, bucketName, obj.Key) { NewObjectMetadata = metadata };
+
+
+                            _ossClient.CopyObject(copyRequest);
+
+                        }
+                        catch (Exception ex)
+                        {
+                            Log.Logger.Error($"❌ 失败: {obj.Key}, 错误: {ex.Message}");
+                        }
+                    }
+
+
+
+                    // 设置 NextMarker 以获取下一页的数据
+                    nextMarker = objectListing.NextMarker;
+
+                } while (objectListing.IsTruncated);
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error($"Error: {ex.Message}");
+            }
+
+
+        }
+        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+        {
+            throw new BusinessValidationFailedException("未定义的存储介质类型");
+        }
+
+
+    }
+
+
     /// <summary>
     /// 坑方法，会清空之前的规则
     /// </summary>
@@ -686,8 +805,8 @@ public class OSSService : IOSSService
             //提供awsEndPoint（域名）进行访问配置
             var clientConfig = new AmazonS3Config
             {
-                RegionEndpoint = RegionEndpoint.USEast1,
-                UseHttp = true,
+                RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
+                //,UseHttp = true,
             };
 
             var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@@ -700,6 +819,9 @@ public class OSSService : IOSSService
         }
     }
 
+
+
+
     /// <summary>
     ///  oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
     /// </summary>
@@ -707,8 +829,9 @@ public class OSSService : IOSSService
     /// <param name="oosFolderPath"></param>
     /// <param name="fileRealName"></param>
     /// <param name="isFileNameAddGuid"></param>
+    /// <param name="uploadInfo">  只用赋值业务参数Id 和批次信息即可，其他信息不用传递</param>
     /// <returns></returns>
-    public async Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true)
+    public async Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true, FileUploadRecordAddOrEdit? uploadInfo = null)
     {
         BackBatchGetToken();
 
@@ -716,74 +839,68 @@ public class OSSService : IOSSService
 
         try
         {
-            using (var memoryStream = new MemoryStream())
-            {
+            if (fileStream.CanSeek)
                 fileStream.Seek(0, SeekOrigin.Begin);
 
-                fileStream.CopyTo(memoryStream);
 
-                memoryStream.Seek(0, SeekOrigin.Begin);
+            if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+            {
+                var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+
+                var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
 
 
-                if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+
+                // 上传文件
+                var result = _ossClient.PutObject(aliConfig.BucketName, ossRelativePath, fileStream);
+
+            }
+            else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
+            {
+                var minIOConfig = ObjectStoreServiceOptions.MinIO;
+
+
+                var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
+                    .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey).WithSSL(minIOConfig.UseSSL)
+                    .Build();
+
+                var putObjectArgs = new PutObjectArgs()
+                       .WithBucket(minIOConfig.BucketName)
+                       .WithObject(ossRelativePath)
+                       .WithStreamData(fileStream)
+                       .WithObjectSize(fileStream.Length);
+
+                await minioClient.PutObjectAsync(putObjectArgs);
+            }
+            else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+            {
+                var awsConfig = ObjectStoreServiceOptions.AWS;
+
+                var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
+
+
+
+                //提供awsEndPoint（域名）进行访问配置
+                var clientConfig = new AmazonS3Config
                 {
-                    var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+                    RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
+                    //,UseHttp = true,
+                };
 
-                    var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
+                var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
 
-
-
-                    // 上传文件
-                    var result = _ossClient.PutObject(aliConfig.BucketName, ossRelativePath, memoryStream);
-
-                }
-                else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
+                var putObjectRequest = new Amazon.S3.Model.PutObjectRequest()
                 {
-                    var minIOConfig = ObjectStoreServiceOptions.MinIO;
+                    BucketName = awsConfig.BucketName,
+                    InputStream = fileStream,
+                    Key = ossRelativePath,
+                };
 
-
-                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
-                        .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey).WithSSL(minIOConfig.UseSSL)
-                        .Build();
-
-                    var putObjectArgs = new PutObjectArgs()
-                           .WithBucket(minIOConfig.BucketName)
-                           .WithObject(ossRelativePath)
-                           .WithStreamData(memoryStream)
-                           .WithObjectSize(memoryStream.Length);
-
-                    await minioClient.PutObjectAsync(putObjectArgs);
-                }
-                else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
-                {
-                    var awsConfig = ObjectStoreServiceOptions.AWS;
-
-                    var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
-
-
-
-                    //提供awsEndPoint（域名）进行访问配置
-                    var clientConfig = new AmazonS3Config
-                    {
-                        RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
-                        //,UseHttp = true,
-                    };
-
-                    var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
-
-                    var putObjectRequest = new Amazon.S3.Model.PutObjectRequest()
-                    {
-                        BucketName = awsConfig.BucketName,
-                        InputStream = memoryStream,
-                        Key = ossRelativePath,
-                    };
-
-                    await amazonS3Client.PutObjectAsync(putObjectRequest);
-                }
-                else
-                {
-                    throw new BusinessValidationFailedException("未定义的存储介质类型");
-                }
+                await amazonS3Client.PutObjectAsync(putObjectRequest);
+            }
+            else
+            {
+                throw new BusinessValidationFailedException("未定义的存储介质类型");
             }
         }
         catch (Exception ex)
@@ -793,42 +910,76 @@ public class OSSService : IOSSService
         }
 
 
+        var returnPath = "/" + ossRelativePath;
 
 
-        return "/" + ossRelativePath;
+        if (ObjectStoreServiceOptions.IsOpenStoreSync && uploadInfo != null)
+        {
+            uploadInfo.FileSize = fileStream.CanSeek ? fileStream.Length : 0;
+            uploadInfo.Path = returnPath;
+            uploadInfo.FileName = fileRealName;
+            uploadInfo.FileType = Path.GetExtension(returnPath).TrimStart('.');
+
+
+            await _fileUploadRecordService.AddOrUpdateFileUploadRecord(uploadInfo);
+        }
+
+
+        return returnPath;
 
     }
 
 
+
     //后端批量上传 或者下载，不每个文件获取临时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)
+
+
+            if (AWSTempToken != null && AWSTempToken.Expiration > DateTime.Now.AddMinutes(15))
             {
-                GetObjectStoreTempToken();
+                return;
             }
-            //token 过期了
-            if (AWSTempToken.Expiration?.AddSeconds(10) <= DateTime.Now)
+
+            lock (_tokenLock)
             {
-                GetObjectStoreTempToken();
+                if (AWSTempToken == null ||
+                    AWSTempToken.Expiration <= DateTime.Now.AddMinutes(15))
+                {
+                    GetObjectStoreTempToken();
+
+                    Log.Logger.Warning("后端获取s3 临时 Token");
+                }
             }
+
         }
+
+
     }
 
 
@@ -841,10 +992,12 @@ public class OSSService : IOSSService
     /// <param name="randomFileName">随机文件名</param>
     /// <returns></returns>
     /// <exception cref="BusinessValidationFailedException"></exception>
-    public async Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true, bool randomFileName = false)
+    public async Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true, bool randomFileName = false, FileUploadRecordAddOrEdit? uploadInfo = null)
     {
         BackBatchGetToken();
 
+        long fileSize = 0;
+
         var localFileName = Path.GetFileName(localFilePath);
 
         var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{localFileName}" : $"{oosFolderPath}/{localFileName}";
@@ -864,6 +1017,8 @@ public class OSSService : IOSSService
             // 上传文件
             var result = _ossClient.PutObject(aliConfig.BucketName, ossRelativePath, localFilePath);
 
+            fileSize = result.ContentLength;
+
         }
         else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
         {
@@ -879,7 +1034,9 @@ public class OSSService : IOSSService
                    .WithObject(ossRelativePath)
                    .WithFileName(localFilePath);
 
-            await minioClient.PutObjectAsync(putObjectArgs);
+            var result = await minioClient.PutObjectAsync(putObjectArgs);
+
+            fileSize = result.Size;
         }
         else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
         {
@@ -904,14 +1061,30 @@ public class OSSService : IOSSService
                 Key = ossRelativePath,
             };
 
-            await amazonS3Client.PutObjectAsync(putObjectRequest);
-
+            var result = await amazonS3Client.PutObjectAsync(putObjectRequest);
+            fileSize = result.ContentLength;
         }
         else
         {
             throw new BusinessValidationFailedException("未定义的存储介质类型");
         }
-        return "/" + ossRelativePath;
+
+        var returnPath = "/" + ossRelativePath;
+
+
+        if (ObjectStoreServiceOptions.IsOpenStoreSync && uploadInfo != null)
+        {
+            uploadInfo.FileSize = fileSize;
+            uploadInfo.Path = returnPath;
+            uploadInfo.FileName = Path.GetFileName(localFilePath);
+            uploadInfo.FileType = Path.GetExtension(returnPath).TrimStart(".");
+
+
+            await _fileUploadRecordService.AddOrUpdateFileUploadRecord(uploadInfo);
+        }
+
+
+        return returnPath;
 
     }
 
@@ -920,6 +1093,13 @@ public class OSSService : IOSSService
     {
         BackBatchGetToken();
 
+        // 确保目标目录存在
+        string directory = Path.GetDirectoryName(localFilePath);
+        if (!string.IsNullOrEmpty(directory) && !Directory.Exists(directory))
+        {
+            Directory.CreateDirectory(directory);
+        }
+
         ossRelativePath = ossRelativePath.TrimStart('/');
         try
         {
@@ -1023,11 +1203,6 @@ public class OSSService : IOSSService
                 // 直接返回流
                 return result.Content;
 
-                //// 将OSS返回的流复制到内存流中并返回
-                //var memoryStream = new MemoryStream();
-                //await result.Content.CopyToAsync(memoryStream);
-                //memoryStream.Position = 0; // 重置位置以便读取
-                //return memoryStream;
             }
             else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
             {
@@ -1076,8 +1251,8 @@ public class OSSService : IOSSService
 
                 var clientConfig = new AmazonS3Config
                 {
-                    RegionEndpoint = RegionEndpoint.USEast1,
-                    UseHttp = true,
+                    RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
+                    //,UseHttp = true,
                 };
 
                 var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@@ -1093,10 +1268,6 @@ public class OSSService : IOSSService
                 // ⭐ 直接返回流
                 return response.ResponseStream;
 
-                //var memoryStream = new MemoryStream();
-                //await response.ResponseStream.CopyToAsync(memoryStream);
-                //memoryStream.Position = 0;
-                //return memoryStream;
             }
             else
             {
@@ -1337,8 +1508,8 @@ public class OSSService : IOSSService
 
                 var clientConfig = new AmazonS3Config
                 {
-                    RegionEndpoint = RegionEndpoint.USEast1,
-                    UseHttp = true,
+                    RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
+                    //,UseHttp = true,
                 };
 
                 var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
@@ -1440,9 +1611,36 @@ public class OSSService : IOSSService
     /// <returns></returns>
     public async Task DeleteFromPrefix(string prefix, bool isCache = false)
     {
-        GetObjectStoreTempToken();
+        if (prefix.StartsWith("/"))
+        {
+            prefix = prefix.TrimStart("/");
+        }
 
-        if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+        //打开了同步的，删除的时候，一起删除
+        if (ObjectStoreServiceOptions.IsOpenStoreSync && ObjectStoreServiceOptions.SyncConfigList.Any(t => t.IsOpenSync))
+        {
+            foreach (var config in ObjectStoreServiceOptions.SyncConfigList.Where(t => t.IsOpenSync))
+            {
+
+
+                GetObjectStoreTempToken(objectUse: config.Primary);
+
+                await DeleteFromPrefixInternal(config.Primary, prefix, isCache);
+            }
+        }
+        else
+        {
+            GetObjectStoreTempToken();
+
+            await DeleteFromPrefixInternal(ObjectStoreServiceOptions.ObjectStoreUse, prefix, isCache);
+        }
+
+    }
+
+
+    private async Task DeleteFromPrefixInternal(string objectUse, string prefix, bool isCache = false)
+    {
+        if (objectUse == "AliyunOSS")
         {
             var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
 
@@ -1498,7 +1696,7 @@ public class OSSService : IOSSService
 
 
         }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
+        else if (objectUse == "MinIO")
         {
             var minIOConfig = ObjectStoreServiceOptions.MinIO;
 
@@ -1535,7 +1733,7 @@ public class OSSService : IOSSService
 
 
         }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+        else if (objectUse == "AWS")
         {
 
             var awsConfig = ObjectStoreServiceOptions.AWS;
@@ -1591,8 +1789,31 @@ public class OSSService : IOSSService
         }
     }
 
+
     public async Task DeleteObjects(List<string> objectKeys, bool isCache = false)
     {
+        //打开了同步的，删除的时候，一起删除
+        if (ObjectStoreServiceOptions.IsOpenStoreSync && ObjectStoreServiceOptions.SyncConfigList.Any(t => t.IsOpenSync))
+        {
+            foreach (var config in ObjectStoreServiceOptions.SyncConfigList.Where(t => t.IsOpenSync))
+            {
+
+                GetObjectStoreTempToken(objectUse: config.Primary);
+
+                await DeleteObjectsInternal(objectKeys, isCache);
+            }
+        }
+        else
+        {
+            GetObjectStoreTempToken();
+
+            await DeleteObjectsInternal(objectKeys, isCache);
+        }
+    }
+    public async Task DeleteObjectsInternal(List<string> objectKeys, bool isCache = false)
+    {
+
+
         GetObjectStoreTempToken();
 
         if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
@@ -1755,13 +1976,42 @@ public class OSSService : IOSSService
 
 
 
-    public ObjectStoreDTO GetObjectStoreTempToken()
+    public ObjectStoreDTO GetObjectStoreTempToken(string? domain = null, bool? isGetAllTempToken = null, string? objectUse = null)
     {
-
-        var ossOptions = ObjectStoreServiceOptions.AliyunOSS;
-
-        if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+        string objectStoreUse = string.Empty;
+        //使用指定配置
+        if (objectUse != null)
         {
+            objectStoreUse = objectUse?.Trim() ?? string.Empty;
+        }
+        //根据域名动态判断
+        else
+        {
+            //如果传递了域名，并且打开了存储同步，根据域名使用的具体存储覆盖之前的配置，否则就用固定的配置
+            if (ObjectStoreServiceOptions.IsOpenStoreSync && domain.IsNotNullOrEmpty() && ObjectStoreServiceOptions.SyncConfigList.Any(t => t.Domain == domain))
+            {
+
+                var find = ObjectStoreServiceOptions.SyncConfigList.FirstOrDefault(t => t.Domain == domain);
+                if (find != null)
+                {
+                    objectStoreUse = find.Primary;
+                }
+
+            }
+            else
+            {
+                //兜底，如果是本地测试环境，那就使用部署默认配置
+                objectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse;
+            }
+        }
+
+
+        var objectStoreDTO = new ObjectStoreDTO() { ObjectStoreUse = objectStoreUse, IsOpenStoreSync = ObjectStoreServiceOptions.IsOpenStoreSync, SyncConfigList = ObjectStoreServiceOptions.SyncConfigList };
+
+        if (objectStoreUse == "AliyunOSS" || isGetAllTempToken == true)
+        {
+            var ossOptions = ObjectStoreServiceOptions.AliyunOSS;
+
             var client = new Client(new AlibabaCloud.OpenApiClient.Models.Config()
             {
                 AccessKeyId = ossOptions.AccessKeyId,
@@ -1803,13 +2053,14 @@ public class OSSService : IOSSService
 
             AliyunOSSTempToken = tempToken;
 
-            return new ObjectStoreDTO() { ObjectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse, AliyunOSS = tempToken };
+            objectStoreDTO.AliyunOSS = tempToken;
+
         }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
+        if (objectStoreUse == "MinIO")
         {
-            return new ObjectStoreDTO() { ObjectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse, MinIO = ObjectStoreServiceOptions.MinIO };
+            objectStoreDTO.MinIO = ObjectStoreServiceOptions.MinIO;
         }
-        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+        if (objectStoreUse == "AWS" || isGetAllTempToken == true)
         {
             var awsOptions = ObjectStoreServiceOptions.AWS;
 
@@ -1851,12 +2102,111 @@ public class OSSService : IOSSService
             };
 
             AWSTempToken = tempToken;
-            return new ObjectStoreDTO() { ObjectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse, AWS = tempToken };
+
+            objectStoreDTO.AWS = tempToken;
         }
-        else
+
+        if (objectStoreUse.IsNullOrEmpty())
         {
             throw new BusinessValidationFailedException("未定义的存储介质类型");
         }
+
+        return objectStoreDTO;
     }
 
+
+    public async Task SyncFileAsync(string objectKey, ObjectStoreUse source, ObjectStoreUse destination, CancellationToken ct = default)
+    {
+        var tempConfig = GetObjectStoreTempToken(isGetAllTempToken: true);
+
+
+        var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+
+        var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
+
+        var awsConfig = ObjectStoreServiceOptions.AWS;
+
+        var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
+
+        //提供awsEndPoint（域名）进行访问配置
+        var clientConfig = new AmazonS3Config
+        {
+            RegionEndpoint = RegionEndpoint.GetBySystemName(awsConfig.Region)
+        };
+
+        var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
+
+        // ⭐ 关键变量
+        IDisposable? owner = null;
+        Stream sourceStream;
+        long contentLength;
+
+        // ========= 获取流 + 长度 =========
+        switch (source)
+        {
+            case 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,
+                    Headers = { ContentLength = contentLength }
+                };
+
+                await amazonS3Client.PutObjectAsync(putRequest, ct);
+            }
+            else if (destination == ObjectStoreUse.AliyunOSS)
+            {
+                _ossClient.PutObject(
+                    aliConfig.BucketName,
+                    objectKey,
+                    sourceStream);
+            }
+            else
+            {
+                throw new BusinessValidationFailedException("未定义的同步类型");
+            }
+        }
+        finally
+        {
+            // ⭐⭐⭐ 真正释放 HTTP 连接
+            owner?.Dispose();
+        }
+    }
+
+
 }

IRaCIS.Core.Application/Helper/OtherTool/WeComNotifier.cs

@@ -1,13 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using IdentityModel;
 using Newtonsoft.Json;
 using RestSharp;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Net;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
 using System.Threading.Tasks;
-using IdentityModel;
 
 namespace IRaCIS.Core.Application.Helper.OtherTool;
 
@@ -31,6 +32,13 @@ public static class WeComNotifier
 
     public static async Task SendAlertAsync(string webhook, WeComAlert alert)
     {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            await Task.CompletedTask;
+
+            return;
+        }
+
         try
         {
             var client = new RestClient();

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

@@ -33,36 +33,36 @@
 
 	<ItemGroup>
 		<PackageReference Include="IdentityModel.OidcClient" Version="6.0.0" />
-		<PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.6" />
-		<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.1.3" />
+		<PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.2.0" />
 		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
-		<PackageReference Include="AWSSDK.S3" Version="4.0.4.1" />
-		<PackageReference Include="DocX" Version="4.0.25105.5786" />	
+		<PackageReference Include="AWSSDK.S3" Version="4.0.21" />
+		<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.5.19" />
+		<PackageReference Include="DocX" Version="5.0.0" />	
 		<PackageReference Include="FreeSpire.Doc" Version="12.2.0" />
-		<PackageReference Include="ExcelDataReader" Version="3.7.0" />
-		<PackageReference Include="ExcelDataReader.DataSet" Version="3.7.0" />
-		<PackageReference Include="DistributedLock.Redis" Version="1.1.0" />
-		<PackageReference Include="DistributedLock.SqlServer" Version="1.0.6" />
-		<PackageReference Include="fo-dicom" Version="5.2.2" />
-		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.2" />
-		<PackageReference Include="fo-dicom.Codecs" Version="5.16.4" />
-		<PackageReference Include="IP2Region.Net" Version="2.0.2" />
-		<PackageReference Include="MailKit" Version="4.11.0" />
-		<PackageReference Include="Masa.Contrib.Service.MinimalAPIs" Version="1.0.0" />
-		<PackageReference Include="MaxMind.GeoIP2" Version="5.3.0" />
+		<PackageReference Include="ExcelDataReader" Version="3.8.0" />
+		<PackageReference Include="ExcelDataReader.DataSet" Version="3.8.0" />
+		<PackageReference Include="DistributedLock.Redis" Version="1.1.1" />
+		<PackageReference Include="DistributedLock.SqlServer" Version="1.0.7" />
+		<PackageReference Include="fo-dicom" Version="5.2.6" />
+		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.6" />
+		<PackageReference Include="fo-dicom.Codecs" Version="5.16.7" />
+		<PackageReference Include="IP2Region.Net" Version="3.0.2" />
+		<PackageReference Include="MailKit" Version="4.15.1" />
+		<PackageReference Include="Masa.Contrib.Service.MinimalAPIs" Version="1.1.0" />
+		<PackageReference Include="MaxMind.GeoIP2" Version="5.4.1" />
 		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
-		<PackageReference Include="MimeKit" Version="4.11.0" />
+		<PackageReference Include="MimeKit" Version="4.15.1" />
 		<PackageReference Include="MiniExcel" Version="1.41.2" />
 		<PackageReference Include="Minio" Version="6.0.3" />
 		<PackageReference Include="MiniWord" Version="0.9.2" />
-		<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
+		<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
 		<PackageReference Include="My.Extensions.Localization.Json" Version="3.3.0">
 		  <TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
 		<PackageReference Include="NPOI" Version="2.7.4" />
 		<PackageReference Include="Panda.DynamicWebApi" Version="1.2.2" />
-		<PackageReference Include="RestSharp" Version="112.1.0" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
+		<PackageReference Include="RestSharp" Version="114.0.0" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
 		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
 	</ItemGroup>
 

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

@@ -6,15 +6,18 @@ using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Contracts.DTO;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.MassTransit.Command;
+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;
 
@@ -78,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)
@@ -92,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();
@@ -119,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();
 
@@ -320,7 +342,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
                              join study in _studyRepository.AsQueryable() on sv.Id equals study.SubjectVisitId
                              select new CheckDBModel()
                              {
-                                  SubjectStatus = sv.Subject.Status,
+                                 SubjectStatus = sv.Subject.Status,
                                  SubjectVisitId = sv.Id,
                                  SiteCode = sv.TrialSite.TrialSiteCode,
                                  StudyDate = study.StudyTime == null ? string.Empty : ((DateTime)study.StudyTime).ToString("yyyy-MM-dd"),
@@ -403,7 +425,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
                         {
                             SubjectStatus = dbCurrentVisitFirst.SubjectStatus,
                             CheckTime = DateTime.Now,
-                            CheckState=CheckStateEnum.CVPassed,
+                            CheckState = CheckStateEnum.CVPassed,
                             SiteCode = dbCurrentVisitFirst.SiteCode,
                             SubjectCode = dbCurrentVisitFirst.SubjectCode,
                             VisitName = dbCurrentVisitFirst.VisitName,
@@ -448,7 +470,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
 
             var fileStreamResult = (FileStreamResult)await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialConsistentFUllCheckList_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(FullCheckResult));
 
-            var ossRelativePath = await _oSSService.UploadToOSSAsync(fileStreamResult.FileStream, $"{trialId.ToString()}/InspectionUpload/DataReconciliation", "DataReconciliation");
+            var ossRelativePath = await _oSSService.UploadToOSSAsync(fileStreamResult.FileStream, $"{trialId.ToString()}/InspectionUpload/DataReconciliation", "DataReconciliation", uploadInfo: new FileUploadRecordAddOrEdit() { TrialId = trialId, BatchDataType = BatchDataType.DataReconciliation });
 
 
             //var add = await _inspectionFileRepository.FindAsync(inspectionFileId);

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,42 +349,55 @@ 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));
-            messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+
+            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}
-                        trialInfo.ExperimentName,       // 项目   {1}
-                        subjectCode,                    // 受试者 {2}
-                        inDto.SubjectVisit.VisitName,         // 访视  {3}
-                        dictionValue[0],                       // 是否加急 {4}
-                        dictionValue[1],                             // 审批结果 {5}
-                        _systemEmailConfig.SiteUrl      // 链接 {6}
-                    );
+            {
+                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, workLanguage),
+                     string.Join(',', userNames),              // 用户名  {0}
+                    trialInfo.ExperimentName,       // 项目   {1}
+                    subjectCode,                    // 受试者 {2}
+                    inDto.SubjectVisit.VisitName,         // 访视  {3}
+                    dictionValue[0],                       // 是否加急 {4}
+                    dictionValue[1],                             // 审批结果 {5}
+                    _systemEmailConfig.SiteUrl      // 链接 {6}
+                );
 
-                    return (topicStr, htmlBodyStr);
-                };
+                return (topicStr, htmlBodyStr);
+            };
 
-       
-          
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(inDto.EmailNoticeConfig, messageToSend, emailConfigFunc);
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
+
+            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(inDto.EmailNoticeConfig, messageToSend, emailConfigFunc, workLanguage);
+
+            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));
-            messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+
+            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,37 +427,48 @@ public class UrgentIRApplyedReReadingConsumer(
 
             var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == visitid).FirstOrDefaultAsync();
 
+            var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == taskInfo.TrialId);
 
-            foreach (var userinfo in userinfoList)
+            var userWorkLanguageList = userinfoList.Select(x => x.UserWorkLanguage).Distinct().ToList();
+
+            foreach (var workLanguage in userWorkLanguageList)
             {
-                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 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(), }, //任务类型
-             new DictionaryDto (){DictionaryCode= "RequestReReadingResult",EnumValue="0", }, //审批结果 都是待审批
-            }
+                    {
+                        new DictionaryDto (){DictionaryCode= "ReadingCategory",EnumValue=taskInfo.ReadingCategory.GetEnumInt(), }, //任务类型
+                        new DictionaryDto (){DictionaryCode= "RequestReReadingResult",EnumValue="0", }, //审批结果 都是待审批
+                    }
                 });
 
+                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,73 +57,85 @@ 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();
 
-            var messageToSend = new MimeMessage();
 
-            var toUserName = string.Empty;
-
-            //有SPM 并且参与
-            if (trialInfo.IsSPMJoinSiteSurvey && sPMOrCPMList.Count > 0)
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
             {
-                foreach (var user in sPMOrCPMList)
+                //重新设置当前发送邮件的语言
+                isEn_US = workLanguage == UserWorkLanguage.US;
+
+                var messageToSend = new MimeMessage();
+
+                var toUserName = string.Empty;
+
+                //有SPM 并且参与
+                if (trialInfo.IsSPMJoinSiteSurvey && sPMOrCPMList.Count > 0)
                 {
-                    messageToSend.To.Add(new MailboxAddress(user.FullName, user.EMail));
+                    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('、', lan_SPMOrCPMList.Select(t => t.FullName));
+
+                    foreach (var user in pmAndAPMList)
+                    {
+                        messageToSend.Cc.Add(new MailboxAddress(user.FullName, user.EMail));
+                    }
+
+                }
+                else
+                {
+                    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('、', lan_pmAndAPMList.Select(t => t.FullName));
                 }
 
-                toUserName = string.Join('、', sPMOrCPMList.Select(t => t.FullName));
+                //发件地址
+                messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
 
-                foreach (var user in pmAndAPMList)
+
+                var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+
+                Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                 {
-                    messageToSend.Cc.Add(new MailboxAddress(user.FullName, user.EMail));
-                }
+                    var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo);
+                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
+                        toUserName,
+                    siteInfo.TrialSiteCode,
+                    siteInfo.TrialSiteAliasName,
 
+                    siteSurveyInfo.UserName,
+                    siteSurveyInfo.Email,
+                    siteSurveyInfo.Phone,
+                    _systemEmailConfig.SiteUrl
+                        );
+
+                    return (topicStr, htmlBodyStr);
+                };
+
+
+                await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc, workLanguage);
+
+                await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
             }
-            else
-            {
-                foreach (var user in pmAndAPMList)
-                {
-                    messageToSend.To.Add(new MailboxAddress(user.FullName, user.EMail));
-                }
-
-                toUserName = string.Join('、', 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),
-                    toUserName,
-                siteInfo.TrialSiteCode,
-                siteInfo.TrialSiteAliasName,
-
-                siteSurveyInfo.UserName,
-                siteSurveyInfo.Email,
-                siteSurveyInfo.Phone,
-                _systemEmailConfig.SiteUrl
-                    );
-
-                return (topicStr, htmlBodyStr);
-            };
-
-
-             await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
-
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
         }
 
     }
@@ -152,61 +164,74 @@ 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();
-
-            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 toUserName = string.Empty;
-
-            foreach (var item in pmAndAPMList)
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
             {
-                messageToSend.To.Add(new MailboxAddress(item.FullName, item.EMail));
+                //重新设置当前发送邮件的语言
+                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;
+
+                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('、', lan_pmAndAPMList.Select(t => t.FullName));
+                }
+
+                //发件地址
+                messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+
+                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, workLanguage),
+                    toUserName,
+                    siteInfo.TrialSiteCode,  //中心编号
+                    siteInfo.TrialSiteAliasName,//中心名称
+
+                   siteSurveyInfo.UserName, //联系人
+                   siteSurveyInfo.Email,  //联系邮箱
+                   siteSurveyInfo.Phone,  //联系电话
+                   _systemEmailConfig.SiteUrl
+                        );
+
+                    return (topicStr, htmlBodyStr);
+                };
+
+                await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc, workLanguage);
+
+                await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
 
-                toUserName = string.Join('、', 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),
-                toUserName,
-                siteInfo.TrialSiteCode,  //中心编号
-                siteInfo.TrialSiteAliasName,//中心名称
-
-               siteSurveyInfo.UserName, //联系人
-               siteSurveyInfo.Email,  //联系邮箱
-               siteSurveyInfo.Phone,  //联系电话
-               _systemEmailConfig.SiteUrl 
-                    );
-
-                return (topicStr, htmlBodyStr);
-            };
-
-             await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
-
-            await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo);
         }
 
 
@@ -235,92 +260,108 @@ public class SiteSurverRejectedEventConsumer(
 
         var trialSiteSurveyId = context.Message.TrialSiteSurveyId;
 
-        var siteSurveyInfo = _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId ,ignoreQueryFilters:true).FirstOrDefault().IfNullThrowException();
+        var siteSurveyInfo = _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId, ignoreQueryFilters: true).FirstOrDefault().IfNullThrowException();
 
         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)
         {
-           
-
-            var messageToSend = new MimeMessage();
-
-            var toUserName = siteSurveyInfo.UserName;
-
-            if (context.Message.IsHaveSPMOrCPM)
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
             {
-                //PM 驳回到SPM
-                if (siteSurveyInfo.State == TrialSiteSurveyEnum.CRCSubmitted)
+                //重新设置当前发送邮件的语言
+                isEn_US = workLanguage == UserWorkLanguage.US;
+
+
+                var messageToSend = new MimeMessage();
+
+                var toUserName = siteSurveyInfo.UserName;
+
+                if (context.Message.IsHaveSPMOrCPM)
                 {
-                    //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();
-
-
-                    foreach (var user in sPMOrCPMList)
+                    //PM 驳回到SPM
+                    if (siteSurveyInfo.State == TrialSiteSurveyEnum.CRCSubmitted)
                     {
-                        messageToSend.To.Add(new MailboxAddress(user.FullName, user.EMail));
+
+                        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, t.UserRole.IdentityUser.UserWorkLanguage }).ToList();
+
+                        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('、', 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));
+
+                        }
+
                     }
 
-                    toUserName = string.Join('、', sPMOrCPMList.Select(t => t.FullName));
-
                 }
-                //SPM 驳回到CRC
-                else if (siteSurveyInfo.State == TrialSiteSurveyEnum.ToSubmit)
+                else
                 {
-                    messageToSend.To.Add(new MailboxAddress(toUserName, siteSurveyInfo.Email));
+                    //没有SPM  PM驳回到CRC
+
+                    //使用中心国家语言 一致才发送
+                    if ((siteInfo.Country == StaticData.SiteCountry.US && isEn_US) || (siteInfo.Country == StaticData.SiteCountry.CN && isEn_US == false))
+                    {
+                        messageToSend.To.Add(new MailboxAddress(toUserName, siteSurveyInfo.Email));
+
+                    }
                 }
 
-            }
-            else
-            {
-                //没有SPM  PM驳回到CRC
+                //发件地址
+                messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+
+                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, workLanguage),
+                   toUserName,
+                    trialInfo.TrialCode,
+                    trialInfo.ResearchProgramNo,
+                    trialInfo.ExperimentName,
+
+                    siteInfo.TrialSiteCode,  //中心编号
+                    siteInfo.TrialSiteAliasName,//中心名称
+                    siteSurveyInfo.LatestBackReason,  //驳回原因
+                    _systemEmailConfig.SiteUrl,  //链接
+                       (siteSurveyInfo.State == TrialSiteSurveyEnum.ToSubmit ? "inline - block" : "none")
+                        );
+
+                    return (topicStr, htmlBodyStr);
+                };
+
+                await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
+
+                await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
 
-                messageToSend.To.Add(new MailboxAddress(siteSurveyInfo.UserName, 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),
-               toUserName,
-                trialInfo.TrialCode,
-                trialInfo.ResearchProgramNo,
-                trialInfo.ExperimentName,
-
-                siteInfo.TrialSiteCode,  //中心编号
-                siteInfo.TrialSiteAliasName,//中心名称
-                siteSurveyInfo.LatestBackReason,  //驳回原因
-                _systemEmailConfig.SiteUrl,  //链接
-                   (siteSurveyInfo.State == TrialSiteSurveyEnum.ToSubmit ? "inline - block" : "none")
-                    );
-
-                return (topicStr, htmlBodyStr);
-            };
-
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
-
-            await SendEmailHelper.SendEmailAsync(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,80 +49,91 @@ 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)
         {
-
-            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 auditStateCode = "AuditStatePE";
-
-            if (trialInfo.QCProcessEnum == TrialQCProcess.DoubleAudit)
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
             {
-                auditStateCode = "AuditStateRC";
-            }
+                //重新设置当前发送邮件的语言
+                isEn_US = workLanguage == UserWorkLanguage.US;
 
 
+                var iqcList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.IQC).Where(t => t.UserWorkLanguage == workLanguage).ToList();
 
-            var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
-            {
 
-                DictionaryRepository = _dictionaryRepository,
-                IsEn_US = isEn_US,
-                DictionaryList = new List<DictionaryDto>()
+                var pmandAPm = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).ToList();
+
+
+                var auditStateCode = "AuditStatePE";
+
+                if (trialInfo.QCProcessEnum == TrialQCProcess.DoubleAudit)
+                {
+                    auditStateCode = "AuditStateRC";
+                }
+
+                var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+                {
+
+                    DictionaryRepository = _dictionaryRepository,
+                    IsEn_US = isEn_US,
+                    DictionaryList = new List<DictionaryDto>()
             {
              new DictionaryDto (){DictionaryCode= auditStateCode,EnumValue=subjectVisit.AuditState.GetEnumInt(), }, //审核状态
 
             }
-            });
+                });
 
-            var messageToSend = new MimeMessage();
-            //发件地址
-            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+                var messageToSend = new MimeMessage();
+                //发件地址
+                messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+
+
+                foreach (var userinfo in iqcList)
+                {
+                    messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+                }
+
+                var userNames = iqcList.Select(x => x.FullName).ToList();
+
+                foreach (var pm in pmandAPm)
+                {
+                    messageToSend.Cc.Add(new MailboxAddress(pm.FullName, pm.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, workLanguage),
+                       string.Join(',', userNames),  // 用户名  {0}
+                       trialInfo.ExperimentName,        // 项目   {1}
+                       subjectCode, // 受试者 {2}
+                       subjectVisit.VisitName,             // 访视  {3}
+                       dictionValue[0],    // 审核状态 {4}
+                       _systemEmailConfig.SiteUrl             // 链接                  {5}
+                        );
+
+                    return (topicStr, htmlBodyStr);
+                };
+
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc, workLanguage);
+
+                await SendEmailHelper.SendTrialEmailAsync(messageToSend, trialInfo);
 
 
-            foreach (var userinfo in userinfoList)
-            {
-                messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
             }
 
-            var userNames = userinfoList.Select(x => x.FullName).ToList();
 
-            foreach (var pm in pmandAPm)
-            {
-                messageToSend.Cc.Add(new MailboxAddress(pm.FullName, pm.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),
-                   string.Join(',', userNames),  // 用户名  {0}
-                   trialInfo.ExperimentName,        // 项目   {1}
-                   subjectCode, // 受试者 {2}
-                   subjectVisit.VisitName,             // 访视  {3}
-                   dictionValue[0],    // 审核状态 {4}
-                   _systemEmailConfig.SiteUrl             // 链接                  {5}
-                    );
-
-                return (topicStr, htmlBodyStr);
-            };
-
-            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
-
-            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,54 +291,61 @@ 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);
 
 
-
-
-            var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
             {
-
-                DictionaryRepository = _dictionaryRepository,
-                IsEn_US = isEn_US,
-                DictionaryList = new List<DictionaryDto>()
-            {
-          new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=isclose.ToString().ToLower(), }, //是否关闭
-
-         }
-            });
+                //重新设置当前发送邮件的语言
+                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()
+                {
+
+                    DictionaryRepository = _dictionaryRepository,
+                    IsEn_US = isEn_US,
+                    DictionaryList = new List<DictionaryDto>()
+                    {
+                  new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=isclose.ToString().ToLower(), }, //是否关闭
+
+                 }
+                });
 
 
-            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,49 +407,58 @@ 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);
 
-
-
-
-            var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
             {
-
-                DictionaryRepository = _dictionaryRepository,
-                IsEn_US = isEn_US,
-                DictionaryList = new List<DictionaryDto>()
-         {
-          new DictionaryDto (){DictionaryCode= "CheckState",EnumValue=subjectVisit.CheckState.GetEnumInt(), }, //审核状态
-
-         }
-            });
+                //重新设置当前发送邮件的语言
+                isEn_US = workLanguage == UserWorkLanguage.US;
+
+
+
+                var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+                {
+
+                    DictionaryRepository = _dictionaryRepository,
+                    IsEn_US = isEn_US,
+                    DictionaryList = new List<DictionaryDto>()
+                     {
+                      new DictionaryDto (){DictionaryCode= "CheckState",EnumValue=subjectVisit.CheckState.GetEnumInt(), }, //审核状态
+
+                     }
+                });
+
+                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,28 +539,46 @@ public class PMRepliedCheckChallengeEventConsumer(
             modalities = subjectVisit.NoneDicomStudyList.Select(t => t.Modality)
      .Union(subjectVisit.StudyList.Select(k => k.ModalityForEdit)).ToList();
 
-            var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+
+
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            //foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
             {
+                //重新设置当前发送邮件的语言
 
-                DictionaryRepository = _dictionaryRepository,
-                IsEn_US = isEn_US,
-                DictionaryList = new List<DictionaryDto>()
-         {
-            new DictionaryDto (){DictionaryCode= "CheckState",EnumValue=subjectVisit.CheckState.GetEnumInt(), }, //核查状态
+                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();
 
 
-            foreach (var userinfo in userinfoList)
-            {
+                var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+                {
+
+                    DictionaryRepository = _dictionaryRepository,
+                    IsEn_US = isEn_US,
+                    DictionaryList = new List<DictionaryDto>()
+                 {
+                    new DictionaryDto (){DictionaryCode= "CheckState",EnumValue=subjectVisit.CheckState.GetEnumInt(), }, //核查状态
+
+                 }
+                });
+
                 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,49 +651,57 @@ 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);
 
 
-
-
-            var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+            // 遍历语言枚举 在底层判断收件人是否为空，决定是否跳过邮件发送，避免每个邮件场景的地方都重复判断
+            foreach (UserWorkLanguage workLanguage in Enum.GetValues<UserWorkLanguage>())
             {
+                //重新设置当前发送邮件的语言
+                isEn_US = workLanguage == UserWorkLanguage.US;
 
-                DictionaryRepository = _dictionaryRepository,
-                IsEn_US = isEn_US,
-                DictionaryList = new List<DictionaryDto>()
-            {
-             new DictionaryDto (){DictionaryCode= "CheckState",EnumValue=subjectVisit.CheckState.GetEnumInt(), }, //审核状态
+                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()
+                {
+
+                    DictionaryRepository = _dictionaryRepository,
+                    IsEn_US = isEn_US,
+                    DictionaryList = new List<DictionaryDto>()
+                {
+                 new DictionaryDto (){DictionaryCode= "CheckState",EnumValue=subjectVisit.CheckState.GetEnumInt(), }, //审核状态
+
+                }
+                });
 
 
-            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 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;
 
 
@@ -703,6 +771,14 @@ public class QCClaimTaskEventConsumer(
 
 
             var userinfo = subjectVisit.CurrentActionUser;
+            if (userinfo == null)
+            {
+                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();
             //发件地址
@@ -741,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}
@@ -755,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);
 
@@ -181,7 +191,7 @@ public class ImageQCRecurringEventConsumer(IRepository<Trial> _trialRepository,
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
     public async Task Consume(ConsumeContext<ImageQCRecurringEvent> context)
     {
-        var trialId=context.Message.TrialId;
+        var trialId = context.Message.TrialId;
 
         var isEn_us = context.Message.CultureInfoName == StaticData.CultureInfo.en_US;
 
@@ -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
@@ -222,11 +236,11 @@ public class ImageQCRecurringEventConsumer(IRepository<Trial> _trialRepository,
 
                 Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc = trialEmailConfig =>
                 {
-                  
+
                     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,203 +85,213 @@ 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));
-                    messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
 
+                    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 SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
-                    }
-
-
+                    await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc, workLanguage);
+                    await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
                 }
                 catch (Exception)
                 {
-
                 }
-
             }
 
-
         }
-    }
 
-    /// <summary>
-    /// 生效通知
-    /// </summary>
-    public class SystemDocumentPublishEventConsumer(
-     IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository,
-     IRepository<VisitTask> _visitTaskRepository,
-        IRepository<SystemDocument> _systemDocumentRepository,
-          IRepository<IdentityUser> _identityUserRepository,
-                IRepository<SystemDocConfirmedIdentityUser> _systemDocConfirmedUserRepository,
-      IRepository<Dictionary> _dictionaryRepository,
-     IRepository<TrialUserRole> _trialUserRoleRepository,
-     IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+        /// <summary>
+        /// 生效通知
+        /// </summary>
+        public class SystemDocumentPublishEventConsumer(
+         IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository,
+         IRepository<VisitTask> _visitTaskRepository,
+            IRepository<SystemDocument> _systemDocumentRepository,
+              IRepository<IdentityUser> _identityUserRepository,
+                    IRepository<SystemDocConfirmedIdentityUser> _systemDocConfirmedUserRepository,
+          IRepository<Dictionary> _dictionaryRepository,
+         IRepository<TrialUserRole> _trialUserRoleRepository,
+         IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
 
-     IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<SystemDocumentPublishEvent>
-    {
-        private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
-
-        public async Task Consume(ConsumeContext<SystemDocumentPublishEvent> context)
+         IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<SystemDocumentPublishEvent>
         {
-            var isEn_US = context.Message.CultureInfoName == StaticData.CultureInfo.en_US;
+            private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
 
-            //设置当前事件传递过来的语言
-            var culture = context.Message.CultureInfoName;
-            CultureInfo.CurrentCulture = new CultureInfo(culture);
-
-            // 记录是否只发送给新增角色的日志
-            if (context.Message.NewUserTypeIds != null && context.Message.NewUserTypeIds.Any())
+            public async Task Consume(ConsumeContext<SystemDocumentPublishEvent> context)
             {
-                Console.WriteLine($"只发送给新增的角色，角色数量: {context.Message.NewUserTypeIds.Count}");
-            }
-            // 构建查询
-            IQueryable<UnionDocumentWithConfirmInfoView> systemDocQuery;
+                var isEn_US = context.Message.CultureInfoName == StaticData.CultureInfo.en_US;
 
-            if (context.Message.NewUserTypeIds != null && context.Message.NewUserTypeIds.Any())
-            {
-                // 只查询新增角色的用户
-                systemDocQuery =
-                from sysDoc in _systemDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id))
-                from identityUser in _identityUserRepository.AsQueryable(false)
-                .Where(t => t.Status == UserStateEnum.Enable &&
-                       t.UserRoleList.Where(t => t.IsUserRoleDisabled == false)
-                       .Any(t => context.Message.NewUserTypeIds.Contains(t.UserTypeId) &&
-                            sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
-                select new UnionDocumentWithConfirmInfoView()
+                //设置当前事件传递过来的语言
+                var culture = context.Message.CultureInfoName;
+                CultureInfo.CurrentCulture = new CultureInfo(culture);
+
+                // 记录是否只发送给新增角色的日志
+                if (context.Message.NewUserTypeIds != null && context.Message.NewUserTypeIds.Any())
                 {
-                    IsSystemDoc = true,
-                    Id = sysDoc.Id,
-                    CreateTime = sysDoc.CreateTime,
-                    IsDeleted = sysDoc.IsDeleted,
-                    SignViewMinimumMinutes = sysDoc.SignViewMinimumMinutes,
-                    Name = sysDoc.Name,
-                    Path = sysDoc.Path,
-                    FileTypeId = sysDoc.FileTypeId,
-                    UpdateTime = sysDoc.UpdateTime,
-                    ConfirmUserId = identityUser.Id,
-                    RealName = identityUser.FullName,
-                    UserName = identityUser.UserName,
-                    IsNeedSendEmial = identityUser.IsZhiZhun || (!identityUser.IsZhiZhun && sysDoc.DocUserSignType == DocUserSignType.InnerAndOuter),
-                    FullFilePath = sysDoc.Path
-                };
-            }
-            else
-            {
-                // 查询所有相关角色的用户
-                systemDocQuery =
-                from sysDoc in _systemDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id))
-                from identityUser in _identityUserRepository.AsQueryable(false)
-                .Where(t => t.Status == UserStateEnum.Enable &&
-                       t.UserRoleList.Where(t => t.IsUserRoleDisabled == false)
-                       .Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
-                select new UnionDocumentWithConfirmInfoView()
+                    Console.WriteLine($"只发送给新增的角色，角色数量: {context.Message.NewUserTypeIds.Count}");
+                }
+                // 构建查询
+                IQueryable<UnionDocumentWithConfirmInfoView> systemDocQuery;
+
+                if (context.Message.NewUserTypeIds != null && context.Message.NewUserTypeIds.Any())
                 {
-                    IsSystemDoc = true,
-                    Id = sysDoc.Id,
-                    CreateTime = sysDoc.CreateTime,
-                    IsDeleted = sysDoc.IsDeleted,
-                    SignViewMinimumMinutes = sysDoc.SignViewMinimumMinutes,
-                    Name = sysDoc.Name,
-                    Path = sysDoc.Path,
-                    FileTypeId = sysDoc.FileTypeId,
-                    UpdateTime = sysDoc.UpdateTime,
-                    ConfirmUserId = identityUser.Id,
-                    RealName = identityUser.FullName,
-                    UserName = identityUser.UserName,
-                    IsNeedSendEmial = identityUser.IsZhiZhun || (!identityUser.IsZhiZhun && sysDoc.DocUserSignType == DocUserSignType.InnerAndOuter),
-                    FullFilePath = sysDoc.Path
-                };
-            }
-            var datalist = await systemDocQuery.IgnoreQueryFilters().Where(x => x.IsNeedSendEmial).ToListAsync();
-
-            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)
-            {
-                string msg = $"{index}生效通知,邮箱：{userinfo.EMail}，姓名{userinfo.UserName},";
-                index++;
-                try
-                {
-
-                    var messageToSend = new MimeMessage();
-                    //发件地址
-                    messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-                    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 =>
+                    // 只查询新增角色的用户
+                    systemDocQuery =
+                    from sysDoc in _systemDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id))
+                    from identityUser in _identityUserRepository.AsQueryable(false)
+                    .Where(t => t.Status == UserStateEnum.Enable &&
+                           t.UserRoleList.Where(t => t.IsUserRoleDisabled == false)
+                           .Any(t => context.Message.NewUserTypeIds.Contains(t.UserTypeId) &&
+                                sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
+                    select new UnionDocumentWithConfirmInfoView()
                     {
-                        var topicStr = string.Format(input.topicStr, companyName);
-
-                        var htmlBodyStr = string.Format(
-                           CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                           userinfo.UserName,  // 用户名  {0}
-                           _systemEmailConfig.SiteUrl
-                            );
-
-                        return (topicStr, htmlBodyStr);
+                        IsSystemDoc = true,
+                        Id = sysDoc.Id,
+                        CreateTime = sysDoc.CreateTime,
+                        IsDeleted = sysDoc.IsDeleted,
+                        SignViewMinimumMinutes = sysDoc.SignViewMinimumMinutes,
+                        Name = sysDoc.Name,
+                        Path = sysDoc.Path,
+                        FileTypeId = sysDoc.FileTypeId,
+                        UpdateTime = sysDoc.UpdateTime,
+                        ConfirmUserId = identityUser.Id,
+                        RealName = identityUser.FullName,
+                        UserName = identityUser.UserName,
+                        IsNeedSendEmial = identityUser.IsZhiZhun || (!identityUser.IsZhiZhun && sysDoc.DocUserSignType == DocUserSignType.InnerAndOuter),
+                        FullFilePath = sysDoc.Path
                     };
-
-                    var scenario = EmailBusinessScenario.GeneralTraining_EffectiveNotification;
-
-                    var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
-
-                    if (emailConfig != null)
+                }
+                else
+                {
+                    // 查询所有相关角色的用户
+                    systemDocQuery =
+                    from sysDoc in _systemDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id))
+                    from identityUser in _identityUserRepository.AsQueryable(false)
+                    .Where(t => t.Status == UserStateEnum.Enable &&
+                           t.UserRoleList.Where(t => t.IsUserRoleDisabled == false)
+                           .Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
+                    select new UnionDocumentWithConfirmInfoView()
                     {
-                        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
+                        IsSystemDoc = true,
+                        Id = sysDoc.Id,
+                        CreateTime = sysDoc.CreateTime,
+                        IsDeleted = sysDoc.IsDeleted,
+                        SignViewMinimumMinutes = sysDoc.SignViewMinimumMinutes,
+                        Name = sysDoc.Name,
+                        Path = sysDoc.Path,
+                        FileTypeId = sysDoc.FileTypeId,
+                        UpdateTime = sysDoc.UpdateTime,
+                        ConfirmUserId = identityUser.Id,
+                        RealName = identityUser.FullName,
+                        UserName = identityUser.UserName,
+                        IsNeedSendEmial = identityUser.IsZhiZhun || (!identityUser.IsZhiZhun && sysDoc.DocUserSignType == DocUserSignType.InnerAndOuter),
+                        FullFilePath = sysDoc.Path
+                    };
+                }
+                var datalist = await systemDocQuery.IgnoreQueryFilters().Where(x => x.IsNeedSendEmial).ToListAsync();
 
+                var confirmUserIdList = datalist.Select(t => t.ConfirmUserId).Distinct().ToList();
+                var userinfoList = await _identityUserRepository.Where(x => confirmUserIdList.Contains(x.Id)).ToListAsync();
+
+                var scenario = EmailBusinessScenario.GeneralTraining_EffectiveNotification;
+                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)
+                {
+                    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();
+
+                        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, workLanguage),
+                               string.Join(',', userNames),
+                               _systemEmailConfig.SiteUrl
+                                );
+
+                            return (topicStr, htmlBodyStr);
+                        };
+                        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc, workLanguage);
                         await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
                         msg += "发送成功";
+
+                    }
+                    catch (Exception)
+                    {
+                        msg += "发送失败";
+
                     }
 
 
-                }
-                catch (Exception)
-                {
-                    msg += "发送失败";
-
+                    Console.WriteLine(msg);
                 }
 
-
-                Console.WriteLine(msg);
             }
-
         }
     }
 }

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));
-                    messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
 
+                    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));
-                    messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
 
+                    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/TaskMedicalReviewService.cs

@@ -54,8 +54,8 @@ namespace IRaCIS.Core.Application.Service
 
                              .WhereIf(inQuery.DoctorUserIdeaEnum != null, t => t.DoctorUserIdeaEnum == inQuery.DoctorUserIdeaEnum)
                              .WhereIf(inQuery.TrialReadingCriterionId != null, t => t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
-                              .WhereIf(inQuery.IsInvalid != null, t => t.IsInvalid == inQuery.IsInvalid)
-                               .WhereIf(inQuery.IsHaveQuestion != null, t => t.IsHaveQuestion == inQuery.IsHaveQuestion)
+                             .WhereIf(inQuery.IsInvalid != null, t => t.IsInvalid == inQuery.IsInvalid)
+                             .WhereIf(inQuery.IsHaveQuestion != null, t => t.IsHaveQuestion == inQuery.IsHaveQuestion)
 
                              .WhereIf(inQuery.BeginAllocateDate != null, t => t.AllocateTime >= inQuery.BeginAllocateDate)
                              .WhereIf(inQuery.EndAllocateDate != null, t => t.AllocateTime <= inQuery.EndAllocateDate)
@@ -211,23 +211,23 @@ namespace IRaCIS.Core.Application.Service
                 .WhereIf(inQuery.SubjectId != null, t => t.VisitTask.SubjectId == inQuery.SubjectId)
                              .WhereIf(inQuery.TrialSiteId != null, t => t.VisitTask.Subject.TrialSiteId == inQuery.TrialSiteId)
                              .WhereIf(inQuery.IsUrgent != null, t => t.VisitTask.IsUrgent == inQuery.IsUrgent)
-                              .WhereIf(inQuery.AuditState != null, t => t.AuditState == inQuery.AuditState)
-                               .WhereIf(inQuery.DoctorUserIdeaEnum != null, t => t.DoctorUserIdeaEnum == inQuery.DoctorUserIdeaEnum)
-                               .WhereIf(inQuery.TaskState != null, t => t.VisitTask.TaskState == inQuery.TaskState)
-                                .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => t.VisitTask.Subject.Code.Contains(inQuery.SubjectCode) || t.VisitTask.Subject.MedicalNo.Contains(inQuery.SubjectCode))
-                                .WhereIf(!string.IsNullOrEmpty(inQuery.TaskName), t => t.VisitTask.TaskName.Contains(inQuery.TaskName) || t.VisitTask.TaskBlindName.Contains(inQuery.TaskName))
+                             .WhereIf(inQuery.AuditState != null, t => t.AuditState == inQuery.AuditState)
+                             .WhereIf(inQuery.DoctorUserIdeaEnum != null, t => t.DoctorUserIdeaEnum == inQuery.DoctorUserIdeaEnum)
+                             .WhereIf(inQuery.TaskState != null, t => t.VisitTask.TaskState == inQuery.TaskState)
+                             .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => t.VisitTask.Subject.Code.Contains(inQuery.SubjectCode) || t.VisitTask.Subject.MedicalNo.Contains(inQuery.SubjectCode))
+                             .WhereIf(!string.IsNullOrEmpty(inQuery.TaskName), t => t.VisitTask.TaskName.Contains(inQuery.TaskName) || t.VisitTask.TaskBlindName.Contains(inQuery.TaskName))
                              .WhereIf(inQuery.DoctorUserId != null, t => t.VisitTask.DoctorUserId == inQuery.DoctorUserId)
                              .WhereIf(inQuery.ReadingCategory != null, t => t.VisitTask.ReadingCategory == inQuery.ReadingCategory)
                              .WhereIf(inQuery.ReadingTaskState != null, t => t.VisitTask.ReadingTaskState == inQuery.ReadingTaskState)
-                              .WhereIf(inQuery.IsInvalid != null, t => t.IsInvalid == inQuery.IsInvalid)
+                             .WhereIf(inQuery.IsInvalid != null, t => t.IsInvalid == inQuery.IsInvalid)
                              .WhereIf(inQuery.IsGetBeRead, x => !x.IsInvalid && x.AuditState != MedicalReviewAuditState.HaveSigned)
-                              .WhereIf(inQuery.TrialReadingCriterionId != null, t => t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
-                              .WhereIf(inQuery.BeginAuditSignTime != null, t => t.AuditSignTime >= inQuery.BeginAuditSignTime)
-                              .WhereIf(inQuery.EndAuditSignTime != null, t => t.AuditSignTime <= inQuery.EndAuditSignTime)
-                              .WhereIf(inQuery.BeginAllocateDate != null, t => t.AllocateTime >= inQuery.BeginAllocateDate)
+                             .WhereIf(inQuery.TrialReadingCriterionId != null, t => t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
+                             .WhereIf(inQuery.BeginAuditSignTime != null, t => t.AuditSignTime >= inQuery.BeginAuditSignTime)
+                             .WhereIf(inQuery.EndAuditSignTime != null, t => t.AuditSignTime <= inQuery.EndAuditSignTime)
+                             .WhereIf(inQuery.BeginAllocateDate != null, t => t.AllocateTime >= inQuery.BeginAllocateDate)
                              .WhereIf(inQuery.EndAllocateDate != null, t => t.AllocateTime <= inQuery.EndAllocateDate)
 
-                              .WhereIf(inQuery.ArmEnum != null, t => t.VisitTask.ArmEnum == inQuery.ArmEnum)
+                             .WhereIf(inQuery.ArmEnum != null, t => t.VisitTask.ArmEnum == inQuery.ArmEnum)
                              .WhereIf(inQuery.MedicalManagerUserId != null, t => t.MedicalManagerUserId == inQuery.MedicalManagerUserId)
                              .WhereIf(inQuery.BeginSignTime != null, t => t.VisitTask.SignTime > inQuery.BeginSignTime)
                              .WhereIf(inQuery.EndSignTime != null, t => t.VisitTask.SignTime < inQuery.EndSignTime)

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

@@ -43,6 +43,9 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository,
     IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
     IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository,
+    IRepository<Segment> _segmentRepository,
+    IRepository<Segmentation> _segmentationRepository,
+    IRepository<SegmentBinding> _segmentBindingRepository,
     IRepository<DicomInstance> _dicomInstanceRepository,
     IRepository<DicomSeries> _dicomSeriesRepository,
     IRepository<SubjectCanceDoctor> _subjectCanceDoctorRepository,
@@ -1013,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)
 
@@ -1024,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)
@@ -1047,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()
@@ -2220,7 +2223,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         }
     }
 
-    private void CopyForms(VisitTask newTask, VisitTask origenalTask)
+    private async Task CopyForms(VisitTask newTask, VisitTask origenalTask)
     {
         newTask.IsCopyLesionAnswer = true;
         //自定义
@@ -2236,6 +2239,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         //_ = _readingCustomTagRepository.AddRangeAsync(readingCustomTagList).Result;
 
 
+       
 
 
         var readingTaskQuestionAnswerList = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
@@ -2294,6 +2298,64 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             }
         }
 
+
+        #region 分割
+        Dictionary<Guid, Guid> segmentationRelationship = new Dictionary<Guid, Guid>() { };
+        var segmentationList =  _segmentationRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
+
+        foreach (var item in segmentationList)
+        {
+
+            var newSegmentationId = NewId.NextSequentialGuid();
+            segmentationRelationship.Add(item.Id, newSegmentationId);
+            item.Id = newSegmentationId;
+            item.VisitTaskId = newTask.Id;
+        }
+
+
+        Dictionary<Guid, Guid> segmentRelationship = new Dictionary<Guid, Guid>() { };
+        var segmentList =  _segmentRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
+        foreach (var item in segmentList)
+        {
+            var newSegmentationId = NewId.NextSequentialGuid();
+            segmentRelationship.Add(item.Id, newSegmentationId);
+            if (segmentationRelationship.ContainsKey(item.SegmentationId))
+            {
+                item.SegmentationId = segmentationRelationship[item.SegmentationId];
+            }
+            item.Id = newSegmentationId;
+            item.VisitTaskId = newTask.Id;
+        }
+
+        var segmentBindingList =  _segmentBindingRepository.Where(x => x.VisitTaskId == origenalTask.Id).ToList();
+
+        foreach (var item in segmentBindingList)
+        {
+            if (segmentationRelationship.ContainsKey(item.SegmentationId))
+            {
+                item.SegmentationId = segmentationRelationship[item.SegmentationId];
+            }
+            if (segmentRelationship.ContainsKey(item.SegmentId))
+            {
+                item.SegmentId = segmentRelationship[item.SegmentId];
+            }
+
+            if (item.RowId != null && lesionRelationship.ContainsKey(item.RowId.Value))
+            {
+                item.RowId = lesionRelationship[item.RowId.Value];
+            }
+            item.Id = NewId.NextSequentialGuid();
+            item.VisitTaskId = newTask.Id;
+        }
+
+
+        _ = _segmentationRepository.AddRangeAsync(segmentationList).Result;
+        _ = _segmentRepository.AddRangeAsync(segmentList).Result;
+        _ = _segmentBindingRepository.AddRangeAsync(segmentBindingList).Result;
+        #endregion
+
+
+
         foreach (var item in readingTableAnswerRowInfoList)
         {
             if (item.SplitRowId != null && lesionRelationship.ContainsKey(item.SplitRowId.Value))
@@ -2654,6 +2716,19 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         sv.ReviewAuditUserId = null;
         sv.SecondReviewState = SecondReviewState.None;
 
+
+        // 处理阅片期的临床数据
+        var readModuleIdList =await _readModuleRepository.Where(x => x.SubjectVisitId == sv.Id).Select(x => x.Id).ToListAsync();
+
+
+        await _readingClinicalDataReposiotry.UpdatePartialFromQueryAsync(t => readModuleIdList.Contains(t.ReadingId), c => new ReadingClinicalData()
+        {
+            IsSign = false,
+            ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded,
+        });
+
+
+
         if (sv.IsBaseLine)
         {
             await _readingClinicalDataReposiotry.UpdatePartialFromQueryAsync(t => t.ReadingId == sv.Id && (t.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject || t.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit), c => new ReadingClinicalData() { IsSign = false, ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded });

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

@@ -0,0 +1,234 @@
+
+//--------------------------------------------------------------------
+//     此代码由liquid模板自动生成  byzhouhang 20240909
+//	   生成时间 2026-03-10 06:15:31Z 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.Collections.Generic;
+namespace IRaCIS.Core.Application.ViewModel;
+
+public class SubjectFileUploadRecordView
+{
+    public string? SubjectCode { get; set; }
+
+    public string? VisitName { get; set; }
+
+    public string StudyCode { get; set; }
+
+    public Guid? SubjectId { get; set; }
+
+    public Guid? SubjectVisitId { get; set; }
+
+    public int FileCount { get; set; }
+
+
+    public string? UploadRegion { get; set; }
+    public string? TargetRegion { get; set; }
+
+
+    public DateTime CreateTime { get; set; }
+    public DateTime? SyncFinishedTime { get; set; }
+
+    public bool IsSync { get; set; }
+}
+
+public class FileUploadRecordView : FileUploadRecordAddOrEdit
+{
+
+    public DateTime CreateTime { get; set; }
+
+    public DateTime UpdateTime { get; set; }
+
+
+
+    [Comment("同步结束时间-最后一个任务的时间")]
+    public DateTime? SyncFinishedTime { get; set; }
+
+
+    public string? SubjectCode { get; set; }
+
+    public string? VisitName { get; set; }
+
+}
+
+
+public class FileUploadRecordAddOrEdit
+{
+    public Guid? Id { get; set; }
+
+
+    public string FileName { get; set; }
+
+    public long FileSize { get; set; }
+
+    public string FileType { get; set; }
+
+    public string Path { get; set; }
+
+
+    public string UploadBatchId { get; set; }
+    public BatchDataType BatchDataType { get; set; }
+
+    public string StudyCode { get; set; }
+
+    public Guid? TrialId { get; set; }
+
+    public Guid? SubjectId { get; set; }
+
+    public Guid? SubjectVisitId { get; set; }
+
+    public Guid? DicomStudyId { get; set; }
+
+    public Guid? NoneDicomStudyId { get; set; }
+
+
+
+    public string FileMarkId { get; set; }
+
+    public int? Priority { get; set; }
+    public string IP { get; set; }
+    public bool? IsNeedSync { get; set; }
+    public string UploadRegion { get; set; }
+    public string TargetRegion { get; set; }
+
+    public bool? IsSync { get; set; }
+}
+
+
+public class SubjectFileUploadRecordQuery : PageInput
+{
+    public Guid TrialId { get; set; }
+
+    public string? SubjectCode { get; set; }
+
+    public string? VisitName { get; set; }
+
+    public string? StudyCode { get; set; }
+
+    public string? UploadRegion { get; set; }
+    public string? TargetRegion { get; set; }
+
+    public bool? IsSync { get; set; }
+
+
+}
+
+public class FileUploadRecordQuery : PageInput
+{
+
+    public BatchDataType? BatchDataType { get; set; }
+
+    public Guid? TrialId { get; set; }
+
+    public int? DataFileType { get; set; }
+
+    public string StudyCode { get; set; }
+
+    public string? SubjectCode { get; set; }
+
+    public string? VisitName { get; set; }
+
+
+    public Guid? SubjectId { get; set; }
+
+    public Guid? SubjectVisitId { get; set; }
+
+
+
+    public string? FileMarkId { get; set; }
+
+    public string? FileName { get; set; }
+
+
+    public string? FileType { get; set; }
+
+    public string? IP { get; set; }
+
+    public bool? IsNeedSync { get; set; }
+
+    public bool? IsSync { get; set; }
+
+
+    public string? Path { get; set; }
+
+    public int? Priority { get; set; }
+
+    public string? TargetRegion { get; set; }
+
+
+    public string? UploadBatchId { get; set; }
+
+    public string? UploadRegion { get; set; }
+
+
+    public DateTime? SyncFinishedStartTime { get; set; }
+
+    public DateTime? SyncFinishedEndTime { get; set; }
+
+    public DateTime? UploadStartTime { get; set; }
+
+    public DateTime? UploadEndTime { get; set; }
+}
+
+
+
+public class UploadFileSyncRecordView
+{
+    public Guid Id { get; set; }
+
+
+    public DateTime? StartTime { get; set; }
+
+    public DateTime? EndTime { get; set; }
+
+    public jobState JobState { get; set; }
+
+
+    public string Msg { get; set; }
+
+    public DateTime CreateTime { get; set; }
+
+    public DateTime UpdateTime { get; set; }
+
+
+    public Guid? FileUploadRecordId { get; set; }
+    public string? FileName { get; set; }
+
+    public string? FileType { get; set; }
+
+    public string? Path { get; set; }
+
+
+    public string StudyCode { get; set; }
+
+    public string? SubjectCode { get; set; }
+
+    public string? VisitName { get; set; }
+
+
+
+}
+
+public class UploadFileSyncRecordQuery : PageInput
+{
+
+    public Guid? FileUploadRecordId { get; set; }
+
+
+    public jobState? JobState { get; set; }
+
+    public string? SubjectCode { get; set; }
+
+    public string? VisitName { get; set; }
+
+    public string? StudyCode { get; set; }
+}
+
+public class BatchAddSyncFileCommand
+{
+    public List<Guid> FileUploadRecordIdList { get; set; }
+
+    public int? Priority { get; set; }
+}

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/EmailLogService.cs

@@ -155,7 +155,8 @@ public class EmailLogService(IRepository<EmailLog> _emailLogRepository,
                                     fileStream: decodeStream,
                                     oosFolderPath: $"EmailAttachment/{emailInfo.Id}",   // OSS 虚拟目录
                                     fileRealName: emaliAttachmentInfo.AttachmentName,
-                                    isFileNameAddGuid: true);             // 让方法自己在文件名前加 Guid
+                                    isFileNameAddGuid: true,
+                                    uploadInfo: new FileUploadRecordAddOrEdit() {TrialId= inDto.TrialId, BatchDataType = BatchDataType.EmailAttach });             // 让方法自己在文件名前加 Guid
 
                                 attachmentInfos.Add(emaliAttachmentInfo);
                             }

IRaCIS.Core.Application/Service/Common/Export/ExcelExportService.cs

@@ -984,7 +984,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var query = _subjectVisitRepository.Where(x => x.TrialId == inQuery.TrialId)
                        .Where(t => t.Subject.IsSubjectQuit == false || t.SubmitState >= SubmitStateEnum.ToSubmit)
-
+                        .WhereIf(inQuery.SubjectStatus != null, t => t.Subject.Status == inQuery.SubjectStatus)
                        .Where(t => t.Subject.FinalSubjectVisitId != null ? t.VisitNum <= t.Subject.FinalSubjectVisit.VisitNum : true)
                        .WhereIf(inQuery.TrialSiteId != null, t => t.TrialSiteId == inQuery.TrialSiteId)
                        .WhereIf(inQuery.SubjectId != null, t => t.Subject.Id == inQuery.SubjectId)
@@ -1034,7 +1034,7 @@ namespace IRaCIS.Core.Application.Service.Common
             var query = _subjectVisitRepository.Where(x => x.TrialId == inQuery.TrialId)
 
                          .Where(t => t.Subject.IsSubjectQuit == false || t.AuditState > AuditStateEnum.ToAudit)
-
+                          .WhereIf(inQuery.SubjectStatus != null, t => t.Subject.Status == inQuery.SubjectStatus)
                          .WhereIf(inQuery.VisitId != null, t => t.Id == inQuery.VisitId)
                         .WhereIf(inQuery.CurrentActionUserId != null, t => t.CurrentActionUserId == inQuery.CurrentActionUserId)
                         .WhereIf(inQuery.ChallengeState != null, t => t.ChallengeState == inQuery.ChallengeState)
@@ -2774,7 +2774,7 @@ namespace IRaCIS.Core.Application.Service.Common
             {
                 list.Add(new ExportDocumentDes() { Code = StaticData.Export.IVUS_CDISC_Export, ExportCatogory = ExportResult.IVUS_CDISC_Export });
             }
-            if (criterion.CriterionGroup != CriterionGroup.Tumor && criterion.CriterionType != CriterionType.OCT && criterion.CriterionType != CriterionType.IVUS)
+            if (criterion.CriterionGroup != CriterionGroup.Tumor /*&& criterion.CriterionType != CriterionType.OCT && criterion.CriterionType != CriterionType.IVUS*/)
             {
                 list.Add(new ExportDocumentDes() { Code = StaticData.Export.CDISC_Reading_Export, ExportCatogory = ExportResult.NoneTumorCDISC });
             }

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

@@ -0,0 +1,589 @@
+
+//--------------------------------------------------------------------
+//     此代码由liquid模板自动生成  byzhouhang 20240909
+//     生成时间 2026-03-10 06:15:17Z 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using DocumentFormat.OpenXml.Office2010.ExcelAc;
+using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.Interfaces;
+using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Core.Infra.EFCore.Common;
+using IRaCIS.Core.Infrastructure.Extention;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Spire.Doc.Interface;
+using System.Drawing;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Service;
+
+[ApiExplorerSettings(GroupName = "Common")]
+public class FileUploadRecordService(IRepository<FileUploadRecord> _fileUploadRecordRepository, IRepository<UploadFileSyncRecord> _uploadFileSyncRecordRepository,
+                                  IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IOptionsMonitor<ObjectStoreServiceOptions> options,
+                                  IFusionCache _fusionCache, IRepository<Trial> _trialRepository, FileSyncQueue _fileSyncQueue) : BaseService, IFileUploadRecordService
+{
+
+    ObjectStoreServiceOptions ObjectStoreServiceConfig = options.CurrentValue;
+
+
+
+    /// <summary>
+    /// 按照 subject  visit  studyCode 三个维度进行分组的查询列表  （subject相关）
+    /// </summary>
+    /// <param name="inQuery"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public async Task<PageOutput<SubjectFileUploadRecordView>> GetSubjectUploadRecordList(SubjectFileUploadRecordQuery inQuery)
+    {
+
+        var query = _fileUploadRecordRepository.Where(t => t.TrialId == inQuery.TrialId && t.SubjectId != null)
+               .WhereIf(!string.IsNullOrEmpty(inQuery.VisitName), t => t.SubjectVisit.VisitName.Contains(inQuery.VisitName))
+               .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => t.Subject.Code.Contains(inQuery.SubjectCode))
+               .WhereIf(!string.IsNullOrEmpty(inQuery.StudyCode), t => t.StudyCode.Contains(inQuery.StudyCode))
+               .WhereIf(!string.IsNullOrEmpty(inQuery.UploadRegion), t => t.UploadRegion == inQuery.UploadRegion)
+               .WhereIf(!string.IsNullOrEmpty(inQuery.TargetRegion), t => t.TargetRegion == inQuery.TargetRegion)
+               .WhereIf(inQuery.IsSync != null, t => t.IsSync == inQuery.IsSync)
+             .GroupBy(t => new { t.StudyCode, SubjectCode = t.Subject.Code, t.SubjectVisit.VisitName, t.SubjectId, t.SubjectVisitId })
+             .Select(g => new SubjectFileUploadRecordView()
+             {
+                 SubjectCode = g.Key.SubjectCode,
+                 VisitName = g.Key.VisitName,
+                 StudyCode = g.Key.StudyCode,
+                 SubjectId = g.Key.SubjectId,
+                 SubjectVisitId = g.Key.SubjectVisitId,
+
+                 FileCount = g.Count(),
+
+                 CreateTime = g.Max(t => t.CreateTime),
+
+                 SyncFinishedTime = g.Max(t => t.SyncFinishedTime),
+
+                 UploadRegion = g.First().UploadRegion,
+
+                 TargetRegion = g.First().TargetRegion,
+
+                 IsSync = !g.Any(t => t.IsSync == false || t.IsSync == null)
+
+             });
+
+
+        var pageList = await query.ToPagedListAsync(inQuery);
+
+        return pageList;
+    }
+
+
+
+    /// <summary>
+    /// 上传记录表--里面包含待同步任务 DataFileType= 0 ：代表系统文件   1：Subject相关    2:项目相关，但是和subject 没关系
+    /// </summary>
+    /// <param name="inQuery"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public async Task<PageOutput<FileUploadRecordView>> GetFileUploadRecordList(FileUploadRecordQuery inQuery)
+    {
+
+        var fileUploadRecordQueryable = _fileUploadRecordRepository
+               .WhereIf(!string.IsNullOrEmpty(inQuery.FileName), t => t.FileName.Contains(inQuery.FileName))
+               .WhereIf(!string.IsNullOrEmpty(inQuery.FileType), t => t.FileType.Contains(inQuery.FileType))
+               .WhereIf(inQuery.TrialId != null, t => t.TrialId == inQuery.TrialId)
+
+               .WhereIf(inQuery.SubjectId != null, t => t.SubjectId == inQuery.SubjectId)
+               .WhereIf(inQuery.SubjectVisitId != null, t => t.SubjectVisitId == inQuery.SubjectVisitId)
+               .WhereIf(!string.IsNullOrEmpty(inQuery.StudyCode), t => t.StudyCode.Contains(inQuery.StudyCode))
+                .WhereIf(!string.IsNullOrEmpty(inQuery.VisitName), t => t.SubjectVisit.VisitName.Contains(inQuery.VisitName))
+                .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => t.Subject.Code.Contains(inQuery.SubjectCode))
+
+               .WhereIf(inQuery.DataFileType == 1 && inQuery.SubjectId != null && inQuery.SubjectVisitId == null, t => t.SubjectVisitId == null)
+               .WhereIf(inQuery.DataFileType == 1 && inQuery.SubjectVisitId != null && inQuery.StudyCode == "", t => t.StudyCode == "")
+               .WhereIf(inQuery.DataFileType == 1 && inQuery.SubjectCode.IsNotNullOrEmpty() && inQuery.VisitName.IsNullOrEmpty(), t => t.SubjectVisitId == null)
+               .WhereIf(inQuery.DataFileType == 1 && inQuery.VisitName.IsNotNullOrEmpty() && inQuery.StudyCode == "", t => t.StudyCode == "")
+
+               .WhereIf(inQuery.DataFileType == 0, t => t.TrialId == null)
+               .WhereIf(inQuery.DataFileType == 1, t => t.SubjectId != null)
+               .WhereIf(inQuery.DataFileType == 2, t => t.SubjectId == null)
+
+               .WhereIf(inQuery.IsNeedSync != null, t => t.IsNeedSync == inQuery.IsNeedSync)
+
+               .WhereIf(inQuery.IsSync != null, t => t.IsSync == inQuery.IsSync)
+               .WhereIf(inQuery.Priority != null, t => t.Priority == inQuery.Priority)
+               .WhereIf(inQuery.BatchDataType != null, t => t.BatchDataType == inQuery.BatchDataType)
+                .WhereIf(!string.IsNullOrEmpty(inQuery.UploadRegion), t => t.UploadRegion == inQuery.UploadRegion)
+               .WhereIf(!string.IsNullOrEmpty(inQuery.TargetRegion), t => t.TargetRegion == inQuery.TargetRegion)
+               .WhereIf(!string.IsNullOrEmpty(inQuery.UploadBatchId), t => t.UploadBatchId.Contains(inQuery.UploadBatchId))
+               .WhereIf(!string.IsNullOrEmpty(inQuery.Path), t => t.Path.Contains(inQuery.Path))
+               .WhereIf(inQuery.UploadStartTime != null, t => t.CreateTime >= inQuery.UploadStartTime)
+               .WhereIf(inQuery.UploadEndTime != null, t => t.CreateTime <= inQuery.UploadEndTime)
+               .WhereIf(inQuery.SyncFinishedStartTime != null, t => t.SyncFinishedTime >= inQuery.SyncFinishedStartTime)
+               .WhereIf(inQuery.SyncFinishedEndTime != null, t => t.SyncFinishedTime <= inQuery.SyncFinishedEndTime)
+
+                .ProjectTo<FileUploadRecordView>(_mapper.ConfigurationProvider);
+
+        var pageList = await fileUploadRecordQueryable.ToPagedListAsync(inQuery);
+
+        return pageList;
+    }
+
+    /// <summary>
+    /// 任务具体执行记录表 
+    /// </summary>
+    /// <param name="inQuery"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public async Task<PageOutput<UploadFileSyncRecordView>> GetUploadFileSyncRecordList(UploadFileSyncRecordQuery inQuery)
+    {
+
+        var fileUploadRecordQueryable = _uploadFileSyncRecordRepository
+               .WhereIf(inQuery.JobState != null, t => t.JobState == inQuery.JobState)
+               .WhereIf(inQuery.FileUploadRecordId != null, t => t.FileUploadRecordId == inQuery.FileUploadRecordId)
+                .WhereIf(!string.IsNullOrEmpty(inQuery.StudyCode), t => t.FileUploadRecord.StudyCode.Contains(inQuery.StudyCode))
+                .WhereIf(!string.IsNullOrEmpty(inQuery.VisitName), t => t.FileUploadRecord.SubjectVisit.VisitName.Contains(inQuery.VisitName))
+                .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => t.FileUploadRecord.Subject.Code.Contains(inQuery.SubjectCode))
+
+                .ProjectTo<UploadFileSyncRecordView>(_mapper.ConfigurationProvider);
+
+        var pageList = await fileUploadRecordQueryable.ToPagedListAsync(inQuery);
+
+        return pageList;
+    }
+
+
+    /// <summary>
+    /// 批量设置为需要同步，并且设置优先级
+    /// </summary>
+    /// <param name="inComand"></param>
+    /// <returns></returns>
+    public async Task<IResponseOutput> BatchAddSyncFileTask(BatchAddSyncFileCommand inComand)
+    {
+
+
+        await _fileUploadRecordRepository.BatchUpdateNoTrackingAsync(t => inComand.FileUploadRecordIdList.Contains(t.Id), u => new FileUploadRecord() { IsNeedSync = true, Priority = inComand.Priority ?? 0 });
+
+        foreach (var item in inComand.FileUploadRecordIdList)
+        {
+            _fileSyncQueue.Enqueue(item, inComand.Priority ?? 0);
+
+        }
+
+
+        await _fileUploadRecordRepository.SaveChangesAsync();
+
+        return ResponseOutput.Ok();
+    }
+
+
+
+
+    public async Task<IResponseOutput> AddOrUpdateFileUploadRecord(FileUploadRecordAddOrEdit addOrEditFileUploadRecord)
+    {
+
+        addOrEditFileUploadRecord.IP = _userInfo.IP;
+
+        if (ObjectStoreServiceConfig.IsOpenStoreSync && _userInfo.Domain.IsNotNullOrEmpty())
+        {
+            var find = ObjectStoreServiceConfig.SyncConfigList.FirstOrDefault(t => t.Domain == _userInfo.Domain);
+            if (find != null)
+            {
+                addOrEditFileUploadRecord.UploadRegion = find.UploadRegion;
+                addOrEditFileUploadRecord.TargetRegion = find.TargetRegion;
+
+            }
+            else
+            {
+                //前后端调试的时候，上传的时候域名不对应，自动按照后端配置设置上传区域和同步区域
+                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)
+        {
+
+            var trialDataStore = await _fusionCache.GetOrSetAsync(CacheKeys.TrialDataStoreType(addOrEditFileUploadRecord.TrialId.Value), async _ =>
+            {
+                return await _trialRepository.Where(t => t.Id == addOrEditFileUploadRecord.TrialId).Select(t => t.TrialDataStoreType)
+                    .FirstOrDefaultAsync();
+            },
+                      TimeSpan.FromDays(7)
+                  );
+
+            //项目配置了，那么就设置需要同步
+            if (trialDataStore == TrialDataStore.MUtiCenter)
+            {
+                addOrEditFileUploadRecord.IsNeedSync = true;
+
+                addOrEditFileUploadRecord.Priority = addOrEditFileUploadRecord.Priority?? 0;
+
+                addOrEditFileUploadRecord.IsSync = false;
+            }
+            else
+            {
+                addOrEditFileUploadRecord.IsNeedSync = false;
+
+                //addOrEditFileUploadRecord.TargetRegion = "";
+
+            }
+
+        }
+        else
+        {
+            //系统文件，默认同步
+            addOrEditFileUploadRecord.IsNeedSync = true;
+
+            addOrEditFileUploadRecord.IsSync = false;
+
+            addOrEditFileUploadRecord.Priority = addOrEditFileUploadRecord.Priority ?? 0;
+        }
+
+        var entity = await _fileUploadRecordRepository.InsertOrUpdateAsync(addOrEditFileUploadRecord, true);
+
+        if (addOrEditFileUploadRecord.IsNeedSync == true)
+        {
+            _fileSyncQueue.Enqueue(entity.Id, addOrEditFileUploadRecord.Priority ?? 0);
+        }
+
+        return ResponseOutput.Ok(entity.Id.ToString());
+
+    }
+
+
+    [HttpDelete("{fileUploadRecordId:guid}")]
+    public async Task<IResponseOutput> DeleteFileUploadRecord(Guid fileUploadRecordId)
+    {
+        var success = await _fileUploadRecordRepository.BatchDeleteNoTrackingAsync(t => t.Id == fileUploadRecordId);
+        return ResponseOutput.Ok();
+    }
+
+}
+
+
+#region 同步队列
+
+
+public sealed class FileSyncQueue
+{
+    /// <summary>
+    /// 优先级队列（仅负责排序）
+    /// </summary>
+    private readonly PriorityQueue<Guid, int> _queue = new();
+
+    /// <summary>
+    /// 当前等待中的任务（唯一真实数据）
+    /// key = Guid
+    /// value = 最新 priority
+    /// </summary>
+    private readonly Dictionary<Guid, int> _waiting = new();
+
+    /// <summary>
+    /// 正在执行的任务（防止重复执行）
+    /// </summary>
+    private readonly HashSet<Guid> _running = new();
+
+    /// <summary>
+    /// worker 等待信号
+    /// </summary>
+    private readonly SemaphoreSlim _signal = new(0);
+
+
+    private readonly object _lock = new();
+
+    // ============================================================
+    // Enqueue
+    // ============================================================
+
+    /// <summary>
+    /// 入队（同 Guid 会覆盖优先级）
+    /// </summary>
+    public void Enqueue(Guid id, int priority)
+    {
+        bool needSignal = false;
+
+        lock (_lock)
+        {
+            // 如果正在执行，忽略（防止重复）
+            if (_running.Contains(id))
+                return;
+
+            // 是否新任务（用于减少 signal 风暴）
+            if (!_waiting.ContainsKey(id))
+                needSignal = true;
+
+            // 更新为最新优先级（最后一次为准）
+            _waiting[id] = priority;   //等价于添加或者更新
+
+            // PriorityQueue 无法更新节点
+            // 允许旧节点存在，Dequeue 时过滤
+            _queue.Enqueue(id, -priority);
+        }
+
+        // 只有新增任务才唤醒 worker
+        if (needSignal)
+            _signal.Release();
+    }
+
+    // ============================================================
+    // Dequeue
+    // ============================================================
+
+    /// <summary>
+    /// 获取一个待执行任务（无任务时自动等待）
+    /// </summary>
+    public async Task<Guid> DequeueAsync(CancellationToken ct)
+    {
+        while (true)
+        {
+            await _signal.WaitAsync(ct);
+
+            lock (_lock)
+            {
+                while (_queue.Count > 0)
+                {
+                    var id = _queue.Dequeue();
+
+                    // 已被覆盖或取消  如果这个任务已经不是“当前最新版任务”，那它只是 PriorityQueue 里的垃圾数据，直接跳过。
+                    if (!_waiting.TryGetValue(id, out _)) //能从等待任务中取到，那么就是有效的，不能取到那么就是覆盖的
+                        continue;
+
+                    // 标记为运行中
+                    _waiting.Remove(id);
+                    _running.Add(id);
+
+                    return id;
+                }
+            }
+        }
+    }
+
+    // ============================================================
+    // Complete
+    // ============================================================
+
+    /// <summary>
+    /// 任务执行完成（必须调用）
+    /// </summary>
+    public void Complete(Guid id)
+    {
+        lock (_lock)
+        {
+            _running.Remove(id);
+        }
+    }
+
+    // ============================================================
+    // Snapshot
+    // ============================================================
+
+    /// <summary>
+    /// 当前等待中的任务快照
+    /// </summary>
+    public Guid[] Snapshot()
+    {
+        lock (_lock)
+        {
+            return _waiting.Keys.ToArray();
+        }
+    }
+
+    // ============================================================
+    // 状态信息（调试用）
+    // ============================================================
+
+    public int WaitingCount
+    {
+        get
+        {
+            lock (_lock)
+                return _waiting.Count;
+        }
+    }
+
+    public int RunningCount
+    {
+        get
+        {
+            lock (_lock)
+                return _running.Count;
+        }
+    }
+}
+
+
+///// <summary>
+///// 同步队列 信号量
+///// </summary>
+//public class FileSyncQueue
+//{
+//    private readonly PriorityQueue<Guid, int> _queue = new();
+//    private readonly SemaphoreSlim _signal = new(0);
+//    private readonly object _lock = new();
+
+//    public void Enqueue(Guid id, int priority)
+//    {
+//        lock (_lock)
+//        {
+//            // priority 越大越优先
+//            _queue.Enqueue(id, -priority);
+//        }
+
+//        //类似于计数器，不会产生通知风暴，可消费资源 +1
+//        //if (有等待线程)  唤醒一个 else 仅增加计数
+//        _signal.Release(); // 唤醒一个 worker
+//    }
+
+//    /// <summary>
+//    /// 如果没有任务 → 挂起等待  有任务 → 被唤醒并返回
+//    /// </summary>
+//    /// <param name="ct"></param>
+//    /// <returns></returns>
+//    public async Task<Guid> DequeueAsync(CancellationToken ct)
+//    {
+//        await _signal.WaitAsync(ct);
+
+//        lock (_lock)
+//        {
+//            return _queue.Dequeue();
+//        }
+//    }
+
+//    /// <summary>
+//    /// 获取队列任务Id
+//    /// </summary>
+//    /// <returns></returns>
+//    public Guid[] Snapshot()
+//    {
+//        lock (_lock)
+//        {
+//            return _queue.UnorderedItems
+//                .Select(x => x.Element)
+//                .ToArray();
+//        }
+//    }
+//}
+
+#region 这里不用 SyncQueueUseChannel   和调度器 SyncScheduler
+public class SyncQueueUseChannel
+{
+    // 优先级队列（priority 越大越先执行）
+    private readonly PriorityQueue<Guid, int> _queue = new();
+
+    // Worker 唤醒信号
+    private readonly Channel<bool> _signal =
+        Channel.CreateUnbounded<bool>(new UnboundedChannelOptions
+        {
+            SingleReader = false,
+            SingleWriter = false
+        });
+
+    // 队列任务数量（不是CPU数量！）
+    private int _count = 0;
+
+
+    private readonly object _lock = new();
+
+    /// <summary>
+    /// 入队任务
+    /// </summary>
+    public void Enqueue(Guid id, int priority)
+    {
+        bool needSignal = false;
+
+        lock (_lock)
+        {
+            // priority 越大越优先 → 转负数
+            _queue.Enqueue(id, -priority);
+
+            // 只有从 0 → 1 才需要唤醒 worker
+            if (_count == 0)
+                needSignal = true;
+
+            _count++;
+        }
+
+        // 避免 signal 风暴
+        if (needSignal)
+            _signal.Writer.TryWrite(true);
+    }
+
+    /// <summary>
+    /// Worker 等待并获取任务
+    /// </summary>
+    public async Task<Guid> DequeueAsync(CancellationToken ct)
+    {
+
+        // 没任务时挂起（不会占CPU）
+        await _signal.Reader.ReadAsync(ct);
+
+        lock (_lock)
+        {
+            var id = _queue.Dequeue();
+
+            _count--;
+
+            // 如果还有任务，继续唤醒下一个 worker
+            if (_count > 0)
+                _signal.Writer.TryWrite(true);
+
+            return id;
+        }
+    }
+
+    /// <summary>
+    /// 当前排队数量（调试用）
+    /// </summary>
+    public int Count
+    {
+        get
+        {
+            lock (_lock)
+                return _count;
+        }
+    }
+}
+
+/// <summary>
+/// 同步调度器
+/// </summary>
+public class FileSyncScheduler
+{
+    private readonly FileSyncQueue _queue;
+
+    public FileSyncScheduler(FileSyncQueue queue)
+    {
+        _queue = queue;
+    }
+
+    public void Enqueue(FileUploadRecord file)
+    {
+        if (file.IsNeedSync != true)
+            return;
+
+        _queue.Enqueue(file.Id, file.Priority ?? 0);
+    }
+
+    /// <summary>
+    /// 如果没有任务 → 挂起等待  有任务 → 被唤醒并返回
+    /// </summary>
+    /// <param name="ct"></param>
+    /// <returns></returns>
+    public Task<Guid> WaitAsync(CancellationToken ct)
+        => _queue.DequeueAsync(ct);
+}
+#endregion
+
+
+
+
+
+
+#endregion
+

IRaCIS.Core.Application/Service/Common/Interface/IFileUploadRecordService.cs

@@ -0,0 +1,23 @@
+
+//--------------------------------------------------------------------
+//     此代码由liquid模板自动生成  byzhouhang 20240909
+//     生成时间 2026-03-10 06:15:31Z 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using System;
+using IRaCIS.Core.Infrastructure.Extention;
+using System.Threading.Tasks;
+using IRaCIS.Core.Application.ViewModel;
+namespace IRaCIS.Core.Application.Interfaces;
+
+public interface IFileUploadRecordService
+{
+
+    Task<PageOutput<FileUploadRecordView>> GetFileUploadRecordList(FileUploadRecordQuery inQuery);
+
+    Task<IResponseOutput> AddOrUpdateFileUploadRecord(FileUploadRecordAddOrEdit addOrEditFileUploadRecord);
+
+    Task<IResponseOutput> DeleteFileUploadRecord(Guid fileUploadRecordId);
+}
+
+

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;
@@ -66,7 +68,7 @@ namespace IRaCIS.Core.Application.Service
 
         Task AddUserSendEmailAsync(Guid userId, string baseUrl, string routeUrl);
 
-        Task AdminResetPwdSendEmailAsync(Guid userId, string pwdNotMd5 = "123456", string baseUrl="");
+        Task AdminResetPwdSendEmailAsync(Guid userId, string pwdNotMd5 = "123456", string baseUrl = "");
 
         Task SiteSurveyUserJoinEmail(Guid trialId, Guid userId, string userTypes, string baseUrl, string rootUrl);
 
@@ -104,10 +106,18 @@ 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,9 +951,9 @@ 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,14 +1032,20 @@ 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)
         {
-            var siteInfo = await _trialSiteRepository.Where(t => t.Id == trialSiteId).Include(x=>x.Trial).FirstOrDefaultAsync();
+            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/Common/_MapConfig.cs

@@ -20,7 +20,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<EmailLog, GetEmailInfoOutDto>()
           .ForMember(t => t.RecipientList, u => u.MapFrom(c => c.EmailRecipientLogList))
-          .ForMember(t => t.AttachmentList, u => u.MapFrom(c => c.AttachmentList)); 
+          .ForMember(t => t.AttachmentList, u => u.MapFrom(c => c.AttachmentList));
 
             CreateMap<EmailLog, EmailLogAddOrEdit>().ReverseMap();
 
@@ -41,7 +41,7 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(t => t.EmailNoticeUserList, u => u.MapFrom(c => c.EmailNoticeUserTypeList));
 
             CreateMap<EmailNoticeConfig, EmailNoticeConfigExportDto>();
-            
+
 
             CreateMap<Dictionary, DicView>()
             .ForMember(t => t.ParentCode, u => u.MapFrom(c => c.Parent.Code));
@@ -89,14 +89,14 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<Internationalization, InternationalizationAddOrEdit>().ReverseMap();
 
             CreateMap<InternationalizationAddOrEdit, IRCGlobalInfoDTO>();
-            
+
 
             CreateMap<Internationalization, BatchInternationalizationDto>().ReverseMap();
 
             CreateMap<Internationalization, IRCGlobalInfoDTO>();
 
             CreateMap<EventStoreRecord, EventStoreRecordView>();
-            
+
             CreateMap<BatchAddInternationalizationDto, InternationalizationAddOrEdit>();
 
 
@@ -116,7 +116,7 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.Subject.TrialSite.TrialSiteCode));
 
 
-            CreateMap<TumorExportBaseModel , TU_Export>();
+            CreateMap<TumorExportBaseModel, TU_Export>();
             CreateMap<TumorExportBaseModel, TR_Export>();
             CreateMap<TumorExportBaseModel, RS_Export>();
             CreateMap<TumorExportBaseModel, CO_Export>();
@@ -124,6 +124,21 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<IVUS_OCTBaseDto, IvusExportDto>();
             CreateMap<IVUS_OCTBaseDto, OctExportDto>();
 
+
+            CreateMap<FileUploadRecord, FileUploadRecordView>()
+                .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.Subject.Code))
+                .ForMember(d => d.VisitName, u => u.MapFrom(s => s.SubjectVisit.VisitName));
+            CreateMap<FileUploadRecord, FileUploadRecordAddOrEdit>().ReverseMap();
+
+
+            CreateMap<UploadFileSyncRecord, UploadFileSyncRecordView>()
+                .ForMember(d => d.FileName, u => u.MapFrom(s => s.FileUploadRecord.FileName))
+                .ForMember(d => d.FileType, u => u.MapFrom(s => s.FileUploadRecord.FileType))
+                .ForMember(d => d.Path, u => u.MapFrom(s => s.FileUploadRecord.Path))
+                .ForMember(d => d.StudyCode, u => u.MapFrom(s => s.FileUploadRecord.StudyCode))
+                .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.FileUploadRecord.Subject.Code))
+                .ForMember(d => d.VisitName, u => u.MapFrom(s => s.FileUploadRecord.SubjectVisit.VisitName));
+
         }
     }
 

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/Doctor/DoctorService.cs

@@ -234,6 +234,7 @@ namespace IRaCIS.Core.Application.Service
                 //重新插入新的 Title记录
                 updateModel.TitleIds.ForEach(titleId => adddata.Add(new DoctorDictionary() { DoctorId = updateModel.Id.Value, KeyName = StaticData.Title, DictionaryId = titleId }));
 
+                indto.ReviewerCode = doctor.ReviewerCode;
                 await _doctorDictionaryRepository.AddRangeAsync(adddata);
 
                 _mapper.Map(indto, doctor);

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,42 +62,51 @@ 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();
 
-            var resultStr = isEn_us ? (result == true ? "Yes" : "No") : (result == true ? "是" : "否");
-
-            if (isEnrollment == true)
+            foreach (var workLanguage in workLanguageList)
             {
-                Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc = trialEmailConfig =>
+                //设置工作语言
+                var isEn_us = workLanguage == UserWorkLanguage.US;
+
+                var resultStr = isEn_us ? (result == true ? "Yes" : "No") : (result == true ? "是" : "否");
+
+
+
+                if (isEnrollment == true)
                 {
-                    var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, taskInfo.ResearchProgramNo, taskInfo.SubjectCode);
+                    Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc = trialEmailConfig =>
+                    {
+                        var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, taskInfo.ResearchProgramNo, taskInfo.SubjectCode);
 
-                    var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
-                       EmailNamePlaceholder, taskInfo.ResearchProgramNo, taskInfo.SubjectCode, resultStr);
+                        var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
+                           EmailNamePlaceholder, taskInfo.ResearchProgramNo, taskInfo.SubjectCode, resultStr);
 
 
-                    return (topicStr, htmlBodyStr, isEn_us, null);
-                };
+                        return (topicStr, htmlBodyStr, isEn_us, null);
+                    };
 
-                await SendTrialEmailAsync(taskInfo.TrialId, taskInfo.CriterionType, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
-            }
-            else
-            {
-                Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc = trialEmailConfig =>
+                    await SendTrialEmailAsync(taskInfo.TrialId, taskInfo.CriterionType, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
+                }
+                else
                 {
-                    var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, taskInfo.ResearchProgramNo, taskInfo.SubjectCode, taskInfo.VisitName);
+                    Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc = trialEmailConfig =>
+                    {
+                        var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, taskInfo.ResearchProgramNo, taskInfo.SubjectCode, taskInfo.VisitName);
 
-                    var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
-                       EmailNamePlaceholder, taskInfo.ResearchProgramNo, taskInfo.SubjectCode, taskInfo.VisitName, resultStr);
+                        var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
+                           EmailNamePlaceholder, taskInfo.ResearchProgramNo, taskInfo.SubjectCode, taskInfo.VisitName, resultStr);
 
 
-                    return (topicStr, htmlBodyStr, isEn_us, null);
-                };
+                        return (topicStr, htmlBodyStr, isEn_us, null);
+                    };
+
+                    await SendTrialEmailAsync(taskInfo.TrialId, taskInfo.CriterionType, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
+                }
 
-                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 () =>
+                        // 只发送给新增的角色
+                        await _mediatorScoped.Publish(new SystemDocumentPublishEvent
                         {
-                            // 创建独立作用域
-                            using (var scope = serviceScopeFactory.CreateScope())
-                            {
-                                // 从新作用域解析服务
-                                var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
-                                // 只发送给新增的角色
-                                await mediator.Publish(new SystemDocumentPublishEvent {
-                                    Ids = new List<Guid> { document.Id },
-                                    NewUserTypeIds = newUserTypeIds
-                                });
-                            }
+                            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,9 +273,12 @@ namespace IRaCIS.Core.Application.Services
         {
 
             var isInternal = _userInfo.IsZhiZhun;
+            var workLanguage = _userInfo.UserWorkLanguage;
 
             var query = from sysDoc in _systemDocumentRepository.Where(t=>t.IsPublish)
-                        .Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+                      .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))
                     //外部人员 只签署 外部需要签署的
                     .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)

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("开始 发布项目文档");
 
-            Task.Run(async () =>
-            {
-                // 创建独立作用域
-                using (var scope = serviceScopeFactory.CreateScope())
-                {
-                    // 从新作用域解析服务
-                    var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
-                    await mediator.Publish(new TrialDocumentPublishEvent { Ids = inDto.Ids });
-                }
-            });
+            await _mediatorScoped.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,7 +578,9 @@ namespace IRaCIS.Core.Application.Services
 
 
             var needSignSystemDocCount = await _systemDocumentRepository.AsQueryable(true).Where(t => t.IsPublish)
-                                    .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)
+                      .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();
 
@@ -969,7 +958,7 @@ namespace IRaCIS.Core.Application.Services
                    IsSystemDoc = true,
                    SysDocUserSignType = sysDoc.DocUserSignType,
                    IsConfirmIdentityUserInner = identityUser.IsZhiZhun,
-                   IsPublish=sysDoc.IsPublish,
+                   IsPublish = sysDoc.IsPublish,
                    Id = sysDoc.Id,
                    CreateTime = sysDoc.CreateTime,
                    IsDeleted = sysDoc.IsDeleted,
@@ -1115,7 +1104,7 @@ namespace IRaCIS.Core.Application.Services
                     return ResponseOutput.NotOk(_localizer["TrialD_DuplicateFileInProject"]);
                 }
 
-                var document = (await _trialDocumentRepository.Where(t => t.Id == addOrEditTrialDocument.Id, true,true).Include(t => t.NeedConfirmedUserTypeList).FirstOrDefaultAsync()).IfNullThrowException();
+                var document = (await _trialDocumentRepository.Where(t => t.Id == addOrEditTrialDocument.Id, true, true).Include(t => t.NeedConfirmedUserTypeList).FirstOrDefaultAsync()).IfNullThrowException();
 
                 bool beforeIsPublish = document.IsPublish;
                 bool beforeIsDeleted = document.IsDeleted;
@@ -1163,21 +1152,13 @@ namespace IRaCIS.Core.Application.Services
                         Console.WriteLine("开始 发送项目文档更新邮件给新增角色");
                         Console.WriteLine(string.Join(",", newUserTypeIds));
 
-                        Task.Run(async () =>
+                        await _mediatorScoped.Publish(new TrialDocumentPublishEvent
                         {
-                            // 创建独立作用域
-                            using (var scope = serviceScopeFactory.CreateScope())
-                            {
-                                // 从新作用域解析服务
-                                var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
-                                // 只发送给新增的角色
-                                await mediator.Publish(new TrialDocumentPublishEvent
-                                {
-                                    Ids = new List<Guid> { document.Id },
-                                    NewUserTypeIds = newUserTypeIds
-                                });
-                            }
+                            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/DicomInstanceModel.cs

@@ -29,6 +29,9 @@
 
         public string SliceThickness { get; set; } = String.Empty;
 
+        public string ImagePositionPatient { get; set; }
+        public string ImageOrientationPatient { get; set; }
+
     }
 
 

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

@@ -13,6 +13,8 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
 
         public bool IsBeMark { get; set; } = false;
 
+        public bool IsBeSegment { get; set; } = false;
+
         public Guid Id { get; set; }
         public Guid StudyId { get; set; }
         public string StudyInstanceUid { get; set; } = String.Empty;
@@ -100,6 +102,10 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
 
         public Guid? SeriesId { get; set; }
 
+        public bool? IsMasked { get; set; }
+
+        public string? PhotometricInterpretation { get; set; }
+
         [JsonIgnore]
         public int ShowOrder { get; set; }
         [JsonIgnore]
@@ -108,6 +114,10 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
         public string WindowCenter { get; set; }
         [JsonIgnore]
         public string WindowWidth { get; set; }
+        [JsonIgnore]
+        public string ImagePositionPatient { get; set; }
+        [JsonIgnore]
+        public string ImageOrientationPatient { get; set; }
 
         public DateTime? RowDate { get; set; }
     }

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

@@ -47,6 +47,50 @@
         public DateTime UpdateTime { get; set; }
         public Guid CreateUserId { get; set; }
         public DateTime CreateTime { get; set; }
+
+        #region 核验
+
+        /// <summary>
+        /// 体重
+        /// </summary>
+        public string PatientWeight { get; set; }
+
+        /// <summary>
+        /// 总剂量
+        /// </summary>
+        public string RadionuclideTotalDose { get; set; } = null!;
+
+        /// <summary>
+        /// 半衰期
+        /// </summary>
+        public string RadionuclideHalfLife { get; set; } = null!;
+
+        /// <summary>
+        /// 注射时间
+        /// </summary>
+        public string RadiopharmaceuticalStartTime { get; set; } = null!;
+
+        /// <summary>
+        /// 成像 / 采集时间
+        /// </summary>
+        public string AcquisitionTime { get; set; } = null!;
+
+
+        #endregion
+
+        /// <summary>
+        /// 是否存在空字符串字段（PatientSex、PatientWeight、RadionuclideTotalDose、RadionuclideHalfLife、RadiopharmaceuticalStartTime、AcquisitionTime 任意一个为空/空字符串）
+        /// </summary>
+        public bool IsHasEmptyPatientInfo =>
+            string.IsNullOrWhiteSpace(PatientSex) ||
+            string.IsNullOrWhiteSpace(PatientWeight) ||
+            string.IsNullOrWhiteSpace(RadionuclideTotalDose) ||
+            string.IsNullOrWhiteSpace(RadionuclideHalfLife) ||
+            string.IsNullOrWhiteSpace(RadiopharmaceuticalStartTime) ||
+            string.IsNullOrWhiteSpace(AcquisitionTime);
+
+
+
     }
 
     public class RelationVisitDTO

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

@@ -1,4 +1,5 @@
 using FellowOakDicom;
+using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Service.ImageAndDoc.DTO;
 using IRaCIS.Core.Domain.Share;
 using Newtonsoft.Json;
@@ -193,6 +194,86 @@ namespace IRaCIS.Core.Application.Contracts
 
     }
 
+    public class EditPatientInfoCommand
+    {
+        public Guid Id { get; set; }
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public string PatientSex { get; set; } = null!;
+
+        /// <summary>
+        /// 体重
+        /// </summary>
+        public string PatientWeight { get; set; }
+
+        /// <summary>
+        /// 总剂量
+        /// </summary>
+        public string RadionuclideTotalDose { get; set; } = null!;
+
+        /// <summary>
+        /// 半衰期
+        /// </summary>
+        public string RadionuclideHalfLife { get; set; } = null!;
+
+        /// <summary>
+        /// 注射时间
+        /// </summary>
+        public string RadiopharmaceuticalStartTime { get; set; } = null!;
+
+        /// <summary>
+        /// 成像 / 采集时间
+        /// </summary>
+        public string AcquisitionTime { get; set; } = null!;
+
+        /// <summary>
+        /// 修改原因
+        /// </summary>
+        public string Reason { get; set; } = null!;
+    }
+
+    public class GetPatientInfoInDto
+    {
+        public Guid StudyId { get; set; }
+    }
+
+    public class PatientInfoDto
+    {
+
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public string PatientSex { get; set; } = null!;
+
+        /// <summary>
+        /// 体重
+        /// </summary>
+        public string PatientWeight { get; set; }
+
+        /// <summary>
+        /// 总剂量
+        /// </summary>
+        public string RadionuclideTotalDose { get; set; } = null!;
+
+        /// <summary>
+        /// 半衰期
+        /// </summary>
+        public string RadionuclideHalfLife { get; set; } = null!;
+
+        /// <summary>
+        /// 注射时间
+        /// </summary>
+        public string RadiopharmaceuticalStartTime { get; set; } = null!;
+
+        /// <summary>
+        /// 成像 / 采集时间
+        /// </summary>
+        public string AcquisitionTime { get; set; } = null!;
+    }
+
     public class PreArchiveDicomStudyCommand
     {
 
@@ -265,6 +346,11 @@ namespace IRaCIS.Core.Application.Contracts
         [NotDefault]
         public Guid StudyMonitorId { get; set; }
 
+        [NotDefault]
+        public string UploadBatchId { get; set; }
+
+
+
         public int FailedFileCount { get; set; }
 
         public string RecordPath { get; set; } = string.Empty;
@@ -289,6 +375,10 @@ namespace IRaCIS.Core.Application.Contracts
         [NotDefault]
         public Guid StudyMonitorId { get; set; }
 
+        [NotDefault]
+        public string UploadBatchId { get; set; }
+
+
         public int FailedFileCount { get; set; }
 
         public string RecordPath { get; set; } = string.Empty;
@@ -352,6 +442,24 @@ namespace IRaCIS.Core.Application.Contracts
 
         #endregion
 
+        #region 核验
+
+        /// <summary>
+        /// 总剂量
+        /// </summary>
+        public string RadionuclideTotalDose { get; set; }
+
+        /// <summary>
+        /// 半衰期
+        /// </summary>
+        public string RadionuclideHalfLife { get; set; }
+
+        /// <summary>
+        /// 注射时间
+        /// </summary>
+        public string RadiopharmaceuticalStartTime { get; set; }
+        #endregion
+
     }
 
     public class AddOrUpdateSeriesDto
@@ -633,6 +741,7 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class DownloadDicomInstanceDto
     {
+        public int NumberOfFrames { get; set; }
         public bool IsEncapsulated { get; set; }
         public Guid InstanceId { get; set; }
         public string FileName { get; set; }
@@ -667,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
@@ -954,7 +1066,7 @@ namespace IRaCIS.Core.Application.Contracts
     }
 
 
-    public class SubjectVisitMarkQuery:PageInput
+    public class SubjectVisitMarkQuery : PageInput
     {
         public Guid TrialId { get; set; }
 
@@ -1038,4 +1150,31 @@ namespace IRaCIS.Core.Application.Contracts
 
         public List<StudyBasicInfo> UploadStudyList { get; set; }
     }
+
+    public class StudyMaskImageCommand
+    {
+        public Guid? SeriesId { get; set; }
+
+        public List<Guid>? InstanceIdList { get; set; }
+
+        public List<MaskRegion> MaskRegionList { get; set; }
+
+
+    }
+
+    public class StudyUndoMaskImageCommand
+    {
+        public Guid? SeriesId { get; set; }
+
+        public List<Guid>? InstanceIdList { get; set; }
+    }
+
+    public class InstanceIdPath
+    {
+        public Guid Id { get; set; }
+
+        public string Path { get; set; }
+    }
+
+
 }

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

@@ -41,6 +41,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         IRepository<VisitTask> _visitTaskRepository,
         IRepository<SubjectVisit> _subjectVisitRepository,
         IOSSService _oSSService,
+        IRepository<FileUploadRecord> _fileUploadRecordRepository,
         IRepository<Dictionary> _dictionaryRepository,
         IRepository<Trial> _trialRepository,
         IRepository<StudyMonitor> _studyMonitorRepository,
@@ -803,6 +804,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 {
                     await _taskStudyRepository.SaveChangesAsync();
                 }
+
+                await _fileUploadRecordRepository.BatchUpdateNoTrackingAsync(t => t.UploadBatchId == incommand.UploadBatchId, u => new FileUploadRecord() { StudyCode = findStudy.StudyCode });
             }
             catch (Exception ex)
             {
@@ -938,8 +941,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             {
                 //存在ivus 和oct 这两种的项目
                 if (_readingQuestionCriterionTrialRepository.Where(t => t.TrialId == info.TrialId &&
-                (t.CriterionType == CriterionType.IVUS || t.CriterionType == CriterionType.OCT)).Distinct().Count() == 2
-                && !_noneDicomStudyReposiotry.Any(t => t.SubjectId == inQuery.SubjectId && t.Modality == "IVUS"))
+                ((t.CriterionType == CriterionType.IVUS || t.CriterionType == CriterionType.OCT) && t.IsConfirm)).Distinct().Count() == 2
+                && _noneDicomStudyReposiotry.Where(t => t.SubjectId == inQuery.SubjectId && t.Modality == "IVUS").Count() != _dicomStudyRepository.Where(t => t.SubjectId == inQuery.SubjectId).Select(t => t.SubjectVisitId).Distinct().Count()
+                )
                 {
                     #region ivus 自动创建非dicom检查
 
@@ -957,6 +961,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                            }).ToListAsync();
 
+                    var noneDicomStudyVisitIdList = _noneDicomStudyReposiotry.Where(t => t.SubjectId == inQuery.SubjectId && t.Modality == "IVUS").Select(t => t.SubjectVisitId).ToList();
 
                     var @lock = _distributedLockProvider.CreateLock($"NoneDicomCode");
 
@@ -967,10 +972,12 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                         //默认会是0  
                         var code = await _noneDicomStudyReposiotry.Where(t => t.TrialId == trialId).Select(x => x.Code).DefaultIfEmpty().MaxAsync();
 
-                        foreach (var g in addList.GroupBy(t => t.SubjectVisitId))
+                        foreach (var g in addList.Where(t => !noneDicomStudyVisitIdList.Contains(t.SubjectVisitId)).GroupBy(t => t.SubjectVisitId))
                         {
                             var addOrEditNoneDicomStudy = g.First();
 
+
+
                             var optEntity = await _noneDicomStudyReposiotry.InsertFromDTOAsync(addOrEditNoneDicomStudy);
 
                             optEntity.Code = code + 1;
@@ -1134,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>();
@@ -1143,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()
                     {
 
@@ -1228,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,
@@ -1244,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()
                             {
@@ -1252,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,
@@ -1653,7 +1663,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             #endregion
 
             var query = from sv in _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id) && t.CheckState == CheckStateEnum.CVPassed))
-                            //一致性分析，导致查询出来两条数据
+                        //一致性分析，导致查询出来两条数据
                         join visitTask in _visitTaskRepository.Where(t => taskIdList.Contains(t.Id)) on sv.Id equals visitTask.SourceSubjectVisitId into cc
                         from leftVisitTask in cc.DefaultIfEmpty()
                         select new ImageDownloadDto()
@@ -1998,6 +2008,21 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
         }
 
+
+        /// <summary>
+        /// 获取未阅片完成的访视，方便前端调用下载
+        /// </summary>
+        /// <param name="trialId"></param>
+        /// <returns></returns>
+        public async Task<List<Guid?>> GetTrialUnreadVisitList(Guid trialId)
+        {
+
+            var subjectVisitList = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.SourceSubjectVisitId!=null).Select(t => t.SourceSubjectVisitId)
+                 .Distinct().ToListAsync();
+
+            return subjectVisitList;
+        }
+
         /// <summary>
         /// 批量勾选访视 进行下载
         /// </summary>

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

@@ -29,6 +29,14 @@ namespace IRaCIS.Core.Application.Services
                 .OrderBy(s => s.InstanceNumber).ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
                 .ProjectTo<DicomInstanceDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
+            // ⭐ DICOM 空间排序（带兜底）
+            var sorted = DicomSortHelper.SortSlices(
+                list,
+                x => x.ImagePositionPatient,
+                x => x.ImageOrientationPatient,
+                x => x.InstanceNumber
+            );
+
             var seriesInfo = await _instanceRepository.Where(s => s.SeriesId == seriesId).Select(t => new
             {
                 t.DicomSerie.ImageResizePath,
@@ -38,7 +46,7 @@ namespace IRaCIS.Core.Application.Services
                 t.DicomSerie.SubjectVisit.VisitName
             }).FirstOrDefaultAsync();
 
-            return ResponseOutput.Ok(list, seriesInfo);
+            return ResponseOutput.Ok(sorted, seriesInfo);
         }
 
 

IRaCIS.Core.Application/Service/ImageAndDoc/Interface/IStudyService.cs

@@ -11,6 +11,8 @@ namespace IRaCIS.Core.Application.Contracts
         DicomTrialSiteSubjectInfo GetSaveToDicomInfo(Guid subjectVisitId);
         IResponseOutput<DicomStudyDTO> Item(Guid studyId,bool? isPacs);
         Task<FileContentResult> Preview(Guid studyId);
+
+        Task<IResponseOutput> AmendmentPatientInfo(EditPatientInfoCommand command);
         //IResponseOutput<List<VerifyStudyUploadResult>> VerifyStudyAllowUpload(VerifyUploadOrReupload verifyInfo);
     }
 }

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

@@ -8,6 +8,7 @@ using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infrastructure;
 using Medallion.Threading;
 using Microsoft.AspNetCore.Mvc;
 using NPOI.SS.Formula.Functions;
@@ -77,7 +78,7 @@ namespace IRaCIS.Core.Application.Contracts
 
                 //ivus-在访视的时候visitTaskId==null  需要过滤掉空检查 ，但是在靶段标注的查看访视级别的时候不能过滤
                 if (_subjectVisitRepository.Where(t => t.Id == subjectVisitId).SelectMany(t => t.Trial.TrialReadingCriterionList)
-                    .Where(t => t.CriterionType == CriterionType.IVUS || t.CriterionType == CriterionType.OCT).Distinct().Count() == 2
+                    .Where(t => (t.CriterionType == CriterionType.IVUS || t.CriterionType == CriterionType.OCT) && t.IsConfirm).Distinct().Count() == 2
                   && visitTaskId == null)
                 {
                     isFilterIVUSNoneDicom = true;
@@ -114,7 +115,7 @@ namespace IRaCIS.Core.Application.Contracts
             var list = await noneDicomStudyQueryable.Where(t => isFilterIVUSNoneDicom ? t.Modality != "IVUS" : true)
                 .OrderBy(x => x.ImageDate).ThenBy(x => x.CreateTime).ToListAsync();
 
-            var config = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList, t.Trial.IsShowStudyName, AuditState = qcAuditState, CriterionType=criterionType }).FirstOrDefaultAsync();
+            var config = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList, t.Trial.IsShowStudyName, AuditState = qcAuditState, CriterionType = criterionType }).FirstOrDefaultAsync();
             return ResponseOutput.Ok(list, config);
         }
 
@@ -154,14 +155,22 @@ namespace IRaCIS.Core.Application.Contracts
             {
                 if (addOrEditNoneDicomStudy.Id == Guid.Empty || addOrEditNoneDicomStudy.Id == null)
                 {
+
+                    if (_subjectVisitRepository.Where(t => t.Id == addOrEditNoneDicomStudy.SubjectVisitId).SelectMany(t => t.Trial.TrialReadingCriterionList)
+                   .Where(t => (t.CriterionType == CriterionType.IVUS || t.CriterionType == CriterionType.OCT) && t.IsConfirm).Distinct().Count() == 2 && addOrEditNoneDicomStudy.Modality != "OCT")
+                    {
+                        throw new BusinessValidationFailedException(_localizer["NoneDicomStudy_OnlyNeedOCT"]);
+                    }
+
                     //默认会是0  
-                    var code = await _noneDicomStudyRepository.Where(t => t.TrialId == addOrEditNoneDicomStudy.TrialId).Select(x => x.Code).DefaultIfEmpty().MaxAsync();
+                    var code = await _trialRepository.Where(t => t.Id == addOrEditNoneDicomStudy.TrialId, ignoreQueryFilters: true).Select(x => x.MaxNoneDicomCode).DefaultIfEmpty().MaxAsync();
 
 
                     optEntity = await _noneDicomStudyRepository.InsertFromDTOAsync(addOrEditNoneDicomStudy);
 
                     optEntity.Code = code + 1;
 
+                    await _trialRepository.BatchUpdateNoTrackingAsync(t => t.Id == addOrEditNoneDicomStudy.TrialId, u => new Trial() { MaxNoneDicomCode = optEntity.Code });
 
                     optEntity.StudyCode = AppSettings.GetCodeStr(optEntity.Code, nameof(NoneDicomStudy));
 

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

@@ -46,13 +46,23 @@ namespace IRaCIS.Core.Application.Services
                 var instanceList = await _scpInstanceRepository.Where(s => s.StudyId == studyId).IgnoreQueryFilters()
                      .OrderBy(t => t.SeriesId).ThenBy(t => t.InstanceNumber)
                      .ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
-                    .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.FileSize }).ToListAsync();//.GroupBy(u => u.SeriesId);
+                    .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.FileSize, t.ImagePositionPatient, t.ImageOrientationPatient }).ToListAsync();//.GroupBy(u => u.SeriesId);
 
 
                 foreach (var series in seriesList)
                 {
 
-                    series.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
+                    var instances = instanceList.Where(x => x.SeriesId == series.Id);
+
+                    // ⭐ DICOM 空间排序（带兜底）
+                    var sorted = DicomSortHelper.SortSlices(
+                        instances,
+                        x => x.ImagePositionPatient,
+                        x => x.ImageOrientationPatient,
+                        x => x.InstanceNumber
+                    );
+
+                    series.InstanceInfoList = sorted.Select(k =>
                        new InstanceBasicInfo()
                        {
                            Id = k.Id,
@@ -62,7 +72,8 @@ namespace IRaCIS.Core.Application.Services
                            InstanceNumber = k.InstanceNumber,
                            IsReading = true,
                            IsDeleted = false,
-                           FileSize = k.FileSize
+                           FileSize = k.FileSize,
+                           
 
                        }).ToList();
 
@@ -93,7 +104,7 @@ namespace IRaCIS.Core.Application.Services
                      .WhereIf(isReading == true, t => t.IsReading == true)
                      .OrderBy(t => t.SeriesId).ThenBy(t => t.InstanceNumber)
                      .ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
-                    .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.HtmlPath, t.IsReading, t.IsDeleted, t.FileSize }).ToListAsync();//.GroupBy(u => u.SeriesId);
+                    .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.HtmlPath, t.IsReading, t.IsDeleted, t.FileSize ,t.IsMasked}).ToListAsync();//.GroupBy(u => u.SeriesId);
 
 
                 foreach (var series in seriesList)
@@ -109,7 +120,8 @@ namespace IRaCIS.Core.Application.Services
                            InstanceNumber = k.InstanceNumber,
                            IsReading = k.IsReading,
                            IsDeleted = k.IsDeleted,
-                           FileSize = k.FileSize
+                           FileSize = k.FileSize,
+                           IsMasked = k.IsMasked
 
                        }).ToList();
 

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

@@ -1,12 +1,24 @@
-using IRaCIS.Core.Application.Contracts;
+using FellowOakDicom;
+using FellowOakDicom.Imaging;
+using FellowOakDicom.IO.Buffer;
+using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Service.ImageAndDoc.DTO;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
+using MathNet.Numerics;
 using Medallion.Threading;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Hosting;
+using NetTopologySuite.Algorithm;
+using SharpCompress.Common;
+using SkiaSharp;
+using System.Data;
+using System.Drawing;
 using ZiggyCreatures.Caching.Fusion;
 
 namespace IRaCIS.Core.Application.Service.ImageAndDoc
@@ -20,12 +32,13 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         IRepository<Trial> _trialRepository,
         IRepository<VisitTask> _visitTaskRepository,
         IRepository<SCPStudy> _scpStudyRepository,
+        IRepository<FileUploadRecord> _fileUploadRecordRepository,
         IRepository<Subject> _subjectRepository,
         IRepository<StudyMonitor> _studyMonitorRepository,
         IRepository<SystemAnonymization> _systemAnonymizationRepository,
         IRepository<NoneDicomStudy> _noneDicomStudyRepository,
-        IDistributedLockProvider _distributedLockProvider,
-        IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, IStudyService
+        IDistributedLockProvider _distributedLockProvider, IOSSService _oSSService,
+        IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache, IWebHostEnvironment _hostEnvironment) : BaseService, IStudyService
     {
 
 
@@ -65,6 +78,497 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         }
 
 
+        private static async Task<bool> TryWriteMergedDicomAsync(Func<Task<Stream>> sourceFactory, Stream output)
+        {
+            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.CanSeek ? source : bufferedStream);
+
+                #endregion
+
+                //获取像素是否为封装形式
+                var syntax = dicomFile.Dataset.InternalTransferSyntax;
+
+                //对于封装像素的文件做转换
+                if (syntax.IsEncapsulated)
+                {
+                    // 获取 Pixel Data 标签
+                    var pixelData = DicomPixelData.Create(dicomFile.Dataset);
+
+                    // 创建一个新的片段序列
+                    var newFragments = new DicomOtherByteFragment(DicomTag.PixelData);
+                    // 获取每帧数据并封装为单独的片段
+                    for (int n = 0; n < pixelData.NumberOfFrames; n++)
+                    {
+                        var frameData = pixelData.GetFrame(n);
+                        newFragments.Fragments.Add(new MemoryByteBuffer(frameData.Data));
+                    }
+
+                    //var frag = dicomFile.Dataset.GetDicomItem<DicomOtherByteFragment>(DicomTag.PixelData);
+
+                    //var originOffsetTable = frag?.OffsetTable;
+
+                    //newFragments.OffsetTable.AddRange(originOffsetTable?.ToArray());
+                    // 替换原有的片段序列
+                    dicomFile.Dataset.AddOrUpdate(newFragments);
+                }
+
+                await dicomFile.SaveAsync(output);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                // 只记录，不传播
+                Log.Logger.Warning($"TryWriteMergedDicomAsync failed: {ex.Message}");
+                return false;
+            }
+        }
+
+        private static async Task<DicomFile> TryWriteSplitDicomAsync(Stream input)
+        {
+            var dicomFile = await DicomFile.OpenAsync(input);
+
+            var numberOfFrames = dicomFile.Dataset.GetSingleValueOrDefault(DicomTag.NumberOfFrames, 1);
+
+            //多帧处理逻辑
+            if (numberOfFrames > 1)
+            {
+                //一定要有像素数据才处理
+                var pixelData = DicomPixelData.Create(dicomFile.Dataset);
+
+                if (pixelData != null)
+                {
+                    try
+                    {
+
+
+                        var syntax = pixelData.Syntax;
+
+                        // 每个 fragment 固定大小 (64KB 示例，可以自己调整)
+                        int fragmentSize = 20 * 1024;
+
+
+
+                        var frag = dicomFile.Dataset.GetDicomItem<DicomOtherByteFragment>(DicomTag.PixelData);
+
+                        int fragmentCount = frag?.Fragments?.Count() ?? 0;
+
+                        var originOffsetTable = frag?.OffsetTable; //有可能没有表，需要自己重建
+
+                        var bot = new List<uint>();
+
+                        uint botOffset = 0;
+
+                        //需要拆成固定片段的
+                        if (syntax.IsEncapsulated && fragmentCount == pixelData.NumberOfFrames && numberOfFrames > 1)
+                        {
+
+                            var newFragments = new DicomOtherByteFragment(DicomTag.PixelData);
+
+
+                            for (int n = 0; n < pixelData.NumberOfFrames; n++)
+                            {
+                                var frameData = pixelData.GetFrame(n);
+                                var data = frameData.Data;
+
+                                // 当前 frame 起始 offset
+                                bot.Add(botOffset);
+
+                                int offset = 0;
+
+                                while (offset < data.Length)
+                                {
+                                    int size = Math.Min(fragmentSize, data.Length - offset);
+
+                                    var buffer = new byte[size];
+                                    Buffer.BlockCopy(data, offset, buffer, 0, size);
+
+                                    newFragments.Fragments.Add(new MemoryByteBuffer(buffer));
+
+                                    // 一个 fragment:
+                                    // 8-byte item header
+                                    // + fragment payload
+                                    botOffset += (uint)(8 + size);
+
+                                    offset += size;
+                                }
+                            }
+
+
+                            #region 最终使用
+
+                            //for (int n = 0; n < pixelData.NumberOfFrames; n++)
+                            //{
+                            //    var frameData = pixelData.GetFrame(n); // 获取完整一帧
+                            //    var data = frameData.Data;
+                            //    int offset = 0;
+
+                            //    bot.Add(botOffset);
+
+                            //    botOffset += (uint)data.Length;
+
+
+                            //    while (offset < data.Length)
+                            //    {
+                            //        botOffset += 8;
+
+
+                            //        int size = Math.Min(fragmentSize, data.Length - offset);
+                            //        var buffer = new byte[size];
+                            //        Buffer.BlockCopy(data, offset, buffer, 0, size);
+
+                            //        newFragments.Fragments.Add(new MemoryByteBuffer(buffer));
+
+                            //        offset += size;
+
+                            //    }
+                            //}
+
+                            //保留原始偏移表
+
+                            //if (originOffsetTable.Count == pixelData.NumberOfFrames)
+                            //{
+                            //    newFragments.OffsetTable.AddRange(originOffsetTable.ToArray());
+
+                            //}
+                            //else
+                            {
+                                newFragments.OffsetTable.AddRange(bot.ToArray());
+
+                                Log.Logger.Warning(bot.ToArray().ToJsonStr());
+                            }
+
+                            #endregion
+
+
+                            dicomFile.Dataset.AddOrUpdate(newFragments);
+
+
+                        }
+                        //传递过来的就是拆分的，但是是没有偏移表的，我需要自己创建偏移表，不然生成缩略图失败
+                        else if (syntax.IsEncapsulated && fragmentCount > pixelData.NumberOfFrames && originOffsetTable.Count == 0)
+                        {
+
+
+
+                            uint offset = 0;
+
+                            bot.Add(offset);
+
+                            var fistSize = frag.Fragments.FirstOrDefault()?.Size ?? 0;
+
+                            //和上一个大小不一样
+                            var isDiffrentBefore = false;
+
+                            uint count = 0;
+
+                            // 假设你知道每帧对应的 fragment 数量
+                            foreach (var frameFragments in frag.Fragments)
+                            {
+                                count++;
+
+                                if (frameFragments.Size == fistSize)
+                                {
+                                    isDiffrentBefore = false;
+                                    // 累加这一帧所有 fragment 的大小
+                                    offset += (uint)frameFragments.Size;
+                                    continue;
+                                }
+                                else
+                                {
+                                    offset += (uint)frameFragments.Size;
+                                    isDiffrentBefore = true;
+
+                                }
+
+                                if (isDiffrentBefore)
+                                {
+                                    //每个Fragment 也占用字节
+                                    offset += 8 * count;
+                                    bot.Add(offset);
+                                    count = 0;
+
+                                }
+
+                            }
+
+                            bot.RemoveAt(bot.Count - 1);
+                            // 设置到新的 PixelData
+                            frag.OffsetTable.AddRange(bot.ToArray());
+
+
+
+                        }
+
+                    }
+                    catch (Exception ex)
+                    {
+                        // 只记录，不传播
+                        Log.Logger.Warning($"拆分 failed: {ex.Message}");
+                    }
+                }
+
+            }
+
+            return dicomFile;
+
+        }
+
+        /// <summary>
+        /// 标注遮盖影像  路径后面加了.MaskImage 就是遮盖的新路径
+        /// </summary>
+        /// <returns></returns>
+        public async Task<IResponseOutput> StudyMaskImage(StudyMaskImageCommand inCommand)
+        {
+            if (inCommand.SeriesId == null && inCommand.InstanceIdList == null)
+            {
+                return ResponseOutput.NotOk("SeriesId and InstanceIdList can not both be null");
+            }
+
+
+            var idPathList = new List<DownloadDicomInstanceDto>();
+
+            if (inCommand.SeriesId == null && inCommand.InstanceIdList != null)
+            {
+                idPathList = await _dicomInstanceRepository.Where(t => inCommand.InstanceIdList.Contains(t.Id)).ProjectTo<DownloadDicomInstanceDto>(_mapper.ConfigurationProvider).ToListAsync();
+
+            }
+            else
+            {
+                idPathList = await _dicomInstanceRepository.Where(t => t.SeriesId == inCommand.SeriesId).ProjectTo<DownloadDicomInstanceDto>(_mapper.ConfigurationProvider).ToListAsync();
+            }
+
+            var errorList = new List<InstanceIdPath>();
+
+            var okList = new List<InstanceIdPath>();
+
+            var batchId = Guid.NewGuid();
+
+            foreach (var item in idPathList)
+            {
+                var path = item.Path;
+
+                try
+                {
+
+                    await using var inputStream = new MemoryStream();
+
+                    if (item.IsEncapsulated)
+                    {
+
+                        var ok = await TryWriteMergedDicomAsync(() => _oSSService.GetStreamFromOSSAsync(path), inputStream);
+                    }
+                    else
+                    {
+                        await (await _oSSService.GetStreamFromOSSAsync(path)).CopyToAsync(inputStream);
+                    }
+
+
+                    var outPutStream = await DicomPixelMasker.MaskAsync(inputStream, inCommand.MaskRegionList);
+
+                    var needUploadDicomFile = await TryWriteSplitDicomAsync(outPutStream);
+
+                    var prefix = path.Substring(1, path.LastIndexOf('/') - 1);
+
+                    //每次都用一个新的名字
+                    var maskFileName = string.Empty;
+
+                    if (path.Contains(".MaskDicom_"))
+                    {
+                        //清理缓存的里面的遮盖图，多次遮盖同一张图时，清除缓存很重要
+                        await _oSSService.DeleteFromPrefix(path, true);                    //清理缓存的里面的遮盖图，多次遮盖同一张图时，清除缓存很重要
+
+                        //本身就是遮盖的图，那么就要要替换guid
+                        var length = Guid.Empty.ToString().Length + ".MaskDicom_".Length;
+
+                        var restorePath = item.Path[..^length];
+
+                        maskFileName = $"{Path.GetFileName(restorePath)}.MaskDicom_{batchId}";
+                    }
+                    else
+                    {
+                        //没有遮盖的，直接加上.批次_MaskDicom
+                        maskFileName = $"{Path.GetFileName(path)}.MaskDicom_{batchId}";
+                    }
+
+
+                    //  直接写入内存
+                    await using var uploadStream = new MemoryStream();
+                    await needUploadDicomFile.SaveAsync(uploadStream);
+                    uploadStream.Position = 0;
+
+                    await _oSSService.UploadToOSSAsync(uploadStream, prefix, maskFileName, false);
+
+                    var newPath = $"/{prefix}/{maskFileName}";
+
+                    okList.Add(new InstanceIdPath() { Id = item.InstanceId, Path = newPath });
+
+                    await _dicomInstanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.InstanceId, u => new DicomInstance() { Path = newPath, IsMasked = true });
+                }
+                catch (Exception ex)
+                {
+
+                    errorList.Add(new InstanceIdPath() { Id = item.InstanceId, Path = path });
+
+                    Log.Logger.Error(ex, $"StudyMaskImage Error for InstanceIdList Path:{path}  {ex.Message}");
+                }
+
+            }
+
+            await _dicomInstanceRepository.SaveChangesAsync();
+
+            return ResponseOutput.Ok(new { OkList = okList, ErrorList = errorList });
+
+
+        }
+
+        /// <summary>
+        /// 撤销遮盖的影像，可以单张，也可以整个序列
+        /// </summary>
+        /// <param name="inCommand"></param>
+        /// <returns></returns>
+        public async Task<IResponseOutput> StudyUndoMaskImage(StudyUndoMaskImageCommand inCommand)
+        {
+            if (inCommand.SeriesId == null && inCommand.InstanceIdList == null)
+            {
+                return ResponseOutput.NotOk("SeriesId and InstanceIdList can not both be null");
+            }
+
+
+            var idPathList = new List<InstanceIdPath>();
+
+            if (inCommand.SeriesId == null && inCommand.InstanceIdList != null)
+            {
+                idPathList = await _dicomInstanceRepository.Where(t => inCommand.InstanceIdList.Contains(t.Id)).Select(t => new InstanceIdPath { Id = t.Id, Path = t.Path }).ToListAsync();
+
+            }
+            else
+            {
+                idPathList = await _dicomInstanceRepository.Where(t => t.SeriesId == inCommand.SeriesId).Select(t => new InstanceIdPath { Id = t.Id, Path = t.Path }).ToListAsync();
+            }
+
+            var okList = new List<InstanceIdPath>();
+
+            foreach (var item in idPathList)
+            {
+                if (item.Path.Contains(".MaskDicom_"))
+                {
+                    await _oSSService.DeleteFromPrefix(item.Path, true);
+
+                    var length = Guid.Empty.ToString().Length + ".MaskDicom_".Length;
+                    var newPath = item.Path[..^length];
+
+                    okList.Add(new InstanceIdPath() { Id = item.Id, Path = newPath });
+
+                    await _dicomInstanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new DicomInstance() { Path = newPath, IsMasked = false });
+                }
+
+                //if (item.Path.EndsWith("."))
+                //{
+                //    await _oSSService.DeleteFromPrefix(item.Path, true);
+
+                //    var newPath = item.Path[..^1];
+
+                //    okList.Add(new InstanceIdPath() { Id = item.Id, Path = newPath });
+
+                //    await _dicomInstanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new DicomInstance() { Path = newPath, IsMasked = false });
+                //}
+
+
+            }
+
+            await _dicomInstanceRepository.SaveChangesAsync();
+
+            return ResponseOutput.Ok(new { OkList = okList });
+
+
+        }
+
+        /// <summary>
+        /// 获取患者基本信息
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<PatientInfoDto> GetPatientInfo(GetPatientInfoInDto inDto)
+        {
+            var study = await _dicomStudyRepository.Where(s => s.Id == inDto.StudyId).ProjectTo<PatientInfoDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+
+            return study;
+        }
+
+        /// <summary>
+        /// 编辑患者基本信息
+        /// </summary>
+        /// <param name="command"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> EditPatientInfo(EditPatientInfoCommand command)
+        {
+            await _dicomStudyRepository.UpdatePartialFromQueryAsync(command.Id, x => new DicomStudy
+            {
+                PatientSex = command.PatientSex,
+                PatientWeight = command.PatientWeight,
+                RadionuclideTotalDose = command.RadionuclideTotalDose,
+                RadionuclideHalfLife = command.RadionuclideHalfLife,
+                RadiopharmaceuticalStartTime = command.RadiopharmaceuticalStartTime,
+                AcquisitionTime = command.AcquisitionTime,
+            });
+            await _dicomStudyRepository.SaveChangesAsync();
+
+            return ResponseOutput.Ok();
+        }
+
+        /// <summary>
+        /// 修正患者基本信息
+        /// </summary>
+        /// <param name="command"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> AmendmentPatientInfo(EditPatientInfoCommand command)
+        {
+            await _dicomStudyRepository.UpdatePartialFromQueryAsync(command.Id, x => new DicomStudy
+            {
+                PatientSex = command.PatientSex,
+                PatientWeight = command.PatientWeight,
+                RadionuclideTotalDose = command.RadionuclideTotalDose,
+                RadionuclideHalfLife = command.RadionuclideHalfLife,
+                RadiopharmaceuticalStartTime = command.RadiopharmaceuticalStartTime,
+                AcquisitionTime = command.AcquisitionTime,
+                Reason = command.Reason,
+            });
+            await _dicomStudyRepository.SaveChangesAsync();
+
+            return ResponseOutput.Ok();
+        }
+
+
         [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         public async Task<IResponseOutput> PreArchiveDicomStudy(PreArchiveDicomStudyCommand preArchiveStudyCommand)
@@ -183,7 +687,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                     using (await @lock.AcquireAsync())
                     {
                         //查询数据库获取最大的Code 没有记录则为0
-                        var dbStudyCodeIntMax = _dicomStudyRepository.Where(s => s.TrialId == trialId).Select(t => t.Code).DefaultIfEmpty().Max();
+                        var dbStudyCodeIntMax = _trialRepository.Where(s => s.Id == trialId, ignoreQueryFilters: true).Select(t => t.MaxDicomCode).DefaultIfEmpty().Max();
 
                         //获取缓存中的值 并发的时候，需要记录，已被占用的值 这样其他线程在此占用的最大的值上递增
                         var cacheMaxCodeInt = await _fusionCache.GetOrDefaultAsync<int>(CacheKeys.TrialStudyMaxCode(trialId));
@@ -192,6 +696,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                         addStudy.Code = currentNextCodeInt;
 
+                        await _trialRepository.BatchUpdateNoTrackingAsync(t => t.Id == trialId, u => new Trial() { MaxDicomCode = addStudy.Code });
+
                         addStudy.StudyCode = AppSettings.GetCodeStr(currentNextCodeInt, nameof(DicomStudy));
 
                         await _fusionCache.SetAsync<int>(CacheKeys.TrialStudyMaxCode(trialId), addStudy.Code, TimeSpan.FromMinutes(30));
@@ -318,12 +824,29 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                         //  不管是新的序列  还是 该序列 掉了Instance   重传的时候 检查的instance 数量都会增加
                         findStudy.InstanceCount += seriesItem.InstanceList.Count;
 
+
+                        if (incommand.Study.RadionuclideTotalDose != string.Empty
+                            || incommand.Study.RadionuclideHalfLife != string.Empty
+                            || incommand.Study.RadiopharmaceuticalStartTime != string.Empty
+
+                            )
+                        {
+                            await _dicomStudyRepository.UpdatePartialFromQueryAsync(t => t.Id == findStudy.Id, u => new DicomStudy()
+                            {
+                                RadionuclideTotalDose = incommand.Study.RadionuclideTotalDose.IsNotNullOrEmpty() ? incommand.Study.RadionuclideTotalDose : findStudy.RadionuclideTotalDose,
+                                RadionuclideHalfLife = incommand.Study.RadionuclideHalfLife.IsNotNullOrEmpty() ? incommand.Study.RadionuclideHalfLife : findStudy.RadionuclideHalfLife,
+                                RadiopharmaceuticalStartTime = incommand.Study.RadiopharmaceuticalStartTime.IsNotNullOrEmpty() ? incommand.Study.RadiopharmaceuticalStartTime : findStudy.RadiopharmaceuticalStartTime
+                            });
+                        }
+
+
+
                     }
 
 
                 }
 
-               
+
 
 
                 var @lock2 = _distributedLockProvider.CreateLock($"StudyCommit");
@@ -332,6 +855,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 {
                     await _dicomInstanceRepository.SaveChangesAsync();
                 }
+
+                await _fileUploadRecordRepository.BatchUpdateNoTrackingAsync(t => t.UploadBatchId == incommand.UploadBatchId, u => new FileUploadRecord() { StudyCode = findStudy.StudyCode });
             }
             catch (Exception ex)
             {
@@ -434,7 +959,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                      Id = t.Id,
 
                      Bodypart = t.BodyPart,
-                     BodyPartForEditOther=t.BodyPartForEditOther,
+                     BodyPartForEditOther = t.BodyPartForEditOther,
 
                      Modalities = t.Modality,
 

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

@@ -4,6 +4,7 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
+using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using Microsoft.AspNetCore.Mvc;
@@ -13,7 +14,7 @@ namespace IRaCIS.Core.Application.Service
     /// SystemAnonymizationService
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Image")]
-    public class SystemAnonymizationService(IRepository<SystemAnonymization> _systemAnonymizationRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISystemAnonymizationService
+    public class SystemAnonymizationService(IRepository<SystemAnonymization> _systemAnonymizationRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, ISystemAnonymizationService
     {
 
 
@@ -37,6 +38,7 @@ namespace IRaCIS.Core.Application.Service
 
             var entity = await _systemAnonymizationRepository.InsertOrUpdateAsync(addOrEditSystemAnonymization, true);
 
+            await _fusionCache.SetAsync(CacheKeys.SystemAnonymization, CacheHelper.GetSystemAnonymizationListAsync(_systemAnonymizationRepository), TimeSpan.FromDays(7));
 
             return ResponseOutput.Ok(entity.Id.ToString());
 

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

@@ -25,6 +25,8 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<AddInstanceDto, TaskInstance>();
 
+            CreateMap<DicomStudy, PatientInfoDto>();
+
 
             CreateMap<DicomSeries, DicomSeriesWithLabelDTO>();
 
@@ -183,7 +185,9 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<ImageMarkNoneDicomStudyBasicInfo, NoneDicomStudyBasicInfo>();
 
-
+            CreateMap<DicomInstance, DownloadDicomInstanceDto>()
+                .ForMember(d => d.InstanceId, u => u.MapFrom(s => s.Id));
+            
 
         }
     }

IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs

@@ -260,6 +260,11 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
         public bool obtaionOrCancel { get; set; }
     }
 
+    public class UpdateReadModuleClinicalDataInDto
+    {
+        public Guid ReadingClinicalDataId { get; set; }
+    }
+
     public class ReadingClinicalDataSignIndto
     {
         /// <summary>

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

@@ -32,6 +32,18 @@ namespace IRaCIS.Core.Application.ViewModel
         public UserTypeEnum UserTypeEnum { get; set; }
     }
 
+    public class SetUserFeedBackStateInDto
+    {
+        public Guid Id { get; set; }
+        public int State { get; set; }
+
+
+        /// <summary>
+        /// 原因
+        /// </summary>
+        public string Reason { get; set; } = string.Empty;
+    }
+
 
     public class GetUserFeedBackQuery
     {
@@ -86,6 +98,11 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public Guid? VisitTaskId { get; set; }
 
+        /// <summary>
+        /// 原因
+        /// </summary>
+        public string Reason { get; set; } = string.Empty;
+
         public List<string> ScreenshotList { get; set; }
 
         [JsonIgnore]

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/UserFeedBackService.cs

@@ -53,12 +53,27 @@ namespace IRaCIS.Core.Application.Service
             return pageList;
         }
 
+
+        /// <summary>
+        /// 设置用户反馈状态 并且可以提供理由 
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> SetUserFeedBackState(SetUserFeedBackStateInDto inDto)
+        {
+            
+            await _userFeedBackRepository.UpdatePartialFromQueryAsync(inDto.Id, u => new UserFeedBack() { State = inDto.State, Reason = inDto.Reason });
+            await _userFeedBackRepository.SaveChangesAsync();
+            return ResponseOutput.Ok();
+        }
+
         [HttpPost]
         public async Task<IResponseOutput> GetUserFeedBackInfo(GetUserFeedBackQuery inQuery)
         {
             if (inQuery.Id == null && inQuery.VisitTaskId == null)
             {
-                throw new BusinessValidationFailedException("Id  或者VisitTaskId 必传一个");
+                throw new BusinessValidationFailedException("The interface parameter Id or VisitTaskId cannot be passed at the same time");
             }
 
             var result = await _userFeedBackRepository
@@ -88,7 +103,7 @@ namespace IRaCIS.Core.Application.Service
                     addOrEditUserFeedBack.SubjectVisitId = info.SourceSubjectVisitId;
                 }
 
-                addOrEditUserFeedBack.State = 0;//设置解决后IR 更新反馈自动变为未解决
+                //addOrEditUserFeedBack.State = 0;//设置解决后IR 更新反馈自动变为未解决
             }
 
             else if (addOrEditUserFeedBack.SubjectVisitId != null)

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

@@ -359,6 +359,8 @@ namespace IRaCIS.Core.Application.Service
 
             await _mailVerificationService.AnolymousSendEmailForResetAccount(email, verificationCode);
 
+            await _fusionCache.RemoveAsync(CacheKeys.UserLoginError(existUser.UserName));
+
             await _fusionCache.RemoveByTagAsync(CacheKeys.UserMFATag(existUser.Id));
 
             return ResponseOutput.Ok();
@@ -440,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);
 
-            await _mailVerificationService.AfterUserModifyPasswordSendEmailAsync(identityUserId);
+            try
+            {
+                await _mailVerificationService.AfterUserModifyPasswordSendEmailAsync(identityUserId);
+            }
+            catch (Exception)
+            {
+
+              
+            }
+         
 
 
             var find = await _identityUserRepository.FindAsync(identityUserId);
@@ -532,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);
@@ -1267,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; }
@@ -415,6 +421,52 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
         public string BodyPartForEditOther { get; set; }
 
+        #region 核验
+
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public string PatientSex { get; set; } = null!;
+
+        /// <summary>
+        /// 体重
+        /// </summary>
+        public string PatientWeight { get; set; }
+
+        /// <summary>
+        /// 总剂量
+        /// </summary>
+        public string RadionuclideTotalDose { get; set; } = null!;
+
+        /// <summary>
+        /// 半衰期
+        /// </summary>
+        public string RadionuclideHalfLife { get; set; } = null!;
+
+        /// <summary>
+        /// 注射时间
+        /// </summary>
+        public string RadiopharmaceuticalStartTime { get; set; } = null!;
+
+        /// <summary>
+        /// 成像 / 采集时间
+        /// </summary>
+        public string AcquisitionTime { get; set; } = null!;
+
+
+        #endregion
+
+
+        /// <summary>
+        /// 是否存在空字符串字段（PatientSex、PatientWeight、RadionuclideTotalDose、RadionuclideHalfLife、RadiopharmaceuticalStartTime、AcquisitionTime 任意一个为空/空字符串）
+        /// </summary>
+        public bool IsHasEmptyPatientInfo =>
+            string.IsNullOrWhiteSpace(PatientSex) ||
+            string.IsNullOrWhiteSpace(PatientWeight) ||
+            string.IsNullOrWhiteSpace(RadionuclideTotalDose) ||
+            string.IsNullOrWhiteSpace(RadionuclideHalfLife) ||
+            string.IsNullOrWhiteSpace(RadiopharmaceuticalStartTime) ||
+            string.IsNullOrWhiteSpace(AcquisitionTime);
     }
 
     public class QASeriesInfoDto