修改稽查

This reverts commit 0b707117c6.

IRC.Core.Dicom/BusinessFilter/ModelActionFilter .cs

@@ -0,0 +1,37 @@
+using IRaCIS.Core.Infrastructure.Extention;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Localization;
+using Newtonsoft.Json;
+
+
+namespace IRaCIS.Core.SCP.Filter
+{
+
+
+    public class ModelActionFilter : ActionFilterAttribute, IActionFilter
+    {
+		public IStringLocalizer _localizer;
+		public ModelActionFilter(IStringLocalizer localizer)
+        {
+			_localizer = localizer;
+		}
+
+		public override void OnActionExecuting(ActionExecutingContext context)
+		{
+            if (!context.ModelState.IsValid)
+            {
+
+                var validationErrors = context.ModelState
+                                              .Keys
+                                              .SelectMany(k => context.ModelState[k]!.Errors)
+                                              .Select(e => e.ErrorMessage)
+                                              .ToArray();
+     
+                //---提供给接口的参数无效。
+                context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["ModelAction_InvalidAPIParameter"] + JsonConvert.SerializeObject( validationErrors)));
+            }
+        }
+    }
+
+}

IRC.Core.Dicom/BusinessFilter/ProjectExceptionFilter.cs

@@ -0,0 +1,61 @@
+using IRaCIS.Core.Infrastructure;
+using IRaCIS.Core.Infrastructure.Extention;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Logging;
+
+namespace IRaCIS.Core.SCP.Filter
+{
+    public class ProjectExceptionFilter : Attribute, IExceptionFilter
+    {
+        private readonly ILogger<ProjectExceptionFilter> _logger;
+
+		public IStringLocalizer _localizer;
+
+		public ProjectExceptionFilter(IStringLocalizer localizer, ILogger<ProjectExceptionFilter> logger)
+        {
+            _logger = logger;
+			_localizer = localizer;
+		}
+        public void OnException(ExceptionContext context)
+        {
+            //context.ExceptionHandled;//记录当前这个异常是否已经被处理过了
+
+            if (!context.ExceptionHandled)
+            {
+                if (context.Exception.GetType().Name == "DbUpdateConcurrencyException")
+                {
+                //---并发更新，当前不允许该操作
+                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["ProjectException_ConcurrentUpdateNotAllowed"] + context.Exception.Message));
+                }
+
+                if (context.Exception.GetType() == typeof(BusinessValidationFailedException))
+                {
+					var error = context.Exception as BusinessValidationFailedException;
+
+					context.Result = new JsonResult(ResponseOutput.NotOk(context.Exception.Message, error!.Code));
+				}
+                else if(context.Exception.GetType() == typeof(QueryBusinessObjectNotExistException))
+                {
+                    context.Result = new JsonResult(ResponseOutput.NotOk( context.Exception.Message, ApiResponseCodeEnum.DataNotExist));
+                }
+                else
+                {
+                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["Project_ExceptionContactDeveloper"] + (context.Exception.InnerException is null ? (context.Exception.Message /*+ context.Exception.StackTrace*/)
+                        : (context.Exception.InnerException?.Message /*+ context.Exception.InnerException?.StackTrace*/)), ApiResponseCodeEnum.ProgramException));
+                }
+
+
+                _logger.LogError(context.Exception.InnerException is null ? (context.Exception.Message + context.Exception.StackTrace) : (context.Exception.InnerException?.Message + context.Exception.InnerException?.StackTrace));
+
+
+            }
+            else
+            {
+                //继续
+            }
+            context.ExceptionHandled = true;//标记当前异常已经被处理过了
+        }
+    }
+}

IRC.Core.Dicom/BusinessFilter/UnifiedApiResultFilter.cs

@@ -0,0 +1,120 @@
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infrastructure.Extention;
+
+namespace IRaCIS.Core.Application.Service.BusinessFilter
+{
+    /// <summary>
+    ///  统一返回前端数据包装，之前在控制器包装，现在修改为动态Api  在ResultFilter这里包装，减少重复冗余代码
+    /// by zhouhang 2021.09.12 周末
+    /// </summary>
+    public class UnifiedApiResultFilter : Attribute, IAsyncResultFilter  
+    {             
+        /// <summary>
+        /// 异步版本
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="next"></param>
+        /// <returns></returns>
+        public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+        {
+
+            if (context.Result is ObjectResult objectResult)
+            {
+                var statusCode = objectResult.StatusCode ?? context.HttpContext.Response.StatusCode;
+
+                //是200 并且没有包装  那么包装结果
+                if (statusCode == 200 && !(objectResult.Value is IResponseOutput))
+                {
+                    //if (objectResult.Value == null)
+                    //{
+                    //    var apiResponse = ResponseOutput.DBNotExist();
+
+                    //    objectResult.Value = apiResponse;
+                    //    objectResult.DeclaredType = apiResponse.GetType();
+                    //}
+                    //else
+                    //{
+
+                    var type = objectResult.Value?.GetType();
+
+
+                    if (  type!=null&& type.IsGenericType&&(type.GetGenericTypeDefinition()==typeof(ValueTuple<,>)|| type.GetGenericTypeDefinition()==typeof(Tuple<,>)))
+                    {
+
+                        //报错
+                        //var tuple = (object, object))objectResult.Value;
+
+                        //var (val1, val2) = ((dynamic, dynamic))objectResult.Value;
+                        //var apiResponse = ResponseOutput.Ok(val1, val2);
+
+                        //OK
+                        var tuple = (dynamic)objectResult.Value;
+                        var apiResponse = ResponseOutput.Ok(tuple.Item1, tuple.Item2);
+
+
+                        objectResult.Value = apiResponse;
+                        objectResult.DeclaredType = apiResponse.GetType();
+                    }
+                    else
+                    {
+                        var apiResponse = ResponseOutput.Ok(objectResult.Value);
+
+                        objectResult.Value = apiResponse;
+                        objectResult.DeclaredType = apiResponse.GetType();
+                    }
+
+                      
+                    //}
+                   
+                }
+                //如果不是200  是IResponseOutput  不处理
+                else if (statusCode != 200 && (objectResult.Value is IResponseOutput))
+                {
+                }
+
+                else if(statusCode != 200&&!(objectResult.Value is IResponseOutput))
+                {
+                //---程序错误，请联系开发人员。
+                    var apiResponse = ResponseOutput.NotOk(I18n.T("UnifiedAPI_ProgramError"));
+
+                    objectResult.Value = apiResponse;
+                    objectResult.DeclaredType = apiResponse.GetType();
+                }
+
+            }
+
+            await next.Invoke();
+
+        }
+
+        public static bool IsTupleType(Type type, bool checkBaseTypes = false)
+        {
+            if (type == null)
+                throw new ArgumentNullException(nameof(type));
+
+            if (type == typeof(Tuple))
+                return true;
+
+            while (type != null)
+            {
+                if (type.IsGenericType)
+                {
+                    var genType = type.GetGenericTypeDefinition();
+                    if (genType == typeof(Tuple<>)
+                        || genType == typeof(Tuple<,>)
+                        || genType == typeof(Tuple<,>))
+                        return true;
+                }
+
+                if (!checkBaseTypes)
+                    break;
+
+                type = type.BaseType;
+            }
+
+            return false;
+        }
+    }
+}

IRC.Core.Dicom/HostConfig/AutofacModuleSetup.cs

@@ -0,0 +1,57 @@
+using Autofac;
+using IRaCIS.Core.Infra.EFCore;
+using Microsoft.AspNetCore.Http;
+using Panda.DynamicWebApi;
+using System;
+using System.Linq;
+using System.Reflection;
+using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Application.Service;
+using AutoMapper;
+using IRaCIS.Core.SCP.Service;
+
+namespace IRaCIS.Core.SCP
+{
+    // ReSharper disable once IdentifierTypo
+    public class AutofacModuleSetup : Autofac.Module
+    {
+        protected override void Load(ContainerBuilder containerBuilder)
+        {
+
+            #region  byzhouhang  20210917  此处注册泛型仓储 可以减少Domain层 和Infra.EFcore 两层 空的仓储接口定义和 仓储文件定义
+
+            containerBuilder.RegisterGeneric(typeof(Repository<>))
+                .As(typeof(IRepository<>)).InstancePerLifetimeScope();//注册泛型仓储
+
+            containerBuilder.RegisterType<Repository>().As<IRepository>().InstancePerLifetimeScope();
+
+
+            #endregion
+
+            #region 指定控制器也由autofac 来进行实例获取 https://www.cnblogs.com/xwhqwer/p/15320838.html
+
+            //获取所有控制器类型并使用属性注入
+            containerBuilder.RegisterAssemblyTypes(typeof(BaseService).Assembly)
+                .Where(type => typeof(IDynamicWebApi).IsAssignableFrom(type))
+                .PropertiesAutowired();
+
+            #endregion
+
+
+
+            Assembly application = Assembly.LoadFrom(AppDomain.CurrentDomain.BaseDirectory + typeof(BaseService).Assembly.GetName().Name+".dll");
+            containerBuilder.RegisterAssemblyTypes(application).Where(t => t.FullName.Contains("Service"))
+                .PropertiesAutowired().AsImplementedInterfaces();
+
+
+            //containerBuilder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
+            //containerBuilder.RegisterType<UserInfo>().As<IUserInfo>().InstancePerLifetimeScope();
+
+
+
+
+
+        }
+    }
+}

IRC.Core.Dicom/HostConfig/EFSetup.cs

@@ -0,0 +1,64 @@
+using EntityFramework.Exceptions.SqlServer;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infra.EFCore;
+using Medallion.Threading;
+using Medallion.Threading.SqlServer;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace IRaCIS.Core.SCP
+{
+    public static class EFSetup
+    {
+        public static void AddEFSetup( this IServiceCollection services, IConfiguration configuration)
+        {
+            services.AddHttpContextAccessor();
+            services.AddScoped<IUserInfo, UserInfo>();
+            services.AddScoped<ISaveChangesInterceptor, AuditEntityInterceptor>();
+
+
+            //这个注入没有成功--注入是没问题的，构造函数也只是支持参数就好，错在注入的地方不能写DbContext
+            //Web程序中通过重用池中DbContext实例可提高高并发场景下的吞吐量， 这在概念上类似于ADO.NET Provider原生的连接池操作方式，具有节省DbContext实例化成本的优点
+            services.AddDbContext<IRaCISDBContext>((sp, options) =>
+            {
+                // 在控制台
+                //public static readonly ILoggerFactory MyLoggerFactory    = LoggerFactory.Create(builder => { builder.AddConsole(); });
+                var logFactory = LoggerFactory.Create(builder => { builder.AddDebug(); });
+
+                options.UseSqlServer(configuration.GetSection("ConnectionStrings:RemoteNew").Value,
+                    contextOptionsBuilder => contextOptionsBuilder.EnableRetryOnFailure());
+
+                options.UseLoggerFactory(logFactory);
+
+                options.UseExceptionProcessor();
+
+                options.EnableSensitiveDataLogging();
+
+                options.AddInterceptors(new QueryWithNoLockDbCommandInterceptor());
+                options.AddInterceptors(sp.GetServices<ISaveChangesInterceptor>());
+
+                options.UseProjectables();
+
+          
+
+            });
+
+            //// Register an additional context factory as a Scoped service, which gets a pooled context from the Singleton factory we registered above,
+            //services.AddScoped<IRaCISDBScopedFactory>();
+
+            //// Finally, arrange for a context to get injected from our Scoped factory:
+            //services.AddScoped(sp => sp.GetRequiredService<IRaCISDBScopedFactory>().CreateDbContext());
+
+            //注意区分 easy caching 也有  IDistributedLockProvider
+            services.AddSingleton<IDistributedLockProvider>(sp =>
+            {
+                //var connection = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!);
+
+                return new SqlDistributedSynchronizationProvider(configuration.GetSection("ConnectionStrings:RemoteNew").Value);
+            });
+
+        }
+    }
+}

IRC.Core.Dicom/HostConfig/NewtonsoftJsonSetup.cs

@@ -0,0 +1,59 @@
+
+
+using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System;
+
+namespace IRaCIS.Core.SCP
+{
+    public static class NewtonsoftJsonSetup
+    {
+        public static void AddNewtonsoftJsonSetup(this IMvcBuilder builder, IServiceCollection services)
+        {
+            services.AddHttpContextAccessor();
+            services.AddScoped<IOSSService,OSSService>();
+
+            builder.AddNewtonsoftJson(options =>
+             {
+                 //options.SerializerSettings.PreserveReferencesHandling = PreserveReferencesHandling.Objects;
+                 // 忽略循环引用
+                 options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
+                 //options.SerializerSettings.TypeNameHandling = TypeNameHandling.All;
+
+                 //处理返回给前端  可空类型 给出默认值 比如in? 为null 设置 默认值0
+                 options.SerializerSettings.ContractResolver = new NullToEmptyStringResolver(); //new DefaultContractResolver();// new NullToEmptyStringResolver();
+                                                                                                // 设置时间格式
+                 options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
+
+                 options.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind;
+
+                 //options.SerializerSettings.Converters.Add(new JSONCustomDateConverter()) ;
+
+                 //options.SerializerSettings.Converters.Add(services.BuildServiceProvider().GetService<JSONTimeZoneConverter>());
+
+
+
+             })
+                .AddControllersAsServices()//动态webApi属性注入需要
+               .ConfigureApiBehaviorOptions(o =>
+                {
+                    o.SuppressModelStateInvalidFilter = true; //自己写验证
+                 
+                });
+
+
+            Newtonsoft.Json.JsonSerializerSettings setting = new Newtonsoft.Json.JsonSerializerSettings();
+            JsonConvert.DefaultSettings = new Func<JsonSerializerSettings>(() =>
+            {
+                //日期类型默认格式化处理
+                setting.DateFormatString = "yyyy-MM-dd HH:mm:ss";
+                setting.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
+
+                return setting;
+            });
+
+
+        }
+    }
+}

IRC.Core.Dicom/HostConfig/NullToEmptyStringResolver.cs

@@ -0,0 +1,36 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace IRaCIS.Core.SCP
+{
+    public class NullToEmptyStringResolver : DefaultContractResolver
+    {
+
+
+        protected override IList<JsonProperty> CreateProperties(Type type, MemberSerialization memberSerialization)
+        {
+            IList<JsonProperty> properties = base.CreateProperties(type, memberSerialization);
+
+            var list= type.GetProperties()
+                .Select(p =>
+                {
+                    var jp = base.CreateProperty(p, memberSerialization);
+                    jp.ValueProvider = new NullToEmptyStringValueProvider(p);
+                    return jp;
+                }).ToList();
+
+            var uu = list.Select(t => t.PropertyName).ToList();
+
+            //获取复杂对象属性
+          properties =   properties.TakeWhile(t => !uu.Contains(t.PropertyName)).ToList();
+
+          list.AddRange(properties);
+          return list;
+        }
+
+
+    }
+}

IRC.Core.Dicom/HostConfig/NullToEmptyStringValueProvider.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Reflection;
+using Newtonsoft.Json.Serialization;
+
+namespace IRaCIS.Core.SCP
+{
+
+    public class NullToEmptyStringValueProvider : IValueProvider
+    {
+        PropertyInfo _MemberInfo;
+        public NullToEmptyStringValueProvider(PropertyInfo memberInfo)
+        {
+            _MemberInfo = memberInfo;
+        }
+        public object GetValue(object target)
+        {
+            object result = _MemberInfo.GetValue(target);
+            if (_MemberInfo.PropertyType == typeof(string) && result == null) result = "";
+            else if (_MemberInfo.PropertyType == typeof(String[]) && result == null) result = new string[] { };
+            //else if (_MemberInfo.PropertyType == typeof(Nullable<Int32>) && result == null) result = 0;
+            else if (_MemberInfo.PropertyType == typeof(Nullable<Decimal>) && result == null) result = 0.00M;
+
+            return result;
+        }
+        public void SetValue(object target, object value)
+        {
+
+            if(_MemberInfo.PropertyType == typeof(string))
+            {
+                //去掉前后空格
+                _MemberInfo.SetValue(target, value==null?string.Empty: value.ToString()==string.Empty? value:value.ToString().Trim());
+              
+            }
+            else
+            {
+                _MemberInfo.SetValue(target, value);
+            }
+          
+        }
+    }
+
+}

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

@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.11" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+	  <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="DistributedLock.Core" Version="1.0.8" />
+	  <PackageReference Include="DistributedLock.SqlServer" Version="1.0.6" />
+	  <PackageReference Include="fo-dicom" Version="5.2.1" />
+	  <PackageReference Include="fo-dicom.Codecs" Version="5.16.1" />
+	  <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.1" />
+	  <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
+	  <PackageReference Include="AutoMapper" Version="13.0.1" />
+	  <PackageReference Include="Minio" Version="6.0.4" />
+	  <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" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\IRaCIS.Core.Infra.EFCore\IRaCIS.Core.Infra.EFCore.csproj" />
+    <ProjectReference Include="..\IRaCIS.Core.Infrastructure\IRaCIS.Core.Infrastructure.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Helper\" />
+  </ItemGroup>
+
+</Project>

IRC.Core.Dicom/Program.cs

@@ -0,0 +1,186 @@
+
+using Autofac;
+using Autofac.Extensions.DependencyInjection;
+using AutoMapper.EquivalencyExpression;
+using FellowOakDicom;
+using FellowOakDicom.Imaging;
+using FellowOakDicom.Imaging.NativeCodec;
+using FellowOakDicom.Network;
+using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Core.SCP;
+using IRaCIS.Core.SCP.Filter;
+using IRaCIS.Core.SCP.Service;
+using MassTransit;
+using MassTransit.NewIdProviders;
+using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.Extensions.DependencyInjection;
+using Panda.DynamicWebApi;
+using Serilog;
+using Serilog.Events;
+using System.Runtime.InteropServices;
+
+
+//以配置文件为准，否则 从url中取环境值(服务以命令行传递参数启动，配置文件配置了就不需要传递环境参数)
+var config = new ConfigurationBuilder()
+            .AddEnvironmentVariables()
+            .Build();
+
+var enviromentName = config["ASPNETCORE_ENVIRONMENT"];
+
+var builder = WebApplication.CreateBuilder(new WebApplicationOptions
+{
+    EnvironmentName = enviromentName
+});
+
+
+
+#region 主机配置
+
+NewId.SetProcessIdProvider(new CurrentProcessIdProvider());
+
+builder.Configuration.AddJsonFile("appsettings.json", false, true)
+                     .AddJsonFile($"appsettings.{enviromentName}.json", false, true);
+builder.Host
+            .UseServiceProviderFactory(new AutofacServiceProviderFactory())
+            .ConfigureContainer<ContainerBuilder>(containerBuilder =>
+            {
+                containerBuilder.RegisterModule<AutofacModuleSetup>();
+            })
+            .UseSerilog();
+#endregion
+
+#region 配置服务
+var _configuration = builder.Configuration;
+
+//健康检查
+builder.Services.AddHealthChecks();
+
+//本地化
+builder.Services.AddJsonLocalization(options => options.ResourcesPath = "Resources");
+
+
+// 异常、参数统一验证过滤器、Json序列化配置、字符串参数绑型统一Trim()
+builder.Services.AddControllers(options =>
+{
+    options.Filters.Add<ModelActionFilter>();
+    options.Filters.Add<ProjectExceptionFilter>();
+    options.Filters.Add<UnitOfWorkFilter>();
+
+
+})
+    .AddNewtonsoftJsonSetup(builder.Services); // NewtonsoftJson 序列化  处理
+
+
+builder.Services.AddOptions().Configure<AliyunOSSOptions>(_configuration.GetSection("AliyunOSS"));
+builder.Services.AddOptions().Configure<ObjectStoreServiceOptions>(_configuration.GetSection("ObjectStoreService"));
+builder.Services.AddOptions().Configure<DicomSCPServiceOption>(_configuration.GetSection("DicomSCPServiceConfig"));
+
+
+//动态WebApi + UnifiedApiResultFilter  省掉控制器代码
+//动态webApi     目前存在的唯一小坑是生成api上服务上的动态代理AOP失效    间接掉用不影响
+builder.Services
+           .AddDynamicWebApi(dynamicWebApiOption =>
+           {
+               //默认是 api
+               dynamicWebApiOption.DefaultApiPrefix = "";
+               //首字母小写
+               dynamicWebApiOption.GetRestFulActionName = (actionName) => char.ToLower(actionName[0]) + actionName.Substring(1);
+               //删除 Service后缀
+               dynamicWebApiOption.RemoveControllerPostfixes.Add("Service");
+
+           });
+
+//AutoMapper
+builder.Services.AddAutoMapper(automapper =>
+{
+
+    automapper.AddCollectionMappers();
+
+
+}, typeof(BaseService).Assembly);
+
+//EF ORM  QueryWithNoLock
+builder.Services.AddEFSetup(_configuration);
+
+builder.Services.AddMediator(cfg =>
+{
+
+});
+
+
+//转发头设置  获取真实IP 
+builder.Services.Configure<ForwardedHeadersOptions>(options =>
+{
+    options.ForwardedHeaders =
+        ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
+});
+
+
+builder.Services.AddFellowOakDicom().AddTranscoderManager<NativeTranscoderManager>()
+              //.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
+              .AddImageManager<ImageSharpImageManager>();
+
+
+
+#endregion
+
+// Add services to the container.
+
+builder.Services.AddControllers();
+// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
+
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+//if (app.Environment.IsDevelopment())
+//{
+app.UseSwagger();
+app.UseSwaggerUI();
+//}
+
+app.UseAuthorization();
+
+app.MapControllers();
+
+#region 日志
+
+
+Log.Logger = new LoggerConfiguration()
+     //.MinimumLevel.Information()
+     .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
+    .WriteTo.Console()
+    .WriteTo.File($"{AppContext.BaseDirectory}Serilogs/.log", rollingInterval: RollingInterval.Day)
+    .CreateLogger();
+
+#endregion
+
+
+#region 运行环境 部署平台
+
+Log.Logger.Warning($"当前环境：{enviromentName}");
+
+if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+{
+    Log.Logger.Warning($"当前部署平台环境：windows");
+}
+else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+{
+    Log.Logger.Warning($"当前部署平台环境：linux");
+}
+else
+{
+    Log.Logger.Warning($"当前部署平台环境：OSX  or FreeBSD");
+}
+
+#endregion
+
+DicomSetupBuilder.UseServiceProvider(app.Services);
+
+var logger = app.Services.GetService<Microsoft.Extensions.Logging.ILogger<Program>>();
+
+var server = DicomServerFactory.Create<CStoreSCPService>(_configuration.GetSection("DicomSCPServiceConfig").GetValue<int>("ServerPort"), userState: app.Services, logger: logger);
+
+
+app.Run();

IRC.Core.Dicom/Properties/launchSettings.json

@@ -0,0 +1,31 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:11224",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5127",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

IRC.Core.Dicom/Service/BaseService.cs

@@ -0,0 +1,111 @@
+using AutoMapper;
+using IRaCIS.Core.Application.Service.BusinessFilter;
+using IRaCIS.Core.Infra.EFCore;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Localization;
+using Panda.DynamicWebApi;
+using Panda.DynamicWebApi.Attributes;
+using System.Diagnostics.CodeAnalysis;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infrastructure.Extention;
+using IRaCIS.Core.Domain.Models;
+
+namespace IRaCIS.Core.SCP.Service
+{
+
+#pragma warning disable CS8618
+
+
+    #region 非泛型版本
+
+    [Authorize, DynamicWebApi, UnifiedApiResultFilter]
+    public class BaseService : IBaseService, IDynamicWebApi
+    {
+        public IMapper _mapper { get; set; }
+
+        public IUserInfo _userInfo { get; set; }
+
+
+        public IStringLocalizer _localizer { get; set; }
+
+        public IWebHostEnvironment _hostEnvironment { get; set; }
+
+
+
+
+        public static IResponseOutput Null404NotFound<TEntity>(TEntity? businessObject) where TEntity : class
+        {
+            return new ResponseOutput<string>()
+            .NotOk($"The query object {typeof(TEntity).Name} does not exist , or was deleted by someone else, or an incorrect parameter query caused", code: ApiResponseCodeEnum.DataNotExist);
+        }
+    }
+
+
+    public interface IBaseService
+    {
+        [MemberNotNull(nameof(_mapper))]
+        public IMapper _mapper { get; set; }
+
+        [MemberNotNull(nameof(_userInfo))]
+        public IUserInfo _userInfo { get; set; }
+
+        [MemberNotNull(nameof(_localizer))]
+        public IStringLocalizer _localizer { get; set; }
+
+        [MemberNotNull(nameof(_hostEnvironment))]
+        public IWebHostEnvironment _hostEnvironment { get; set; }
+
+    }
+    #endregion
+
+
+    #region 泛型版本测试
+
+
+    public interface IBaseServiceTest<T> where T : Entity
+    {
+        [MemberNotNull(nameof(_mapper))]
+        public IMapper _mapper { get; set; }
+
+        [MemberNotNull(nameof(_userInfo))]
+        public IUserInfo _userInfo { get; set; }
+
+
+
+        [MemberNotNull(nameof(_localizer))]
+        public IStringLocalizer _localizer { get; set; }
+
+
+
+    }
+
+
+    [Authorize, DynamicWebApi, UnifiedApiResultFilter]
+    public class BaseServiceTest<T> : IBaseServiceTest<T>, IDynamicWebApi where T : Entity
+    {
+        public IMapper _mapper { get; set; }
+
+        public IUserInfo _userInfo { get; set; }
+
+        public IStringLocalizer _localizer { get; set; }
+
+        public static IResponseOutput Null404NotFound<TEntity>(TEntity? businessObject) where TEntity : class
+        {
+            return new ResponseOutput<string>()
+            .NotOk($"The query object {typeof(TEntity).Name} does not exist , or was deleted by someone else, or an incorrect parameter query caused", code: ApiResponseCodeEnum.DataNotExist);
+        }
+
+
+    }
+
+
+    #endregion
+
+
+
+
+
+
+
+}

IRC.Core.Dicom/Service/CStoreSCPService.cs

@@ -0,0 +1,376 @@
+using FellowOakDicom.Network;
+using FellowOakDicom;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using IRaCIS.Core.SCP.Service;
+using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Infra.EFCore;
+using Medallion.Threading;
+using IRaCIS.Core.Domain.Share;
+using Serilog;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
+using Microsoft.Extensions.Options;
+using System.Data;
+using FellowOakDicom.Imaging;
+using SharpCompress.Common;
+using SixLabors.ImageSharp.Formats.Jpeg;
+using IRaCIS.Core.Infrastructure;
+
+namespace IRaCIS.Core.SCP.Service
+{
+
+    public class DicomSCPServiceOption
+    {
+        public List<string> CalledAEList { get; set; }
+
+        public string ServerPort { get; set; }
+    }
+
+
+
+
+    public class CStoreSCPService : DicomService, IDicomServiceProvider, IDicomCStoreProvider, IDicomCEchoProvider
+    {
+        private IServiceProvider _serviceProvider { get; set; }
+
+        private List<Guid> _SCPStudyIdList { get; set; } = new List<Guid>();
+
+        private SCPImageUpload _upload { get; set; }
+
+        private Guid _trialId { get; set; }
+
+        private Guid _trialSiteId { get; set; }
+
+
+
+        private static readonly DicomTransferSyntax[] _acceptedTransferSyntaxes = new DicomTransferSyntax[]
+        {
+               DicomTransferSyntax.ExplicitVRLittleEndian,
+               DicomTransferSyntax.ExplicitVRBigEndian,
+               DicomTransferSyntax.ImplicitVRLittleEndian
+        };
+
+        private static readonly DicomTransferSyntax[] _acceptedImageTransferSyntaxes = new DicomTransferSyntax[]
+        {
+                // Lossless
+               DicomTransferSyntax.JPEGLSLossless,   //1.2.840.10008.1.2.4.80
+               DicomTransferSyntax.JPEG2000Lossless, //1.2.840.10008.1.2.4.90
+               DicomTransferSyntax.JPEGProcess14SV1, //1.2.840.10008.1.2.4.70
+               DicomTransferSyntax.JPEGProcess14,    //1.2.840.10008.1.2.4.57 JPEG Lossless, Non-Hierarchical (Process 14)
+               DicomTransferSyntax.RLELossless,      //1.2.840.10008.1.2.5
+               // Lossy
+               DicomTransferSyntax.JPEGLSNearLossless,//1.2.840.10008.1.2.4.81"
+               DicomTransferSyntax.JPEG2000Lossy,     //1.2.840.10008.1.2.4.91
+               DicomTransferSyntax.JPEGProcess1,      //1.2.840.10008.1.2.4.50
+               DicomTransferSyntax.JPEGProcess2_4,    //1.2.840.10008.1.2.4.51
+               // Uncompressed
+               DicomTransferSyntax.ExplicitVRLittleEndian, //1.2.840.10008.1.2.1
+               DicomTransferSyntax.ExplicitVRBigEndian,    //1.2.840.10008.1.2.2
+               DicomTransferSyntax.ImplicitVRLittleEndian  //1.2.840.10008.1.2
+        };
+
+
+        public CStoreSCPService(INetworkStream stream, Encoding fallbackEncoding, Microsoft.Extensions.Logging.ILogger log, DicomServiceDependencies dependencies, IServiceProvider injectServiceProvider)
+            : base(stream, fallbackEncoding, log, dependencies)
+        {
+            _serviceProvider = injectServiceProvider.CreateScope().ServiceProvider;
+        }
+
+
+
+
+        public Task OnReceiveAssociationRequestAsync(DicomAssociation association)
+        {
+
+            _upload = new SCPImageUpload() { StartTime = DateTime.Now, CallingAE = association.CallingAE, CalledAE = association.CalledAE, CallingAEIP = association.RemoteHost };
+
+
+            Log.Logger.Warning($"接收到来自{association.CallingAE}的连接");
+
+            //_serviceProvider = (IServiceProvider)this.UserState;
+
+            var _trialDicomAERepository = _serviceProvider.GetService<IRepository<TrialDicomAE>>();
+
+
+            var trialDicomAEList = _trialDicomAERepository.Select(t => new { t.CalledAE, t.TrialId }).ToList();
+            var trialCalledAEList = trialDicomAEList.Select(t => t.CalledAE).ToList();
+
+            Log.Logger.Information("当前系统配置：", string.Join('|', trialDicomAEList));
+
+            var findCalledAE = trialDicomAEList.Where(t => t.CalledAE == association.CalledAE).FirstOrDefault();
+
+            var isCanReceiveIamge = false;
+
+            if (findCalledAE != null)
+            {
+                _trialId = findCalledAE.TrialId;
+
+                var _trialSiteDicomAERepository = _serviceProvider.GetService<IRepository<TrialSiteDicomAE>>();
+
+
+                var findTrialSiteAE = _trialSiteDicomAERepository.Where(t => t.CallingAE == association.CallingAE && t.TrialId==_trialId).FirstOrDefault();
+
+                if (findTrialSiteAE != null)
+                {
+                    _trialSiteId = findTrialSiteAE.TrialSiteId;
+
+                    isCanReceiveIamge = true;
+                }
+
+               
+            }
+
+            if (association.CallingAE == "test-callingAE")
+            {
+                isCanReceiveIamge = true;
+            }
+
+            if (!trialCalledAEList.Contains(association.CalledAE) || isCanReceiveIamge == false)
+            {
+
+                Log.Logger.Warning($"拒绝CallingAE:{association.CallingAE}  CalledAE:{association.CalledAE}的连接");
+
+                return SendAssociationRejectAsync(
+                    DicomRejectResult.Permanent,
+                    DicomRejectSource.ServiceUser,
+                    DicomRejectReason.CalledAENotRecognized);
+            }
+
+            foreach (var pc in association.PresentationContexts)
+            {
+                if (pc.AbstractSyntax == DicomUID.Verification)
+                {
+                    pc.AcceptTransferSyntaxes(_acceptedTransferSyntaxes);
+                }
+                else if (pc.AbstractSyntax.StorageCategory != DicomStorageCategory.None)
+                {
+                    pc.AcceptTransferSyntaxes(_acceptedImageTransferSyntaxes);
+                }
+            }
+
+
+
+            return SendAssociationAcceptAsync(association);
+        }
+
+
+        public async Task OnReceiveAssociationReleaseRequestAsync()
+        {
+            await DataMaintenanceAsaync();
+
+            //记录监控
+
+            var _SCPImageUploadRepository = _serviceProvider.GetService<IRepository<SCPImageUpload>>();
+
+            _upload.EndTime = DateTime.Now;
+            _upload.StudyCount = _SCPStudyIdList.Count;
+            _upload.TrialId = _trialId;
+            _upload.TrialSiteId = _trialSiteId;
+
+            await _SCPImageUploadRepository.AddAsync(_upload, true);
+
+
+            var _studyRepository = _serviceProvider.GetService<IRepository<SCPStudy>>();
+            //将检查设置为传输结束
+            await _studyRepository.BatchUpdateNoTrackingAsync(t => _SCPStudyIdList.Contains(t.Id), u => new SCPStudy() { IsUploadFinished = true });
+
+            await _studyRepository.SaveChangesAndClearAllTrackingAsync();
+
+            await SendAssociationReleaseResponseAsync();
+        }
+
+
+        private async Task DataMaintenanceAsaync()
+        {
+            Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE}传输结束：开始维护数据，处理检查Modality");
+
+
+
+            //处理检查Modality
+            var _dictionaryRepository = _serviceProvider.GetService<IRepository<Dictionary>>();
+            var _seriesRepository = _serviceProvider.GetService<IRepository<SCPSeries>>();
+            var _studyRepository = _serviceProvider.GetService<IRepository<SCPStudy>>();
+
+            var dicModalityList = _dictionaryRepository.Where(t => t.Code == "Modality").SelectMany(t => t.ChildList.Select(c => c.Value)).ToList();
+            var seriesModalityList = _seriesRepository.Where(t => _SCPStudyIdList.Contains(t.StudyId)).Select(t => new { SCPStudyId = t.StudyId, t.Modality }).ToList();
+
+            foreach (var g in seriesModalityList.GroupBy(t => t.SCPStudyId))
+            {
+                var modality = string.Join('、', g.Select(t => t.Modality).Distinct().ToList());
+
+                //特殊逻辑
+                var modalityForEdit = dicModalityList.Contains(modality) ? modality : String.Empty;
+
+                if (modality == "MR")
+                {
+                    modalityForEdit = "MRI";
+                }
+
+                if (modality == "PT")
+                {
+                    modalityForEdit = "PET";
+                }
+                if (modality == "PT、CT" || modality == "CT、PT")
+                {
+                    modalityForEdit = "PET-CT";
+                }
+
+                await _studyRepository.BatchUpdateNoTrackingAsync(t => t.Id == g.Key, u => new SCPStudy() { Modalities = modality, ModalityForEdit = modalityForEdit });
+
+            }
+
+            Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE}维护数据结束");
+        }
+
+        public void OnReceiveAbort(DicomAbortSource source, DicomAbortReason reason)
+        {
+            Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE}接收中断，中断原因：{source.ToString() + reason.ToString()}");
+            /* nothing to do here */
+        }
+
+
+        public async void OnConnectionClosed(Exception exception)
+        {
+            /* nothing to do here */
+
+            //奇怪的bug  上传的时候，用王捷修改的影像，会关闭，重新连接，导致检查id 丢失，然后状态不一致
+            if (exception == null)
+            {
+                //var _studyRepository = _serviceProvider.GetService<IRepository<SCPStudy>>();
+                ////将检查设置为传输结束
+                //await _studyRepository.BatchUpdateNoTrackingAsync(t => _SCPStudyIdList.Contains(t.Id), u => new SCPStudy() { IsUploadFinished = true });
+
+                //await _studyRepository.SaveChangesAndClearAllTrackingAsync();
+            }
+
+            Log.Logger.Warning($"连接关闭 {exception?.Message} {exception?.InnerException?.Message}");
+        }
+
+
+
+
+        public async Task<DicomCStoreResponse> OnCStoreRequestAsync(DicomCStoreRequest request)
+        {
+
+            string studyInstanceUid = request.Dataset.GetString(DicomTag.StudyInstanceUID);
+            string seriesInstanceUid = request.Dataset.GetString(DicomTag.SeriesInstanceUID);
+            string sopInstanceUid = request.Dataset.GetString(DicomTag.SOPInstanceUID);
+
+            //Guid studyId = IdentifierHelper.CreateGuid(studyInstanceUid, trialId.ToString());
+            Guid seriesId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, _trialId.ToString());
+            Guid instanceId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, sopInstanceUid, _trialId.ToString());
+
+
+            var ossService = _serviceProvider.GetService<IOSSService>();
+            var dicomArchiveService = _serviceProvider.GetService<IDicomArchiveService>();
+            var _seriesRepository = _serviceProvider.GetService<IRepository<SCPSeries>>();
+
+            var _distributedLockProvider = _serviceProvider.GetService<IDistributedLockProvider>();
+
+            var storeRelativePath = string.Empty;
+            var ossFolderPath = $"{_trialId}/Image/PACS/{_trialSiteId}/{studyInstanceUid}";
+
+
+            long fileSize = 0;
+            try
+            {
+
+                using (MemoryStream ms = new MemoryStream())
+                {
+                    await request.File.SaveAsync(ms);
+
+                    //irc 从路径最后一截取Guid
+                    storeRelativePath = await ossService.UploadToOSSAsync(ms, ossFolderPath, instanceId.ToString(), false);
+
+                    fileSize = ms.Length;
+                }
+
+                Log.Logger.Information($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE} {request.SOPInstanceUID} 上传完成 ");
+
+            }
+            catch (Exception ec)
+            {
+                Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE} 上传异常 {ec.Message}");
+            }
+
+
+
+            var @lock = _distributedLockProvider.CreateLock($"{studyInstanceUid}");
+
+            using (await @lock.AcquireAsync())
+            {
+                try
+                {
+                    var scpStudyId = await dicomArchiveService.ArchiveDicomFileAsync(request.Dataset, _trialId, _trialSiteId, storeRelativePath, Association.CallingAE, Association.CalledAE,fileSize);
+
+                    if (!_SCPStudyIdList.Contains(scpStudyId))
+                    {
+                        _SCPStudyIdList.Add(scpStudyId);
+                    }
+
+                    var series = await _seriesRepository.FirstOrDefaultAsync(t => t.Id == seriesId);
+
+                    //没有缩略图
+                    if (series != null && string.IsNullOrEmpty(series.ImageResizePath))
+                    {
+
+                        // 生成缩略图
+                        using (var memoryStream = new MemoryStream())
+                        {
+                            DicomImage image = new DicomImage(request.Dataset);
+
+                            var sharpimage = image.RenderImage().AsSharpImage();
+                            sharpimage.Save(memoryStream, new JpegEncoder());
+
+                            // 上传缩略图到 OSS
+
+                            var seriesPath = await ossService.UploadToOSSAsync(memoryStream, ossFolderPath, seriesId.ToString() + ".preview.jpg", false);
+
+                            Console.WriteLine(seriesPath + "  Id:  " + seriesId);
+
+                            series.ImageResizePath = seriesPath;
+
+                        }
+                    }
+
+
+                    await _seriesRepository.SaveChangesAsync();
+                }
+                catch (Exception ex)
+                {
+
+                    Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE} 传输处理异常：{ex.ToString()}");
+
+                }
+
+            }
+
+
+
+            //监控信息设置
+            _upload.FileCount++;
+            _upload.FileSize = _upload.FileSize + fileSize;
+            return new DicomCStoreResponse(request, DicomStatus.Success);
+        }
+
+
+        public Task OnCStoreRequestExceptionAsync(string tempFileName, Exception e)
+        {
+            // let library handle logging and error response
+            return Task.CompletedTask;
+        }
+
+
+        public Task<DicomCEchoResponse> OnCEchoRequestAsync(DicomCEchoRequest request)
+        {
+            return Task.FromResult(new DicomCEchoResponse(request, DicomStatus.Success));
+        }
+
+    }
+}

IRC.Core.Dicom/Service/DicomArchiveService.cs

@@ -0,0 +1,356 @@
+using IRaCIS.Core.Domain.Share;
+using System.Text;
+using Microsoft.AspNetCore.Hosting;
+using IRaCIS.Core.Infrastructure;
+using Medallion.Threading;
+using FellowOakDicom;
+using FellowOakDicom.Imaging.Codec;
+using System.Data;
+using IRaCIS.Core.Domain.Models;
+using FellowOakDicom.Network;
+using IRaCIS.Core.SCP.Service;
+using IRaCIS.Core.Infra.EFCore;
+using MassTransit;
+using System.Runtime.Intrinsics.X86;
+using Serilog.Sinks.File;
+
+namespace IRaCIS.Core.SCP.Service
+{
+    public class DicomArchiveService : BaseService, IDicomArchiveService
+    {
+        private readonly IRepository<SCPPatient> _patientRepository;
+        private readonly IRepository<SCPStudy> _studyRepository;
+        private readonly IRepository<SCPSeries> _seriesRepository;
+        private readonly IRepository<SCPInstance> _instanceRepository;
+        private readonly IRepository<Dictionary> _dictionaryRepository;
+        private readonly IDistributedLockProvider _distributedLockProvider;
+
+
+        private List<Guid> _instanceIdList = new List<Guid>();
+
+        public DicomArchiveService(IRepository<SCPPatient> patientRepository, IRepository<SCPStudy> studyRepository,
+            IRepository<SCPSeries> seriesRepository,
+            IRepository<SCPInstance> instanceRepository,
+            IRepository<Dictionary> dictionaryRepository,
+            IDistributedLockProvider distributedLockProvider)
+        {
+            _distributedLockProvider = distributedLockProvider;
+            _studyRepository = studyRepository;
+            _patientRepository = patientRepository;
+            _seriesRepository = seriesRepository;
+            _instanceRepository = instanceRepository;
+            _dictionaryRepository = dictionaryRepository;
+
+        }
+
+
+
+
+        /// <summary>
+        /// 单个文件接收 归档
+        /// </summary>
+        /// <param name="dataset"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task<Guid> ArchiveDicomFileAsync(DicomDataset dataset, Guid trialId, Guid trialSiteId, string fileRelativePath, string callingAE, string calledAE,long fileSize)
+        {
+            string studyInstanceUid = dataset.GetString(DicomTag.StudyInstanceUID);
+            string seriesInstanceUid = dataset.GetString(DicomTag.SeriesInstanceUID);
+            string sopInstanceUid = dataset.GetString(DicomTag.SOPInstanceUID);
+
+            string patientIdStr = dataset.GetSingleValueOrDefault(DicomTag.PatientID,string.Empty);
+
+            //Guid patientId= IdentifierHelper.CreateGuid(patientIdStr);
+            Guid studyId = IdentifierHelper.CreateGuid(studyInstanceUid,trialId.ToString());
+            Guid seriesId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, trialId.ToString());
+            Guid instanceId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, sopInstanceUid, trialId.ToString());
+
+            var isStudyNeedAdd = false;
+            var isSeriesNeedAdd = false;
+            var isInstanceNeedAdd = false;
+            var isPatientNeedAdd = false;
+
+            //var @lock = _distributedLockProvider.CreateLock($"{studyInstanceUid}");
+
+            //using (@lock.Acquire())
+            {
+                var findPatient = await _patientRepository.FirstOrDefaultAsync(t => t.PatientIdStr == patientIdStr && t.TrialSiteId==trialSiteId );
+                var findStudy = await _studyRepository.FirstOrDefaultAsync(t=>t.Id== studyId);
+                var findSerice = await _seriesRepository.FirstOrDefaultAsync(t => t.Id ==   seriesId);
+                var findInstance = await _instanceRepository.FirstOrDefaultAsync(t => t.Id == instanceId);
+
+                DateTime? studyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.StudyDate).Add(dataset.GetSingleValueOrDefault(DicomTag.StudyTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.StudyTime).TimeOfDay);
+
+                //先传输了修改了患者编号的，又传输了没有修改患者编号的，导致后传输的没有修改患者编号的下面的检查为0
+                if (findPatient == null && findStudy==null)
+                {
+                    isPatientNeedAdd = true;
+
+
+                    findPatient = new SCPPatient()
+                    {
+                        Id = NewId.NextSequentialGuid(),
+                        TrialId=trialId,
+                        TrialSiteId=trialSiteId,
+                        PatientIdStr = dataset.GetSingleValueOrDefault(DicomTag.PatientID, string.Empty),
+                        PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty),
+                        PatientAge = dataset.GetSingleValueOrDefault(DicomTag.PatientAge, string.Empty),
+                        PatientSex = dataset.GetSingleValueOrDefault(DicomTag.PatientSex, string.Empty),
+                        PatientBirthDate = dataset.GetSingleValueOrDefault(DicomTag.PatientBirthDate, string.Empty),
+
+                        EarliestStudyTime = studyTime,
+                        LatestStudyTime = studyTime,
+                        LatestPushTime = DateTime.Now,
+                    };
+
+                    if (findPatient.PatientBirthDate.Length == 8)
+                    {
+                        var birthDateStr = $"{findPatient.PatientBirthDate[0]}{findPatient.PatientBirthDate[1]}{findPatient.PatientBirthDate[2]}{findPatient.PatientBirthDate[3]}-{findPatient.PatientBirthDate[4]}{findPatient.PatientBirthDate[5]}-{findPatient.PatientBirthDate[6]}{findPatient.PatientBirthDate[7]}";
+
+                        var yearStr = $"{findPatient.PatientBirthDate[0]}{findPatient.PatientBirthDate[1]}{findPatient.PatientBirthDate[2]}{findPatient.PatientBirthDate[3]}";
+
+                        int year = 0;
+
+                        var canParse = int.TryParse(yearStr, out year);
+
+                        if (canParse && year > 1900)
+                        {
+                            findPatient.PatientBirthDate = birthDateStr;
+
+                            DateTime birthDate;
+
+                            if (findPatient.PatientAge == string.Empty && studyTime.HasValue && DateTime.TryParse(findPatient.PatientBirthDate,out birthDate))
+                            {
+                                var patientAge = studyTime.Value.Year - birthDate.Year;
+                                // 如果生日还未到，年龄减去一岁
+                                if (studyTime.Value < birthDate.AddYears(patientAge))
+                                {
+                                    patientAge--;
+                                }
+
+                                findPatient.PatientAge = patientAge.ToString();
+                            }
+
+                        }
+                        else
+                        {
+                            findPatient.PatientBirthDate = string.Empty;
+                        }
+
+                    }
+                }
+                else
+                {
+                    if (studyTime < findPatient.EarliestStudyTime)
+                    {
+                        findPatient.EarliestStudyTime = studyTime;
+                    }
+                    if (studyTime > findPatient.LatestStudyTime)
+                    {
+                        findPatient.LatestStudyTime = studyTime;
+                    }
+
+                    findPatient.LatestPushTime = DateTime.Now;
+                }
+
+                if (findStudy == null)
+                {
+                    isStudyNeedAdd = true;
+                    findStudy = new SCPStudy
+                    {
+                        CalledAE = calledAE,
+                        CallingAE = callingAE,
+
+                        PatientId = findPatient.Id,
+                        Id = studyId,
+                        TrialId = trialId,
+                        TrialSiteId = trialSiteId,
+                        StudyInstanceUid = studyInstanceUid,
+                        StudyTime = studyTime,
+                        Modalities = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty),
+                        //ModalityForEdit = modalityForEdit,
+                        Description = dataset.GetSingleValueOrDefault(DicomTag.StudyDescription, string.Empty),
+                        InstitutionName = dataset.GetSingleValueOrDefault(DicomTag.InstitutionName, string.Empty),
+                        PatientIdStr = dataset.GetSingleValueOrDefault(DicomTag.PatientID, string.Empty),
+                        PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty),
+                        PatientAge = dataset.GetSingleValueOrDefault(DicomTag.PatientAge, string.Empty),
+                        PatientSex = dataset.GetSingleValueOrDefault(DicomTag.PatientSex, string.Empty),
+                        BodyPartExamined = dataset.GetSingleValueOrDefault(DicomTag.BodyPartExamined, string.Empty),
+
+                        StudyId = dataset.GetSingleValueOrDefault(DicomTag.StudyID, string.Empty),
+                        AccessionNumber = dataset.GetSingleValueOrDefault(DicomTag.AccessionNumber, string.Empty),
+
+                        //需要特殊处理
+                        PatientBirthDate = dataset.GetSingleValueOrDefault(DicomTag.PatientBirthDate, string.Empty),
+
+
+                        AcquisitionTime = dataset.GetSingleValueOrDefault(DicomTag.AcquisitionTime, string.Empty),
+                        AcquisitionNumber = dataset.GetSingleValueOrDefault(DicomTag.AcquisitionNumber, string.Empty),
+                        TriggerTime = dataset.GetSingleValueOrDefault(DicomTag.TriggerTime, string.Empty),
+
+
+
+                        //IsDoubleReview = addtionalInfo.IsDoubleReview,
+                        SeriesCount = 0,
+                        InstanceCount = 0
+                    };
+
+
+                    if (findStudy.PatientBirthDate.Length == 8)
+                    {
+                        findStudy.PatientBirthDate = $"{findStudy.PatientBirthDate[0]}{findStudy.PatientBirthDate[1]}{findStudy.PatientBirthDate[2]}{findStudy.PatientBirthDate[3]}-{findStudy.PatientBirthDate[4]}{findStudy.PatientBirthDate[5]}-{findStudy.PatientBirthDate[6]}{findStudy.PatientBirthDate[7]}";
+                    }
+                }
+
+
+                if (findSerice == null)
+                {
+                    isSeriesNeedAdd = true;
+
+                    findSerice = new SCPSeries
+                    {
+                        Id = seriesId,
+                        StudyId = findStudy.Id,
+
+                        StudyInstanceUid = findStudy.StudyInstanceUid,
+                        SeriesInstanceUid = seriesInstanceUid,
+                        SeriesNumber = dataset.GetSingleValueOrDefault(DicomTag.SeriesNumber, 1),
+                        //SeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, DateTime.Now).Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, DateTime.Now).TimeOfDay),
+                        //SeriesTime = DateTime.TryParse(dataset.GetSingleValue<string>(DicomTag.SeriesDate) + dataset.GetSingleValue<string>(DicomTag.SeriesTime), out DateTime dt) ? dt : null,
+                        SeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.SeriesDate).Add(dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.SeriesTime).TimeOfDay),
+                        Modality = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty),
+                        Description = dataset.GetSingleValueOrDefault(DicomTag.SeriesDescription, string.Empty),
+                        SliceThickness = dataset.GetSingleValueOrDefault(DicomTag.SliceThickness, string.Empty),
+
+                        ImagePositionPatient = dataset.GetSingleValueOrDefault(DicomTag.ImagePositionPatient, string.Empty),
+                        ImageOrientationPatient = dataset.GetSingleValueOrDefault(DicomTag.ImageOrientationPatient, string.Empty),
+                        BodyPartExamined = dataset.GetSingleValueOrDefault(DicomTag.BodyPartExamined, string.Empty),
+                        SequenceName = dataset.GetSingleValueOrDefault(DicomTag.SequenceName, string.Empty),
+                        ProtocolName = dataset.GetSingleValueOrDefault(DicomTag.ProtocolName, string.Empty),
+                        ImagerPixelSpacing = dataset.GetSingleValueOrDefault(DicomTag.ImagerPixelSpacing, string.Empty),
+
+                        AcquisitionTime = dataset.GetSingleValueOrDefault(DicomTag.AcquisitionTime, string.Empty),
+                        AcquisitionNumber = dataset.GetSingleValueOrDefault(DicomTag.AcquisitionNumber, string.Empty),
+                        TriggerTime = dataset.GetSingleValueOrDefault(DicomTag.TriggerTime, string.Empty),
+
+
+                        InstanceCount = 0
+                    };
+
+                    ++findStudy.SeriesCount;
+                }
+
+
+                if (findInstance == null)
+                {
+                    isInstanceNeedAdd = true;
+                    findInstance = new SCPInstance
+                    {
+                        Id = instanceId,
+                        StudyId = findStudy.Id,
+                        SeriesId = findSerice.Id,
+                        StudyInstanceUid = findStudy.StudyInstanceUid,
+                        SeriesInstanceUid = findSerice.SeriesInstanceUid,
+
+                        SopInstanceUid = sopInstanceUid,
+                        InstanceNumber = dataset.GetSingleValueOrDefault(DicomTag.InstanceNumber, 1),
+                        InstanceTime = dataset.GetSingleValueOrDefault(DicomTag.ContentDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.ContentDate).Add(dataset.GetSingleValueOrDefault(DicomTag.ContentTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.ContentTime).TimeOfDay),
+                        //InstanceTime = DateTime.TryParse(dataset.GetSingleValue<string>(DicomTag.ContentDate) + dataset.GetSingleValue<string>(DicomTag.ContentTime), out DateTime dt) ? dt : null,
+                        //InstanceTime = dataset.GetSingleValueOrDefault(DicomTag.ContentDate,(DateTime?)null)?.Add(dataset.GetSingleValueOrDefault(DicomTag.ContentTime, TimeSpan.Zero)),
+                        //dataset.GetSingleValueOrDefault(DicomTag.ContentDate,DateTime.Now);//, DicomTag.ContentTime)
+                        CPIStatus = false,
+                        ImageRows = dataset.GetSingleValueOrDefault(DicomTag.Rows, 0),
+                        ImageColumns = dataset.GetSingleValueOrDefault(DicomTag.Columns, 0),
+                        SliceLocation = dataset.GetSingleValueOrDefault(DicomTag.SliceLocation, 0),
+
+                        SliceThickness = dataset.GetSingleValueOrDefault(DicomTag.SliceThickness, string.Empty),
+                        NumberOfFrames = dataset.GetSingleValueOrDefault(DicomTag.NumberOfFrames, 0),
+                        PixelSpacing = dataset.GetSingleValueOrDefault(DicomTag.PixelSpacing, string.Empty),
+                        ImagerPixelSpacing = dataset.GetSingleValueOrDefault(DicomTag.ImagerPixelSpacing, string.Empty),
+                        FrameOfReferenceUID = dataset.GetSingleValueOrDefault(DicomTag.FrameOfReferenceUID, string.Empty),
+                        WindowCenter = dataset.GetSingleValueOrDefault(DicomTag.WindowCenter, string.Empty),
+                        WindowWidth = dataset.GetSingleValueOrDefault(DicomTag.WindowWidth, string.Empty),
+
+                        Path = fileRelativePath,
+
+                        FileSize= fileSize,
+
+                    };
+
+                    ++findStudy.InstanceCount;
+                    ++findSerice.InstanceCount;
+                }
+
+                if (isPatientNeedAdd)
+                {
+                    var ss = await _patientRepository.AddAsync(findPatient);
+                }
+                if (isStudyNeedAdd)
+                {
+                    var dd = await _studyRepository.AddAsync(findStudy);
+                }
+                else
+                {
+                    await _studyRepository.BatchUpdateNoTrackingAsync(t => t.Id == findStudy.Id, t => new SCPStudy() { IsUploadFinished = false });
+                }
+
+                if (isSeriesNeedAdd)
+                {
+                    await _seriesRepository.AddAsync(findSerice);
+                }
+                if (isInstanceNeedAdd)
+                {
+                    await _instanceRepository.AddAsync(findInstance);
+                }
+                else
+                {
+                    await _instanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == instanceId, u => new SCPInstance() { Path = fileRelativePath,FileSize=fileSize });
+                }
+
+                await _studyRepository.SaveChangesAsync();
+
+                return findStudy.Id;
+            }
+
+        }
+
+
+        // 从DICOM文件中获取使用的字符集
+        private string GetEncodingVaulueFromDicomFile(DicomDataset dataset, DicomTag dicomTag)
+        {
+
+            // 获取DICOM文件的特定元素，通常用于指示使用的字符集
+            var charset = dataset.GetSingleValueOrDefault(DicomTag.SpecificCharacterSet, string.Empty);
+
+            var dicomEncoding = DicomEncoding.GetEncoding(charset);
+
+
+            var dicomStringElement = dataset.GetDicomItem<DicomStringElement>(dicomTag);
+
+            var bytes = dicomStringElement.Buffer.Data;
+
+
+            return dicomEncoding.GetString(bytes);
+
+
+            //// 从DICOM文件中获取使用的字符集
+            //string filePath = "C:\\Users\\hang\\Documents\\WeChat Files\\wxid_r2imdzb7j3q922\\FileStorage\\File\\2024-05\\1.2.840.113619.2.80.169103990.5390.1271401378.4.dcm";
+            //DicomFile dicomFile = DicomFile.Open(filePath);
+
+            //// 获取DICOM文件的特定元素，通常用于指示使用的字符集
+            //var charset = dicomFile.Dataset.GetSingleValueOrDefault(DicomTag.SpecificCharacterSet, string.Empty);
+
+            //var dicomEncoding = DicomEncoding.GetEncoding(charset);
+
+            //var value = dicomFile.Dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty);
+
+            //var dicomStringElement = dicomFile.Dataset.GetDicomItem<DicomStringElement>(DicomTag.PatientName);
+
+            //var bytes = dicomStringElement.Buffer.Data;
+
+            //var aa= dicomEncoding.GetString(bytes);
+
+
+        }
+    }
+}

IRC.Core.Dicom/Service/Interface/IDicomArchiveService.cs

@@ -0,0 +1,11 @@
+using FellowOakDicom;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
+
+namespace IRaCIS.Core.SCP.Service
+{
+    public interface IDicomArchiveService
+    {
+        Task<Guid> ArchiveDicomFileAsync(DicomDataset dicomDataset,Guid trialId,Guid trialSiteId, string fileRelativePath,string callingAE,string calledAE,long fileSize);
+
+    }
+}

IRC.Core.Dicom/Service/OSSService.cs

@@ -0,0 +1,770 @@
+using AlibabaCloud.SDK.Sts20150401;
+using Aliyun.OSS;
+using Amazon;
+using Amazon.Runtime;
+using Amazon.S3;
+using Amazon.S3.Model;
+using Amazon.SecurityToken;
+using Amazon.SecurityToken.Model;
+using IRaCIS.Core.Infrastructure;
+using IRaCIS.Core.Infrastructure.NewtonsoftJson;
+using MassTransit;
+using Microsoft.Extensions.Options;
+using Minio;
+using Minio.DataModel.Args;
+using System.Reactive.Linq;
+using System.Runtime.InteropServices;
+
+namespace IRaCIS.Core.SCP;
+
+#region 绑定和返回模型
+
+[LowerCamelCaseJson]
+public class MinIOOptions : AWSOptions
+{
+    public int Port { get; set; }
+
+}
+
+
+public class AWSOptions
+{
+    public string EndPoint { get; set; }
+    public bool UseSSL { get; set; }
+    public string AccessKeyId { get; set; }
+    public string RoleArn { get; set; }
+    public string SecretAccessKey { get; set; }
+    public string BucketName { get; set; }
+    public string ViewEndpoint { get; set; }
+    public int DurationSeconds { get; set; }
+    public string Region { get; set; }
+}
+
+public class AliyunOSSOptions
+{
+    public string RegionId { get; set; }
+    public string AccessKeyId { get; set; }
+    public string AccessKeySecret { get; set; }
+
+    public string InternalEndpoint { get; set; }
+
+    public string EndPoint { get; set; }
+    public string BucketName { get; set; }
+
+    public string RoleArn { get; set; }
+
+    public string Region { get; set; }
+
+    public string ViewEndpoint { get; set; }
+
+    public int DurationSeconds { get; set; }
+
+
+
+}
+
+public class ObjectStoreServiceOptions
+{
+    public string ObjectStoreUse { get; set; }
+
+    public AliyunOSSOptions AliyunOSS { get; set; }
+
+
+    public MinIOOptions MinIO { get; set; }
+
+    public AWSOptions AWS { get; set; }
+
+}
+
+public class ObjectStoreDTO
+{
+    public string ObjectStoreUse { get; set; }
+
+
+    public AliyunOSSTempToken AliyunOSS { get; set; }
+
+    public MinIOOptions MinIO { get; set; }
+
+    public AWSTempToken AWS { get; set; }
+
+}
+
+[LowerCamelCaseJson]
+public class AliyunOSSTempToken
+{
+    public string AccessKeyId { get; set; }
+    public string AccessKeySecret { get; set; }
+
+    public string EndPoint { get; set; }
+    public string BucketName { get; set; }
+
+    public string Region { get; set; }
+
+    public string ViewEndpoint { get; set; }
+
+    public string SecurityToken { get; set; }
+    public DateTime Expiration { get; set; }
+
+
+}
+
+[LowerCamelCaseJson]
+public class AWSTempToken
+{
+    public string Region { get; set; }
+    public string SessionToken { get; set; }
+    public string EndPoint { get; set; }
+    public string AccessKeyId { get; set; }
+    public string SecretAccessKey { get; set; }
+    public string BucketName { get; set; }
+    public string ViewEndpoint { get; set; }
+    public DateTime Expiration { get; set; }
+}
+
+public enum ObjectStoreUse
+{
+    AliyunOSS = 0,
+    MinIO = 1,
+    AWS = 2,
+}
+
+#endregion
+
+// aws 参考链接 https://github.com/awsdocs/aws-doc-sdk-examples/tree/main/dotnetv3/S3/S3_Basics
+
+public interface IOSSService
+{
+    public Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true);
+    public Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true);
+
+    public Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath);
+
+    public ObjectStoreServiceOptions ObjectStoreServiceOptions { get; set; }
+
+    public Task<string> GetSignedUrl(string ossRelativePath);
+
+    public Task DeleteFromPrefix(string prefix);
+
+    public ObjectStoreDTO GetObjectStoreTempToken();
+}
+
+
+public class OSSService : IOSSService
+{
+    public ObjectStoreServiceOptions ObjectStoreServiceOptions { get; set; }
+
+    private AliyunOSSTempToken AliyunOSSTempToken { get; set; }
+
+    private AWSTempToken AWSTempToken { get; set; }
+
+
+    public OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options)
+    {
+        ObjectStoreServiceOptions = options.CurrentValue;
+
+    }
+
+
+
+    /// <summary>
+    ///  oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
+    /// </summary>
+    /// <param name="fileStream"></param>
+    /// <param name="oosFolderPath"></param>
+    /// <param name="fileRealName"></param>
+    /// <param name="isFileNameAddGuid"></param>
+    /// <returns></returns>
+    public async Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true)
+    {
+        GetObjectStoreTempToken();
+
+        var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{fileRealName}" : $"{oosFolderPath}/{fileRealName}";
+
+        try
+        {
+            using (var memoryStream = new MemoryStream())
+            {
+                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);
+
+
+
+                    // 上传文件
+                    var result = _ossClient.PutObject(aliConfig.BucketName, ossRelativePath, memoryStream);
+
+                }
+                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(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.USEast1,
+                        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("未定义的存储介质类型");
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+
+            throw new BusinessValidationFailedException($"上传发生异常：{ex.Message}");
+        }
+
+
+
+
+        return "/" + ossRelativePath;
+
+    }
+
+
+
+    /// <summary>
+    /// oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
+    /// </summary>
+    /// <param name="localFilePath"></param>
+    /// <param name="oosFolderPath"></param>
+    /// <param name="isFileNameAddGuid"></param>
+    /// <returns></returns>
+    /// <exception cref="BusinessValidationFailedException"></exception>
+    public async Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true)
+    {
+        GetObjectStoreTempToken();
+
+        var localFileName = Path.GetFileName(localFilePath);
+
+        var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{localFileName}" : $"{oosFolderPath}/{localFileName}";
+
+
+        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 result = _ossClient.PutObject(aliConfig.BucketName, ossRelativePath, localFilePath);
+
+        }
+        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)
+                   .WithFileName(localFilePath);
+
+            await minioClient.PutObjectAsync(putObjectArgs);
+        }
+        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+        {
+            var awsConfig = ObjectStoreServiceOptions.AWS;
+
+            // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
+            var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
+
+            //提供awsEndPoint（域名）进行访问配置
+            var clientConfig = new AmazonS3Config
+            {
+                RegionEndpoint = RegionEndpoint.USEast1,
+                UseHttp = true,
+            };
+
+            var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
+
+            var putObjectRequest = new Amazon.S3.Model.PutObjectRequest()
+            {
+                BucketName = awsConfig.BucketName,
+                FilePath = localFilePath,
+                Key = ossRelativePath,
+            };
+
+            await amazonS3Client.PutObjectAsync(putObjectRequest);
+
+        }
+        else
+        {
+            throw new BusinessValidationFailedException("未定义的存储介质类型");
+        }
+        return "/" + ossRelativePath;
+
+    }
+
+
+    public async Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath)
+    {
+        GetObjectStoreTempToken();
+
+        ossRelativePath = ossRelativePath.TrimStart('/');
+        try
+        {
+
+
+            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 result = _ossClient.GetObject(aliConfig.BucketName, ossRelativePath);
+
+                // 将下载的文件流保存到本地文件
+                using (var fs = File.OpenWrite(localFilePath))
+                {
+                    result.Content.CopyTo(fs);
+                    fs.Close();
+                }
+
+            }
+            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 getObjectArgs = new GetObjectArgs()
+                .WithBucket(minIOConfig.BucketName)
+                .WithObject(ossRelativePath)
+                .WithFile(localFilePath);
+
+                await minioClient.GetObjectAsync(getObjectArgs);
+
+            }
+            else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+            {
+                var awsConfig = ObjectStoreServiceOptions.AWS;
+
+                // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
+                var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
+
+                //提供awsEndPoint（域名）进行访问配置
+                var clientConfig = new AmazonS3Config
+                {
+                    RegionEndpoint = RegionEndpoint.USEast1,
+                    UseHttp = true,
+                };
+
+                var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
+
+                var getObjectArgs = new Amazon.S3.Model.GetObjectRequest()
+                {
+                    BucketName = awsConfig.BucketName,
+                    Key = ossRelativePath,
+                };
+
+
+                await (await amazonS3Client.GetObjectAsync(getObjectArgs)).WriteResponseStreamToFileAsync(localFilePath, true, CancellationToken.None);
+
+
+            }
+            else
+            {
+                throw new BusinessValidationFailedException("未定义的存储介质类型");
+            }
+        }
+        catch (Exception ex)
+        {
+
+            throw new BusinessValidationFailedException("oss下载失败!" + ex.Message);
+        }
+
+
+
+
+
+    }
+
+    public async Task<string> GetSignedUrl(string ossRelativePath)
+    {
+        GetObjectStoreTempToken();
+
+        ossRelativePath = ossRelativePath.TrimStart('/');
+        try
+        {
+
+
+            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);
+
+                // 生成签名URL。
+                var req = new GeneratePresignedUriRequest(aliConfig.BucketName, ossRelativePath, SignHttpMethod.Get)
+                {
+                    // 设置签名URL过期时间，默认值为3600秒。
+                    Expiration = DateTime.Now.AddHours(1),
+                };
+                var uri = _ossClient.GeneratePresignedUri(req);
+
+                return uri.PathAndQuery;
+
+            }
+            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 args = new PresignedGetObjectArgs()
+                    .WithBucket(minIOConfig.BucketName)
+                    .WithObject(ossRelativePath)
+                    .WithExpiry(3600)
+                    /*.WithHeaders(reqParams)*/;
+
+                var presignedUrl = await minioClient.PresignedGetObjectAsync(args);
+
+                Uri uri = new Uri(presignedUrl);
+
+                string relativePath = uri.PathAndQuery;
+
+
+                return relativePath;
+
+            }
+            else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+            {
+                var awsConfig = ObjectStoreServiceOptions.AWS;
+
+
+                // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
+                var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
+
+                //提供awsEndPoint（域名）进行访问配置
+                var clientConfig = new AmazonS3Config
+                {
+                    RegionEndpoint = RegionEndpoint.USEast1,
+                    UseHttp = true,
+                };
+
+                var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
+
+                var presignedUrl = await amazonS3Client.GetPreSignedURLAsync(new GetPreSignedUrlRequest()
+                {
+                    BucketName = awsConfig.BucketName,
+                    Key = ossRelativePath,
+                    Expires = DateTime.UtcNow.AddMinutes(120)
+                });
+
+                Uri uri = new Uri(presignedUrl);
+
+                string relativePath = uri.PathAndQuery;
+
+
+                return relativePath;
+            }
+            else
+            {
+                throw new BusinessValidationFailedException("未定义的存储介质类型");
+            }
+        }
+        catch (Exception ex)
+        {
+
+            throw new BusinessValidationFailedException("oss授权url失败!" + ex.Message);
+        }
+
+    }
+
+    /// <summary>
+    /// 删除某个目录的文件
+    /// </summary>
+    /// <param name="prefix"></param>
+    /// <returns></returns>
+    public async Task DeleteFromPrefix(string prefix)
+    {
+        GetObjectStoreTempToken();
+
+        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);
+
+
+            try
+            {
+                ObjectListing objectListing = null;
+                string nextMarker = null;
+                do
+                {
+                    // 使用 prefix 模拟目录结构，设置 MaxKeys 和 NextMarker
+                    objectListing = _ossClient.ListObjects(new Aliyun.OSS.ListObjectsRequest(aliConfig.BucketName)
+                    {
+                        Prefix = prefix,
+                        MaxKeys = 1000,
+                        Marker = nextMarker
+                    });
+
+                    List<string> keys = objectListing.ObjectSummaries.Select(t => t.Key).ToList();
+
+                    // 删除获取到的文件
+                    if (keys.Count > 0)
+                    {
+                        _ossClient.DeleteObjects(new Aliyun.OSS.DeleteObjectsRequest(aliConfig.BucketName, keys, false));
+                    }
+
+                    // 设置 NextMarker 以获取下一页的数据
+                    nextMarker = objectListing.NextMarker;
+
+                } while (objectListing.IsTruncated);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Error: {ex.Message}");
+            }
+
+
+        }
+        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 listArgs = new ListObjectsArgs().WithBucket(minIOConfig.BucketName).WithPrefix(prefix).WithRecursive(true);
+
+
+
+            // 创建一个空列表用于存储对象键
+            var objects = new List<string>();
+
+            // 使用 await foreach 来异步迭代对象列表
+            await foreach (var item in minioClient.ListObjectsEnumAsync(listArgs))
+            {
+                objects.Add(item.Key);
+            }
+
+
+            if (objects.Count > 0)
+            {
+                var objArgs = new RemoveObjectsArgs()
+              .WithBucket(minIOConfig.BucketName)
+              .WithObjects(objects);
+
+                // 删除对象
+                await minioClient.RemoveObjectsAsync(objArgs);
+            }
+
+
+
+        }
+        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+        {
+
+            var awsConfig = ObjectStoreServiceOptions.AWS;
+
+
+            // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
+            var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
+
+            //提供awsEndPoint（域名）进行访问配置
+            var clientConfig = new AmazonS3Config
+            {
+                RegionEndpoint = RegionEndpoint.USEast1,
+                UseHttp = true,
+            };
+
+            var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
+
+            // 列出指定前缀下的所有对象
+            var listObjectsRequest = new ListObjectsV2Request
+            {
+                BucketName = awsConfig.BucketName,
+                Prefix = prefix
+            };
+
+            var listObjectsResponse = await amazonS3Client.ListObjectsV2Async(listObjectsRequest);
+
+            if (listObjectsResponse.S3Objects.Count > 0)
+            {
+                // 准备删除请求
+                var deleteObjectsRequest = new Amazon.S3.Model.DeleteObjectsRequest
+                {
+                    BucketName = awsConfig.BucketName,
+                    Objects = new List<KeyVersion>()
+                };
+
+                foreach (var s3Object in listObjectsResponse.S3Objects)
+                {
+                    deleteObjectsRequest.Objects.Add(new KeyVersion
+                    {
+                        Key = s3Object.Key
+                    });
+                }
+
+                // 批量删除对象
+                var deleteObjectsResponse = await amazonS3Client.DeleteObjectsAsync(deleteObjectsRequest);
+            }
+
+
+
+        }
+        else
+        {
+            throw new BusinessValidationFailedException("未定义的存储介质类型");
+        }
+    }
+
+
+    public ObjectStoreDTO GetObjectStoreTempToken()
+    {
+
+        var ossOptions = ObjectStoreServiceOptions.AliyunOSS;
+
+        if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+        {
+            var client = new Client(new AlibabaCloud.OpenApiClient.Models.Config()
+            {
+                AccessKeyId = ossOptions.AccessKeyId,
+                AccessKeySecret = ossOptions.AccessKeySecret,
+                //AccessKeyId = "LTAI5tJV76pYX5yPg1N9QVE8",
+                //AccessKeySecret = "roRNLa9YG1of4pYruJGCNKBXEWTAWa",
+
+                Endpoint = "sts.cn-hangzhou.aliyuncs.com"
+            });
+
+            var assumeRoleRequest = new AlibabaCloud.SDK.Sts20150401.Models.AssumeRoleRequest();
+            // 将<YOUR_ROLE_SESSION_NAME>设置为自定义的会话名称，例如oss-role-session。
+            assumeRoleRequest.RoleSessionName = $"session-name-{NewId.NextGuid()}";
+            // 将<YOUR_ROLE_ARN>替换为拥有上传文件到指定OSS Bucket权限的RAM角色的ARN。
+            assumeRoleRequest.RoleArn = ossOptions.RoleArn;
+            //assumeRoleRequest.RoleArn = "acs:ram::1899121822495495:role/webdirect";
+            assumeRoleRequest.DurationSeconds = ossOptions.DurationSeconds;
+            var runtime = new AlibabaCloud.TeaUtil.Models.RuntimeOptions();
+            var response = client.AssumeRoleWithOptions(assumeRoleRequest, runtime);
+            var credentials = response.Body.Credentials;
+
+            var tempToken = new AliyunOSSTempToken()
+            {
+                AccessKeyId = credentials.AccessKeyId,
+                AccessKeySecret = credentials.AccessKeySecret,
+
+                //转为服务器时区，最后统一转为客户端时区
+                Expiration = TimeZoneInfo.ConvertTimeFromUtc(DateTime.Parse(credentials.Expiration), TimeZoneInfo.Local),
+                SecurityToken = credentials.SecurityToken,
+
+
+                Region = ossOptions.Region,
+                BucketName = ossOptions.BucketName,
+                EndPoint = ossOptions.EndPoint,
+                ViewEndpoint = ossOptions.ViewEndpoint,
+
+            };
+
+            AliyunOSSTempToken = tempToken;
+
+            return new ObjectStoreDTO() { ObjectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse, AliyunOSS = tempToken };
+        }
+        else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
+        {
+            return new ObjectStoreDTO() { ObjectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse, MinIO = ObjectStoreServiceOptions.MinIO };
+        }
+        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+        {
+            var awsOptions = ObjectStoreServiceOptions.AWS;
+
+            //aws 临时凭证
+            // 创建 STS 客户端
+            var stsClient = new AmazonSecurityTokenServiceClient(awsOptions.AccessKeyId, awsOptions.SecretAccessKey);
+
+            // 使用 AssumeRole 请求临时凭证
+            var assumeRoleRequest = new AssumeRoleRequest
+            {
+
+                RoleArn = awsOptions.RoleArn, // 角色 ARN
+                RoleSessionName = $"session-name-{NewId.NextGuid()}",
+                DurationSeconds = awsOptions.DurationSeconds          // 临时凭证有效期
+            };
+
+            var assumeRoleResponse = stsClient.AssumeRoleAsync(assumeRoleRequest).Result;
+
+            var credentials = assumeRoleResponse.Credentials;
+
+            var tempToken = new AWSTempToken()
+            {
+                AccessKeyId = credentials.AccessKeyId,
+                SecretAccessKey = credentials.SecretAccessKey,
+                SessionToken = credentials.SessionToken,
+                Expiration = credentials.Expiration,
+                Region = awsOptions.Region,
+                BucketName = awsOptions.BucketName,
+                EndPoint = awsOptions.EndPoint,
+                ViewEndpoint = awsOptions.ViewEndpoint,
+
+            };
+
+            AWSTempToken = tempToken;
+            return new ObjectStoreDTO() { ObjectStoreUse = ObjectStoreServiceOptions.ObjectStoreUse, AWS = tempToken };
+        }
+        else
+        {
+            throw new BusinessValidationFailedException("未定义的存储介质类型");
+        }
+    }
+
+}

IRC.Core.Dicom/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

IRC.Core.Dicom/appsettings.json

@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}

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

@@ -7,28 +7,28 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.4" />
+	  <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.405" />
+	  <PackageReference Include="AWSSDK.S3" Version="3.7.416.8" />
-	  <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.36" />
+	  <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.401.81" />
-	  <PackageReference Include="DistributedLock.Core" Version="1.0.7" />
+	  <PackageReference Include="DistributedLock.Core" Version="1.0.8" />
-	  <PackageReference Include="DistributedLock.SqlServer" Version="1.0.5" />
+	  <PackageReference Include="DistributedLock.SqlServer" Version="1.0.6" />
-	  <PackageReference Include="fo-dicom" Version="5.1.3" />
+	  <PackageReference Include="fo-dicom" Version="5.2.1" />
-	  <PackageReference Include="fo-dicom.Codecs" Version="5.15.1" />
+	  <PackageReference Include="fo-dicom.Codecs" Version="5.16.1" />
-	  <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.3" />
+	  <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.1" />
 	  <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="Minio" Version="6.0.4" />
 	  <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="8.0.0" />
+	  <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="6.9.0" />
+	  <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
   </ItemGroup>
 
   <ItemGroup>

IRC.Core.SCP/Program.cs

@@ -126,16 +126,22 @@ builder.Services.Configure<ForwardedHeadersOptions>(options =>
         ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
 });
 
+
+builder.Services.AddFellowOakDicom().AddTranscoderManager<NativeTranscoderManager>()
+              //.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
+              .AddImageManager<ImageSharpImageManager>();
+
+
 //Dicom影像渲染图片  跨平台
 //builder.Services.AddDicomSetup();
-new DicomSetupBuilder()
+//new DicomSetupBuilder()
-       .RegisterServices(s =>
+//       .RegisterServices(s =>
-            s.AddFellowOakDicom()
+//            s.AddFellowOakDicom()
-              .AddTranscoderManager<NativeTranscoderManager>()
+//              .AddTranscoderManager<NativeTranscoderManager>()
-              //.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
+//              //.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
-              .AddImageManager<ImageSharpImageManager>())
+//              .AddImageManager<ImageSharpImageManager>())
-       .SkipValidation()
+//       .SkipValidation()
-       .Build();
+//       .Build();
 
 
 
@@ -211,6 +217,8 @@ else
 
 #endregion
 
+DicomSetupBuilder.UseServiceProvider(app.Services);
+
 var logger = app.Services.GetService<Microsoft.Extensions.Logging.ILogger<Program>>();
 
 var server = DicomServerFactory.Create<CStoreSCPService>(_configuration.GetSection("DicomSCPServiceConfig").GetValue<int>("ServerPort"), userState: app.Services,logger: logger);

IRC.Core.SCP/Service/CStoreSCPService.cs

@@ -21,6 +21,7 @@ using FellowOakDicom.Imaging;
 using SharpCompress.Common;
 using SixLabors.ImageSharp.Formats.Jpeg;
 using IRaCIS.Core.Infrastructure;
+using IRaCIS.Core.Infrastructure.Extention;
 
 namespace IRaCIS.Core.SCP.Service
 {
@@ -76,9 +77,10 @@ namespace IRaCIS.Core.SCP.Service
         };
 
 
-        public CStoreSCPService(INetworkStream stream, Encoding fallbackEncoding, Microsoft.Extensions.Logging.ILogger log, DicomServiceDependencies dependencies)
+        public CStoreSCPService(INetworkStream stream, Encoding fallbackEncoding, Microsoft.Extensions.Logging.ILogger log, DicomServiceDependencies dependencies, IServiceProvider injectServiceProvider)
             : base(stream, fallbackEncoding, log, dependencies)
         {
+            _serviceProvider = injectServiceProvider.CreateScope().ServiceProvider;
         }
 
 
@@ -92,9 +94,7 @@ namespace IRaCIS.Core.SCP.Service
 
             Log.Logger.Warning($"接收到来自{association.CallingAE}的连接");
 
-            _serviceProvider = (IServiceProvider)this.UserState;
+            //_serviceProvider = (IServiceProvider)this.UserState;
-
-
 
             var _trialDicomAERepository = _serviceProvider.GetService<IRepository<TrialDicomAE>>();
 
@@ -259,9 +259,16 @@ namespace IRaCIS.Core.SCP.Service
         public async Task<DicomCStoreResponse> OnCStoreRequestAsync(DicomCStoreRequest request)
         {
 
-            string studyInstanceUid = request.Dataset.GetString(DicomTag.StudyInstanceUID);
+            string studyInstanceUid = request.Dataset.GetSingleValueOrDefault(DicomTag.StudyInstanceUID,string.Empty);
-            string seriesInstanceUid = request.Dataset.GetString(DicomTag.SeriesInstanceUID);
+            string seriesInstanceUid = request.Dataset.GetSingleValueOrDefault(DicomTag.SeriesInstanceUID, string.Empty);
-            string sopInstanceUid = request.Dataset.GetString(DicomTag.SOPInstanceUID);
+            string sopInstanceUid = request.Dataset.GetSingleValueOrDefault(DicomTag.SOPInstanceUID, string.Empty);
+
+            if(studyInstanceUid.IsNullOrEmpty() || seriesInstanceUid.IsNullOrEmpty() || sopInstanceUid.IsNullOrEmpty())
+            {
+                Log.Logger.Error($"接收数据读取StudyInstanceUID：{studyInstanceUid}、SeriesInstanceUID：{seriesInstanceUid}、SOPInstanceUID：{sopInstanceUid}有空 ");
+
+                return new DicomCStoreResponse(request, DicomStatus.Success);
+            }
 
             //Guid studyId = IdentifierHelper.CreateGuid(studyInstanceUid, trialId.ToString());
             Guid seriesId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, _trialId.ToString());

IRaCIS.Core.API.sln

@@ -19,6 +19,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRaCIS.Core.Infrastructure"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRC.Core.SCP", "IRC.Core.SCP\IRC.Core.SCP.csproj", "{ECD08F47-DC1A-484E-BB91-6CDDC8823CC5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IRC.Core.Dicom", "IRC.Core.Dicom\IRC.Core.Dicom.csproj", "{0545F0A5-D97B-4A47-92A6-A8A02A181322}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -57,6 +59,10 @@ Global
 		{ECD08F47-DC1A-484E-BB91-6CDDC8823CC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ECD08F47-DC1A-484E-BB91-6CDDC8823CC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ECD08F47-DC1A-484E-BB91-6CDDC8823CC5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0545F0A5-D97B-4A47-92A6-A8A02A181322}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0545F0A5-D97B-4A47-92A6-A8A02A181322}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0545F0A5-D97B-4A47-92A6-A8A02A181322}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0545F0A5-D97B-4A47-92A6-A8A02A181322}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -1,4 +1,5 @@
-using Amazon.Auth.AccessControlPolicy;
+using AlibabaCloud.SDK.Sts20150401;
+using Amazon.Auth.AccessControlPolicy;
 using Amazon.SecurityToken;
 using AutoMapper;
 using Azure.Core;
@@ -21,10 +22,12 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Org.BouncyCastle.Tls;
 using RestSharp;
 using RestSharp.Authenticators;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -181,11 +184,74 @@ namespace IRaCIS.Api.Controllers
         }
 
 
+        #region 老项目依赖
+
+        [HttpGet("user/GenerateSTS")]
+        public IResponseOutput GenerateSTS([FromServices] IOptionsMonitor<ObjectStoreServiceOptions> options)
+        {
+
+            var ossOptions = options.CurrentValue.AliyunOSS;
+
+            var client = new Client(new AlibabaCloud.OpenApiClient.Models.Config()
+            {
+                AccessKeyId = ossOptions.AccessKeyId,
+                AccessKeySecret = ossOptions.AccessKeySecret,
+                Endpoint = "sts.cn-hangzhou.aliyuncs.com"
+            });
+
+            var assumeRoleRequest = new AlibabaCloud.SDK.Sts20150401.Models.AssumeRoleRequest();
+            // 将<YOUR_ROLE_SESSION_NAME>设置为自定义的会话名称，例如oss-role-session。
+            assumeRoleRequest.RoleSessionName = $"session-name-{NewId.NextGuid()}";
+            // 将<YOUR_ROLE_ARN>替换为拥有上传文件到指定OSS Bucket权限的RAM角色的ARN。
+            assumeRoleRequest.RoleArn = ossOptions.RoleArn;
+            //assumeRoleRequest.RoleArn = "acs:ram::1899121822495495:role/webdirect";
+            assumeRoleRequest.DurationSeconds = ossOptions.DurationSeconds;
+            var runtime = new AlibabaCloud.TeaUtil.Models.RuntimeOptions();
+            var response = client.AssumeRoleWithOptions(assumeRoleRequest, runtime);
+            var credentials = response.Body.Credentials;
+
+            var tempToken = new AliyunOSSTempToken()
+            {
+                AccessKeyId = credentials.AccessKeyId,
+                AccessKeySecret = credentials.AccessKeySecret,
+
+                //转为服务器时区，最后统一转为客户端时区
+                Expiration = TimeZoneInfo.ConvertTimeFromUtc(DateTime.Parse(credentials.Expiration), TimeZoneInfo.Local),
+                SecurityToken = credentials.SecurityToken,
+
+
+                Region = ossOptions.Region,
+                BucketName = ossOptions.BucketName,
+                EndPoint = ossOptions.EndPoint,
+                ViewEndpoint = ossOptions.ViewEndpoint,
+                PreviewEndpoint = ossOptions.PreviewEndpoint
+
+            };
+
+            // 返回STS令牌信息给前端
+            var stsToken = new
+            {
+                AccessKeyId = credentials.AccessKeyId,
+                AccessKeySecret = credentials.AccessKeySecret,
+                SecurityToken = credentials.SecurityToken,
+                Expiration = credentials.Expiration,
+
+                Region = ossOptions.Region,
+                BucketName = ossOptions.BucketName,
+                ViewEndpoint = ossOptions.ViewEndpoint,
+
+            };
+
+            return ResponseOutput.Ok(stsToken);
+
+        }
+
+        #endregion
 
 
         [HttpGet("User/UserRedirect")]
         [AllowAnonymous]
-        public async Task<IActionResult> UserRedirect([FromServices] IRepository<IdentityUser> _useRepository, string url, [FromServices] ILogger<ExtraController> _logger)
+        public async Task<IActionResult> UserRedirect([FromServices] IRepository<IdentityUser> _useRepository, string url, [FromServices] ILogger<ExtraController> _logger, [FromServices] ITokenService _tokenService)
         {
 
             var decodeUrl = System.Web.HttpUtility.UrlDecode(url);
@@ -200,10 +266,22 @@ namespace IRaCIS.Api.Controllers
 
             var errorUrl = domainStrList[0] + "//" + domainStrList[2] + "/error";
 
-
+            if (lang == "zh")
-            if (!await _useRepository.AnyAsync(t => t.Id == Guid.Parse(userId) && t.EmailToken == token && t.IsFirstAdd))
             {
-                decodeUrl = errorUrl + $"?lang={lang}&ErrorMessage={System.Web.HttpUtility.UrlEncode(lang == "zh" ? "您的初始化链接已过期" : "Error！The initialization link has expired.")} ";
+                CultureInfo.CurrentCulture = new CultureInfo(StaticData.CultureInfo.zh_CN);
+                CultureInfo.CurrentUICulture = new CultureInfo(StaticData.CultureInfo.zh_CN);
+            }
+            else
+            {
+                CultureInfo.CurrentCulture = new CultureInfo(StaticData.CultureInfo.en_US);
+                CultureInfo.CurrentUICulture = new CultureInfo(StaticData.CultureInfo.en_US);
+            }
+
+            var isExpire = _tokenService.IsTokenExpired(token);
+
+            if (!await _useRepository.AnyAsync(t => t.Id == Guid.Parse(userId) && t.EmailToken == token && t.IsFirstAdd) || isExpire)
+            {
+                decodeUrl = errorUrl + $"?lang={lang}&ErrorMessage={System.Web.HttpUtility.UrlEncode(I18n.T("UserRedirect_InitializationLinkExpire"))} ";
             }
 
             return Redirect(decodeUrl);

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -2,6 +2,7 @@
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Application.BusinessFilter;
 using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Contracts.DTO;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Image.QA;
 using IRaCIS.Core.Application.Service;
@@ -34,6 +35,31 @@ namespace IRaCIS.Core.API.Controllers
         ) : ControllerBase
     {
 
+
+        [HttpPost, Route("Inspection/NoneDicomStudy/UpdateNoneDicomStudy")]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [UnitOfWork]
+
+        public async Task<IResponseOutput> UpdateNoneDicomStudy(DataInspectionDto<NoneDicomEdit> opt, [FromServices] INoneDicomStudyService _noneDicomStudyService)
+        {
+            var singId = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _noneDicomStudyService.UpdateNoneDicomStudy(opt.Data);
+            await _inspectionService.CompletedSign(singId, result);
+            return result;
+        }
+
+        [HttpPost, Route("Inspection/QCOperation/UpdateDicomStudyInfo")]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [UnitOfWork]
+
+        public async Task<IResponseOutput> UpdateDicomStudyInfo(DataInspectionDto<DicomStudyEdit> opt, [FromServices] IQCOperationService _qcOperationService)
+        {
+            var singId = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _qcOperationService.UpdateDicomStudyInfo(opt.Data);
+            await _inspectionService.CompletedSign(singId, result);
+            return result;
+        }
+
         #region 获取稽查数据
         /// <summary>
         /// 获取稽查数据
@@ -52,7 +78,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns> 
         [HttpPost, Route("Inspection/ReadingImageTask/SubmitOncologyReadingInfo")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [UnitOfWork]
         public async Task<IResponseOutput> SetOncologyReadingInfo(DataInspectionDto<SubmitOncologyReadingInfoInDto> opt)
@@ -69,7 +95,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns> 
         [HttpPost, Route("Inspection/ReadingImageTask/SubmitDicomVisitTask")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [UnitOfWork]
         public async Task<IResponseOutput> SubmitDicomVisitTask(DataInspectionDto<SubmitDicomVisitTaskInDto> opt)
@@ -88,7 +114,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns> 
         [HttpPost, Route("Inspection/ReadingImageTask/SubmitGlobalReadingInfo")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [UnitOfWork]
         public async Task<IResponseOutput> SubmitGlobalReadingInfo(DataInspectionDto<SubmitGlobalReadingInfoInDto> opt)
@@ -107,7 +133,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns> 
         [HttpPost, Route("Inspection/configTrialBasicInfo/TrialReadingInfoSign")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [UnitOfWork]
         public async Task<IResponseOutput> TrialReadingInfoSign(DataInspectionDto<TrialReadingInfoSignInDto> opt)
@@ -126,7 +152,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ReadingMedicalReview/FinishMedicalReview")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [UnitOfWork]
         public async Task<IResponseOutput> FinishMedicalReview(DataInspectionDto<FinishMedicalReviewInDto> opt)
@@ -143,7 +169,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ReadingMedicineQuestion/ConfirmReadingMedicineQuestion")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [UnitOfWork]
         public async Task<IResponseOutput> ConfirmReadingMedicineQuestion(DataInspectionDto<ConfirmReadingMedicineQuestionInDto> opt)
@@ -161,7 +187,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ReadingImageTask/SubmitVisitTaskQuestions")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [UnitOfWork]
         public async Task<IResponseOutput> SubmitVisitTaskQuestions(DataInspectionDto<SubmitVisitTaskQuestionsInDto> opt)
@@ -179,7 +205,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ClinicalAnswer/CRCSignClinicalData")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [UnitOfWork]
         public async Task<IResponseOutput> CRCSignClinicalData(DataInspectionDto<CRCSignClinicalDataInDto> opt)
@@ -197,7 +223,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ClinicalAnswer/CRCConfirmClinical")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [UnitOfWork]
         public async Task<IResponseOutput> CRCConfirmClinical(DataInspectionDto<CRCConfirmClinicalInDto> opt)
@@ -214,7 +240,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ClinicalAnswer/CRCCancelConfirmClinical")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [UnitOfWork]
         public async Task<IResponseOutput> CRCCancelConfirmClinical(DataInspectionDto<CRCCancelConfirmClinicalInDto> opt)
@@ -232,7 +258,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ClinicalAnswer/PMConfirmClinical")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [UnitOfWork]
         public async Task<IResponseOutput> PMConfirmClinical(DataInspectionDto<CRCConfirmClinicalInDto> opt)
@@ -250,7 +276,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ReadingClinicalData/SignConsistencyAnalysisReadingClinicalData")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [UnitOfWork]
         public async Task<IResponseOutput> SignConsistencyAnalysisReadingClinicalData(DataInspectionDto<SignConsistencyAnalysisReadingClinicalDataInDto> opt)
@@ -267,7 +293,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ClinicalAnswer/SubmitClinicalFormAndSign")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [UnitOfWork]
         public async Task<IResponseOutput> SubmitClinicalFormAndSign(DataInspectionDto<SubmitClinicalFormInDto> opt)
@@ -284,7 +310,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ReadingImageTask/SubmitJudgeVisitTaskResult")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [UnitOfWork]
         public async Task<IResponseOutput> SubmitJudgeVisitTaskResult(DataInspectionDto<SaveJudgeVisitTaskResult> opt)
@@ -303,7 +329,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <returns></returns> 
         [HttpPost, Route("Inspection/configTrialBasicInfo/ConfigTrialBasicInfoConfirm")]
         [UnitOfWork]
-        [TrialGlobalLimit( "BeforeOngoingCantOpt" )]
+        [TrialGlobalLimit("BeforeOngoingCantOpt")]
         public async Task<IResponseOutput> ConfigTrialBasicInfoConfirm(DataInspectionDto<BasicTrialConfig> opt)
         {
 
@@ -345,7 +371,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <returns></returns> 
         [HttpPost, Route("Inspection/configTrialBasicInfo/ConfigTrialUrgentInfoConfirm")]
         [UnitOfWork]
-        [TrialGlobalLimit( "BeforeOngoingCantOpt" )]
+        [TrialGlobalLimit("BeforeOngoingCantOpt")]
         public async Task<IResponseOutput> ConfigTrialUrgentInfoConfirm(DataInspectionDto<TrialUrgentConfig> opt)
         {
             opt.Data.IsTrialUrgentConfirmed = true;
@@ -358,7 +384,7 @@ namespace IRaCIS.Core.API.Controllers
 
         [HttpPost, Route("Inspection/configTrialBasicInfo/ConfigTrialPACSInfoConfirm")]
         [UnitOfWork]
-        [TrialGlobalLimit( "BeforeOngoingCantOpt" )]
+        [TrialGlobalLimit("BeforeOngoingCantOpt")]
         public async Task<IResponseOutput> ConfigTrialPACSInfoConfirm(DataInspectionDto<TrialPACSConfig> opt)
         {
             opt.Data.IsTrialPACSConfirmed = true;
@@ -374,7 +400,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <returns></returns>
         [HttpPost, Route("Inspection/configTrialBasicInfo/TrialConfigSignatureConfirm")]
         [UnitOfWork]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         public async Task<IResponseOutput> TrialConfigSignatureConfirm(DataInspectionDto<SignConfirmDTO> opt)
         {
@@ -391,7 +417,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <returns></returns>
         [HttpPost, Route("Inspection/ReadingCriterion/ResetAndAsyncCriterion")]
         [UnitOfWork]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         public async Task<IResponseOutput> ResetAndAsyncCriterion(DataInspectionDto<ResetAndAsyncCriterionInDto> opt)
         {
@@ -409,7 +435,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/QCOperation/CRCRequestToQC")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         [UnitOfWork]
         public async Task<IResponseOutput> CRCRequestToQC(DataInspectionDto<CRCRequestToQCCommand> opt)
         {
@@ -424,21 +450,31 @@ namespace IRaCIS.Core.API.Controllers
         /// 设置QC 通过或者不通过   7:QC failed  8：QC passed  
         /// </summary>
         [HttpPost, Route("Inspection/QCOperation/QCPassedOrFailed")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         [UnitOfWork]
         public async Task<IResponseOutput> QCPassedOrFailed(DataInspectionDto<QCPassedOrFailedDto> opt)
         {
             var singid = await _inspectionService.RecordSing(opt.SignInfo);
-            var result = await _qCOperationService.QCPassedOrFailed(opt.Data.trialId, opt.Data.subjectVisitId, opt.Data.auditState);
+            if (opt.Data.IsSecondPass != null)
-            await _inspectionService.CompletedSign(singid, result);
+            {
-            return result;
+                var result = await _qCOperationService.QCSecondReviewPassedOrFailed(opt.Data.trialId, opt.Data.subjectVisitId, (bool)opt.Data.IsSecondPass);
+                await _inspectionService.CompletedSign(singid, result);
+                return result;
+            }
+            else
+            {
+                var result = await _qCOperationService.QCPassedOrFailed(opt.Data.trialId, opt.Data.subjectVisitId, opt.Data.auditState);
+                await _inspectionService.CompletedSign(singid, result);
+                return result;
+            }
+
         }
 
         /// <summary>
         /// 一致性核查 回退  对话记录不清除  只允许PM回退
         /// </summary>
         [HttpPost, Route("Inspection/QCOperation/CheckBack")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         [UnitOfWork]
         public async Task<IResponseOutput> CheckBack(DataInspectionDto<IDDto> opt)
         {
@@ -455,7 +491,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/ReadClinicalData/ReadClinicalDataSign")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         [UnitOfWork]
         public async Task<IResponseOutput> ReadClinicalDataSign(DataInspectionDto<ReadingClinicalDataSignIndto> opt)
         {
@@ -470,7 +506,7 @@ namespace IRaCIS.Core.API.Controllers
         /// CRC  设置已经重传完成
         /// </summary>
         [HttpPost, Route("Inspection/QCOperation/SetReuploadFinished")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         [UnitOfWork]
         public async Task<IResponseOutput> SetReuploadFinished(DataInspectionDto<CRCReuploadFinishedCommand> opt)
         {
@@ -486,7 +522,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="opt"></param>
         /// <returns></returns>
         [HttpPost, Route("Inspection/TrialConfig/updateTrialState")]
-        [TrialGlobalLimit( "BeforeOngoingCantOpt")]
+        [TrialGlobalLimit("BeforeOngoingCantOpt")]
         [UnitOfWork]
         public async Task<IResponseOutput> UpdateTrialState(DataInspectionDto<UpdateTrialStateDto> opt)
         {
@@ -502,7 +538,7 @@ namespace IRaCIS.Core.API.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost, Route("Inspection/TrialDocument/userConfirm")]
-        [TrialGlobalLimit( "BeforeOngoingCantOpt", "SignSystemDocNoTrialId", "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("BeforeOngoingCantOpt", "SignSystemDocNoTrialId", "AfterStopCannNotOpt")]
         [UnitOfWork]
         public async Task<IResponseOutput> UserConfirm(DataInspectionDto<UserConfirmCommand> opt)
         {
@@ -519,10 +555,10 @@ namespace IRaCIS.Core.API.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost, Route("Inspection/VisitTask/ConfirmReReading")]
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         [UnitOfWork]
 
-        public async Task<IResponseOutput> ConfirmReReading(DataInspectionDto<ConfirmReReadingCommand> opt,  [FromServices] IVisitTaskService _visitTaskService)
+        public async Task<IResponseOutput> ConfirmReReading(DataInspectionDto<ConfirmReReadingCommand> opt, [FromServices] IVisitTaskService _visitTaskService)
         {
             var singId = await _inspectionService.RecordSing(opt.SignInfo);
             var result = await _visitTaskService.ConfirmReReading(opt.Data);

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -27,6 +27,7 @@ using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Microsoft.Net.Http.Headers;
 using MiniExcelLibs;
 using Newtonsoft.Json;
@@ -38,6 +39,7 @@ using System.Data;
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Path = System.IO.Path;
 
@@ -527,7 +529,7 @@ namespace IRaCIS.Core.API.Controllers
             }
             var uploadFinishedTime = DateTime.Now;
 
-            var noneDicomStudy = await _noneDicomStudyRepository.FirstOrDefaultAsync((t => t.Id == noneDicomStudyId));
+            var noneDicomStudy = await _noneDicomStudyRepository.FirstOrDefaultAsync(t => t.Id == noneDicomStudyId, true);
 
             noneDicomStudy.FileCount = noneDicomStudy.FileCount + (incommand.VisitTaskId != null ? 0 : incommand.UploadedFileList.Count);
 
@@ -582,9 +584,9 @@ namespace IRaCIS.Core.API.Controllers
                 templateFileStream.Seek(0, SeekOrigin.Begin);
 
 
-                var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, "InspectionUpload/Check", realFileName);
+                var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, $"{trialId.ToString()}/InspectionUpload/DataReconciliation", realFileName);
 
-                await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId });
+                await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId }, true);
 
                 return ossRelativePath;
 
@@ -799,12 +801,13 @@ namespace IRaCIS.Core.API.Controllers
 
         [HttpPost, Route("TrialSiteSurvey/UploadTrialSiteSurveyUser")]
         [DisableFormValueModelBinding]
-        [UnitOfWork]
         public async Task<IResponseOutput> UploadTrialSiteSurveyUser(Guid trialId, string baseUrl, string routeUrl,
     [FromServices] IRepository<TrialSite> _trialSiteRepository,
      [FromServices] IRepository<UserType> _usertypeRepository,
      [FromServices] ITrialSiteSurveyService _trialSiteSurveyService,
      [FromServices] IOSSService oSSService,
+     [FromServices] IOptionsMonitor<SystemEmailSendConfig> _systemEmailConfig,
+
      [FromServices] IRepository<InspectionFile> _inspectionFileRepository)
         {
             var templateFileStream = new MemoryStream();
@@ -821,9 +824,9 @@ namespace IRaCIS.Core.API.Controllers
                     throw new BusinessValidationFailedException(_localizer["UploadDownLoad_TemplateUploadData"]);
                 }
 
-                var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, "InspectionUpload/SiteSurvey", realFileName);
+                var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, $"{trialId.ToString()}/InspectionUpload/SiteSurvey", realFileName);
 
-                await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId });
+                await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId }, true);
 
 
 
@@ -836,6 +839,26 @@ namespace IRaCIS.Core.API.Controllers
                 .Where(t => !(string.IsNullOrWhiteSpace(t.TrialSiteCode) && string.IsNullOrWhiteSpace(t.FirstName) && string.IsNullOrWhiteSpace(t.LastName) && string.IsNullOrWhiteSpace(t.Email)
                 && string.IsNullOrWhiteSpace(t.Phone) && string.IsNullOrWhiteSpace(t.UserTypeStr) && string.IsNullOrWhiteSpace(t.OrganizationName))).ToList();
 
+            //处理前后空格
+            foreach (var excel in excelList)
+            {
+                excel.Email = excel.Email.Trim();
+                excel.Phone = excel.Phone.Trim();
+                excel.OrganizationName = excel.OrganizationName.Trim();
+                excel.UserTypeStr = excel.UserTypeStr?.Trim();
+                excel.TrialSiteCode = excel.TrialSiteCode.Trim();
+                excel.FirstName = excel.FirstName.Trim();
+                excel.LastName = excel.LastName.Trim();
+            }
+
+            var emailRegexStr = _systemEmailConfig.CurrentValue.EmailRegexStr;
+            if (excelList.Any(t => !Regex.IsMatch(t.Email, emailRegexStr)))
+            {
+                var errorList = excelList.Where(t => !Regex.IsMatch(t.Email, emailRegexStr)).Select(t => t.Email).ToList();
+                //有邮箱不符合邮箱格式,请核查Excel数据
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidEmail"] + string.Join("   |   ", errorList));
+            }
+
             if (excelList.Any(t => string.IsNullOrWhiteSpace(t.TrialSiteCode) || string.IsNullOrWhiteSpace(t.FirstName) || string.IsNullOrWhiteSpace(t.LastName) || string.IsNullOrWhiteSpace(t.Email) || string.IsNullOrWhiteSpace(t.UserTypeStr)))
             {
                 //请确保Excel中 每一行的 中心编号，姓名，邮箱，用户类型数据记录完整再进行上传
@@ -864,11 +887,6 @@ namespace IRaCIS.Core.API.Controllers
                 }
             }
 
-            if (excelList.Any(t => !t.Email.Contains("@")))
-            {
-                //有邮箱不符合邮箱格式,请核查Excel数据
-                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidEmail"]);
-            }
             var generateUserTypeList = new List<string>() { "CRC", "CRA" };
 
             //if (excelList.Any(t => !generateUserTypeList.Contains(t.UserTypeStr.ToUpper())))

IRaCIS.Core.API/HostService/HangfireHostService.cs

@@ -20,6 +20,8 @@ namespace IRaCIS.Core.API.HostService;
 
 public class HangfireHostService(IRecurringMessageScheduler _recurringMessageScheduler, 
     IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
+
+     IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
     IMediator _mediator,
     ILogger<HangfireHostService> _logger) : IHostedService
 {
@@ -39,6 +41,21 @@ public class HangfireHostService(IRecurringMessageScheduler _recurringMessageSch
             HangfireJobHelper.RemoveCronJob(jobId);
         }
 
+        // 清除所有可能存在的定时任务，防止类型加载错误
+        var allJobIdList = JobStorage.Current.GetConnection().GetRecurringJobs().Select(t => t.Id).ToList();
+        foreach (var jobId in allJobIdList)
+        {
+            try
+            {
+                HangfireJobHelper.RemoveCronJob(jobId);
+                _logger.LogInformation($"已清除定时任务: {jobId}");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning($"清除定时任务 {jobId} 时出错: {ex.Message}");
+            }
+        }
+
 
         var taskInfoList = await _trialEmailNoticeConfigRepository.Where(t => t.Trial.TrialStatusStr == StaticData.TrialState.TrialOngoing && t.EmailCron != string.Empty && t.IsAutoSend)
               .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
@@ -55,6 +72,20 @@ public class HangfireHostService(IRecurringMessageScheduler _recurringMessageSch
         }
 
 
+        // 系统邮件定时任务
+        var systemTaskInfoList = await _emailNoticeConfigrepository.Where(t => t.EmailCron != string.Empty && t.IsAutoSend)
+          .Select(t => new { t.Id, t.Code,  t.EmailCron, t.BusinessScenarioEnum, })
+          .ToListAsync();
+
+        foreach (var task in systemTaskInfoList)
+        {
+            //利用主键作为任务Id
+            var jobId = $"{task.Id}_({task.BusinessScenarioEnum})";
+
+            HangfireJobHelper.AddOrUpdateTimingCronJob(jobId, task.BusinessScenarioEnum, task.EmailCron);
+        }
+
+
         //await _recurringMessageScheduler.ScheduleRecurringPublish(new QCImageQuestionSchedule() { CronExpression = "0/3 * * * * ? " }, new MasstransiTestCommand { value = "message at " + DateTime.Now.ToString() });
 
 

IRaCIS.Core.API/IRaCIS.Core.API.csproj

@@ -69,24 +69,22 @@
 
 	<ItemGroup>
 		<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.14" />
 
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.15">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="ConfigMapFileProvider" Version="2.0.1" />
-		<PackageReference Include="Hangfire.AspNetCore" Version="1.8.14" />
+		<PackageReference Include="Hangfire.AspNetCore" Version="1.8.20" />
 		<PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
 		<PackageReference Include="Hangfire.InMemory" Version="1.0.0" />
-		<PackageReference Include="Hangfire.SqlServer" Version="1.8.14" />
+		<PackageReference Include="Hangfire.SqlServer" Version="1.8.20" />
-		<PackageReference Include="Invio.Extensions.Authentication.JwtBearer" Version="2.0.1" />
-		<PackageReference Include="LogDashboard" Version="1.4.8" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
-		<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
 		<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
-		<PackageReference Include="Serilog.Sinks.Email" Version="4.0.0" />
+		<PackageReference Include="Serilog.Sinks.Email" Version="4.1.0" />
-		<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+		<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.9.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -114,6 +112,12 @@
 	  </Content>
 	</ItemGroup>
 
+	<ItemGroup>
+	  <None Update="Resources\GeoLite2-City.mmdb">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	</ItemGroup>
+
 	<ProjectExtensions>
 		<VisualStudio>
 			<UserProperties properties_4launchsettings_1json__JsonSchema="" />

IRaCIS.Core.API/Progranm.cs

@@ -7,7 +7,6 @@ using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.Service.BusinessFilter;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Infrastructure.Extention;
-using LogDashboard;
 using MassTransit;
 using MassTransit.NewIdProviders;
 using Microsoft.AspNetCore.Builder;
@@ -37,6 +36,11 @@ var config = new ConfigurationBuilder()
 
 var enviromentName = config["ASPNETCORE_ENVIRONMENT"];
 
+var openSwaggerStr = config["ASPNETCORE_OpenSwagger"];
+
+var isOpenSwagger= openSwaggerStr == null|| openSwaggerStr?.ToLower()=="true";
+
+
 if (string.IsNullOrWhiteSpace(enviromentName))
 {
 
@@ -111,8 +115,13 @@ builder.Services.AddAutoMapperSetup();
 builder.Services.AddEFSetup(_configuration, enviromentName);
 //Http 响应压缩
 builder.Services.AddResponseCompressionSetup();
-//Swagger Api 文档
+
-builder.Services.AddSwaggerSetup();
+if (isOpenSwagger)
+{
+    //Swagger Api 文档
+    builder.Services.AddSwaggerSetup();
+}
+
 //JWT Token 验证
 builder.Services.AddJWTAuthSetup(_configuration);
 
@@ -126,7 +135,7 @@ builder.Services.AddFusionCache();
 builder.Services.AddhangfireSetup(_configuration);
 
 //Serilog 日志可视化 LogDashboard日志
-builder.Services.AddLogDashboardSetup();
+//builder.Services.AddLogDashboardSetup();
 
 //Dicom影像渲染图片  跨平台
 builder.Services.AddDicomSetup();
@@ -211,13 +220,18 @@ app.UseResponseCompression();
 app.UseStaticFiles();
 
 //LogDashboard
-app.UseLogDashboard("/LogDashboard");
+//app.UseLogDashboard("/LogDashboard");
 
 //hangfire
 app.UseHangfireConfig(env);
 
 // Swagger
-SwaggerSetup.Configure(app, env);
+
+if (isOpenSwagger)
+{
+    SwaggerSetup.Configure(app, env);
+}
+
 
 //serilog 记录请求的用户信息
 app.UseSerilogConfig(env);

IRaCIS.Core.API/Properties/launchSettings.json

@@ -20,7 +20,8 @@
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Test_IRC"
+        "ASPNETCORE_ENVIRONMENT": "Test_IRC",
+        "ASPNETCORE_OpenSwagger": "true"
       },
       "applicationUrl": "http://localhost:6100"
     },

IRaCIS.Core.API/_PipelineExtensions/LogDashboard/LogDashBoardAuthFilter.cs

@@ -1,15 +1,15 @@
-using LogDashboard;
+//using LogDashboard;
-using LogDashboard.Authorization;
+//using LogDashboard.Authorization;
 
-namespace IRaCIS.Core.API.Filter
+//namespace IRaCIS.Core.API.Filter
-{
+//{
 
-    public class LogDashBoardAuthFilter : ILogDashboardAuthorizationFilter
+//    public class LogDashBoardAuthFilter : ILogDashboardAuthorizationFilter
-    {
+//    {
-        //在此可以利用 本系统的UerTypeEnum 判断
+//        //在此可以利用 本系统的UerTypeEnum 判断
-        public bool Authorization(LogDashboardContext context)
+//        public bool Authorization(LogDashboardContext context)
-        {
+//        {
-            return context.HttpContext.User.Identity.IsAuthenticated;
+//            return context.HttpContext.User.Identity.IsAuthenticated;
-        }
+//        }
-    }
+//    }
-}
+//}

IRaCIS.Core.API/_ServiceExtensions/LogDashboardSetup.cs

@@ -1,25 +1,25 @@
 
-using LogDashboard;
+//using LogDashboard;
-using Microsoft.Extensions.DependencyInjection;
+//using Microsoft.Extensions.DependencyInjection;
 
-namespace IRaCIS.Core.API
+//namespace IRaCIS.Core.API
-{
+//{
-    public static class LogDashboardSetup
+//    public static class LogDashboardSetup
-    {
+//    {
-        public static void AddLogDashboardSetup(this IServiceCollection services)
+//        public static void AddLogDashboardSetup(this IServiceCollection services)
-        {
+//        {
-            //IIS 配置虚拟路径部署，会出现IIS静态文件404
+//            //IIS 配置虚拟路径部署，会出现IIS静态文件404
-            services.AddLogDashboard(opt =>
+//            services.AddLogDashboard(opt =>
-            {
+//            {
-                //opt.PathMatch = "/api/LogDashboard";
+//                //opt.PathMatch = "/api/LogDashboard";
-                opt.PathMatch = "/LogDashboard";
+//                opt.PathMatch = "/LogDashboard";
 
-                //opt.AddAuthorizationFilter(new LogDashboardBasicAuthFilter("admin", "zhizhun2018"));
+//                //opt.AddAuthorizationFilter(new LogDashboardBasicAuthFilter("admin", "zhizhun2018"));
 
-                //opt.AddAuthorizationFilter(new LogDashBoardAuthFilter());
+//                //opt.AddAuthorizationFilter(new LogDashBoardAuthFilter());
 
-            });
+//            });
 
-        }
+//        }
-    }
+//    }
-}
+//}

IRaCIS.Core.API/_ServiceExtensions/SerilogSetup.cs

@@ -22,6 +22,10 @@ namespace IRaCIS.Core.API
             var config = new LoggerConfiguration()
                    .MinimumLevel.Information()
                    .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                   .MinimumLevel.Override("MassTransit", LogEventLevel.Warning)
+                    //https://github.com/ZiggyCreatures/FusionCache/blob/main/docs/Logging.md
+                    .MinimumLevel.Override("ZiggyCreatures.Caching.Fusion", LogEventLevel.Warning)
+                   
                    // Filter out ASP.NET Core infrastructre logs that are Information and below  日志太多了 一个请求 记录好几条
                    .MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Warning)
                    .MinimumLevel.Override("Microsoft.AspNetCore.Hosting", LogEventLevel.Warning)
@@ -31,7 +35,7 @@ namespace IRaCIS.Core.API
                    .Enrich.FromLogContext()   
                    .Filter.ByExcluding(logEvent => logEvent.Properties.ContainsKey("RequestPath") && logEvent.Properties["RequestPath"].ToString().Contains("/health"))
                    .WriteTo.Console()
-                   .WriteTo.File($"{AppContext.BaseDirectory}Serilogs/.log", rollingInterval: RollingInterval.Day);
+                   .WriteTo.File($"{AppContext.BaseDirectory}Serilogs/.log", rollingInterval: RollingInterval.Day,retainedFileCountLimit:60);
 
             #region 根据环境配置是否打开错误发送邮件通知
 

IRaCIS.Core.API/_ServiceExtensions/SwaggerSetup.cs

@@ -16,27 +16,30 @@ namespace IRaCIS.Core.API;
 
 public enum SwaggerVersion
 {
-    [Description("医生模块")]
+    [Description("文件记录(FileRecord)")]
+    FileRecord = -1,
+
+    [Description("医生模块(Reviewer)")]
     Reviewer = 1,
-    [Description("项目模块")]
+    [Description("项目模块(Trial)")]
     Trial = 2,
-    [Description("入组模块")]
+    [Description("入组模块(Enroll)")]
     Enroll = 3,
-    [Description("工作量模块")]
+    [Description("工作量模块(Workload)")]
     Workload = 4,
-    [Description("通用信息获取")]
+    [Description("通用信息获取(Common)")]
     Common = 5,
-    [Description("机构信息模块")]
+    [Description("机构信息模块(Institution)")]
     Institution = 6,
-    [Description("统计模块")]
+    [Description("统计模块(DashboardStatistics)")]
     DashboardStatistics = 7,
-    [Description("财务模块")]
+    [Description("财务模块(Financial)")]
     Financial = 8,
-    [Description("管理模块")]
+    [Description("管理模块(Management)")]
     Management =9,
-    [Description("影像模块")]
+    [Description("影像模块(Image)")]
     Image =10,
-    [Description("读片模块")]
+    [Description("读片模块(Reading)")]
     Reading =11
 };
 

IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs

@@ -27,7 +27,8 @@ namespace IRaCIS.Core.API
                     hangFireConfig.UseSqlServerStorage(hangFireConnStr, new SqlServerStorageOptions()
                     {
                         SchemaName = "dbo",
-                    }).UseRecommendedSerializerSettings().UseSimpleAssemblyNameTypeSerializer();
+                    }).UseRecommendedSerializerSettings();
+                    // 移除 UseSimpleAssemblyNameTypeSerializer() 以避免类型加载问题
                 }
 
 

IRaCIS.Core.API/appsettings.Event_IRC.json

@@ -7,8 +7,8 @@
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=47.117.164.182,1434;Database=Event_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "RemoteNew": "Server=101.132.253.119,1435;Database=irc_Prpd_bak;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=47.117.164.182,1434;Database=Event_IRC_Hangfire;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",
@@ -52,7 +52,10 @@
 
     "IsNeedChangePassWord": true,
 
-    "ChangePassWordDays": 90
+    "ChangePassWordDays": 90,
+
+    // 模板类型 1 Elevate  2 Extensive
+    "TemplateType": 2
   },
   "SystemEmailSendConfig": {
     "Port": 465,

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -7,10 +7,10 @@
     }
   },
   "ConnectionStrings": {
-    //"RemoteNew": "Server=101.132.193.237,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
+    "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"
+    "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",
+    //"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"
+    //"Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
   },
   "ObjectStoreService": {
     "ObjectStoreUse": "AliyunOSS",
@@ -51,16 +51,19 @@
     "ReadingRestTimeMin": 10,
 
     "IsNeedChangePassWord": true,
-    "ChangePassWordDays": 90
+    "ChangePassWordDays": 90,
+    // 模板类型 1 Elevate  2 Extensive
+    "TemplateType": 2
   },
 
   "SystemEmailSendConfig": {
     "Port": 465,
     "Host": "smtp.qiye.aliyun.com",
     "FromEmail": "irc@extimaging.com",
-    "FromName": "irc",
+    "FromName": "IRC Imaging System",
     "AuthorizationCode": "ExtImg@2022",
     "SiteUrl": "http://irc.extimaging.com/login",
+    "SystemShortName": "IRC",
     "OrganizationName": "Extlmaging",
     "OrganizationNameCN": "Extlmaging",
     "CompanyName": "Extensive Imaging",
@@ -69,6 +72,7 @@
     "CompanyShortNameCN": "展影医疗",
     "IsEnv_US": false,
     "IsOpenErrorNoticeEmail": false,
+    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]
   },
   "SystemPacsConfig": {

IRaCIS.Core.API/appsettings.Test_IRC.json

@@ -1,99 +1,164 @@
 {
+  // 日志信息
   "Logging": {
+    // 日志等级
     "LogLevel": {
+      // 默认日志等级
       "Default": "Information",
+      // 调试日志等级
       "Microsoft": "Warning",
+      // ASP.NET Core 日志等级
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
+  // 数据库链接字符串
   "ConnectionStrings": {
+    // 本地数据库链接字符串
     "RemoteNew": "Server=106.14.89.110,1435;Database=Test_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    // Hangfire 定时任务数据库链接字符串
     "Hangfire": "Server=106.14.89.110,1435;Database=Test_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
   },
-
+  // 对象存储服务配置
   "ObjectStoreService": {
-
+    // 使用的对象存储服务类型
     "ObjectStoreUse": "AliyunOSS",
-
+    // 阿里云对象存储服务的配置
     "AliyunOSS": {
+      // 阿里云 OSS 的 Region ID
       "RegionId": "cn-shanghai",
+      // 阿里云 OSS 的内部访问端点
       "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
+      // 阿里云 OSS 的外部访问端点
       "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
+      // 阿里云 OSS 的访问密钥 ID
       "AccessKeyId": "LTAI5tRRZehUp2V9pyTPtAJm",
+      // 阿里云 OSS 的访问密钥 Secret
       "AccessKeySecret": "FLizxkHsMm4CGYHtkV8E3PNJJZU7oV",
+      // 阿里云 OSS 的角色 ARN
       "RoleArn": "acs:ram::1899121822495495:role/dev-oss-access",
+      // 阿里云 OSS 的Bucket名称
       "BucketName": "zy-irc-test-store",
-      "ViewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
+      // 阿里云 OSS 的访问端点
+      "ViewEndpoint": "https://zy-irc-test-dev-cache.oss-cn-shanghai.aliyuncs.com",
+      // 阿里云 OSS 的预览端点
       "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
+      // 阿里云 OSS 的临时访问凭证有效时间（秒）
+      "DurationSeconds": 7200,
+      // 阿里云 OSS 的预览端点
+      "PreviewEndpoint": "https://test-oss.test.extimaging.com"
     },
+    // MinIO 对象存储服务的配置
     "MinIO": {
+      // MinIO 的访问端点
       "EndPoint": "hir-oss.test.extimaging.com",
+      // MinIO 的端口
       "Port": "443",
+      // 是否使用 SSL
       "UseSSL": true,
+      // MinIO 的角色 ARN
       "AccessKey": "fbStsVYCIPKHQneeqMwD",
+      // MinIO 的访问密钥
       "SecretKey": "TzgvyA3zGXMUnpilJNUlyMYHfosl1hBMl6lxPmjy",
+      // MinIO 的BucketName
       "BucketName": "irc-test",
+      // MinIO 的访问端点
       "ViewEndpoint": "https://hir-oss.test.extimaging.com/irc-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
     }
   },
-
+  // 系统配置
   "BasicSystemConfig": {
-
+    // 打开用户复杂密码
     "OpenUserComplexPassword": false,
+    // 是否在开始工作前强制签署电子知情同意书
     "OpenSignDocumentBeforeWork": false,
-
+    // 是否启用登录失败次数限制（防暴力破解）
     "OpenLoginLimit": false,
+    // 连续登录失败多少次后触发锁定
     "LoginMaxFailCount": 5,
+    // 触发锁定后账号锁定时长（分钟）
     "LoginFailLockMinutes": 1,
+    // 无操作自动登出的超时时间（分钟）
     "AutoLoginOutMinutes": 10,
-
+    // 是否启用多因子登录认证（MFA）
     "OpenLoginMFA": false,
-
+    // 连续阅片的最长工作时间（分钟），超时后强制休息
     "ContinuousReadingTimeMin": 120,
+    // 强制休息时长（分钟）
     "ReadingRestTimeMin": 10,
-
+    // 是否强制用户定期修改密码
     "IsNeedChangePassWord": true,
+    // 密码有效期（天），到期后必须修改
     "ChangePassWordDays": 90,
-
+    // 模板类型 1 Elevate  2 Extensive
-
+    "TemplateType": 2,
+    // 是否打开项目关联删除
     "OpenTrialRelationDelete": true,
-
+    // 转换PDF服务配置
     "ThirdPdfUrl": "http://106.14.89.110:30088/api/v1/convert/file/pdf"
   },
-
+  // 邮件服务配置（用于系统通知、找回密码、错误报警等）
   "SystemEmailSendConfig": {
+    // SMTP端口
     "Port": 465,
+    // 企业邮箱SMTP服务器地址
     "Host": "smtp.qiye.aliyun.com",
+    // 发件人邮箱地址
     "FromEmail": "test@extimaging.com",
-    "FromName": "Test_IRC",
+    // 发件人显示名称
+    "FromName": "Test IRC Imaging System",
+    // SMTP授权码
     "AuthorizationCode": "SHzyyl2021",
+    // 系统对外访问地址
     "SiteUrl": "http://irc.test.extimaging.com/login",
-
+    // 系统简称
+    "SystemShortName": "IRC",
+    // 组织英文名称
     "OrganizationName": "Extlmaging",
+    // 组织中文名称
     "OrganizationNameCN": "Extlmaging",
+    // 公司英文全称
     "CompanyName": "Extensive Imaging",
+    // 公司中文全称
     "CompanyNameCN": "上海展影医疗科技有限公司",
+    // 公司英文简称
     "CompanyShortName": "Extensive Imaging",
+    // 公司中文简称
     "CompanyShortNameCN": "展影医疗",
+    // 是否为国际版环境
     "IsEnv_US": false,
+    // 是否开启系统异常邮件报警
     "IsOpenErrorNoticeEmail": false,
-    "ErrorNoticeEmailList": ["872297557@qq.com"]
+    // 邮箱格式校验正则表达式
+    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
+    // 接收系统异常报警的邮箱列表
+    "ErrorNoticeEmailList": [ "872297557@qq.com" ]
   },
-
+  // PACS 连接配置
   "SystemPacsConfig": {
+    // PACS服务器端口
     "Port": "11113",
+    // PACS服务器IP地址
     "IP": "106.14.89.110"
   }
 }

IRaCIS.Core.API/appsettings.US_Prod_IRC.json

@@ -54,7 +54,8 @@
 
     "IsNeedChangePassWord": true,
     "ChangePassWordDays": 90,
-
+    // 模板类型 1 Elevate  2 Extensive
+    "TemplateType": 1,
 
     "OpenTrialRelationDelete": false
 
@@ -64,9 +65,10 @@
     "Port": 587,
     "Host": "smtp-mail.outlook.com",
     "FromEmail": "donotreply@elevateimaging.ai",
-    "FromName": "LiLi",
+    "FromName": "LiLi System",
     "AuthorizationCode": "Q#669869497420ul",
 
+    "SystemShortName": "LiLi",
     "OrganizationName": "Elevate Imaging",
     "OrganizationNameCN": "Elevate Imaging",
     "CompanyName": "Elevate Imaging Inc.",
@@ -76,6 +78,7 @@
     "SiteUrl": "https://lili.elevateimaging.ai/login",
     "IsEnv_US": true,
     "IsOpenErrorNoticeEmail": false,
+    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]
   },
 

IRaCIS.Core.API/appsettings.US_Test_IRC.json

@@ -64,7 +64,8 @@
     "IsNeedChangePassWord": true,
 
     "ChangePassWordDays": 90,
-
+    // 模板类型 1 Elevate  2 Extensive
+    "TemplateType": 1,
     "OpenLoginMFA": true
   },
 
@@ -72,9 +73,10 @@
     "Port": 587,
     "Host": "smtp-mail.outlook.com",
     "FromEmail": "donotreply@elevateimaging.ai",
-    "FromName": "LiLi",
+    "FromName": "LiLi System",
     "AuthorizationCode": "Q#669869497420ul",
 
+    "SystemShortName": "LiLi",
     "OrganizationName": "Elevate Imaging",
     "OrganizationNameCN": "Elevate Imaging",
     "CompanyName": "Elevate Imaging Inc.",

IRaCIS.Core.API/appsettings.US_Uat_IRC.json

@@ -63,16 +63,19 @@
     "ReadingRestTimeMin": 10,
 
     "IsNeedChangePassWord": true,
-    "ChangePassWordDays": 90
+    "ChangePassWordDays": 90,
+    // 模板类型 1 Elevate  2 Extensive
+    "TemplateType": 1
   },
 
   "SystemEmailSendConfig": {
     "Port": 587,
     "Host": "smtp-mail.outlook.com",
     "FromEmail": "donotreply@elevateimaging.ai",
-    "FromName": "LiLi",
+    "FromName": "LiLi System",
     "AuthorizationCode": "Q#669869497420ul",
 
+    "SystemShortName": "LiLi",
     "OrganizationName": "Elevate Imaging",
     "OrganizationNameCN": "Elevate Imaging",
     "CompanyName": "Elevate Imaging Inc.",
@@ -82,6 +85,7 @@
     "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,}$",
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]
   },
 

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -70,16 +70,20 @@
     "ReadingRestTimeMin": 10,
 
     "IsNeedChangePassWord": true,
-    "ChangePassWordDays": 90
+    "ChangePassWordDays": 90,
+    // 模板类型 1 Elevate  2 Extensive
+    "TemplateType": 2
 
   },
   "SystemEmailSendConfig": {
     "Port": 465,
     "Host": "smtp.qiye.aliyun.com",
     "FromEmail": "uat@extimaging.com",
-    "FromName": "UAT_IRC",
+    "FromName": "Uat IRC Imaging System",
     "AuthorizationCode": "SHzyyl2021",
     "SiteUrl": "http://irc.uat.extimaging.com/login",
+
+    "SystemShortName": "IRC",
     "OrganizationName": "Extlmaging",
     "OrganizationNameCN": "Extlmaging",
     "CompanyName": "Extensive Imaging",
@@ -88,6 +92,7 @@
     "CompanyShortNameCN": "展影医疗",
     "IsEnv_US": false,
     "IsOpenErrorNoticeEmail": false,
+    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]
   },
 

IRaCIS.Core.API/appsettings.json

@@ -3,7 +3,7 @@
     "SecurityKey": "ShangHaiZhanYing_SecurityKey_SHzyyl@2021",
     "Issuer": "Extimaging",
     "Audience": "EICS",
-    "TokenExpireDays": "7"
+    "TokenExpireMinute": "10080"//7天
   },
   "IpRateLimiting": {
     "EnableEndpointRateLimiting": true,

IRaCIS.Core.Application/Auth/JwtSetting.cs

@@ -23,7 +23,7 @@ namespace IRaCIS.Core.Application.Auth
         /// <summary>
         ///  过期时间
         /// </summary>
-        public int TokenExpireDays { get; set; }
+        public int TokenExpireMinute { get; set; }
 
         //public Dictionary<string, object> Claims { get; set; }
 

IRaCIS.Core.Application/Auth/TokenService.cs

@@ -9,6 +9,8 @@ namespace IRaCIS.Core.Application.Auth
     public interface ITokenService
     {
         string GetToken(UserTokenInfo user);
+
+        bool IsTokenExpired(string token);
     }
 
 
@@ -47,13 +49,27 @@ namespace IRaCIS.Core.Application.Auth
                     signingCredentials: _jwtSetting.Credentials,
                     claims: claims,
                     notBefore: DateTime.Now,
-                    expires: DateTime.Now.AddDays(_jwtSetting.TokenExpireDays)
+                    expires: DateTime.Now.AddMinutes(_jwtSetting.TokenExpireMinute)
                 );
 
             string jwtToken = new JwtSecurityTokenHandler().WriteToken(token);
             return jwtToken;
 
         }
+
+        public bool IsTokenExpired(string token)
+        {
+            var handler = new JwtSecurityTokenHandler();
+            try
+            {
+                var jwtToken = handler.ReadJwtToken(token);
+                return jwtToken.ValidTo < DateTime.UtcNow;
+            }
+            catch
+            {
+                return true; // 无效 Token 也视为已过期
+            }
+        }
     }
 
 

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

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Logging;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IRaCIS.Core.Application.Service.BusinessFilter;
 

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

@@ -34,6 +34,8 @@ public class ServiceVerifyConfigOption
     [Description("修改密码的天数")]
     public int ChangePassWordDays { get; set; }
 
+    public SysTemplateType TemplateType { get; set; }
+
     public string ThirdPdfUrl { get; set; }
 
 }
@@ -51,6 +53,8 @@ public class SystemEmailSendConfig
 
     public string SiteUrl { get; set; } = string.Empty;
 
+    public string SystemShortName { get; set; } = string.Empty; 
+
     public string OrganizationName { get; set; } = string.Empty;
     public string OrganizationNameCN { get; set; } = string.Empty;
 
@@ -66,11 +70,14 @@ public class SystemEmailSendConfig
 
     public bool IsOpenErrorNoticeEmail { get; set; }
 
+    public string EmailRegexStr { get; set; }
+
     public List<string> ErrorNoticeEmailList { get; set; } =new List<string>();
 }
 
 public class SystemEmailSendConfigView
 {
+   public string SystemShortName { get; set; } = string.Empty;
     public string CompanyName { get; set; } = string.Empty;
 
     public string CompanyNameCN { get; set; } = string.Empty;
@@ -78,6 +85,8 @@ public class SystemEmailSendConfigView
     public string CompanyShortName { get; set; } = string.Empty;
 
     public string CompanyShortNameCN { get; set; } = string.Empty;
+
+    public string EmailRegexStr { get; set; }
 }
 
 public class SystemPacsConfig

IRaCIS.Core.Application/GlobalUsings.cs

@@ -11,5 +11,6 @@ global using AutoMapper;
 global using IRaCIS.Core.Domain.Share;
 global using IRaCIS.Core.Application.BusinessFilter;
 global using IdentityUser = IRaCIS.Core.Domain.Models.IdentityUser;
+global using Serilog;
 
 

IRaCIS.Core.Application/Helper/DicomDIRHelper.cs

@@ -0,0 +1,190 @@
+using FellowOakDicom;
+using FellowOakDicom.Media;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Helper
+{
+
+    public class StudyDIRInfo
+    {
+        public Guid SubjectVisitId { get; set; }
+        // Study
+        public Guid DicomStudyId { get; set; }
+
+        public string PatientId { get; set; }
+        public string PatientName { get; set; }
+        public string PatientBirthDate { get; set; }
+        public string PatientSex { get; set; }
+
+        public string StudyInstanceUid { get; set; }
+        public string StudyId { get; set; }
+        public string DicomStudyDate { get; set; }
+        public string DicomStudyTime { get; set; }
+        public string AccessionNumber { get; set; }
+        public string StudyDescription { get; set; }
+
+        // Series
+        public string SeriesInstanceUid { get; set; }
+        public string Modality { get; set; }
+        public string DicomSeriesDate { get; set; }
+        public string DicomSeriesTime { get; set; }
+        public int SeriesNumber { get; set; }
+        public string SeriesDescription { get; set; }
+
+        // Instance
+        public Guid InstanceId { get; set; }
+        public string SopInstanceUid { get; set; }
+        public string SOPClassUID { get; set; }
+        public int InstanceNumber { get; set; }
+        public string MediaStorageSOPClassUID { get; set; }
+        public string MediaStorageSOPInstanceUID { get; set; }
+        public string TransferSytaxUID { get; set; }
+    }
+    public static class DicomDIRHelper
+    {
+
+        public static async Task GenerateStudyDIRAndUploadAsync(List<StudyDIRInfo> list, Dictionary<string, string> dic, string ossFolder, IOSSService _oSSService)
+        {
+            var mappings = new List<string>();
+            int index = 1;
+
+
+            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(), Path.GetFileName(filename));
+
+                    dicomDir.AddFile(dicomFile, filename);
+
+                    index++;
+                }
+
+
+            }
+
+            //有实际的文件
+            if (mappings.Count > 0)
+            {
+                #region 写入临时路径
+                var tempFilePath = Path.GetTempFileName();
+
+                // 保存 DICOMDIR 到临时文件  不能直接写入到流种
+                await dicomDir.SaveAsync(tempFilePath);
+
+                using (var memoryStream = new MemoryStream(File.ReadAllBytes(tempFilePath)))
+                {
+                    // 重置流位置
+                    memoryStream.Position = 0;
+
+                    await _oSSService.UploadToOSSAsync(memoryStream, ossFolder, "DICOMDIR", false);
+                }
+
+                //清理临时文件
+                File.Delete(tempFilePath);
+
+                #endregion
+
+                #region 映射上传
+
+                // 将映射写入内存流
+                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);
+
+                #endregion
+            }
+
+        }
+
+
+
+        public static StudyDIRInfo ReadDicomDIRInfo(DicomFile dicomFile)
+        {
+            var dataset = dicomFile.Dataset;
+
+
+            var info = new StudyDIRInfo
+            {
+                PatientId = dataset.GetSingleValueOrDefault(DicomTag.PatientID, string.Empty),
+                PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty),
+                PatientBirthDate = dataset.GetSingleValueOrDefault(DicomTag.PatientBirthDate, string.Empty),
+                PatientSex = dataset.GetSingleValueOrDefault(DicomTag.PatientSex, string.Empty),
+
+                StudyInstanceUid = dataset.GetSingleValueOrDefault(DicomTag.StudyInstanceUID, string.Empty),
+                StudyId = dataset.GetSingleValueOrDefault(DicomTag.StudyID, string.Empty),
+                DicomStudyDate = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, string.Empty),
+                DicomStudyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyTime, string.Empty),
+                AccessionNumber = dataset.GetSingleValueOrDefault(DicomTag.AccessionNumber, string.Empty),
+                StudyDescription = dataset.GetSingleValueOrDefault(DicomTag.StudyDescription, string.Empty),
+
+                SeriesInstanceUid = dataset.GetSingleValueOrDefault(DicomTag.SeriesInstanceUID, string.Empty),
+                Modality = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty),
+                DicomSeriesDate = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, string.Empty),
+                DicomSeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, string.Empty),
+                SeriesNumber = dataset.GetSingleValueOrDefault(DicomTag.SeriesNumber, 1),
+                SeriesDescription = dataset.GetSingleValueOrDefault(DicomTag.SeriesDescription, string.Empty),
+
+                SopInstanceUid = dataset.GetSingleValueOrDefault(DicomTag.SOPInstanceUID, string.Empty),
+                SOPClassUID = dataset.GetSingleValueOrDefault(DicomTag.SOPClassUID, string.Empty),
+                InstanceNumber = dataset.GetSingleValueOrDefault(DicomTag.InstanceNumber, 1),
+
+                MediaStorageSOPClassUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.MediaStorageSOPClassUID, string.Empty),
+                MediaStorageSOPInstanceUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.MediaStorageSOPInstanceUID, string.Empty),
+
+                TransferSytaxUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.TransferSyntaxUID, string.Empty)
+            };
+
+            return info;
+        }
+    }
+}

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

@@ -1,4 +1,7 @@
-namespace IRaCIS.Core.Application.Helper;
+using System.Globalization;
+using System.Text.RegularExpressions;
+
+namespace IRaCIS.Core.Application.Helper;
 
 public static class IRCEmailPasswordHelper
 {
@@ -74,4 +77,56 @@ public static class IRCEmailPasswordHelper
         // 随机打乱密码字符顺序
         return new string(password.OrderBy(_ => Random.Next()).ToArray());
     }
+
+
+
+    // https://learn.microsoft.com/zh-cn/dotnet/standard/base-types/how-to-verify-that-strings-are-in-valid-email-format
+    /// <summary>
+    /// 微软官方邮件验证  很宽松
+    /// </summary>
+    /// <param name="email"></param>
+    /// <returns></returns>
+    public static bool IsValidEmail(string email)
+    {
+        if (string.IsNullOrWhiteSpace(email))
+            return false;
+
+        try
+        {
+            // Normalize the domain
+            email = Regex.Replace(email, @"(@)(.+)$", DomainMapper,
+                                  RegexOptions.None, TimeSpan.FromMilliseconds(200));
+
+            // Examines the domain part of the email and normalizes it.
+            string DomainMapper(Match match)
+            {
+                // Use IdnMapping class to convert Unicode domain names.
+                var idn = new IdnMapping();
+
+                // Pull out and process domain name (throws ArgumentException on invalid)
+                string domainName = idn.GetAscii(match.Groups[2].Value);
+
+                return match.Groups[1].Value + domainName;
+            }
+        }
+        catch (RegexMatchTimeoutException e)
+        {
+            return false;
+        }
+        catch (ArgumentException e)
+        {
+            return false;
+        }
+
+        try
+        {
+            return Regex.IsMatch(email,
+                @"^[^@\s]+@[^@\s]+\.[^@\s]+$",
+                RegexOptions.IgnoreCase, TimeSpan.FromMilliseconds(250));
+        }
+        catch (RegexMatchTimeoutException)
+        {
+            return false;
+        }
+    }
 }

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

@@ -11,6 +11,12 @@ public static class SendEmailHelper
 
     public static async Task SendEmailAsync(MimeMessage messageToSend, SystemEmailSendConfig _systemEmailConfig, EventHandler<MessageSentEventArgs>? messageSentSuccess = null)
     {
+        //没有收件人 那么不发送
+        if (messageToSend.To.Count == 0)
+        { 
+            return;
+        }
+
         try
         {
             using (var smtp = new MailKit.Net.Smtp.SmtpClient())

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

@@ -243,6 +243,7 @@ public static class ExcelExportHelper
 
     }
 
+
     public class DynamicColumnConfig
     {
         /// <summary>
@@ -260,7 +261,9 @@ public static class ExcelExportHelper
         /// </summary>
         public int TempalteLastColumnIndex { get; set; }
 
-        public List<string> CDISCList { get; set; } = new List<string>();
+        public bool IsCDISCExport { get; set; } = false;
+
+        //public List<string> CDISCList { get; set; } = new List<string>();
 
         /// <summary>
         /// 动态的列名  如果Id 重复，那么就按照名称填充，否则就按照Id 填充列数据
@@ -300,6 +303,19 @@ public static class ExcelExportHelper
         {
             public Guid Id { get; set; }
             public string Name { get; set; }
+
+            public string CDISCCode { get; set; }
+
+            public override bool Equals(object obj)
+            {
+                if (obj is not ColumItem other) return false;
+                return Id == other.Id && Name == other.Name;
+            }
+
+            public override int GetHashCode()
+            {
+                return HashCode.Combine(Id, Name);
+            }
         }
 
         public List<string> ColumnIdList => ColumnIdNameList == null ? new List<string>() : ColumnIdNameList.Select(t => t.Id.ToString()).ToList();
@@ -478,7 +494,9 @@ public static class ExcelExportHelper
 
             if (dynamicColumnConfig != null)
             {
-                var isCdics = dynamicColumnConfig.CDISCList.Count > 0;
+                //var isCdics = dynamicColumnConfig.CDISCList.Count > 0;
+
+                var isCdics = dynamicColumnConfig.IsCDISCExport;
 
                 var sheet = workbook.GetSheetAt(0);
 
@@ -533,7 +551,7 @@ public static class ExcelExportHelper
                 }
 
                 //创建新的列
-                for (int i = originTotalEndIndex; i < originTotalEndIndex + needAddCount; i++)
+                for (int i = originRemoveEndIndex; i < originRemoveEndIndex + needAddCount; i++)
                 {
 
                     titelRow.CreateCell(i + 1);
@@ -554,6 +572,11 @@ public static class ExcelExportHelper
                     titelRow.GetCell(i).SetCellValue(titelRow.GetCell(i - gap).StringCellValue);
 
                     templateRow.GetCell(i).SetCellValue(templateRow.GetCell(i - gap).StringCellValue);
+
+                    if (isCdics)
+                    {
+                        cdicsRow.GetCell(i).SetCellValue(cdicsRow.GetCell(i - gap).StringCellValue);
+                    }
                 }
 
 
@@ -562,6 +585,7 @@ public static class ExcelExportHelper
 
                 for (int i = dynamicColunmStartIndex; i < dynamicColunmStartIndex + needAddCount; i++)
                 {
+
                     var name = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].Name;
 
                     titelRow.GetCell(i).SetCellValue(name);
@@ -569,13 +593,15 @@ public static class ExcelExportHelper
 
                     if (isCdics)
                     {
-                        var cdicsCode = dynamicColumnConfig.CDISCList[i - dynamicColunmStartIndex];
+                        var cdicsCode = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].CDISCCode;
 
                         cdicsRow.GetCell(i).SetCellValue(cdicsCode);
                     }
                 }
+
             }
 
+
             using (var memoryStream2 = new MemoryStream())
             {
                 workbook.Write(memoryStream2, true);
@@ -598,8 +624,11 @@ public static class ExcelExportHelper
             IgnoreTemplateParameterMissing = true,
         };
 
+        //await MiniExcel.SaveAsByTemplateAsync("testmini.xlsx", templateStream.ToArray(), translateData);
+
         await MiniExcel.SaveAsByTemplateAsync(memoryStream, templateStream.ToArray(), translateData, config);
 
+
         memoryStream.Seek(0, SeekOrigin.Begin);
 
         if (dynamicColumnConfig != null)
@@ -632,7 +661,7 @@ public static class ExcelExportHelper
 
                     var iteObjDic = itemObj.ToDictionary();
 
-                    var itemDicName = iteObjDic[dynamicColumnConfig.DynamicItemDicName]?.ToString();
+                    var itemDicName = iteObjDic.ContainsKey(dynamicColumnConfig.DynamicItemDicName) ? iteObjDic[dynamicColumnConfig.DynamicItemDicName]?.ToString() : "";
                     var itemValue = iteObjDic[dynamicColumnConfig.DynamicItemValueName]?.ToString();
 
                     //var writeIndex = itemList.IndexOf(itemObj) + dynamicColumnConfig.AutoColumnStartIndex;
@@ -896,7 +925,7 @@ public static class ExcelExportHelper
                 {
                     var name = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].Name;
 
-                    var cdicsCode = dynamicColumnConfig.CDISCList[i - dynamicColunmStartIndex];
+                    var cdicsCode = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].CDISCCode;
 
                     cdicsRow.GetCell(i).SetCellValue(cdicsCode);
                     titelRow.GetCell(i).SetCellValue(name);

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

@@ -69,6 +69,15 @@ public static class FileStoreHelper
         return rootFolder;
     }
 
+    public static string GetDonwnloadImageFolder(IWebHostEnvironment _hostEnvironment)
+    {
+        var rootPath = GetIRaCISRootPath(_hostEnvironment);
+
+        var rootFolder = Path.Combine(rootPath, StaticData.Folder.DownloadIamgeFolder);
+
+        return rootFolder;
+    }
+
     //根据相对路径  获取具体文件物理地址
     public static string GetPhysicalFilePath(IWebHostEnvironment _hostEnvironment, string relativePath)
     {

IRaCIS.Core.Application/Helper/HangfireJobHelper.cs

@@ -20,12 +20,12 @@ namespace IRaCIS.Core.Application.Helper
         //添加 或者更新定时任务  Id 要唯一标识一个定义任务
         public static void AddOrUpdateCronJob<T>(string jobId, Expression<Action<T>> methodCall, string cron, string queueName = "default")
         {
-            RecurringJob.AddOrUpdate<T>(jobId, queueName, methodCall, cron);
+            RecurringJob.AddOrUpdate<T>(jobId, queueName, methodCall, cron, new RecurringJobOptions() { TimeZone = TimeZoneInfo.Local });
         }
 
         public static void AddOrUpdateInitCronJob<T>(string jobId, Expression<Action<T>> methodCall, string cron)
         {
-            RecurringJob.AddOrUpdate<T>(jobId, "sys_init", methodCall, cron);
+            RecurringJob.AddOrUpdate<T>(jobId, "sys_init", methodCall, cron, new RecurringJobOptions() { TimeZone = TimeZoneInfo.Local });
         }
 
         public static void RemoveCronJob(string jobId)
@@ -73,17 +73,36 @@ namespace IRaCIS.Core.Application.Helper
                 case EmailBusinessScenario.QCToCRCImageQuestion:
                     HangfireJobHelper.AddOrUpdateCronJob<IMediator>(jobId, t => t.Send(new QCImageQuestionRecurringEvent() { TrialId = trialId }, default), emailCron);
                     break;
-                    //加急阅片 10分钟
+                //加急阅片 10分钟
                 case EmailBusinessScenario.ExpeditedReading:
                     HangfireJobHelper.AddOrUpdateCronJob<IMediator>(jobId, t => t.Send(new UrgentIRUnReadTaskRecurringEvent() { TrialId = trialId }, default), emailCron);
                     break;
-
-                    
                 default:
                     break;
             }
 
         }
+
+        public static void AddOrUpdateTimingCronJob(string jobId, EmailBusinessScenario businessScenario, string emailCron)
+        {
+            switch (businessScenario)
+            {
+
+                case EmailBusinessScenario.GeneralTraining_ExpirationNotification:
+
+
+                    HangfireJobHelper.AddOrUpdateCronJob<IMediator>(jobId, t => t.Send(new SystemDocumentErverDayEvent() { }, default), emailCron);
+                    break;
+                case EmailBusinessScenario.TrialTraining_ExpirationNotification:
+
+                    Console.WriteLine("更新项目到期job");
+                    HangfireJobHelper.AddOrUpdateCronJob<IMediator>(jobId, t => t.Send(new TrialDocumentErverDayEvent() { }, default), emailCron);
+                    break;
+
+                default:
+                    break;
+            }
+        }
     }
 }
 

IRaCIS.Core.Application/Helper/IPCityHelper.cs

@@ -0,0 +1,42 @@
+using IRaCIS.Core.Domain.Models;
+using MaxMind.GeoIP2;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Helper
+{
+    public static class IPCityHelper
+    {
+
+        public static string GetCityResponse(string ip)
+        {
+            var path = Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources, "GeoLite2-City.mmdb");
+
+            try
+            {
+                using (var reader = new DatabaseReader(path))
+                {
+
+                    var city = reader.City(ip);
+
+                    //Console.WriteLine(city.Country.IsoCode); // 'US' 'CN'
+                    //Console.WriteLine(city.Country.Name); // 'United States'  'China'
+                    ////Console.WriteLine(city.Country.Names["zh-CN"]); // '美国'
+                    //Console.WriteLine(city.MostSpecificSubdivision.Name); // 'Minnesota'  'Hubei'
+                    //Console.WriteLine(city.City.Name); // 'Minneapolis'    'WUHan'
+
+                    return $"{city.Country.Name} | {city.MostSpecificSubdivision.Name} | {city.City.Name}";
+
+                }
+            }
+            catch (Exception ex)
+            {
+
+                return $"UN | UN | {ip}";
+            }
+        }
+    }
+}

IRaCIS.Core.Application/Helper/OSSService.cs

@@ -1,5 +1,6 @@
 using AlibabaCloud.SDK.Sts20150401;
 using Aliyun.OSS;
+using Aliyun.OSS.Common;
 using Amazon;
 using Amazon.Runtime;
 using Amazon.S3;
@@ -9,11 +10,15 @@ using Amazon.SecurityToken.Model;
 using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Infrastructure.NewtonsoftJson;
 using MassTransit;
+using MassTransit.Caching.Internals;
 using Microsoft.Extensions.Options;
 using Minio;
+using Minio.DataModel;
 using Minio.DataModel.Args;
+using Minio.Exceptions;
 using System.Reactive.Linq;
 using System.Runtime.InteropServices;
+using System.Web;
 
 namespace IRaCIS.Core.Application.Helper;
 
@@ -59,7 +64,7 @@ public class AliyunOSSOptions
 
     public int DurationSeconds { get; set; }
 
-
+    public string PreviewEndpoint { get; set; }
 
 }
 
@@ -105,6 +110,9 @@ public class AliyunOSSTempToken
     public string SecurityToken { get; set; }
     public DateTime Expiration { get; set; }
 
+    public string PreviewEndpoint { get; set; }
+
+    public string DownloadEndPoint => EndPoint.Insert(EndPoint.IndexOf("//") + 2, BucketName + ".");
 
 }
 
@@ -118,7 +126,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
@@ -139,15 +147,23 @@ public interface IOSSService
 
     public Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath);
 
+    public Task<Stream> GetStreamFromOSSAsync(string ossRelativePath);
+
     public ObjectStoreServiceOptions ObjectStoreServiceOptions { get; set; }
 
     public Task<string> GetSignedUrl(string ossRelativePath);
 
-    public Task DeleteFromPrefix(string prefix);
+    public Task DeleteFromPrefix(string prefix, bool isCache = false);
+
+    public Task DeleteObjects(List<string> objectKeys);
 
     List<string> GetRootFolderNames();
 
     public ObjectStoreDTO GetObjectStoreTempToken();
+
+    public Task MoveObject(string sourcePath, string destPath, bool overwrite = true);
+
+    public Task<long> GetObjectSizeAsync(string sourcePath);
 }
 
 
@@ -178,7 +194,7 @@ public class OSSService : IOSSService
     /// <returns></returns>
     public async Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true)
     {
-        GetObjectStoreTempToken();
+        BackBatchGetToken();
 
         var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{fileRealName}" : $"{oosFolderPath}/{fileRealName}";
 
@@ -268,6 +284,37 @@ public class OSSService : IOSSService
     }
 
 
+    //后端批量上传 或者下载，不每个文件获取临时token
+    private void BackBatchGetToken()
+    {
+        if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+        {
+            if (AliyunOSSTempToken == null)
+            {
+                GetObjectStoreTempToken();
+            }
+            //token 过期了
+            else if (AliyunOSSTempToken.Expiration.AddSeconds(10) <= DateTime.Now)
+            {
+                GetObjectStoreTempToken();
+            }
+
+
+        }
+        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+        {
+            if (AWSTempToken == null)
+            {
+                GetObjectStoreTempToken();
+            }
+            //token 过期了
+            else if (AWSTempToken.Expiration?.AddSeconds(10) <= DateTime.Now)
+            {
+                GetObjectStoreTempToken();
+            }
+        }
+    }
+
 
     /// <summary>
     /// oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
@@ -279,7 +326,7 @@ public class OSSService : IOSSService
     /// <exception cref="BusinessValidationFailedException"></exception>
     public async Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true)
     {
-        GetObjectStoreTempToken();
+        BackBatchGetToken();
 
         var localFileName = Path.GetFileName(localFilePath);
 
@@ -349,7 +396,7 @@ public class OSSService : IOSSService
 
     public async Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath)
     {
-        GetObjectStoreTempToken();
+        BackBatchGetToken();
 
         ossRelativePath = ossRelativePath.TrimStart('/');
         try
@@ -362,14 +409,12 @@ public class OSSService : IOSSService
 
                 var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
 
-                // 上传文件
                 var result = _ossClient.GetObject(aliConfig.BucketName, ossRelativePath);
 
                 // 将下载的文件流保存到本地文件
                 using (var fs = File.OpenWrite(localFilePath))
                 {
-                    result.Content.CopyTo(fs);
+                    await result.Content.CopyToAsync(fs);
-                    fs.Close();
                 }
 
             }
@@ -433,6 +478,96 @@ public class OSSService : IOSSService
 
     }
 
+    public async Task<Stream> GetStreamFromOSSAsync(string ossRelativePath)
+    {
+        BackBatchGetToken();
+        ossRelativePath = ossRelativePath.TrimStart('/');
+
+        try
+        {
+            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 result = _ossClient.GetObject(aliConfig.BucketName, ossRelativePath);
+
+                // 将OSS返回的流复制到内存流中并返回
+                var memoryStream = new MemoryStream();
+                await result.Content.CopyToAsync(memoryStream);
+                memoryStream.Position = 0; // 重置位置以便读取
+                return memoryStream;
+            }
+            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 memoryStream = new MemoryStream();
+
+                var getObjectArgs = new GetObjectArgs()
+                    .WithBucket(minIOConfig.BucketName)
+                    .WithObject(ossRelativePath)
+                    .WithCallbackStream(stream => stream.CopyToAsync(memoryStream));
+
+                await minioClient.GetObjectAsync(getObjectArgs);
+                memoryStream.Position = 0;
+                return memoryStream;
+            }
+            else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+            {
+                var awsConfig = ObjectStoreServiceOptions.AWS;
+
+                var credentials = new SessionAWSCredentials(
+                    AWSTempToken.AccessKeyId,
+                    AWSTempToken.SecretAccessKey,
+                    AWSTempToken.SessionToken
+                );
+
+                var clientConfig = new AmazonS3Config
+                {
+                    RegionEndpoint = RegionEndpoint.USEast1,
+                    UseHttp = true,
+                };
+
+                var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
+
+                var getObjectRequest = new Amazon.S3.Model.GetObjectRequest
+                {
+                    BucketName = awsConfig.BucketName,
+                    Key = ossRelativePath
+                };
+
+                var response = await amazonS3Client.GetObjectAsync(getObjectRequest);
+
+                var memoryStream = new MemoryStream();
+                await response.ResponseStream.CopyToAsync(memoryStream);
+                memoryStream.Position = 0;
+                return memoryStream;
+            }
+            else
+            {
+                throw new BusinessValidationFailedException("未定义的存储介质类型");
+            }
+        }
+        catch (Exception ex)
+        {
+            throw new BusinessValidationFailedException("oss流获取失败! " + ex.Message);
+        }
+    }
+
+
     public async Task<string> GetSignedUrl(string ossRelativePath)
     {
         GetObjectStoreTempToken();
@@ -528,6 +663,185 @@ public class OSSService : IOSSService
 
     }
 
+
+    /// <summary>
+    /// 移动OSS文件到新路径
+    /// </summary>
+    /// <param name="sourcePath">原文件路径（格式：bucket/key）</param>
+    /// <param name="destPath">新文件路径（格式：bucket/key）</param>
+    /// <param name="overwrite">是否覆盖已存在的目标文件（默认true）</param>
+    public async Task MoveObject(string sourcePath, string destPath, bool overwrite = true)
+    {
+        GetObjectStoreTempToken();
+
+        switch (ObjectStoreServiceOptions.ObjectStoreUse)
+        {
+            case "AliyunOSS":
+                #region 阿里云
+                var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+                var client = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
+                if (sourcePath.StartsWith("/"))
+                {
+                    sourcePath = sourcePath.Substring(1);
+                }
+
+
+                if (destPath.StartsWith("/"))
+                {
+                    destPath = destPath.Substring(1);
+                }
+
+                var sourceBucket = aliConfig.BucketName;
+                var sourceKey = sourcePath;
+
+                var destBucket = aliConfig.BucketName;
+
+                var destKey = destPath;
+
+
+                try
+                {
+                    // 检查目标是否存在（当不允许覆盖时）
+                    if (!overwrite && client.DoesObjectExist(destBucket, destKey))
+                    {
+                        throw new InvalidOperationException("File Exist");
+                    }
+
+
+                    //var copyRequest = new Aliyun.OSS.CopyObjectRequest(sourceBucket, sourceKey, sourceBucket, destKey);
+                    //var result = client.CopyObject(copyRequest);
+
+                    //// 2. 删除原文件（可选，根据是否需要保留原文件）
+                    //client.DeleteObject(sourceBucket, sourceKey);
+
+                    // 执行复制
+                    var copyRequestAli = new Aliyun.OSS.CopyObjectRequest(
+                        sourceBucket, sourceKey,
+                        destBucket, destKey);
+
+                    // 保持原文件元数据
+                    copyRequestAli.NewObjectMetadata = new ObjectMetadata
+                    {
+                        ContentType = client.GetObjectMetadata(sourceBucket, sourceKey).ContentType
+                    };
+
+                    var result = client.CopyObject(copyRequestAli);
+
+                    // 删除原文件（仅在复制成功后）
+                    client.DeleteObject(sourceBucket, sourceKey);
+                }
+                catch (OssException ex)
+                {
+                    throw new Exception($"[{ex.ErrorCode}] {ex.Message}", ex);
+                }
+                #endregion
+
+                break;
+            case "MinIO":
+                #region MinIO
+                var minIOConfig = ObjectStoreServiceOptions.MinIO;
+                var minioClient = new MinioClient()
+                 .WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
+                 .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey)
+                 .WithSSL(minIOConfig.UseSSL)
+                 .Build();
+
+                // 定义源路径和目标路径
+                string destinationKey = "b路径/文件名";
+
+                try
+                {
+                    // 1. 复制文件到新路径[2,5](@ref)
+                    using (var memoryStream = new MemoryStream())
+                    {
+                        // 下载源文件流
+                        await minioClient.GetObjectAsync(new GetObjectArgs()
+                            .WithBucket(minIOConfig.BucketName)
+                            .WithObject(sourcePath)
+                            .WithCallbackStream(stream => stream.CopyTo(memoryStream)));
+
+                        memoryStream.Position = 0; // 重置流位置
+
+                        // 上传到新路径
+                        await minioClient.PutObjectAsync(new PutObjectArgs()
+                            .WithBucket(minIOConfig.BucketName)
+                            .WithObject(destinationKey)
+                            .WithStreamData(memoryStream)
+                            .WithObjectSize(memoryStream.Length));
+                    }
+
+                    // 2. 删除原文件[1,6](@ref)
+                    await minioClient.RemoveObjectAsync(new RemoveObjectArgs()
+                        .WithBucket(minIOConfig.BucketName)
+                        .WithObject(sourcePath));
+                }
+                catch (MinioException ex)
+                {
+                    // 处理异常（例如：记录日志或抛出）
+                    throw new Exception();
+                }
+                #endregion
+
+                break;
+            case "AWS":
+                #region AWS
+                var awsConfig = ObjectStoreServiceOptions.AWS;
+
+                var credentials = new SessionAWSCredentials(
+                    AWSTempToken.AccessKeyId,
+                    AWSTempToken.SecretAccessKey,
+                    AWSTempToken.SessionToken
+                );
+
+                var clientConfig = new AmazonS3Config
+                {
+                    RegionEndpoint = RegionEndpoint.USEast1,
+                    UseHttp = true,
+                };
+
+                var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
+
+                // 定义原路径和目标路径
+
+
+                // 1. 复制对象到新路径
+                var copyRequest = new Amazon.S3.Model.CopyObjectRequest
+                {
+                    SourceBucket = awsConfig.BucketName,
+                    SourceKey = sourcePath,
+                    DestinationBucket = awsConfig.BucketName,
+                    DestinationKey = destPath
+                };
+
+                try
+                {
+                    // 执行复制操作
+                    await amazonS3Client.CopyObjectAsync(copyRequest);
+
+                    // 2. 删除原对象
+                    var deleteRequest = new Amazon.S3.Model.DeleteObjectRequest
+                    {
+                        BucketName = awsConfig.BucketName,
+                        Key = sourcePath
+                    };
+                    await amazonS3Client.DeleteObjectAsync(deleteRequest);
+
+
+                }
+                catch (AmazonS3Exception ex)
+                {
+                    Console.WriteLine($"ERROR: {ex.Message}");
+                    // 可根据异常类型细化处理（如文件不存在、权限问题等）
+                }
+                #endregion
+                break;
+            default:
+                throw new BusinessValidationFailedException("ERROR");
+
+        }
+
+    }
+
     /// <summary>
     /// 获取所有根目录名称
     /// </summary>
@@ -550,7 +864,7 @@ public class OSSService : IOSSService
             do
             {
                 // 列出根目录下的对象和文件夹
-                 objectListing = _ossClient.ListObjects(new  Aliyun.OSS.ListObjectsRequest(aliConfig.BucketName)
+                objectListing = _ossClient.ListObjects(new Aliyun.OSS.ListObjectsRequest(aliConfig.BucketName)
                 {
 
                     MaxKeys = 1000,
@@ -582,7 +896,7 @@ public class OSSService : IOSSService
     /// </summary>
     /// <param name="prefix"></param>
     /// <returns></returns>
-    public async Task DeleteFromPrefix(string prefix)
+    public async Task DeleteFromPrefix(string prefix, bool isCache = false)
     {
         GetObjectStoreTempToken();
 
@@ -592,6 +906,21 @@ public class OSSService : IOSSService
 
             var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
 
+            var bucketName = string.Empty;
+
+            if (isCache)
+            {
+                Uri uri = new Uri(aliConfig.ViewEndpoint);
+                string host = uri.Host; // 获取 "zy-irc-test-dev-cache.oss-cn-shanghai.aliyuncs.com"
+                string[] parts = host.Split('.');
+                bucketName = parts[0];
+            }
+            else
+            {
+                bucketName = aliConfig.BucketName;
+            }
+
+
 
             try
             {
@@ -600,7 +929,7 @@ public class OSSService : IOSSService
                 do
                 {
                     // 使用 prefix 模拟目录结构，设置 MaxKeys 和 NextMarker
-                    objectListing = _ossClient.ListObjects(new Aliyun.OSS.ListObjectsRequest(aliConfig.BucketName)
+                    objectListing = _ossClient.ListObjects(new Aliyun.OSS.ListObjectsRequest(bucketName)
                     {
                         Prefix = prefix,
                         MaxKeys = 1000,
@@ -612,7 +941,7 @@ public class OSSService : IOSSService
                     // 删除获取到的文件
                     if (keys.Count > 0)
                     {
-                        _ossClient.DeleteObjects(new Aliyun.OSS.DeleteObjectsRequest(aliConfig.BucketName, keys, false));
+                        _ossClient.DeleteObjects(new Aliyun.OSS.DeleteObjectsRequest(bucketName, keys, false));
                     }
 
                     // 设置 NextMarker 以获取下一页的数据
@@ -669,7 +998,6 @@ public class OSSService : IOSSService
 
             var awsConfig = ObjectStoreServiceOptions.AWS;
 
-
             // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
             var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
 
@@ -721,6 +1049,155 @@ public class OSSService : IOSSService
         }
     }
 
+    public async Task DeleteObjects(List<string> objectKeys)
+    {
+        GetObjectStoreTempToken();
+
+        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 (objectKeys.Count > 0)
+            {
+                var result = _ossClient.DeleteObjects(new Aliyun.OSS.DeleteObjectsRequest(aliConfig.BucketName, objectKeys, false));
+
+            }
+        }
+        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();
+
+
+            if (objectKeys.Count > 0)
+            {
+                var objArgs = new RemoveObjectsArgs()
+              .WithBucket(minIOConfig.BucketName)
+              .WithObjects(objectKeys);
+
+                // 删除对象
+                await minioClient.RemoveObjectsAsync(objArgs);
+            }
+        }
+        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+        {
+
+            var awsConfig = ObjectStoreServiceOptions.AWS;
+
+
+            // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
+            var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
+
+            //提供awsEndPoint（域名）进行访问配置
+            var clientConfig = new AmazonS3Config
+            {
+                RegionEndpoint = RegionEndpoint.USEast1,
+                UseHttp = true,
+            };
+
+            var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
+
+            if (objectKeys.Count > 0)
+            {
+                // 准备删除请求
+                var deleteObjectsRequest = new Amazon.S3.Model.DeleteObjectsRequest
+                {
+                    BucketName = awsConfig.BucketName,
+                    Objects = objectKeys.Select(t => new KeyVersion() { Key = t }).ToList()
+                };
+
+
+                // 批量删除对象
+                var deleteObjectsResponse = await amazonS3Client.DeleteObjectsAsync(deleteObjectsRequest);
+            }
+
+        }
+        else
+        {
+            throw new BusinessValidationFailedException("未定义的存储介质类型");
+        }
+    }
+
+    public async Task<long> GetObjectSizeAsync(string sourcePath)
+    {
+        BackBatchGetToken();
+
+
+        var objectkey = sourcePath.Trim('/');
+
+        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 key = HttpUtility.UrlDecode(objectkey);
+            var metadata = _ossClient.GetObjectMetadata(aliConfig.BucketName, key);
+
+            long fileSize = metadata?.ContentLength ?? 0; // 文件大小（字节）
+
+            return fileSize;
+        }
+        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 stat = await minioClient.StatObjectAsync(new Minio.DataModel.Args.StatObjectArgs()
+                 .WithBucket(minIOConfig.BucketName)
+                 .WithObject(objectkey));
+
+            return stat.Size; // 文件大小（字节）
+        }
+        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+        {
+
+            var awsConfig = ObjectStoreServiceOptions.AWS;
+
+
+            // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
+            var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
+
+            //提供awsEndPoint（域名）进行访问配置
+            var clientConfig = new AmazonS3Config
+            {
+                RegionEndpoint = RegionEndpoint.USEast1,
+                UseHttp = true,
+            };
+
+            var request = new Amazon.S3.Model.GetObjectMetadataRequest
+            {
+                BucketName = awsConfig.BucketName,
+                Key = objectkey
+            };
+
+            var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
+
+            var response = await amazonS3Client.GetObjectMetadataAsync(request);
+
+            long fileSize = response.ContentLength; // 文件大小（字节）
+
+            return fileSize;
+
+        }
+        else
+        {
+            throw new BusinessValidationFailedException("未定义的存储介质类型");
+        }
+    }
+
+
 
     public ObjectStoreDTO GetObjectStoreTempToken()
     {
@@ -764,6 +1241,7 @@ public class OSSService : IOSSService
                 BucketName = ossOptions.BucketName,
                 EndPoint = ossOptions.EndPoint,
                 ViewEndpoint = ossOptions.ViewEndpoint,
+                PreviewEndpoint = ossOptions.PreviewEndpoint
 
             };
 

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

@@ -15,14 +15,20 @@ public static class ImageHelper
 
         fileStorePath = fileStorePath ?? filePath + ".preview.jpeg";
 
-        using (var image = SixLabors.ImageSharp.Image.Load(filePath))
+        // 读取 DICOM 文件
-        {
+        var dicomImage = new DicomImage(filePath);
 
+        // 渲染 DICOM 图像到 ImageSharp 格式
+        using (var image = dicomImage.RenderImage().AsSharpImage())
+        {
+            // 生成缩略图（调整大小）
             image.Mutate(x => x.Resize(500, 500));
 
-            image.Save(fileStorePath);
+            // 保存缩略图为 JPEG
-
+            image.Save(fileStorePath, new JpegEncoder());
         }
+
+       
     }
 
 

IRaCIS.Core.Application/Helper/SafeBussinessHelper.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Helper
+{
+    public static class SafeBussinessHelper
+    {
+        public static async Task<bool> RunAsync(Func<Task> func, [CallerMemberName] string caller = "", string errorMsgTitle = "")
+        {
+            try
+            {
+                await func();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error($"【{errorMsgTitle}失败 - {caller}】: {ex.Message}");
+                return false;
+            }
+        }
+
+        public static async Task<(bool Success, T? Result)> RunAsync<T>(Func<Task<T>> func, [CallerMemberName] string caller = "", string errorMsgTitle = "")
+        {
+            try
+            {
+                var result = await func();
+                return (true, result);
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error($"【{errorMsgTitle}失败 - {caller}】: {ex.Message}");
+                return (false, default);
+            }
+        }
+    }
+
+}

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

@@ -33,37 +33,38 @@
 
 	<ItemGroup>
 		<PackageReference Include="IdentityModel.OidcClient" Version="6.0.0" />
-		<PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.4" />
+		<PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.6" />
-		<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.36" />
+		<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.1.3" />
 		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
-		<PackageReference Include="AWSSDK.S3" Version="3.7.405" />
+		<PackageReference Include="AWSSDK.S3" Version="4.0.4.1" />
-		<PackageReference Include="DocX" Version="3.0.1" />	
+		<PackageReference Include="DocX" Version="4.0.25105.5786" />	
 		<PackageReference Include="FreeSpire.Doc" Version="12.2.0" />
-		<PackageReference Include="Hangfire.Core" Version="1.8.14" />
 		<PackageReference Include="ExcelDataReader" Version="3.7.0" />
 		<PackageReference Include="ExcelDataReader.DataSet" Version="3.7.0" />
 		<PackageReference Include="DistributedLock.Redis" Version="1.0.3" />
-		<PackageReference Include="DistributedLock.SqlServer" Version="1.0.5" />
+		<PackageReference Include="DistributedLock.SqlServer" Version="1.0.6" />
-		<PackageReference Include="fo-dicom" Version="5.1.3" />
+		<PackageReference Include="fo-dicom" Version="5.2.2" />
-		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.3" />
+		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.2" />
-		<PackageReference Include="fo-dicom.Codecs" Version="5.15.1" />
+		<PackageReference Include="fo-dicom.Codecs" Version="5.16.3" />
 		<PackageReference Include="IP2Region.Net" Version="2.0.2" />
-		<PackageReference Include="MailKit" Version="4.7.1.1" />
+		<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="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
-		<PackageReference Include="MimeKit" Version="4.7.1" />
+		<PackageReference Include="MimeKit" Version="4.11.0" />
-		<PackageReference Include="MiniExcel" Version="1.34.2" />
+		<PackageReference Include="MiniExcel" Version="1.41.2" />
-		<PackageReference Include="Minio" Version="6.0.3" />
+		<PackageReference Include="Minio" Version="6.0.5" />
-		<PackageReference Include="MiniWord" Version="0.8.0" />
+		<PackageReference Include="MiniWord" Version="0.9.2" />
+		<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
 		<PackageReference Include="My.Extensions.Localization.Json" Version="3.3.0">
 		  <TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
-		<PackageReference Include="NPOI" Version="2.7.1" />
+		<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.5" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
 		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
-		<PackageReference Include="ZiggyCreatures.FusionCache" Version="1.4.0" />
+		<PackageReference Include="ZiggyCreatures.FusionCache" Version="2.3.0" />
 	</ItemGroup>
 
 	<ItemGroup>

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

@@ -14,19 +14,20 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer;
 
 public static class CommonEmailHelper
 {
-    public static async Task<EmailNoticeConfig> GetEmailSubejctAndHtmlInfoAndBuildAsync(IRepository<EmailNoticeConfig> _emailNoticeConfigrepository, EmailBusinessScenario scenario, MimeMessage messageToSend,
+
-    Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailFunc)
+    /// <summary>
+    /// 系统默认邮件  + 项目默认邮件  （不用添加到项目邮件配置中，才发送）
+    /// </summary>
+    /// <param name="configInfo"></param>
+    /// <param name="messageToSend"></param>
+    /// <param name="emailFunc"></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)
     {
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
-        var configInfo = await _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario).FirstOrDefaultAsync();
-
-        if (configInfo == null)
-        {
-            throw new BusinessValidationFailedException("系统未找到当前场景邮件配置信息，请联系运维人员核查");
-        }
-
-
         var (topicStr, htmlBodyStr) = isEn_US ? (configInfo.EmailTopic, configInfo.EmailHtmlContent) : (configInfo.EmailTopicCN, configInfo.EmailHtmlContentCN);
 
         try
@@ -36,8 +37,9 @@ public static class CommonEmailHelper
         }
         catch (Exception ex)
         {
+            //"邮件模板内容有误，填充内容出现问题，请联系运维人员核查"
 
-            throw new BusinessValidationFailedException("邮件模板内容有误，填充内容出现问题，请联系运维人员核查");
+            throw new BusinessValidationFailedException(I18n.T("CommonEmail_ConfigError"));
         }
 
 
@@ -52,6 +54,49 @@ public static class CommonEmailHelper
         return configInfo;
     }
 
+    /// <summary>
+    /// 项目手动邮件  （需要添加到项目邮件配置中，才发送）
+    /// </summary>
+    /// <param name="configInfo"></param>
+    /// <param name="messageToSend"></param>
+    /// <param name="emailFunc"></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)
+    {
+        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+
+
+        var (topicStr, htmlBodyStr) = isEn_US ? (configInfo.EmailTopic, configInfo.EmailHtmlContent) : (configInfo.EmailTopicCN, configInfo.EmailHtmlContentCN);
+
+        try
+        {
+            //每个场景修改主题 和body的逻辑不一样
+            (topicStr, htmlBodyStr) = emailFunc((topicStr, htmlBodyStr));
+        }
+        catch (Exception ex)
+        {
+            //"邮件模板内容有误，填充内容出现问题，请联系运维人员核查"
+
+            throw new BusinessValidationFailedException(I18n.T("CommonEmail_ConfigError"));
+        }
+
+
+        messageToSend.Subject = topicStr;
+
+        var builder = new BodyBuilder();
+
+        builder.HtmlBody = htmlBodyStr;
+
+        messageToSend.Body = builder.ToMessageBody();
+
+        return configInfo;
+    }
+
+
+
+
     public static string ReplaceCompanyName(SystemEmailSendConfig _systemEmailConfig, string needDealtxt)
     {
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
@@ -74,12 +119,13 @@ public static class CommonEmailHelper
         var enumValueList = inDto.DictionaryList.Select(x => x.EnumValue).ToList();
 
 
-        var dicList =await inDto.DictionaryRepository.Where(x => dictionaryCodelist.Contains(x.Parent.Code) && enumValueList.Contains(x.Code)).Select(x=>new DictionaryData() { 
+        var dicList = await inDto.DictionaryRepository.Where(x => dictionaryCodelist.Contains(x.Parent.Code) && enumValueList.Contains(x.Code)).Select(x => new DictionaryData()
+        {
 
-        DictionaryCode=x.Parent.Code,
+            DictionaryCode = x.Parent.Code,
-        EnumValue=x.Code,
+            EnumValue = x.Code,
-        Value=x.Value,
+            Value = x.Value,
-        ValueCN=x.ValueCN
+            ValueCN = x.ValueCN
         }).ToListAsync();
 
 
@@ -88,7 +134,7 @@ public static class CommonEmailHelper
         inDto.DictionaryList.ForEach(x =>
         {
 
-            var dic = dicList.Where(y => y.EnumValue == x.EnumValue && y.DictionaryCode == x.DictionaryCode).FirstOrDefault();
+            var dic = dicList.Where(y => y.EnumValue == x.EnumValue && y.DictionaryCode.Equals(x.DictionaryCode,StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
             result.Add(dic == null ? string.Empty : (inDto.IsEn_US ? dic.Value : dic.ValueCN));
         });
 

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

@@ -1,9 +1,12 @@
 using AutoMapper;
+using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Application.Contracts.DTO;
 using IRaCIS.Core.Application.MassTransit.Command;
 using IRaCIS.Core.Domain.Share;
 using MassTransit;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 using System.Text;
 
@@ -21,6 +24,9 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
         private readonly IRepository<NoneDicomStudy> _noneDicomStudyRepository;
         public IStringLocalizer _localizer { get; set; }
 
+        private readonly SystemEmailSendConfig _systemEmailConfig;
+
+        private readonly IRepository<Dictionary> _dictionaryRepository;
         /// <summary>
         /// 构造函数注入
         /// </summary>
@@ -28,7 +34,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
         public ConsistencyCheckConsumer(IRepository<DicomStudy> studyRepository, IUserInfo userInfo,
             IRepository<Subject> subjectRepository, IRepository<SubjectVisit> subjectVisitRepository,
             IRepository<TrialSite> trialSiteRepository, IRepository<NoneDicomStudy> noneDicomStudyRepository,
-            IMapper mapper, IStringLocalizer localizer)
+            IMapper mapper, IStringLocalizer localizer, IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig, IRepository<Dictionary> dictionaryRepository)
         {
             _noneDicomStudyRepository = noneDicomStudyRepository;
             _studyRepository = studyRepository;
@@ -38,6 +44,9 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
             _trialSiteRepository = trialSiteRepository;
             _mapper = mapper;
             _localizer = localizer;
+
+            _systemEmailConfig = systemEmailConfig.CurrentValue;
+            _dictionaryRepository = dictionaryRepository;
         }
 
 
@@ -47,6 +56,9 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
 
             var trialId = context.Message.TrialId;
 
+            //系统定义MRI  到底是MR  还是MRI
+            var mriModality = await _dictionaryRepository.Where(t => t.Parent.Code == "Modality").Where(t => t.Code == "MRI").Select(t => t.Value).FirstNotNullAsync();
+
             //处理Excel大小写
             context.Message.ETCList.ForEach(t => { t.Modality = t.Modality.ToUpper().Trim(); t.StudyDate = Convert.ToDateTime(t.StudyDate).ToString("yyyy-MM-dd"); t.SiteCode = t.SiteCode.ToUpper().Trim(); t.VisitName = t.VisitName.ToUpper().Trim(); t.SubjectCode = t.SubjectCode.ToUpper().Trim(); });
             var etcList = context.Message.ETCList;
@@ -55,7 +67,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
 
             //subjectVisitLambda2= subjectVisitLambda2.And(x => x.CheckState == CheckStateEnum.ToCheck && x.AuditState == AuditStateEnum.QCPassed || (x.CheckState == CheckStateEnum.CVIng && x.AuditState == AuditStateEnum.QCPassed));
 
-            Expression<Func<SubjectVisit, bool>> subjectVisitLambda = x => x.TrialId == trialId &&
+            Expression<Func<SubjectVisit, bool>> subjectVisitLambda = x => x.TrialId == trialId && x.Subject.IsSubjectQuit == false &&
             (x.CheckState == CheckStateEnum.ToCheck && x.AuditState == AuditStateEnum.QCPassed || (x.CheckState == CheckStateEnum.CVIng && x.AuditState == AuditStateEnum.QCPassed));
 
             var dicomQuery = from sv in _subjectVisitRepository.Where(subjectVisitLambda)
@@ -115,6 +127,16 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
                     var etcVisitStudyList = etcList.Where(t => t.SubjectCode == sv.SubjectCode && t.SiteCode == sv.SiteCode && t.VisitName == sv.VisitName).ToList();
 
 
+                    //以我们系统数据库为准 ，判断是MR 还是MRI, 把Excel 里的MR 或者MRI 处理成一致，MR MRI 是一致的
+                    foreach (var item in etcVisitStudyList)
+                    {
+                        if (item.Modality == "MR" || item.Modality == "MRI")
+                        {
+                            item.Modality = mriModality;
+                        }
+                    }
+
+
 
                     StringBuilder dialogMsg = new StringBuilder();
                     //---您好,根据本系统自动识别，该受试者当前访视在IRC系统中已提交的影像检查情况如下：
@@ -186,7 +208,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
                         {
                             dialogMsg.AppendLine($"<br/>");
                             //---核对EDC数据，完全一致, 审核通过
-                            dialogMsg.AppendLine(_localizer["ConsistencyVerification_EDCA"]);
+                            dialogMsg.AppendLine(_localizer["ConsistencyVerification_EDCA", _systemEmailConfig.SystemShortName]);
 
 
                             // dialogMsg.AppendLine(@$"<br>说明：为高效解决/处理以上全部质疑问题，麻烦您准确核实实际影像检查情况。请注意影像日期与实际检查的日期可能会不一致，部分检查（如PET -CT)可能同时存在多种模态影像。准确核实后，请回复该访视正确的影像检查情况。");
@@ -196,7 +218,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
                             dbSV.CheckChallengeState = CheckChanllengeTypeEnum.Closed;
 
                             //---核对EDC数据，完全一致
-                            dbSV.CheckResult = _localizer["ConsistencyVerification_EDCB"];
+                            dbSV.CheckResult = _localizer["ConsistencyVerification_EDCB", _systemEmailConfig.SystemShortName];
                             //---自动核查通过
                             dbSV.ManualPassReason = _localizer["ConsistencyVerification_Auto"];
 
@@ -224,7 +246,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
                             {
                                 num++;
                                 //影像检查(EDC 缺少)   ConsistencyVerification_EdcL
-                                dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {_localizer["ConsistencyVerification_EdcL", item.StudyDate, item.Modality]}</div>");
+                                dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {_localizer["ConsistencyVerification_EdcL", item.StudyDate, item.Modality/*, _systemEmailConfig.SystemShortName*/]}</div>");
 
                             }
 
@@ -232,15 +254,15 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
                             {
                                 num++;
                                 // 影像检查(IRC 缺少)
-                                dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {_localizer["ConsistencyVerification_IrcLi", item.StudyDate, item.Modality]}</div>");
+                                dialogMsg.AppendLine($"<br/><div style='text-indent: 20px;'>{num}. {_localizer["ConsistencyVerification_IrcLi", item.StudyDate, item.Modality, _systemEmailConfig.SystemShortName]}</div>");
                             }
 
                             dialogMsg.AppendLine($"<br/>");
                             dialogMsg.AppendLine(@$"<div>{_localizer["ConsistencyVerification_Desc"]}</div>");
 
-                            dbSV.CheckResult = _localizer["ConsistencyVerification_Conf"] +
+                            dbSV.CheckResult =
-                                    String.Join(" | ", dbExceptExcel.Select(t => $"{_localizer["ConsistencyVerification_EdcL", t.StudyDate, t.Modality]}")) + "  |  "
+                                    String.Join(" | ", dbExceptExcel.Select(t => $"{_localizer["ConsistencyVerification_EdcL", t.StudyDate, t.Modality/*, _systemEmailConfig.SystemShortName*/]}")) + "  |  "
-                                    + String.Join(" | ", excelExceptDB.Select(t => $"{_localizer["ConsistencyVerification_IrcLi", t.StudyDate, t.Modality]}"));
+                                    + String.Join(" | ", excelExceptDB.Select(t => $"{_localizer["ConsistencyVerification_IrcLi", t.StudyDate, t.Modality, _systemEmailConfig.SystemShortName]}"));
 
                             //新增一致性核查质疑记录
 

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

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.MassTransit.Consumer.Dto
+{
+    public class SendImageReuploadEmailInDto
+    {
+        public EmailNoticeConfig EmailNoticeConfig { get; set; }
+
+        public EmailBusinessScenario Scenario { get; set; }
+
+        public SubjectVisit SubjectVisit { get; set; }
+
+        public Guid TrialId { get; set; }
+        public List<UserTypeEnum> UserTypes { get; set; } = null;
+
+        public ImageBackStateEnum ImageBackStateEnum { get; set; } = ImageBackStateEnum.None;
+
+        public RequestBackStateEnum RequestBackStateEnum { get; set; } = RequestBackStateEnum.NotRequest;
+
+        public ReReadingApplyState ReReadingApplyState { get; set; } = ReReadingApplyState.Default;
+
+
+
+
+
+    }
+}

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

@@ -0,0 +1,508 @@
+using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.MassTransit.Command;
+using IRaCIS.Core.Application.MassTransit.Consumer.Dto;
+using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Domain;
+using IRaCIS.Core.Domain._DomainEvent;
+using IRaCIS.Core.Domain.BaseModel;
+using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infra.EFCore.Common;
+using MassTransit;
+using MassTransit.Mediator;
+using MassTransit.Scheduling;
+using Medallion.Threading;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.StaticFiles;
+using Microsoft.Extensions.Options;
+using MimeKit;
+using Newtonsoft.Json;
+using Panda.DynamicWebApi.Attributes;
+using RestSharp;
+using SkiaSharp;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.MassTransit.Consumer;
+
+/// <summary>
+/// 影像重传和阅片人筛选相关邮件发送
+/// </summary>
+public class ImageConsumer(
+    IRepository<UserRole> _userRoleRepository,
+    IRepository<TrialUserRole> _trialUseRoleRepository,
+    IRepository<SubjectVisit> _subjectVisitRepository,
+    IRepository<Trial> _trialRepository,
+    IRepository<Enroll> _enrollRepository,
+    IRepository<VisitTask> _visitTaskRepository,
+    IRepository<ReadModule> _readModuleRepository,
+    IRepository<EmailNoticeUserType> _emailNoticeUserTypeRepository,
+    IRepository<TrialSite> _trialSiteRepository,
+    IRepository<Dictionary> _dictionaryRepository,
+    IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+    IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) :
+    IConsumer<DirectApplyReupdloadEvent>,
+    IConsumer<CheckReuploadEvent>,
+    IConsumer<QCChanllengeReuploadEvent>,
+    IConsumer<HaveReadVisitTaskReReading>,
+    IConsumer<ReviewerPMApplyEvent>,
+    IConsumer<ReviewerSPMApprovedEvent>
+{
+    private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
+
+    /// <summary>
+    /// 处理直接申请流程的重传事件
+    /// </summary>
+    public async Task Consume(ConsumeContext<DirectApplyReupdloadEvent> context)
+    {
+        Console.WriteLine("发送【影像重传-直接申请流程】邮件！！！");
+        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.Subject).FirstNotNullAsync();
+        var trialId = subjectVisit.TrialId;
+        List<UserTypeEnum> userTypes = null;
+        // 根据申请角色和状态确定邮件场景
+        EmailBusinessScenario scenario;
+        if (context.Message.ImageBackState == ImageBackStateEnum.None)
+        {
+            switch (context.Message.ApplyUserRole)
+            {
+                case ImageBackApplyEnum.IQCRequestBack:
+                    scenario = EmailBusinessScenario.ImageQC_IQCApplyRe_Uploading; // 64
+                    break;
+                case ImageBackApplyEnum.CRCRequestBack:
+                    scenario = EmailBusinessScenario.ImageUploadCRCApplyRe_Uploading; // 65
+                    break;
+                default:
+                    scenario = EmailBusinessScenario.ImageQC_IQCApplyRe_Uploading; // 64
+                    break;
+
+            }
+        }
+        else
+        {
+            scenario = EmailBusinessScenario.ImageReUpload_PMApprovalRe_Uploading; // 66
+            if (context.Message.ApplyUserRole == ImageBackApplyEnum.IQCRequestBack)
+            {
+                userTypes = new List<UserTypeEnum>() { UserTypeEnum.IQC, UserTypeEnum.ClinicalResearchCoordinator };
+            }
+            else if (context.Message.ApplyUserRole == ImageBackApplyEnum.CRCRequestBack)
+            {
+                userTypes = new List<UserTypeEnum>() { UserTypeEnum.ClinicalResearchCoordinator };
+            }
+        }
+
+
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable && t.IsAutoSend).FirstOrDefault();
+
+        if (emailConfig != null)
+        {
+            var inDto = new SendImageReuploadEmailInDto
+            {
+                EmailNoticeConfig = emailConfig,
+                Scenario = scenario,
+                SubjectVisit = subjectVisit,
+                TrialId = trialId,
+                UserTypes = userTypes,
+                ImageBackStateEnum = context.Message.ImageBackState
+            };
+            await SendImageReuploadEmail(inDto);
+        }
+    }
+
+    /// <summary>
+    /// 处理一致性核查申请重传事件
+    /// </summary>
+    public async Task Consume(ConsumeContext<CheckReuploadEvent> context)
+    {
+        Console.WriteLine("发送【一致性核查-影像重传】邮件！！！");
+        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.Subject).FirstNotNullAsync();
+        var trialId = subjectVisit.TrialId;
+
+        // 根据状态确定邮件场景
+        EmailBusinessScenario scenario;
+        switch (context.Message.RequestBackState)
+        {
+            case RequestBackStateEnum.CRC_RequestBack:
+                scenario = EmailBusinessScenario.DataReconciliation_CRCApplyRe_Uploading; // 62
+                break;
+            case RequestBackStateEnum.PM_AgressBack:
+            case RequestBackStateEnum.PM_NotAgree:
+                scenario = EmailBusinessScenario.DataReconciliation_PMApprovalRe_Uploading; // 63
+                break;
+            default:
+                return; // 其他状态不发送邮件
+        }
+
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable && t.IsAutoSend).FirstOrDefault();
+
+        if (emailConfig != null)
+        {
+            var inDto = new SendImageReuploadEmailInDto
+            {
+                EmailNoticeConfig = emailConfig,
+                Scenario = scenario,
+                SubjectVisit = subjectVisit,
+                TrialId = trialId,
+                RequestBackStateEnum = context.Message.RequestBackState,
+            };
+            await SendImageReuploadEmail(inDto);
+        }
+    }
+
+    /// <summary>
+    /// 处理质疑CRC申请重传事件
+    /// </summary>
+    public async Task Consume(ConsumeContext<QCChanllengeReuploadEvent> context)
+    {
+        Console.WriteLine("发送【影像质疑-影像重传】邮件！！！");
+        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.Subject).FirstNotNullAsync();
+        var trialId = subjectVisit.TrialId;
+
+        // 根据状态确定邮件场景
+        EmailBusinessScenario scenario;
+        switch (context.Message.ReuploadEnum)
+        {
+            case QCChanllengeReuploadEnum.CRCRequestReupload:
+                scenario = EmailBusinessScenario.ImageQueryCRCApplyRe_Uploading; // 60
+                break;
+            case QCChanllengeReuploadEnum.QCAgreeUpload:
+                scenario = EmailBusinessScenario.ImageQuery_IQCApprovalRe_Uploading; // 61
+                break;
+            default:
+                return; // 其他状态不发送邮件
+        }
+
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable && t.IsAutoSend).FirstOrDefault();
+
+        if (emailConfig != null)
+        {
+            var inDto = new SendImageReuploadEmailInDto
+            {
+                EmailNoticeConfig = emailConfig,
+                Scenario = scenario,
+                SubjectVisit = subjectVisit,
+                TrialId = trialId
+            };
+            await SendImageReuploadEmail(inDto);
+        }
+    }
+
+    /// <summary>
+    /// 处理已阅任务重阅申请事件
+    /// </summary>
+    public async Task Consume(ConsumeContext<HaveReadVisitTaskReReading> context)
+    {
+        Console.WriteLine("发送【重阅-影像重传】邮件！！！");
+        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+
+        var visitTaskId = context.Message.VisitTaskId;
+        // 获取VisitTask关联的SubjectVisit
+        var visitTask = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Include(x => x.Subject).Include(x => x.SourceSubjectVisit).FirstNotNullAsync();
+        var subjectVisit = new SubjectVisit() { };
+        if (visitTask.SourceSubjectVisitId != null)
+        {
+            subjectVisit = visitTask.SourceSubjectVisit;
+        }
+        else if (visitTask.SouceReadModuleId != null)
+        {
+            var readModule = await _readModuleRepository.Where(x => x.Id == visitTask.SouceReadModuleId).Include(x => x.SubjectVisit).FirstOrDefaultAsync();
+            subjectVisit = readModule.SubjectVisit;
+        }
+
+        var trialId = subjectVisit.TrialId;
+
+        // 根据状态确定邮件场景
+        EmailBusinessScenario scenario;
+        switch (context.Message.ReReadingApplyState)
+        {
+            case ReReadingApplyState.TrialGroupHaveApplyed:
+                scenario = EmailBusinessScenario.ReadTracking_PMApplyRe_Reading; // 67
+                break;
+            case ReReadingApplyState.Agree:
+            case ReReadingApplyState.Reject:
+                scenario = EmailBusinessScenario.Re_ReadApproval_SPMCPMApprovalRe_Reading; // 68
+                break;
+            default:
+                return; // 其他状态不发送邮件
+        }
+
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable && t.IsAutoSend).FirstOrDefault();
+
+        if (emailConfig != null)
+        {
+            var inDto = new SendImageReuploadEmailInDto
+            {
+                EmailNoticeConfig = emailConfig,
+                Scenario = scenario,
+                SubjectVisit = subjectVisit,
+                TrialId = trialId,
+                ReReadingApplyState= context.Message.ReReadingApplyState,
+            };
+            await SendImageReuploadEmail(inDto);
+        }
+    }
+
+    /// <summary>
+    /// 发送影像重传相关邮件的通用方法
+    /// </summary>
+    private async Task SendImageReuploadEmail(SendImageReuploadEmailInDto inDto)
+    {
+        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+
+        inDto.SubjectVisit = await _subjectVisitRepository.Where(x => x.Id == inDto.SubjectVisit.Id).Include(x => x.Subject).FirstNotNullAsync();
+        // 获取项目信息
+        var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == inDto.TrialId);
+
+        List<UserTypeEnum> filterUserTypeList = new List<UserTypeEnum>() 
+        {
+           UserTypeEnum.ClinicalResearchCoordinator,
+           UserTypeEnum.CRA,
+        };
+
+        // 根据不同场景获取不同角色的用户  先排除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();
+
+        // CRC和CRA单独取
+        var crcAndcraUserList = await _trialSiteRepository.Where(x => x.Id == inDto.SubjectVisit.TrialSiteId).SelectMany(x => x.CRCUserList.Select(y => y.UserRole)).ToListAsync();
+        trialUserList.AddRange(crcAndcraUserList);
+
+        // 根据场景确定收件人
+        List<UserRole> toUserList = new List<UserRole>();
+        List<UserRole> ccUserList = new List<UserRole>();
+
+        var emailNoticeUserList = await _emailNoticeUserTypeRepository.Where(x => x.EmailNoticeConfigId == inDto.EmailNoticeConfig.Id).ToListAsync();
+        var userTypeEnumList = emailNoticeUserList.Select(x => x.UserType).ToList();
+        if (inDto.UserTypes != null)
+        {
+            userTypeEnumList = inDto.UserTypes;
+        }
+
+        if (inDto.UserTypes == null)
+        {
+            var toList = emailNoticeUserList.Where(x => x.EmailUserType == EmailUserType.To).Select(x => x.UserType).ToList();
+            toUserList = trialUserList.Where(x => toList.Contains(x.UserTypeEnum)).ToList();
+        }
+        else
+        {
+            var toList = inDto.UserTypes;
+            toUserList = trialUserList.Where(x => toList.Contains(x.UserTypeEnum)).ToList();
+        }
+
+        var ccList = emailNoticeUserList.Where(x => x.EmailUserType == EmailUserType.Copy).Select(x => x.UserType).ToList();
+        ccUserList = trialUserList.Where(x => ccList.Contains(x.UserTypeEnum)).ToList();
+
+        // 如果没有收件人，则不发送邮件
+        if (toUserList.Count == 0)
+        {
+            return;
+        }
+
+
+        List<DictionaryDto> dictionaryDtos = new List<DictionaryDto>() {
+             new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=inDto.SubjectVisit.IsUrgent.ToString().ToLower(), }, //是否加急
+            };
+        switch (inDto.Scenario)
+        {
+            case EmailBusinessScenario.Re_ReadApproval_SPMCPMApprovalRe_Reading:
+                dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "ReReadingApplyState", EnumValue = inDto.ReReadingApplyState.GetEnumInt(), });
+                break;
+            case EmailBusinessScenario.DataReconciliation_PMApprovalRe_Uploading:
+                dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "RequestBackState", EnumValue = inDto.RequestBackStateEnum.GetEnumInt(), });
+                break;
+            default:
+                dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "ImageBackStateEnum", EnumValue = inDto.ImageBackStateEnum.GetEnumInt(), });//审批结果
+                break;
+        }
+        var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+        {
+
+            DictionaryRepository = _dictionaryRepository,
+            IsEn_US = isEn_US,
+            DictionaryList = dictionaryDtos
+        });
+
+        foreach (var userinfo in toUserList)
+        {
+            var messageToSend = new MimeMessage();
+            // 发件地址
+            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+            messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+
+            // 添加抄送
+            foreach (var ccUser in ccUserList)
+            {
+                messageToSend.Cc.Add(new MailboxAddress(String.Empty, ccUser.EMail));
+            }
+            // 格式化邮件内容
+            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}
+                    );
+
+                    return (topicStr, htmlBodyStr);
+                };
+
+            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(inDto.EmailNoticeConfig, messageToSend, emailConfigFunc);
+
+            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+        }
+    }
+
+    /// <summary>
+    /// 处理PM申请阅片人筛选事件
+    /// </summary>
+    public async Task Consume(ConsumeContext<ReviewerPMApplyEvent> context)
+    {
+        Console.WriteLine("发送【阅片人筛选-PM申请审批】邮件！！！");
+        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+
+        // 获取项目信息
+        var enrollIdList = context.Message.EnrollIdList;
+        if (enrollIdList == null || !enrollIdList.Any())
+        {
+            return;
+        }
+
+        // 获取第一个Enroll的TrialId
+        var enrollId = enrollIdList.First();
+        var enroll = await _enrollRepository.Where(x => x.Id == enrollId).FirstNotNullAsync();
+        var trialId = enroll.TrialId;
+
+        // 设置邮件场景
+        var scenario = EmailBusinessScenario.ReviewerSelection_PMApplyApproving; // 69
+
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable && t.IsAutoSend).FirstOrDefault();
+
+        if (emailConfig != null)
+        {
+            await SendReviewerSelectionEmail(emailConfig, trialId, enrollIdList);
+        }
+    }
+
+    /// <summary>
+    /// 处理SPM审批阅片人筛选事件
+    /// </summary>
+    public async Task Consume(ConsumeContext<ReviewerSPMApprovedEvent> context)
+    {
+        Console.WriteLine("发送【阅片人筛选-SPM审批】邮件！！！");
+        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+
+        // 获取项目信息
+        var enrollIdList = context.Message.EnrollIdList;
+        if (enrollIdList == null || !enrollIdList.Any())
+        {
+            return;
+        }
+
+        // 获取第一个Enroll的TrialId
+        var enrollId = enrollIdList.First();
+        var enroll = await _enrollRepository.Where(x => x.Id == enrollId).FirstNotNullAsync();
+        var trialId = enroll.TrialId;
+
+        // 设置邮件场景
+        var scenario = EmailBusinessScenario.ReviewerSelection_SPMCPMApproval; // 70
+
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable && t.IsAutoSend).FirstOrDefault();
+
+        if (emailConfig != null)
+        {
+            await SendReviewerSelectionEmail(emailConfig,  trialId, enrollIdList);
+        }
+    }
+
+    /// <summary>
+    /// 发送阅片人筛选相关邮件的通用方法
+    /// </summary>
+    private async Task SendReviewerSelectionEmail(EmailNoticeConfig emailNoticeConfig, Guid trialId, List<Guid> enrollIdList)
+    {
+        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+
+        // 获取项目信息
+        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();
+
+        // 根据场景确定收件人
+        List<UserRole> toUserList = new List<UserRole>();
+        List<UserRole> ccUserList = new List<UserRole>();
+
+        var emailNoticeUserList = await _emailNoticeUserTypeRepository.Where(x => x.EmailNoticeConfigId == emailNoticeConfig.Id).ToListAsync();
+
+        var toList = emailNoticeUserList.Where(x => x.EmailUserType == EmailUserType.To).Select(x => x.UserType).ToList();
+
+        toUserList = trialUser.Where(x => toList.Contains(x.UserTypeEnum)).ToList();
+
+        var ccList = emailNoticeUserList.Where(x => x.EmailUserType == EmailUserType.Copy && x.UserType != UserTypeEnum.ClinicalResearchCoordinator).Select(x => x.UserType).ToList();
+
+        ccUserList = trialUser.Where(x => ccList.Contains(x.UserTypeEnum)).ToList();
+
+
+        // 如果没有收件人，则不发送邮件
+        if (toUserList.Count == 0)
+        {
+            return;
+        }
+
+        foreach (var userinfo in toUserList)
+        {
+            var messageToSend = new MimeMessage();
+            // 发件地址
+            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+            messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+
+            // 添加抄送
+            foreach (var ccUser in ccUserList)
+            {
+                messageToSend.Cc.Add(new MailboxAddress(String.Empty, ccUser.EMail));
+            }
+
+            // 格式化邮件内容
+            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}
+                    trialInfo.ExperimentName,       // 项目   {1}
+                    "",                             // 受试者 {2} - 阅片人筛选不涉及受试者
+                    "",                             // 访视  {3} - 阅片人筛选不涉及访视
+                    "",                             // 是否加急 {4}
+                    "",                             // 预留 {5}
+                    _systemEmailConfig.SiteUrl      // 链接 {6}
+                );
+
+                return (topicStr, htmlBodyStr);
+            };
+
+            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailNoticeConfig, messageToSend, emailConfigFunc);
+
+            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+        }
+    }
+}
+
+

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

@@ -29,7 +29,7 @@ public class UrgentMedicalReviewAddedEventConsumer(
       IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
       IRepository<VisitTask> _visitTaskRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+      IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig
     ) : IConsumer<UrgentMedicalReviewAddedEvent>
 {
@@ -48,52 +48,62 @@ public class UrgentMedicalReviewAddedEventConsumer(
 
         var medicalReviewId = context.Message.MedicalReviewId;
 
-        var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == medicalReviewId).Include(x => x.VisitTask).Include(x=>x.MedicalManagerUser).FirstOrDefaultAsync();
+        var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == medicalReviewId).Include(x => x.VisitTask).Include(x => x.MedicalManagerUser).FirstOrDefaultAsync();
-
 
 
         if (medicalReview.MedicalManagerUserId == null)
         {
-            Console.WriteLine("MIMId为空 ID"+ medicalReviewId);
+            Console.WriteLine("MIMId为空 ID" + medicalReviewId);
             return;
         }
-        var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == medicalReview.VisitTask.TrialReadingCriterionId);
-        var userinfo = await _userRoleRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();
 
-        var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReview.VisitTaskId).Include(x=>x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();
+        var trialId = medicalReview.TrialId;
 
+        var scenario = context.Message.IsPD ? EmailBusinessScenario.PDVerification_MedicalQC : EmailBusinessScenario.EligibilityVerification_MedicalQC;
 
-        var visitid = taskInfo.SourceSubjectVisit == null ? taskInfo.ReadModule.SubjectVisitId : taskInfo.SourceSubjectVisitId;
+        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
-
+        if (trialEmailConfig != null)
-        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == visitid).FirstOrDefaultAsync();
-
-
-
-        var messageToSend = new MimeMessage();
-        //发件地址
-        messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-        messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
-
-        var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId);
-        var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
-
-
-        var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
         {
 
-            DictionaryRepository = _dictionaryRepository,
+
-            IsEn_US = isEn_US,
+            var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == medicalReview.VisitTask.TrialReadingCriterionId);
+            var userinfo = await _userRoleRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();
+
+            var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReview.VisitTaskId).Include(x => x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();
 
 
-            DictionaryList = new List<DictionaryDto>()
+            var visitid = taskInfo.SourceSubjectVisit == null ? taskInfo.ReadModule.SubjectVisitId : taskInfo.SourceSubjectVisitId;
+
+
+            var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == visitid).FirstOrDefaultAsync();
+
+
+
+            var messageToSend = new MimeMessage();
+            //发件地址
+            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+            messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+
+            var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId);
+            var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+
+
+            var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+            {
+
+                DictionaryRepository = _dictionaryRepository,
+                IsEn_US = isEn_US,
+
+
+                DictionaryList = new List<DictionaryDto>()
             {
              new DictionaryDto (){DictionaryCode= "ReadingCategory",EnumValue=taskInfo.ReadingCategory.GetEnumInt(), },
              new DictionaryDto (){DictionaryCode= "MedicalReviewDoctorUserIdea",EnumValue=medicalReview.DoctorUserIdeaEnum.GetEnumInt(), },
              new DictionaryDto (){DictionaryCode= "MedicalReviewAuditState",EnumValue=medicalReview.AuditState.GetEnumInt(), },
              new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=taskInfo.IsUrgent.ToString().ToLower(), }
             }
-         }) ;
+            });
 
             Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
             {
@@ -107,7 +117,7 @@ public class UrgentMedicalReviewAddedEventConsumer(
                    subjectName, // 受试者 {3}
                    taskInfo.TaskBlindName,             // 访视  {4}
                    dictionValue[0],      // 任务类型            {5}
-                   //dictionValue[1],     // 阅片人是否同意        {6}
+                                         //dictionValue[1],     // 阅片人是否同意        {6}
                    dictionValue[2],     // 审核状态             {6}
                    dictionValue[3],    // 是否加急               {7}
                   _systemEmailConfig.SiteUrl              // 链接                    {8}
@@ -116,13 +126,12 @@ public class UrgentMedicalReviewAddedEventConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
+             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
-         context.Message.IsPD ? EmailBusinessScenario.PDVerification_MedicalQC :   EmailBusinessScenario.EligibilityVerification_MedicalQC,
+            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
 
-            messageToSend, emailConfigFunc);
+        }
 
-        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
     }
 }
 
@@ -135,7 +144,7 @@ public class UrgentIRRepliedMedicalReviewConsumer(
       IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
       IRepository<VisitTask> _visitTaskRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+      IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<UrgentIRRepliedMedicalReview>
 {
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
@@ -151,79 +160,85 @@ public class UrgentIRRepliedMedicalReviewConsumer(
 
         var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == medicalReviewId).Include(x => x.VisitTask).Include(x => x.MedicalManagerUser).FirstOrDefaultAsync();
 
-
-
         if (medicalReview.MedicalManagerUserId == null)
         {
             Console.WriteLine("MIMId为空 ID" + medicalReviewId);
             return;
         }
-        var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == medicalReview.VisitTask.TrialReadingCriterionId);
+        var trialId = medicalReview.TrialId;
-        var userinfo = await _userRoleRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();
 
-        var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReview.VisitTaskId).Include(x => x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();
+        var scenario = context.Message.IsPD ? EmailBusinessScenario.PDVerification_ExpeditedMedicalQCResponse : EmailBusinessScenario.EligibilityVerification_ExpeditedMedicalQCResponse;
 
+        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
-        var visitid = taskInfo.SourceSubjectVisit == null ? taskInfo.ReadModule.SubjectVisitId : taskInfo.SourceSubjectVisitId;
+        if (trialEmailConfig != null)
-
-
-        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == visitid).FirstOrDefaultAsync();
-
-
-
-        var messageToSend = new MimeMessage();
-        //发件地址
-        messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-        messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
-
-        var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId);
-        var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
-
-
-        var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
         {
 
-            DictionaryRepository = _dictionaryRepository,
-            IsEn_US = isEn_US,
 
           
-            DictionaryList = new List<DictionaryDto>()
+            var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == medicalReview.VisitTask.TrialReadingCriterionId);
+            var userinfo = await _userRoleRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();
+
+            var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReview.VisitTaskId).Include(x => x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();
+
+
+            var visitid = taskInfo.SourceSubjectVisit == null ? taskInfo.ReadModule.SubjectVisitId : taskInfo.SourceSubjectVisitId;
+
+
+            var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == visitid).FirstOrDefaultAsync();
+
+
+
+            var messageToSend = new MimeMessage();
+            //发件地址
+            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+            messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+
+            var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId);
+            var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+
+
+            var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+            {
+
+                DictionaryRepository = _dictionaryRepository,
+                IsEn_US = isEn_US,
+
+
+                DictionaryList = new List<DictionaryDto>()
             {
              new DictionaryDto (){DictionaryCode= "ReadingCategory",EnumValue=taskInfo.ReadingCategory.GetEnumInt(), },
              new DictionaryDto (){DictionaryCode= "MedicalReviewDoctorUserIdea",EnumValue=medicalReview.DoctorUserIdeaEnum.GetEnumInt(), },
              new DictionaryDto (){DictionaryCode= "MedicalReviewAuditState",EnumValue=medicalReview.AuditState.GetEnumInt(), },
              new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=taskInfo.IsUrgent.ToString().ToLower(), }
             }
-        });
+            });
 
-        Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
+            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
-        {
+            {
-            var subjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode;
+                var subjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode;
-            var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, taskInfo.TaskBlindName);
+                var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, taskInfo.TaskBlindName);
-            var htmlBodyStr = string.Format(
+                var htmlBodyStr = string.Format(
-               CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-               userinfo.FullName,              // 用户名  {0}
+                   userinfo.FullName,              // 用户名  {0}
-               trialInfo.ExperimentName,        // 项目   {1}
+                   trialInfo.ExperimentName,        // 项目   {1}
-               criterion.CriterionName,  // 阅片标准       {2}
+                   criterion.CriterionName,  // 阅片标准       {2}
-               subjectCode, // 受试者 {3}
+                   subjectCode, // 受试者 {3}
-               taskInfo.TaskBlindName,             // 访视  {4}
+                   taskInfo.TaskBlindName,             // 访视  {4}
-               dictionValue[0],      // 任务类型            {5}
+                   dictionValue[0],      // 任务类型            {5}
-               dictionValue[1],     // 阅片人是否同意        {6}
+                   dictionValue[1],     // 阅片人是否同意        {6}
-               dictionValue[2],     // 审核状态             {7}
+                   dictionValue[2],     // 审核状态             {7}
-               dictionValue[3],    // 是否加急               {8}
+                   dictionValue[3],    // 是否加急               {8}
-              _systemEmailConfig.SiteUrl              // 链接                    {9}
+                  _systemEmailConfig.SiteUrl              // 链接                    {9}
-                );
+                    );
 
-            return (topicStr, htmlBodyStr);
+                return (topicStr, htmlBodyStr);
-        };
+            };
+             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
+            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+        }
 
-         context.Message.IsPD ? EmailBusinessScenario.PDVerification_ExpeditedMedicalQCResponse : EmailBusinessScenario.EligibilityVerification_ExpeditedMedicalQCResponse,
-
-            messageToSend, emailConfigFunc);
-
-        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
     }
 }
 
@@ -238,7 +253,7 @@ public class UrgentMIMRepliedMedicalReviewConsumer(
       IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
       IRepository<VisitTask> _visitTaskRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+      IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<UrgentMIMRepliedMedicalReview>
 {
 
@@ -254,91 +269,93 @@ public class UrgentMIMRepliedMedicalReviewConsumer(
         Console.WriteLine("发送(022) 【加急医学反馈】邮件！！！");
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
+
         var medicalReviewId = context.Message.MedicalReviewId;
 
         var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == medicalReviewId).Include(x => x.VisitTask).Include(x => x.MedicalManagerUser).FirstOrDefaultAsync();
 
-
-
         if (medicalReview.MedicalManagerUserId == null)
         {
             Console.WriteLine("MIMId为空 ID" + medicalReviewId);
             return;
         }
-        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 trialId = medicalReview.TrialId;
 
+        var scenario = EmailBusinessScenario.ExpeditedMedicalQCToIR;
 
+        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
-
+        if (trialEmailConfig != null)
-        var visitid = taskInfo.SourceSubjectVisit == null ? taskInfo.ReadModule.SubjectVisitId : taskInfo.SourceSubjectVisitId;
-
-
-        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == visitid).FirstOrDefaultAsync();
-
-
-
-        var messageToSend = new MimeMessage();
-        //发件地址
-        messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-        messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
-
-        var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId);
-        var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
-
-
-        var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
         {
 
-            DictionaryRepository = _dictionaryRepository,
+
-            IsEn_US = isEn_US,
+            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();
 
 
-            DictionaryList = new List<DictionaryDto>()
+
+
+            var visitid = taskInfo.SourceSubjectVisit == null ? taskInfo.ReadModule.SubjectVisitId : taskInfo.SourceSubjectVisitId;
+
+
+            var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == visitid).FirstOrDefaultAsync();
+
+
+
+            var messageToSend = new MimeMessage();
+            //发件地址
+            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+            messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+
+            var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId);
+            var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+
+
+            var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+            {
+
+                DictionaryRepository = _dictionaryRepository,
+                IsEn_US = isEn_US,
+
+
+                DictionaryList = new List<DictionaryDto>()
             {
              new DictionaryDto (){DictionaryCode= "ReadingCategory",EnumValue=taskInfo.ReadingCategory.GetEnumInt(), },
              new DictionaryDto (){DictionaryCode= "IsPass",EnumValue=medicalReview.IsHaveQuestion.ToString().ToLower(), },// 审核结论
              new DictionaryDto (){DictionaryCode= "AuditAdvice",EnumValue=medicalReview.AuditAdviceEnum.GetEnumInt(), },// 审核建议
              new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=taskInfo.IsUrgent.ToString().ToLower(), }, //是否加急         
-
- 
-          
-          
-         
             }
-        });
+            });
 
-        Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
+            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
-        {
+            {
-            var subjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode;
+                var subjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode;
-            var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, taskInfo.TaskBlindName);
+                var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, taskInfo.TaskBlindName);
-            var htmlBodyStr = string.Format(
+                var htmlBodyStr = string.Format(
-               CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-               userinfo.FullName,              // 用户名  {0}
+                   userinfo.FullName,              // 用户名  {0}
-               trialInfo.ExperimentName,        // 项目   {1}
+                   trialInfo.ExperimentName,        // 项目   {1}
-               subjectCode, // 受试者 {2}
+                   subjectCode, // 受试者 {2}
-               taskInfo.TaskBlindName,             // 访视  {3}
+                   taskInfo.TaskBlindName,             // 访视  {3}
-               criterion.CriterionName,  // 阅片标准       {4}
+                   criterion.CriterionName,  // 阅片标准       {4}
-               dictionValue[0],      // 任务类型            {5}
+                   dictionValue[0],      // 任务类型            {5}
-               dictionValue[1],      // 审核结论           {6}
+                   dictionValue[1],      // 审核结论           {6}
-               dictionValue[2],     // 医学审核建议        {7}
+                   dictionValue[2],     // 医学审核建议        {7}
-               dictionValue[3],    // 是否加急               {8}
+                   dictionValue[3],    // 是否加急               {8}
 
-              _systemEmailConfig.SiteUrl              // 链接                  {9}
+                  _systemEmailConfig.SiteUrl              // 链接                  {9}
-                );
+                    );
 
-            return (topicStr, htmlBodyStr);
+                return (topicStr, htmlBodyStr);
-        };
+            };
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
+             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
-          EmailBusinessScenario.ExpeditedMedicalQCToIR,
+            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
-
+        }
-            messageToSend, emailConfigFunc);
-
-        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
     }
 }
 
@@ -354,7 +371,7 @@ public class UrgentIRApplyedReReadingConsumer(
       IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
       IRepository<VisitTask> _visitTaskRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+      IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<UrgentApplyedReReading>
 {
 
@@ -367,79 +384,87 @@ public class UrgentIRApplyedReReadingConsumer(
         var visitTaskId = context.Message.VisitTaskId;
 
         var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Include(x => x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();
-        var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == taskInfo.TrialReadingCriterionId);
 
+        var trialId=taskInfo.TrialId;
 
-        var doctorInfo = await _userRoleRepository.Where(x => x.Id == taskInfo.DoctorUserId).FirstOrDefaultAsync();
+        var scenario = context.Message.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed ? EmailBusinessScenario.ReReadFromPMApproval : EmailBusinessScenario.ReReadFromIRApproval;
 
-        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == taskInfo.TrialId).Include(x => x.UserRole).Select(x=>x.UserRole).ToListAsync();
+        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
-        var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.ProjectManager||x.UserTypeEnum==UserTypeEnum.APM).ToList();
+        if (trialEmailConfig != null)
-        if (context.Message.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
         {
-            userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.CPM || x.UserTypeEnum == UserTypeEnum.SPM).ToList();
-        }
-
-        var visitid = taskInfo.SourceSubjectVisit == null ? taskInfo.ReadModule.SubjectVisitId : taskInfo.SourceSubjectVisitId;
 
           
-        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == visitid).FirstOrDefaultAsync();
+            var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == taskInfo.TrialReadingCriterionId);
 
 
-        foreach (var userinfo in userinfoList)
+            var doctorInfo = await _userRoleRepository.Where(x => x.Id == taskInfo.DoctorUserId).FirstOrDefaultAsync();
-        {
-            var messageToSend = new MimeMessage();
-            //发件地址
-            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-            messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
 
-            var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == taskInfo.TrialId);
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == taskInfo.TrialId && x.TrialUser.IsDeleted==false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
-            var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
-
+            var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.ProjectManager || x.UserTypeEnum == UserTypeEnum.APM).ToList();
-            var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+            if (context.Message.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
             {
+                userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.CPM || x.UserTypeEnum == UserTypeEnum.SPM).ToList();
+            }
 
-                DictionaryRepository = _dictionaryRepository,
+            var visitid = taskInfo.SourceSubjectVisit == null ? taskInfo.ReadModule.SubjectVisitId : taskInfo.SourceSubjectVisitId;
-                IsEn_US = isEn_US,
+
-                DictionaryList = new List<DictionaryDto>()
+
+            var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == visitid).FirstOrDefaultAsync();
+
+
+            foreach (var userinfo in userinfoList)
+            {
+                var messageToSend = new MimeMessage();
+                //发件地址
+                messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+                messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+
+                var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == taskInfo.TrialId);
+                var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+
+
+                var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+                {
+
+                    DictionaryRepository = _dictionaryRepository,
+                    IsEn_US = isEn_US,
+                    DictionaryList = new List<DictionaryDto>()
             {
              new DictionaryDto (){DictionaryCode= "ReadingCategory",EnumValue=taskInfo.ReadingCategory.GetEnumInt(), }, //任务类型
              new DictionaryDto (){DictionaryCode= "RequestReReadingResult",EnumValue="0", }, //审批结果 都是待审批
             }
-            });
+                });
 
-            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
+                Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
-            {
+                {
-                var subjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode;
+                    var subjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode;
-                var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, taskInfo.TaskBlindName);
+                    var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, taskInfo.TaskBlindName);
-                var htmlBodyStr = string.Format(
+                    var htmlBodyStr = string.Format(
-                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                       CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                   userinfo.FullName,              // 用户名  {0}
+                       userinfo.FullName,              // 用户名  {0}
-                   trialInfo.ExperimentName,        // 项目   {1}
+                       trialInfo.ExperimentName,        // 项目   {1}
-                   subjectCode, // 受试者 {2}
+                       subjectCode, // 受试者 {2}
-                   taskInfo.TaskBlindName,             // 访视  {3}
+                       taskInfo.TaskBlindName,             // 访视  {3}
-                   dictionValue[0],    // 任务类型 {4}
+                       dictionValue[0],    // 任务类型 {4}
-                   doctorInfo.FullName,                       // 阅片人 {5}
+                       doctorInfo.FullName,                       // 阅片人 {5}
-                   criterion.CriterionName,                      // 阅片标准 {6}
+                       criterion.CriterionName,                      // 阅片标准 {6}
-                   dictionValue[1],                                               // 审批结果 {7}
+                       dictionValue[1],                                               // 审批结果 {7}
-                   _systemEmailConfig.SiteUrl             // 链接                  {8}
+                       _systemEmailConfig.SiteUrl             // 链接                  {8}
 
 
 
 
-                    );
+                        );
 
-                return (topicStr, htmlBodyStr);
+                    return (topicStr, htmlBodyStr);
-            };
+                };
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
+                 await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
-             context.Message.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed? EmailBusinessScenario.ReReadFromPMApproval: EmailBusinessScenario.ReReadFromIRApproval,
+                await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
-
+            }
-                messageToSend, emailConfigFunc);
-
-            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
 
 

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

@@ -25,7 +25,7 @@ using System.Threading.Tasks;
 namespace IRaCIS.Core.Application.MassTransit.Consumer;
 
 /// <summary>
-/// 用户提交 发送邮件 通知SPM 或者PM
+/// 用户提交 发送邮件 通知SPM 或者PM   项目默认邮件，不用添加到项目中，直接发送的
 /// </summary>
 public class UserSiteSurveySubmitedEventConsumer(
       IRepository<Trial> _trialRepository,
@@ -47,75 +47,83 @@ public class UserSiteSurveySubmitedEventConsumer(
 
         var trialId = siteSurveyInfo.TrialId;
 
-        var trialUserList = await _trialUserRoleRepository.Where(t => t.TrialId == siteSurveyInfo.TrialId)
-            .Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM || t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserRole.UserTypeEnum == UserTypeEnum.APM)
-            .Select(t => new { t.UserRole.FullName, t.UserRole.IdentityUser.EMail, t.UserRole.UserTypeEnum }).ToListAsync();
-
-        var sPMOrCPMList = trialUserList.Where(t => t.UserTypeEnum == UserTypeEnum.SPM || t.UserTypeEnum == UserTypeEnum.CPM).ToList();
-        var pmAndAPMList = trialUserList.Where(t => t.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserTypeEnum == UserTypeEnum.APM).ToList();
-
-        var messageToSend = new MimeMessage();
-
-        var toUserName = string.Empty;
-
-        //有SPM
-        if (sPMOrCPMList.Count > 0)
-        {
-            foreach (var user in sPMOrCPMList)
-            {
-                messageToSend.To.Add(new MailboxAddress(user.FullName, user.EMail));
-            }
-
-            toUserName = string.Join('、', sPMOrCPMList.Select(t => t.FullName));
-
-            foreach (var user in pmAndAPMList)
-            {
-                messageToSend.Cc.Add(new MailboxAddress(user.FullName, user.EMail));
-            }
-
-        }
-        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 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);
-        };
-
         var scenario = _trialSiteSurveyRepository.Where(t => t.Id != trialSiteSurveyId && t.TrialId == siteSurveyInfo.TrialId && t.TrialSiteId == siteSurveyInfo.TrialSiteId).IgnoreQueryFilters().Any() ?
-          EmailBusinessScenario.Approval_UpdateSiteSurvey : EmailBusinessScenario.Approval_SubmitSiteSurvey;
+        EmailBusinessScenario.Approval_UpdateSiteSurvey : EmailBusinessScenario.Approval_SubmitSiteSurvey;
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, scenario, messageToSend, emailConfigFunc);
 
-        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+        if (emailConfig != null)
+        {
+
+            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();
+
+            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 (sPMOrCPMList.Count > 0)
+            {
+                foreach (var user in sPMOrCPMList)
+                {
+                    messageToSend.To.Add(new MailboxAddress(user.FullName, user.EMail));
+                }
+
+                toUserName = string.Join('、', sPMOrCPMList.Select(t => t.FullName));
+
+                foreach (var user in pmAndAPMList)
+                {
+                    messageToSend.Cc.Add(new MailboxAddress(user.FullName, user.EMail));
+                }
+
+            }
+            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 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, _systemEmailConfig);
+        }
 
     }
 }
@@ -143,55 +151,65 @@ public class SiteSurveySPMSubmitedEventConsumer(
 
         var trialId = siteSurveyInfo.TrialId;
 
-        var messageToSend = new MimeMessage();
+        var scenario = EmailBusinessScenario.Approval_SubmitSiteSurvey;
 
-        var trialUserList = _trialUserRoleRepository.Where(t => t.TrialId == trialId)
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
-            .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();
+        if (emailConfig != null)
-        var pmAndAPMList = trialUserList.Where(t => t.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserTypeEnum == UserTypeEnum.APM).ToList();
-
-        var toUserName = string.Empty;
-
-        foreach (var item in pmAndAPMList)
         {
-            messageToSend.To.Add(new MailboxAddress(item.FullName, item.EMail));
+            var messageToSend = new MimeMessage();
 
-            toUserName = string.Join('、', pmAndAPMList.Select(t => t.FullName));
+            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)
+            {
+                messageToSend.To.Add(new MailboxAddress(item.FullName, item.EMail));
+
+                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, _systemEmailConfig);
         }
 
-        //发件地址
-        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(_emailNoticeConfigrepository, EmailBusinessScenario.Approval_SubmitSiteSurvey, messageToSend, emailConfigFunc);
-
-        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
     }
 }
 
@@ -204,7 +222,7 @@ public class SiteSurverRejectedEventConsumer(
       IRepository<Trial> _trialRepository,
       IRepository<TrialSite> _trialSiteRepository,
       IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+     IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig
     ) : IConsumer<SiteSurverRejectedEvent>
 {
@@ -216,83 +234,95 @@ public class SiteSurverRejectedEventConsumer(
 
         var trialSiteSurveyId = context.Message.TrialSiteSurveyId;
 
-        var siteSurveyInfo = _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId).FirstOrDefault().IfNullThrowException();
+        var siteSurveyInfo = _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId ,ignoreQueryFilters:true).FirstOrDefault().IfNullThrowException();
 
         var trialId = siteSurveyInfo.TrialId;
 
-        var messageToSend = new MimeMessage();
+        var scenario = EmailBusinessScenario.SiteSurveyReject;
 
-        var toUserName = siteSurveyInfo.UserName;
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
-        if (context.Message.IsHaveSPMOrCPM)
+        if (emailConfig != null)
         {
-            //PM 驳回到SPM
+           
-            if (siteSurveyInfo.State == TrialSiteSurveyEnum.CRCSubmitted)
+
+            var messageToSend = new MimeMessage();
+
+            var toUserName = siteSurveyInfo.UserName;
+
+            if (context.Message.IsHaveSPMOrCPM)
             {
-                //var user = await _userRoleRepository.FirstOrDefaultAsync(t => t.Id == siteSurveyInfo.PreliminaryUserId);
+                //PM 驳回到SPM
-
+                if (siteSurveyInfo.State == TrialSiteSurveyEnum.CRCSubmitted)
-                //name = user.FullName;
-
-                var sPMOrCPMList = _trialUserRoleRepository.Where(t => t.TrialId == trialId)
-                  .Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM)
-                  .Select(t => new { t.UserRole.IdentityUser.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum }).ToList();
-
-
-                foreach (var user in sPMOrCPMList)
                 {
-                    messageToSend.To.Add(new MailboxAddress(user.FullName, user.EMail));
+                    //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)
+                    {
+                        messageToSend.To.Add(new MailboxAddress(user.FullName, user.EMail));
+                    }
+
+                    toUserName = string.Join('、', sPMOrCPMList.Select(t => t.FullName));
+
+                }
+                //SPM 驳回到CRC
+                else if (siteSurveyInfo.State == TrialSiteSurveyEnum.ToSubmit)
+                {
+                    messageToSend.To.Add(new MailboxAddress(toUserName, siteSurveyInfo.Email));
                 }
 
-                toUserName = string.Join('、', sPMOrCPMList.Select(t => t.FullName));
-
             }
-            //SPM 驳回到CRC
+            else
-            else if (siteSurveyInfo.State == TrialSiteSurveyEnum.ToSubmit)
             {
-                messageToSend.To.Add(new MailboxAddress(toUserName, siteSurveyInfo.Email));
+                //没有SPM  PM驳回到CRC
+
+                messageToSend.To.Add(new MailboxAddress(String.Empty, siteSurveyInfo.Email));
             }
 
-        }
+            //发件地址
-        else
+            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-        {
-            //没有SPM  PM驳回到CRC
-
-            messageToSend.To.Add(new MailboxAddress(String.Empty, siteSurveyInfo.Email));
-        }
-
-        //发件地址
-        messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
 
 
-        var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == 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 siteInfo = await _trialSiteRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.Id == siteSurveyInfo.TrialSiteId, true);
 
 
-        var companyName = 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 =>
+            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
-        {
+            {
-            var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo);
+                var topicStr = string.Format(input.topicStr, companyName,trialInfo.ResearchProgramNo);
-            var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-           toUserName,
+               toUserName,
-            trialInfo.TrialCode,
+                trialInfo.TrialCode,
-                 trialInfo.ResearchProgramNo,
+                trialInfo.ResearchProgramNo,
                 trialInfo.ExperimentName,
-            siteInfo.TrialSiteCode,
-            siteInfo.TrialSiteAliasName,
-               siteSurveyInfo.LatestBackReason,
-            _systemEmailConfig.SiteUrl,
-               (siteSurveyInfo.State == TrialSiteSurveyEnum.ToSubmit ? "inline - block" : "none")
-                );
 
-            return (topicStr, htmlBodyStr);
+                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, _systemEmailConfig);
+        }
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.SiteSurveyReject, messageToSend, emailConfigFunc);
 
-        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
 
 
     }

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

@@ -24,13 +24,13 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer;
 /// </summary>
 public class CRCSubmitedAndQCToAuditEventConsumer(
       IRepository<UserRole> _userRoleRepository,
-        IRepository<TrialUserRole> _trialUseRoleRepository,
+      IRepository<TrialUserRole> _trialUseRoleRepository,
-       IRepository<SubjectVisit> _subjectVisitRepository,
+      IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<Trial> _trialRepository,
       IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
       IRepository<VisitTask> _visitTaskRepository,
-         IRepository<Dictionary> _dictionaryRepository,
+      IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<CRCSubmitedAndQCToAuditEvent>
 {
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
@@ -41,37 +41,46 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
 
         var subjectVisitId = context.Message.SubjectVisitId;
 
-        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).FirstOrDefaultAsync();
+        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).FirstNotNullAsync();
 
-        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+        var trialId = subjectVisit.TrialId;
 
-        var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.IQC).ToList();
+        var scenario = context.Message.IsPd ? EmailBusinessScenario.PDVerification_PendingImageQCClaim : EmailBusinessScenario.EligibilityVerification_PendingClaim;
 
+        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
-        var pmandAPm = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).ToList();
+        if (trialEmailConfig != null)
-
-        var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
-
-        var auditStateCode = "AuditStatePE";
-
-        if (trialInfo.QCProcessEnum == TrialQCProcess.DoubleAudit)
-        {
-            auditStateCode = "AuditStateRC";
-        }
-
-
-
-        var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
         {
 
-            DictionaryRepository = _dictionaryRepository,
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
-            IsEn_US = isEn_US,
+
-            DictionaryList = new List<DictionaryDto>()
+            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)
+            {
+                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();
             //发件地址
@@ -80,7 +89,7 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
 
             foreach (var userinfo in userinfoList)
             {
-               messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+                messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
             }
 
             var userNames = userinfoList.Select(x => x.FullName).ToList();
@@ -111,13 +120,10 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
+            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
-
-             context.Message.IsPd ? EmailBusinessScenario.PDVerification_PendingImageQCClaim : EmailBusinessScenario.EligibilityVerification_PendingClaim,
-
-                messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+        }
 
     }
 }
@@ -134,7 +140,7 @@ public class CRCRepliedQCChallengeEventConsumer(
       IRepository<QCChallenge> _qCChallengeRepository,
       IRepository<QCChallengeDialog> _qCChallengeDialogRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<CRCRepliedQCChallengeEvent>
 {
 
@@ -148,74 +154,75 @@ public class CRCRepliedQCChallengeEventConsumer(
 
         var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).Include(x => x.CurrentActionUser).FirstNotNullAsync();
 
+        var trialId = subjectVisit.TrialId;
 
-        var qCChallengeDialog = await _qCChallengeDialogRepository.Where(x => x.Id == context.Message.QCChallengeDialogId).Include(x => x.QCChallenge).FirstNotNullAsync();
+        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 trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
-
-
-
-
-        var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.IQC).ToList();
-        var pmandAPm = trialUser.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 messageToSend = new MimeMessage();
-        //发件地址
-        messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-        messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
-
-        foreach (var pm in pmandAPm)
-        {
-            messageToSend.Cc.Add(new MailboxAddress(String.Empty, pm.EMail));
-        }
-        var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
-
-
-        var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
         {
 
-            DictionaryRepository = _dictionaryRepository,
+
-            IsEn_US = isEn_US,
+            var qCChallengeDialog = await _qCChallengeDialogRepository.Where(x => x.Id == context.Message.QCChallengeDialogId).Include(x => x.QCChallenge).FirstNotNullAsync();
-            DictionaryList = new List<DictionaryDto>()
+
+
+            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 messageToSend = new MimeMessage();
+            //发件地址
+            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+            messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+
+            foreach (var pm in pmandAPm)
+            {
+                messageToSend.Cc.Add(new MailboxAddress(String.Empty, pm.EMail));
+            }
+            var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+
+
+            var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+            {
+
+                DictionaryRepository = _dictionaryRepository,
+                IsEn_US = isEn_US,
+                DictionaryList = new List<DictionaryDto>()
             {
              new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=qCChallengeDialog.QCChallenge.IsClosed.ToString().ToLower(), }, //是否关闭
 
             }
-        });
+            });
 
-        Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
+            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
-        {
+            {
-            var subjectCode = subjectVisit.Subject.Code;
+                var subjectCode = subjectVisit.Subject.Code;
-            var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
+                var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
-            var htmlBodyStr = string.Format(
+                var htmlBodyStr = string.Format(
-               CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-               userinfo.FullName,              // 用户名  {0}
+                   userinfo.FullName,              // 用户名  {0}
-               trialInfo.ExperimentName,        // 项目   {1}
+                   trialInfo.ExperimentName,        // 项目   {1}
-               subjectCode, // 受试者 {2}
+                   subjectCode, // 受试者 {2}
-               subjectVisit.VisitName,             // 访视  {3}
+                   subjectVisit.VisitName,             // 访视  {3}
-               dictionValue[0],    // 是否关闭 {4}
+                   dictionValue[0],    // 是否关闭 {4}
-               qCChallengeDialog.TalkContent,    // 质疑内容{5}
+                   qCChallengeDialog.TalkContent,    // 质疑内容{5}
-               _systemEmailConfig.SiteUrl             // 链接                  {6}
+                   _systemEmailConfig.SiteUrl             // 链接                  {6}
-                );
+                    );
 
-            return (topicStr, htmlBodyStr);
+                return (topicStr, htmlBodyStr);
-        };
+            };
+            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
+            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
-
+        }
-         context.Message.IsPd ? EmailBusinessScenario.PDVerification_UnderQCQuery : EmailBusinessScenario.EligibilityVerification_Pending,
-
-            messageToSend, emailConfigFunc);
-
-        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
     }
 }
 
@@ -231,7 +238,7 @@ public class QCRepliedQCChallengeEventConsumer(
       IRepository<QCChallenge> _qCChallengeRepository,
       IRepository<QCChallengeDialog> _qCChallengeDialogRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<QCRepliedQCChallengeEvent>
 {
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
@@ -240,90 +247,100 @@ public class QCRepliedQCChallengeEventConsumer(
         Console.WriteLine("发送(014，015) 【  QC回复 质控质疑，通知CRC】邮件！！！");
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
-        string talkContent = string.Empty;
-        var isclose = false;
-        if (context.Message.QCChallengeDialogId != null)
-        {
-            var qCChallengeDialog = await _qCChallengeDialogRepository.Where(x => x.Id == context.Message.QCChallengeDialogId.Value).Include(x => x.QCChallenge).FirstNotNullAsync();
-            talkContent = qCChallengeDialog.TalkContent;
-            isclose = qCChallengeDialog.QCChallenge.IsClosed;
-        }
-        else if(context.Message.QCChallengeId != null)
-        {
-            var qCChallenge = await _qCChallengeRepository.Where(x => x.Id == context.Message.QCChallengeId.Value).FirstNotNullAsync();
-            talkContent = qCChallenge.Content;
-            isclose = qCChallenge.IsClosed;
-        }
-       
         var subjectVisitId = context.Message.SubjectVisitId;
 
         var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).FirstNotNullAsync();
 
-        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+        var trialId = subjectVisit.TrialId;
 
-        var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).ToList();
+        var scenario = context.Message.IsPd ? EmailBusinessScenario.PDVerification_ImageQuery : EmailBusinessScenario.EligibilityVerification_ImageQuery;
 
-        var craInfo = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.CRA).FirstOrDefault();
+        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
-        var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
+        if (trialEmailConfig != null)
-
-
-
-
-        var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
         {
 
-            DictionaryRepository = _dictionaryRepository,
+
-            IsEn_US = isEn_US,
+            string talkContent = string.Empty;
-            DictionaryList = new List<DictionaryDto>()
+            var isclose = false;
+            if (context.Message.QCChallengeDialogId != null)
+            {
+                var qCChallengeDialog = await _qCChallengeDialogRepository.Where(x => x.Id == context.Message.QCChallengeDialogId.Value).Include(x => x.QCChallenge).FirstNotNullAsync();
+                talkContent = qCChallengeDialog.TalkContent;
+                isclose = qCChallengeDialog.QCChallenge.IsClosed;
+            }
+            else if (context.Message.QCChallengeId != null)
+            {
+                var qCChallenge = await _qCChallengeRepository.Where(x => x.Id == context.Message.QCChallengeId.Value).FirstNotNullAsync();
+                talkContent = qCChallenge.Content;
+                isclose = qCChallenge.IsClosed;
+            }
+
+
+
+            var 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 trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
+
+
+
+
+            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)
+            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));
-            if (craInfo != null)
             {
-                messageToSend.Cc.Add(new MailboxAddress(String.Empty, craInfo.EMail));
+                var messageToSend = new MimeMessage();
+                //发件地址
+                messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+                messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+                if (craInfo != null)
+                {
+                    messageToSend.Cc.Add(new MailboxAddress(String.Empty, craInfo.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}
+                       trialInfo.ExperimentName,        // 项目   {1}
+                       subjectCode, // 受试者 {2}
+                       subjectVisit.VisitName,             // 访视  {3}
+                       dictionValue[0],    // 质疑是否关闭 {4}
+                       talkContent,    // 质疑内容 {5}
+                       _systemEmailConfig.SiteUrl             // 链接                  {65}
+                        );
+
+                    return (topicStr, htmlBodyStr);
+                };
+
+
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
+
+                await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
             }
-
-            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}
-                   trialInfo.ExperimentName,        // 项目   {1}
-                   subjectCode, // 受试者 {2}
-                   subjectVisit.VisitName,             // 访视  {3}
-                   dictionValue[0],    // 质疑是否关闭 {4}
-                   talkContent,    // 质疑内容 {5}
-                   _systemEmailConfig.SiteUrl             // 链接                  {65}
-                    );
-
-                return (topicStr, htmlBodyStr);
-            };
-
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
-
-             context.Message.IsPd ? EmailBusinessScenario.PDVerification_ImageQuery : EmailBusinessScenario.EligibilityVerification_ImageQuery,
-
-                messageToSend, emailConfigFunc);
-
-            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
     }
 }
@@ -340,7 +357,7 @@ public class CRCRepliedCheckChallengeEventConsumer(
       IRepository<QCChallenge> _qCChallengeRepository,
       IRepository<QCChallengeDialog> _qCChallengeDialogRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<CRCRepliedCheckChallengeEvent>
 {
 
@@ -350,70 +367,80 @@ public class CRCRepliedCheckChallengeEventConsumer(
         Console.WriteLine("发送(019,020) 【 CRC 回复一致性核查质疑 通知PM】邮件！！！");
         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.Subject).FirstNotNullAsync();
 
-        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+        var trialId = subjectVisit.TrialId;
 
-        var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).ToList();
+        var scenario = context.Message.IsPd ? EmailBusinessScenario.PDVerification_UnderDRForPMOrAPM : EmailBusinessScenario.EligibilityVerification_UnderDRForPMOrAPM;
 
+        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
-        var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
+        if (trialEmailConfig != null)
-
-
-
-
-        var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
         {
 
-            DictionaryRepository = _dictionaryRepository,
+
-            IsEn_US = isEn_US,
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
-            DictionaryList = new List<DictionaryDto>()
+
+            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()
+            {
+
+                DictionaryRepository = _dictionaryRepository,
+                IsEn_US = isEn_US,
+                DictionaryList = new List<DictionaryDto>()
          {
           new DictionaryDto (){DictionaryCode= "CheckState",EnumValue=subjectVisit.CheckState.GetEnumInt(), }, //审核状态
 
          }
-        });
+            });
 
 
-        foreach (var userinfo in userinfoList)
+            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 companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
-
-
-
-
-            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
             {
-                var subjectCode = subjectVisit.Subject.Code;
+                var messageToSend = new MimeMessage();
-                var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
+                //发件地址
-                var htmlBodyStr = string.Format(
+                messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
-                   userinfo.FullName,              // 用户名  {0}
-                   trialInfo.ExperimentName,        // 项目   {1}
-                   subjectCode, // 受试者 {2}
-                   subjectVisit.VisitName,             // 访视  {3}
-                   dictionValue[0],    // 核查状态 {4}
-                   _systemEmailConfig.SiteUrl             // 链接                  {5}
-                    );
 
-                return (topicStr, htmlBodyStr);
-            };
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
+                var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
-             context.Message.IsPd ? EmailBusinessScenario.PDVerification_UnderDRForPMOrAPM : EmailBusinessScenario.EligibilityVerification_UnderDRForPMOrAPM,
 
-                messageToSend, emailConfigFunc);
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+
+                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}
+                       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, _systemEmailConfig);
+            }
         }
     }
 }
@@ -432,7 +459,7 @@ public class PMRepliedCheckChallengeEventConsumer(
       IRepository<CheckChallengeDialog> _checkChallengeDialogRepository,
       IRepository<QCChallengeDialog> _qCChallengeDialogRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<PMRepliedCheckChallengeEvent>
 {
 
@@ -441,80 +468,89 @@ public class PMRepliedCheckChallengeEventConsumer(
     {
         Console.WriteLine("发送(016，017) 【  PM 一致性核查 通知CRC】邮件！！！");
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
-        var checkChallengeDialog = await _checkChallengeDialogRepository.Where(x => x.Id == context.Message.CheckChallengeDialogId).FirstNotNullAsync();
+
         var subjectVisitId = context.Message.SubjectVisitId;
 
         var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.NoneDicomStudyList).Include(x => x.StudyList).Include(x => x.Subject).FirstNotNullAsync();
 
-        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+        var trialId = subjectVisit.TrialId;
-
-        var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).ToList();
-
-        var craInfo = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.CRA).FirstOrDefault();
-
-        var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
 
 
-        List<string> modalities = new List<string>();
+        var scenario = context.Message.IsPd ? EmailBusinessScenario.PDVerification_UnderDR : EmailBusinessScenario.EligibilityVerification_UnderDR;
-        modalities =subjectVisit.NoneDicomStudyList.Select(t => t.Modality)
- .Union(subjectVisit.StudyList.Select(k => k.ModalityForEdit)).ToList();
 
-        var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+        if (trialEmailConfig != null)
         {
 
-            DictionaryRepository = _dictionaryRepository,
+            var checkChallengeDialog = await _checkChallengeDialogRepository.Where(x => x.Id == context.Message.CheckChallengeDialogId).FirstNotNullAsync();
-            IsEn_US = isEn_US,
+
-            DictionaryList = new List<DictionaryDto>()
+
+            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 trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
+
+
+            List<string> modalities = new List<string>();
+            modalities = subjectVisit.NoneDicomStudyList.Select(t => t.Modality)
+     .Union(subjectVisit.StudyList.Select(k => k.ModalityForEdit)).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)
+            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));
-            if (craInfo != null)
             {
-                messageToSend.Cc.Add(new MailboxAddress(String.Empty, craInfo.EMail));
+                var messageToSend = new MimeMessage();
+                //发件地址
+                messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+                messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+                if (craInfo != null)
+                {
+                    messageToSend.Cc.Add(new MailboxAddress(String.Empty, craInfo.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}
+                       trialInfo.ExperimentName,        // 项目   {1}
+
+                       subjectCode, // 受试者 {2}
+                       subjectVisit.VisitName,             // 访视  {3}
+                      string.Join(',', modalities),    // 检查类型 {4}
+                       dictionValue[0],    // 核查状态 {5}
+                       checkChallengeDialog.TalkContent,// 质疑内容{6}
+                       _systemEmailConfig.SiteUrl             // 链接                  {7}
+                        );
+
+                    return (topicStr, htmlBodyStr);
+                };
+
+
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
+
+                await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
             }
-
-            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}
-                   trialInfo.ExperimentName,        // 项目   {1}
-              
-                   subjectCode, // 受试者 {2}
-                   subjectVisit.VisitName,             // 访视  {3}
-                  string.Join(',', modalities),    // 检查类型 {4}
-                   dictionValue[0],    // 核查状态 {5}
-                   checkChallengeDialog.TalkContent,// 质疑内容{6}
-                   _systemEmailConfig.SiteUrl             // 链接                  {7}
-                    );
-
-                return (topicStr, htmlBodyStr);
-            };
-
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
-
-             context.Message.IsPd ? EmailBusinessScenario.PDVerification_UnderDR : EmailBusinessScenario.EligibilityVerification_UnderDR,
-
-                messageToSend, emailConfigFunc);
-
-            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
     }
 }
@@ -531,7 +567,7 @@ public class CheckStateChangedToAuditEventConsumer(
       IRepository<QCChallenge> _qCChallengeRepository,
       IRepository<QCChallengeDialog> _qCChallengeDialogRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<CheckStateChangedToAuditEvent>
 {
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
@@ -540,70 +576,80 @@ public class CheckStateChangedToAuditEventConsumer(
         Console.WriteLine("发送(018,030) 【通知PM 进行一致性核查】邮件！！！");
         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.Subject).FirstNotNullAsync();
 
-        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+        var trialId = subjectVisit.TrialId;
 
-        var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).ToList();
+        var scenario = context.Message.IsPd ? EmailBusinessScenario.PDVerification_DR : EmailBusinessScenario.EligibilityVerification_DR;
 
+        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
-        var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
+        if (trialEmailConfig != null)
-
-
-
-
-        var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
         {
 
-            DictionaryRepository = _dictionaryRepository,
+
-            IsEn_US = isEn_US,
+
-            DictionaryList = new List<DictionaryDto>()
+            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.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).ToList();
+
+
+            var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
+
+
+
+
+            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)
+            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 companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
-
-
-
-
-            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
             {
-                var subjectCode = subjectVisit.Subject.Code;
+                var messageToSend = new MimeMessage();
-                var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
+                //发件地址
-                var htmlBodyStr = string.Format(
+                messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
-                    userinfo.FullName,   // 姓名  {0}
-                    trialInfo.ExperimentName,        // 项目   {1}                       
-                   subjectCode, // 受试者 {2}
-                   subjectVisit.VisitName,             // 访视  {3}
-                   dictionValue[0],    // 核查状态 {4}
-                   _systemEmailConfig.SiteUrl             // 链接                  {5}
-                    );
 
-                return (topicStr, htmlBodyStr);
-            };
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
+                var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
-             context.Message.IsPd ? EmailBusinessScenario.PDVerification_DR : EmailBusinessScenario.EligibilityVerification_DR,
 
-                messageToSend, emailConfigFunc);
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+
+                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}
+                        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, _systemEmailConfig);
+            }
         }
     }
 }
@@ -619,7 +665,7 @@ public class QCClaimTaskEventConsumer(
       IRepository<QCChallenge> _qCChallengeRepository,
       IRepository<QCChallengeDialog> _qCChallengeDialogRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<QCClaimTaskEvent>
 {
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
@@ -628,87 +674,90 @@ public class QCClaimTaskEventConsumer(
         Console.WriteLine("发送(Code007，008) 【QC 领取了质控任务】邮件！！！");
         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.Subject).Include(x => x.CurrentActionUser).FirstNotNullAsync();
 
+        var trialId = subjectVisit.TrialId;
 
-        var subjectVisitList = await _subjectVisitRepository.Where(x => x.CurrentActionUserId == context.Message.CurrentActionUserId && x.TrialId == subjectVisit.TrialId).Include(x => x.Subject).ToListAsync();
+        var scenario = context.Message.IsPd ? EmailBusinessScenario.PDVerification_PendingImageQC : EmailBusinessScenario.EligibilityVerification_PendingImageQC;
 
+        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
-
+        if (trialEmailConfig != null)
-
-
-        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
-
-
-
-
-      
-        var pmandAPm = trialUser.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 messageToSend = new MimeMessage();
-        //发件地址
-        messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-        messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
-
-        foreach (var pm in pmandAPm)
         {
-            messageToSend.Cc.Add(new MailboxAddress(String.Empty, pm.EMail));
-        }
-        var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
-        var auditStateCode = "AuditStatePE";
 
-        if (trialInfo.QCProcessEnum == TrialQCProcess.DoubleAudit)
+            var subjectVisitList = await _subjectVisitRepository.Where(x => x.CurrentActionUserId == context.Message.CurrentActionUserId && x.TrialId == subjectVisit.TrialId).Include(x => x.Subject).ToListAsync();
-        {
-            auditStateCode = "AuditStateRC";
-        }
 
-        var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+
-        {
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
-            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 trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
+
+
+            var userinfo = subjectVisit.CurrentActionUser;
+
+            var messageToSend = new MimeMessage();
+            //发件地址
+            messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+            messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+
+            foreach (var pm in pmandAPm)
+            {
+                messageToSend.Cc.Add(new MailboxAddress(String.Empty, pm.EMail));
+            }
+            var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+
+            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 subjectcodes = subjectVisitList.Select(x => x.Subject.Code).Distinct().ToList();
+            var subjectcodes = subjectVisitList.Select(x => x.Subject.Code).Distinct().ToList();
-        var visitnames = subjectVisitList.Select(x => x.VisitName).Distinct().ToList();
+            var visitnames = subjectVisitList.Select(x => x.VisitName).Distinct().ToList();
 
-        Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
+            Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
-        {
+            {
-            var subjectCode = subjectVisit.Subject.Code;
+                var subjectCode = subjectVisit.Subject.Code;
-            var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
+                var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
-            var htmlBodyStr = string.Format(
+                var htmlBodyStr = string.Format(
-               CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-               userinfo.FullName,              // 用户名  {0}
+                   userinfo.FullName,              // 用户名  {0}
-               trialInfo.ExperimentName,        // 项目   {1}
+                   trialInfo.ExperimentName,        // 项目   {1}
-               string.Join(',', subjectcodes), // 受试者 {2}
+                   string.Join(',', subjectcodes), // 受试者 {2}
-              string.Join(',', visitnames),             // 访视  {3}
+                  string.Join(',', visitnames),             // 访视  {3}
-               dictionValue[0],    // 审核状态 {4}
+                   dictionValue[0],    // 审核状态 {4}
 
-               _systemEmailConfig.SiteUrl             // 链接                  {5}
+                   _systemEmailConfig.SiteUrl             // 链接                  {5}
-                );
+                    );
 
-            return (topicStr, htmlBodyStr);
+                return (topicStr, htmlBodyStr);
-        };
+            };
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
 
-         context.Message.IsPd ? EmailBusinessScenario.PDVerification_PendingImageQC : EmailBusinessScenario.EligibilityVerification_PendingImageQC,
+            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
-            messageToSend, emailConfigFunc);
+            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
-
+        }
-        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
     }
 }

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

@@ -1,4 +1,5 @@
 using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Spreadsheet;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Helper;
@@ -27,7 +28,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
         IRepository<VisitTask> _visitTaskRepository,
          IRepository<Dictionary> _dictionaryRepository,
         IRepository<TrialUserRole> _trialUserRoleRepository,
-        IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+        IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
         IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<UrgentIRUnReadTaskRecurringEvent>
     {
         private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
@@ -35,144 +36,151 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
         public async Task Consume(ConsumeContext<UrgentIRUnReadTaskRecurringEvent> context)
         {
             var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
-
             var trialId = context.Message.TrialId;
 
-            var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+            var scenario = EmailBusinessScenario.ExpeditedReading;
+            var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+            if (trialEmailConfig != null)
             {
-                DictionaryRepository = _dictionaryRepository,
+
-                IsEn_US = isEn_US,
+
-                DictionaryList = new List<DictionaryDto>()
+                var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+                {
+                    DictionaryRepository = _dictionaryRepository,
+                    IsEn_US = isEn_US,
+                    DictionaryList = new List<DictionaryDto>()
                 {
                     new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue="true" }
                 }
-            });
+                });
 
-            //找到该项目所有的IR 并且有加急 和Pd  未读的任务
+                //找到该项目所有的IR 并且有加急 和Pd  未读的任务
 
-            Expression<Func<VisitTask, bool>> comonTaskFilter = t => t.TrialId == trialId && t.TaskState == TaskState.Effect && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskAllocationState == TaskAllocationState.Allocated;
+                Expression<Func<VisitTask, bool>> comonTaskFilter = t => t.TrialId == trialId && t.TaskState == TaskState.Effect && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskAllocationState == TaskAllocationState.Allocated;
 
-            var trialUserList = _trialUserRoleRepository.Where(t => t.TrialId == trialId && t.TrialUser.JoinTime != null).Select(t => new
+                var trialUserList = _trialUserRoleRepository.Where(t => t.TrialId == trialId && t.TrialUser.JoinTime != null).Select(t => new
-            {
-                t.UserId,
-                t.UserRole.FullName,
-                t.UserRole.IdentityUser.EMail,
-                t.UserRole.IdentityUser.UserName,
-                t.Trial.TrialCode,
-                t.Trial.ResearchProgramNo
-                //TrialReadingCriterionList = t.Trial.TrialReadingCriterionList.Select(t => new { t.CriterionName, TrialReadingCriterionId = t.Id }).ToList()
-            });
-
-
-            foreach (var trialUser in trialUserList)
-            {
-
-                var userId = trialUser.UserId;
-
-                var doctorCriterionList = await _trialReadingCriterionRepository.Where(t => t.IsSigned && t.IsConfirm && t.TrialId == trialId && t.Trial.TrialUserRoleList.Any(t => t.UserId == userId))
-                     .Select(c => new
-                     {
-
-                         TrialReadingCriterionId = c.Id,
-                         CriterionName = c.CriterionName,
-
-                         UnReadList = c.VisitTaskList.Where(t => t.ExpetidEmailNoticeTime == null) //没有被通知
-                              .Where(t => t.DoctorUserId == userId && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect)
-                              // 前序 不存在 未一致性核查未通过的
-                              .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
-                              //前序 不存在  未生成任务的访视
-                              .Where(t => c.IsAutoCreate == false ? !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum) : true)
-
-                              .Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
-
-                              .Where(t => t.SourceSubjectVisit.PDState == PDStateEnum.PDProgress || t.SourceSubjectVisit.IsEnrollmentConfirm ||
-                              t.ReadModule.SubjectVisit.PDState == PDStateEnum.PDProgress || t.ReadModule.SubjectVisit.IsEnrollmentConfirm)
-                              .Select(c => new
-                              {
-                                  SubejctCode = c.IsAnalysisCreate ? c.BlindSubjectCode : c.Subject.Code,
-                                  c.TaskBlindName,
-                                  c.TaskName,
-                                  VisitTaskId = c.Id
-                              }).ToList()
-
-                     }).ToListAsync();
-
-
-                var toTalUnreadCount = doctorCriterionList.SelectMany(t => t.UnReadList).Count();
-
-                if (toTalUnreadCount > 0)
                 {
-                    var messageToSend = new MimeMessage();
+                    t.UserId,
+                    t.UserRole.FullName,
+                    t.UserRole.IdentityUser.EMail,
+                    t.UserRole.IdentityUser.UserName,
+                    t.Trial.TrialCode,
+                    t.Trial.ResearchProgramNo
+                    //TrialReadingCriterionList = t.Trial.TrialReadingCriterionList.Select(t => new { t.CriterionName, TrialReadingCriterionId = t.Id }).ToList()
+                });
 
-                    //发件地址
-                    messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-                    messageToSend.To.Add(new MailboxAddress(trialUser.FullName, trialUser.EMail));
 
-                    var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+                foreach (var trialUser in trialUserList)
+                {
 
-                    Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
+                    var userId = trialUser.UserId;
+
+                    var doctorCriterionList = await _trialReadingCriterionRepository.Where(t => t.IsSigned && t.IsConfirm && t.TrialId == trialId && t.Trial.TrialUserRoleList.Any(t => t.UserId == userId))
+                         .Select(c => new
+                         {
+
+                             TrialReadingCriterionId = c.Id,
+                             CriterionName = c.CriterionName,
+
+                             UnReadList = c.VisitTaskList.Where(t => t.ExpetidEmailNoticeTime == null) //没有被通知
+                                  .Where(t => t.DoctorUserId == userId && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect)
+                                  // 前序 不存在 未一致性核查未通过的
+                                  .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
+                                  //前序 不存在  未生成任务的访视
+                                  .Where(t => c.IsAutoCreate == false ? !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum) : true)
+
+                                  .Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
+
+                                  .Where(t => t.SourceSubjectVisit.PDState == PDStateEnum.PDProgress || t.SourceSubjectVisit.IsEnrollmentConfirm ||
+                                  t.ReadModule.SubjectVisit.PDState == PDStateEnum.PDProgress || t.ReadModule.SubjectVisit.IsEnrollmentConfirm)
+                                  .Select(c => new
+                                  {
+                                      SubejctCode = c.IsAnalysisCreate ? c.BlindSubjectCode : c.Subject.Code,
+                                      c.TaskBlindName,
+                                      c.TaskName,
+                                      VisitTaskId = c.Id
+                                  }).ToList()
+
+                         }).ToListAsync();
+
+
+                    var toTalUnreadCount = doctorCriterionList.SelectMany(t => t.UnReadList).Count();
+
+                    if (toTalUnreadCount > 0)
                     {
-                        var topicStr = string.Format(input.topicStr, trialUser.ResearchProgramNo);
+                        var messageToSend = new MimeMessage();
 
-                        var template = input.htmlBodyStr;
+                        //发件地址
+                        messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+                        messageToSend.To.Add(new MailboxAddress(trialUser.FullName, trialUser.EMail));
 
-                        //正则提取循环的部分 {%for%}(.*?){%end for%}
+                        var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
-                        string pattern = @"{%for%}(.*?){%end for%}";
-                        var match = Regex.Match(template, pattern, RegexOptions.Singleline);
 
-                        string criteriaTemplate = match.Groups[1].Value; // 提取循环模板
+                        Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
-
-                        // 构建循环内容
-                        string criteriaDetails = "";
-                        foreach (var criteria in doctorCriterionList)
                         {
-                            if (criteria.UnReadList.Count() > 0)
+                            var topicStr = string.Format(input.topicStr, trialUser.ResearchProgramNo);
+
+                            var template = input.htmlBodyStr;
+
+                            //正则提取循环的部分 {%for%}(.*?){%end for%}
+                            string pattern = @"{%for%}(.*?){%end for%}";
+                            var match = Regex.Match(template, pattern, RegexOptions.Singleline);
+
+                            string criteriaTemplate = match.Groups[1].Value; // 提取循环模板
+
+                            // 构建循环内容
+                            string criteriaDetails = "";
+                            foreach (var criteria in doctorCriterionList)
                             {
-                                criteriaDetails += string.Format(criteriaTemplate, criteria.CriterionName, criteria.UnReadList.Select(t => t.SubejctCode).Distinct().Count(), criteria.UnReadList.Count());
+                                if (criteria.UnReadList.Count() > 0)
+                                {
+                                    criteriaDetails += string.Format(criteriaTemplate, criteria.CriterionName, criteria.UnReadList.Select(t => t.SubejctCode).Distinct().Count(), criteria.UnReadList.Count());
 
+                                }
                             }
-                        }
 
-                        // 用循环内容替换原始模板中的循环部分
+                            // 用循环内容替换原始模板中的循环部分
-                        string emailContent = template.Replace(criteriaTemplate, criteriaDetails).Replace("{%for%}", "").Replace("{%end for%}", "");
+                            string emailContent = template.Replace(criteriaTemplate, criteriaDetails).Replace("{%for%}", "").Replace("{%end for%}", "");
 
 
 
-                        var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, emailContent),
+                            var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, emailContent),
-                            trialUser.FullName,
+                                trialUser.FullName,
 
-                        DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                            DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
-                        toTalUnreadCount,
+                            toTalUnreadCount,
 
-                        trialUser.ResearchProgramNo,
+                            trialUser.ResearchProgramNo,
-                         dictionValue[0],
+                             dictionValue[0],
-                        _systemEmailConfig.SiteUrl
+                            _systemEmailConfig.SiteUrl
-                            );
+                                );
 
-                        return (topicStr, htmlBodyStr);
+                            return (topicStr, htmlBodyStr);
-                    };
+                        };
 
-                    await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.ExpeditedReading, messageToSend, emailConfigFunc);
+                         await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
-                    await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+                        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
 
-                    //处理标记已通知的任务
+                        //处理标记已通知的任务
+
+                        var visitTaskIdList = doctorCriterionList.Where(t => t.UnReadList.Count() > 0).SelectMany(t => t.UnReadList.Select(u => u.VisitTaskId)).ToList();
+
+                        await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => visitTaskIdList.Contains(t.Id), u => new VisitTask() { ExpetidEmailNoticeTime = DateTime.Now });
+                    }
 
-                    var visitTaskIdList = doctorCriterionList.Where(t => t.UnReadList.Count() > 0).SelectMany(t => t.UnReadList.Select(u => u.VisitTaskId)).ToList();
 
-                    await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => visitTaskIdList.Contains(t.Id), u => new VisitTask() { ExpetidEmailNoticeTime = DateTime.Now });
                 }
 
 
+
             }
 
 
 
 
 
-
-
-
         }
     }
 }

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

@@ -28,10 +28,10 @@ public static class OldRecurringEmailHelper
 
         Guid trialId, EmailBusinessScenario businessScenario, 
         Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc,
-        Guid? trialSiteId = null, Guid? trialReadingCriterionId = null)
+        Guid? trialSiteId = null)
     {
         //找到配置
-        var trialEmailConfig = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionId && t.BusinessScenarioEnum == businessScenario, ignoreQueryFilters: true)
+        var trialEmailConfig = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId == trialId  && t.BusinessScenarioEnum == businessScenario, ignoreQueryFilters: true)
        .Include(t => t.TrialEmailNoticeUserList).Include(t => t.TrialEmailBlackUserList).FirstOrDefaultAsync();
 
 

IRaCIS.Core.Application/MassTransit/Recurring/Schedule/RecurringEvent.cs

@@ -37,4 +37,45 @@ public class UrgentIRUnReadTaskRecurringEvent : DomainEvent
     public Guid TrialId { get; set; }
 }
 
+/// <summary>
+/// 定时提醒
+/// </summary>
+public class SystemDocumentErverDayEvent : DomainEvent
+{
+
+}
+
+
+public class SystemDocumentPublishEvent : DomainEvent
+{
+    public List<Guid> Ids { get; set; }
+
+    /// <summary>
+    /// 新增的需要发送邮件的用户角色ID列表
+    /// 如果为null或空，则发送给所有相关角色
+    /// </summary>
+    public List<Guid> NewUserTypeIds { get; set; }
+}
+
+
+/// <summary>
+/// 定时提醒
+/// </summary>
+public class TrialDocumentErverDayEvent : DomainEvent
+{
+
+}
+
+
+public class TrialDocumentPublishEvent : DomainEvent
+{
+    public List<Guid> Ids { get; set; }
+
+    /// <summary>
+    /// 新增的需要发送邮件的用户角色ID列表
+    /// 如果为null或空，则发送给所有相关角色
+    /// </summary>
+    public List<Guid> NewUserTypeIds { get; set; }
+}
+
 

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

@@ -0,0 +1,277 @@
+using DocumentFormat.OpenXml;
+using IRaCIS.Application.Contracts;
+using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.MassTransit.Consumer;
+using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Domain.Models;
+using MassTransit;
+using Microsoft.Extensions.Options;
+using MimeKit;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Reactive.Joins;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.MassTransit.Recurring
+{
+
+    /// <summary>
+    /// 定时过期提醒
+    /// </summary>
+    public class SystemDocumentErverDayEventConsumer(
+        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<SystemDocumentErverDayEvent>
+    {
+        private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
+
+        public async Task Consume(ConsumeContext<SystemDocumentErverDayEvent> context)
+        {
+
+            DateTime now = DateTime.Now;
+            Console.WriteLine("发送定时过期提醒");
+            var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+            var systemDocQuery =
+            from sysDoc in _systemDocumentRepository.AsQueryable(false)
+            from identityUser in _identityUserRepository.AsQueryable(false).Where(t => t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
+            join confirmc in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = identityUser.Id, SystemDocumentId = sysDoc.Id } equals new { confirmc.ConfirmUserId, confirmc.SystemDocumentId } into cc
+            from confirm in cc.DefaultIfEmpty()
+            select new UnionDocumentWithConfirmInfoView()
+            {
+                IsSystemDoc = true,
+                Id = sysDoc.Id,
+                CreateTime = sysDoc.CreateTime,
+                IsDeleted = sysDoc.IsDeleted,
+                SignViewMinimumMinutes = sysDoc.SignViewMinimumMinutes,
+                Name = sysDoc.Name,
+                Path = sysDoc.Path,
+                FileTypeId = sysDoc.FileTypeId,
+                UpdateTime = sysDoc.UpdateTime,
+                ConfirmUserId = identityUser.Id,
+                ConfirmTime = confirm.ConfirmTime,
+                UserCreateTime = identityUser.CreateTime,
+                CurrentStaffTrainDays = sysDoc.CurrentStaffTrainDays,
+                NewStaffTrainDays = sysDoc.NewStaffTrainDays,
+                RealName = identityUser.FullName,
+                UserName = identityUser.UserName,
+
+
+                IsNeedSendEmial = identityUser.IsZhiZhun || (!identityUser.IsZhiZhun && sysDoc.DocUserSignType == DocUserSignType.InnerAndOuter),
+                FullFilePath = sysDoc.Path
+            };
+            var datalist = await systemDocQuery.IgnoreQueryFilters().Where(t => t.IsDeleted == false && t.ConfirmTime == null)
+             .ToListAsync();
+            datalist = datalist.Where(x => x.SuggestFinishTime != null && x.SuggestFinishTime.Value.Date == DateTime.Now.Date)
+                .Where(x => x.IsNeedSendEmial).ToList();
+            var confirmUserIdList = datalist.Select(t => t.ConfirmUserId).Distinct().ToList();
+            var userinfoList = await _identityUserRepository.Where(x => confirmUserIdList.Contains(x.Id)).ToListAsync();
+
+            Console.WriteLine("发送定时过期提醒:人员数量" + userinfoList.Count);
+            int index = 1;
+            foreach (var userinfo in userinfoList)
+            {
+                try
+                {
+                    Console.WriteLine($"{index}发送定时过期提醒,邮箱：{userinfo.EMail}，姓名{userinfo.UserName}");
+                    index++;
+                    var messageToSend = new MimeMessage();
+                    //发件地址
+                    messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+                    messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+
+
+
+                    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}
+                                 _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);
+                    }
+
+
+                }
+                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,
+
+     IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<SystemDocumentPublishEvent>
+    {
+        private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
+
+        public async Task Consume(ConsumeContext<SystemDocumentPublishEvent> context)
+        {
+            var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+
+            // 记录是否只发送给新增角色的日志
+            if (context.Message.NewUserTypeIds != null && context.Message.NewUserTypeIds.Any())
+            {
+                Console.WriteLine($"只发送给新增的角色，角色数量: {context.Message.NewUserTypeIds.Count}");
+            }
+            // 构建查询
+            IQueryable<UnionDocumentWithConfirmInfoView> systemDocQuery;
+
+            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()
+                {
+                    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()
+                {
+                    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(String.Empty, userinfo.EMail));
+
+
+
+                    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}
+                           _systemEmailConfig.SiteUrl
+                            );
+
+                        return (topicStr, htmlBodyStr);
+                    };
+
+                    var scenario = EmailBusinessScenario.GeneralTraining_EffectiveNotification;
+
+                    var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+                    if (emailConfig != null)
+                    {
+                        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
+
+                        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+                        msg += "发送成功";
+                    }
+
+
+                }
+                catch (Exception)
+                {
+                    msg += "发送失败";
+
+                }
+
+
+                Console.WriteLine(msg);
+            }
+
+        }
+    }
+}

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

@@ -0,0 +1,307 @@
+using DocumentFormat.OpenXml;
+using IRaCIS.Application.Contracts;
+using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.MassTransit.Consumer;
+using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Domain.Models;
+using MassTransit;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using MimeKit;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Reactive.Joins;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.MassTransit.Recurring
+{
+
+    /// <summary>
+    /// 定时过期提醒
+    /// </summary>
+    public class TrialDocumentErverDayEventConsumer(
+        IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository,
+        IRepository<VisitTask> _visitTaskRepository,
+           IRepository<SystemDocument> _systemDocumentRepository,
+             IRepository<IdentityUser> _identityUserRepository,
+                   IRepository<SystemDocConfirmedIdentityUser> _systemDocConfirmedUserRepository,
+         IRepository<Dictionary> _dictionaryRepository,
+        IRepository<TrialUserRole> _trialUserRoleRepository, IRepository<TrialDocument> _trialDocumentRepository,
+        IRepository<Trial> _trialRepository,
+        ISystemDocumentService _systemDocumentService,
+        IRepository<SystemDocNeedConfirmedUserType> _systemDocNeedConfirmedUserTypeRepository,
+         IRepository<TrialDocNeedConfirmedUserType> _trialDocNeedConfirmedUserTypeRepository,
+           IServiceScopeFactory serviceScopeFactory,
+        IRepository<TrialIdentityUser> _trialIdentityUserRepository,
+        IRepository<TrialDocConfirmedIdentityUser> _trialDocConfirmedUserRepository,
+        IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
+        IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+
+        IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<TrialDocumentErverDayEvent>
+    {
+        private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
+
+        public async Task Consume(ConsumeContext<TrialDocumentErverDayEvent> context)
+        {
+
+            DateTime now = DateTime.Now;
+            Console.WriteLine("发送定时项目过期提醒");
+            var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+            var trialDocQuery =
+             from trialDoc in _trialDocumentRepository.AsQueryable(true)
+ 
+             join trialIdentityUser in _trialIdentityUserRepository.Where(x => x.IsDeleted == false) on trialDoc.TrialId equals trialIdentityUser.TrialId
+             join trialUserRole in _trialUserRoleRepository.Where(x => x.IsDeleted == false) on trialIdentityUser.Id equals trialUserRole.TrialUserId
+             from identityUser in _identityUserRepository.AsQueryable(false)
+
+             .Where(t => t.Status == UserStateEnum.Enable &&
+                    t.Id == trialIdentityUser.IdentityUserId &&
+                    t.UserRoleList.Where(t => t.IsUserRoleDisabled == false)
+                    .Any(t => trialDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
+
+             join confirm in _trialDocConfirmedUserRepository.Where() on
+             new { trialIdentityUser.IdentityUserId, TrialDocumentId = trialDoc.Id } equals new { IdentityUserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
+
+             from confirm in cc.DefaultIfEmpty()
+             select new TrialSignDocView()
+            {
+                TrialCode = trialDoc.Trial.TrialCode,
+                ResearchProgramNo = trialDoc.Trial.ResearchProgramNo,
+                ExperimentName = trialDoc.Trial.ExperimentName,
+                CurrentStaffTrainDays = trialDoc.CurrentStaffTrainDays,
+                NewStaffTrainDays = trialDoc.NewStaffTrainDays,
+                Id = trialDoc.Id,
+                IsSystemDoc = false,
+                CreateTime = trialDoc.CreateTime,
+                FullFilePath = trialDoc.Path,
+                IsDeleted = trialDoc.IsDeleted,
+                Name = trialDoc.Name,
+                Path = trialDoc.Path,
+                FileTypeId = trialDoc.FileTypeId,
+                UpdateTime = trialDoc.UpdateTime,
+                SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
+                //IsConfirmed = confirm.ConfirmTime != null,
+                ConfirmUserId = identityUser.Id,
+                ConfirmTime = confirm.ConfirmTime,
+                RealName = trialIdentityUser.IdentityUser.FullName,
+                UserName = trialIdentityUser.IdentityUser.UserName,
+                UserCreateTime= trialIdentityUser.CreateTime,
+                IdentityUserTypeList = trialIdentityUser.TrialUserRoleList.Select(t => t.UserRole.UserTypeRole.UserTypeShortName).ToList(),
+
+                DocNeedSignUserTypeList = trialDoc.NeedConfirmedUserTypeList.Select(t => t.UserTypeRole.UserTypeShortName).ToList(),
+            };
+            var datalist = await trialDocQuery.IgnoreQueryFilters().Where(t => t.IsDeleted == false && t.ConfirmTime == null&&t.ConfirmTime==null)
+             .ToListAsync();
+            datalist = datalist.Where(x => x.SuggestFinishTime != null && x.SuggestFinishTime.Value.Date == DateTime.Now.Date)
+                .ToList();
+            var confirmUserIdList = datalist.Select(t => t.ConfirmUserId).Distinct().ToList();
+            var userinfoList = await _identityUserRepository.Where(x => confirmUserIdList.Contains(x.Id)).ToListAsync();
+
+            Console.WriteLine("发送定时项目过期提醒:人员数量" + userinfoList.Count);
+            int index = 1;
+            foreach (var userinfo in userinfoList)
+            {
+                try
+                {
+                    Console.WriteLine($"{index}发送定时过期提醒,邮箱：{userinfo.EMail}，姓名{userinfo.UserName}");
+                    index++;
+                    var messageToSend = new MimeMessage();
+                    //发件地址
+                    messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+                    messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+
+
+
+                    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}
+                                 _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, _systemEmailConfig);
+                    }
+
+
+                }
+                catch (Exception)
+                {
+
+                }
+
+            }
+
+
+        }
+    }
+
+    /// <summary>
+    /// 生效通知
+    /// </summary>
+    public class TrialDocumentPublishEventConsumer(
+     IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository,
+     IRepository<VisitTask> _visitTaskRepository,
+        IRepository<TrialDocument> _trialDocumentRepository,
+          IRepository<IdentityUser> _identityUserRepository,
+              IRepository<TrialIdentityUser> _trialIdentityUserRepository,
+      IRepository<Dictionary> _dictionaryRepository,
+     IRepository<TrialUserRole> _trialUserRoleRepository,
+     IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+
+     IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<TrialDocumentPublishEvent>
+    {
+        private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
+
+        public async Task Consume(ConsumeContext<TrialDocumentPublishEvent> context)
+        {
+            var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+
+            // 记录是否只发送给新增角色的日志
+            if (context.Message.NewUserTypeIds != null && context.Message.NewUserTypeIds.Any())
+            {
+                Console.WriteLine($"只发送给新增项目的角色，角色数量: {context.Message.NewUserTypeIds.Count}");
+            }
+            // 构建查询
+            IQueryable<UnionDocumentWithConfirmInfoView> systemDocQuery;
+
+            if (context.Message.NewUserTypeIds != null && context.Message.NewUserTypeIds.Any())
+            {
+                // 只查询新增角色的用户
+                systemDocQuery =
+                from trialDoc in _trialDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id))
+                join trialIdentityUser in _trialIdentityUserRepository.Where(x=>x.IsDeleted==false) on trialDoc.TrialId equals trialIdentityUser.TrialId
+                join trialUserRole in _trialUserRoleRepository.Where(x => x.IsDeleted == false) on trialIdentityUser.Id equals trialUserRole.TrialUserId
+                from identityUser in _identityUserRepository.AsQueryable(false)
+                .Where(t => t.Status == UserStateEnum.Enable &&
+                        t.Id == trialIdentityUser.IdentityUserId &&
+                       t.UserRoleList.Where(t => t.IsUserRoleDisabled == false)
+                       .Any(t => context.Message.NewUserTypeIds.Contains(t.UserTypeId) &&
+                            trialDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
+                select new UnionDocumentWithConfirmInfoView()
+                {
+                    IsSystemDoc = true,
+                    Id = trialDoc.Id,
+                    CreateTime = trialDoc.CreateTime,
+                    IsDeleted = trialDoc.IsDeleted,
+                    SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
+                    Name = trialDoc.Name,
+                    Path = trialDoc.Path,
+                    FileTypeId = trialDoc.FileTypeId,
+                    UpdateTime = trialDoc.UpdateTime,
+                    ConfirmUserId = identityUser.Id,
+                    RealName = identityUser.FullName,
+                    UserName = identityUser.UserName,
+                    IsNeedSendEmial = identityUser.IsZhiZhun,
+                    FullFilePath = trialDoc.Path
+                };
+            }
+            else
+            {
+                // 查询所有相关角色的用户
+                systemDocQuery =
+                from trialDoc in _trialDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id))
+                join trialIdentityUser in _trialIdentityUserRepository.Where(x => x.IsDeleted == false) on trialDoc.TrialId equals trialIdentityUser.TrialId
+                join trialUserRole in _trialUserRoleRepository.Where(x=>x.IsDeleted==false) on trialIdentityUser.Id equals trialUserRole.TrialUserId
+                from identityUser in _identityUserRepository.AsQueryable(false)
+                .Where(t => t.Status == UserStateEnum.Enable &&
+                       t.Id== trialIdentityUser.IdentityUserId&&
+                       t.UserRoleList.Where(t => t.IsUserRoleDisabled == false)
+                       .Any(t => trialDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
+                select new UnionDocumentWithConfirmInfoView()
+                {
+                    IsSystemDoc = false,
+                    Id = trialDoc.Id,
+                    CreateTime = trialDoc.CreateTime,
+                    IsDeleted = trialDoc.IsDeleted,
+                    SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
+                    Name = trialDoc.Name,
+                    Path = trialDoc.Path,
+                    FileTypeId = trialDoc.FileTypeId,
+                    UpdateTime = trialDoc.UpdateTime,
+                    ConfirmUserId = identityUser.Id,
+                    RealName = identityUser.FullName,
+                    UserName = identityUser.UserName,
+                    IsNeedSendEmial = identityUser.IsZhiZhun ,
+                    FullFilePath = trialDoc.Path
+                };
+            }
+            var datalist = await systemDocQuery.IgnoreQueryFilters().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(String.Empty, userinfo.EMail));
+
+
+
+                    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}
+                           _systemEmailConfig.SiteUrl
+                            );
+
+                        return (topicStr, htmlBodyStr);
+                    };
+
+                    var scenario = EmailBusinessScenario.TrialTraining_EffectiveNotification;
+
+                    var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable).FirstOrDefault();
+
+                    if (emailConfig != null)
+                    {
+                        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
+
+                        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+                        msg += "发送成功";
+                    }
+
+
+                }
+                catch (Exception)
+                {
+                    msg += "发送失败";
+
+                }
+
+
+                Console.WriteLine(msg);
+            }
+
+        }
+    }
+}

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -71,6 +71,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public bool IsPMSetBack { get; set; }
 
+        public bool IsSubjectQuit { get; set; }
+
         #region 标准配置
         public Guid TrialReadingCriterionId { get; set; }
 
@@ -214,6 +216,10 @@ namespace IRaCIS.Core.Application.ViewModel
         /// </summary>
         public bool IsManualGeneration { get; set; }
         //public bool IsAfterConvertedTask { get; set; }
+
+        public string PMBackReason { get; set; }
+
+        public int? RandomOrder { get; set; }
     }
 
 
@@ -234,6 +240,7 @@ namespace IRaCIS.Core.Application.ViewModel
         //public string ReReadingOriginalTaskCode { get; set; }
 
 
+        public string ApplicantName { get; set; }
 
         public Guid Id { get; set; }
 
@@ -339,6 +346,16 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public int UrgentCount { get; set; }
 
+        /// <summary>
+        /// 是否存在未处理的反馈
+        /// </summary>
+        public bool IsExistUnprocessedFeedback
+        {
+            get
+            {
+                return UnReadCanReadTaskList.Any(t => t.IsExistUnprocessedFeedback);
+            }
+        }
 
         public List<IRUnreadTaskView> UnReadCanReadTaskList { get; set; } = new List<IRUnreadTaskView>();
 
@@ -356,6 +373,11 @@ namespace IRaCIS.Core.Application.ViewModel
         /// </summary>
         public bool IsAnalysisCreate { get; set; }
    
+        /// <summary>
+        /// 是否存在未处理的反馈
+        /// </summary>
+        public bool IsExistUnprocessedFeedback { get; set; }
+
         public bool IsUrgent { get; set; }
 
         public decimal VisitNum { get; set; }
@@ -465,6 +487,9 @@ namespace IRaCIS.Core.Application.ViewModel
         public string? RequestReReadingReason { get; set; }
 
         public ExportResult? ReadingExportType { get; set; }
+
+        public int? RandomOrder { get; set; }
+        public bool? IsRandomOrderList { get; set; }
     }
 
 
@@ -891,6 +916,30 @@ namespace IRaCIS.Core.Application.ViewModel
         CancelAssign = 4,
     }
 
+
+    public class SetRandomTaskOrderCommand
+    {
+        [NotDefault]
+        public Guid TrialId { get; set; }
+
+        [NotDefault]
+        public Guid TrialReadingCriterionId { get; set; }
+
+        [NotDefault]
+        public Guid DoctorUserId { get; set; }
+
+        public bool IsAutoSet { get; set; }
+
+        public List<VisitTaskOrderCommand> SetList { get; set; }
+    }
+
+    public class VisitTaskOrderCommand
+    {
+        public Guid Id { get; set; }
+
+        public int? RandomOrder { get; set; }
+    }
+
 }
 
 

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

@@ -4,10 +4,12 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
+using DocumentFormat.OpenXml.Spreadsheet;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Mvc;
 
@@ -46,7 +48,7 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         public async Task<IResponseOutput> AddOrUpdateTaskAllocationRule(TaskAllocationRuleAddOrEdit addOrEditTaskAllocationRule)
         {
@@ -77,7 +79,7 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [HttpDelete("{taskAllocationRuleId:guid}")]
         public async Task<IResponseOutput> DeleteTaskAllocationRule(Guid taskAllocationRuleId)
@@ -123,7 +125,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpGet("{trialId:guid}")]
         public async Task<List<TrialDoctorUserSelectView>> GetDoctorUserSelectList(Guid trialId, [FromServices] IRepository<Enroll> _enrollRepository)
         {
-            var query = from enroll in _enrollRepository.Where(t => t.TrialId == trialId && t.EnrollStatus >= EnrollStatus.ConfirmIntoGroup)
+            var query = from enroll in _enrollRepository.Where(t => t.TrialId == trialId /*&& t.TaskAllocationRule.IsEnable*/ && /*(t.EnrollStatus >= EnrollStatus.ConfirmIntoGroup ||*/ t.Trial.SubjectDoctorUserList.Any(v => v.DoctorUserId == t.DoctorUser.Id))
                         join user in _userRoleRepository.AsQueryable() on enroll.DoctorId equals user.DoctorId
                         select new TrialDoctorUserSelectView()
                         {

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

@@ -47,16 +47,16 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
 
-        public  async Task<FileResult> ExportTemplateAsync(ExportTemplateAsyncDto inDto)
+        public async Task<FileResult> ExportTemplateAsync(ExportTemplateAsyncDto inDto)
         {
             return await ExcelExportHelper.ExportTemplateAsync(new ExportTemplateServiceDto()
             {
-                Data=inDto.Data,
+                Data = inDto.Data,
-                commonDocumentRepository= _commonDocumentRepository,
+                commonDocumentRepository = _commonDocumentRepository,
-                TemplateCode=inDto.TemplateCode,
+                TemplateCode = inDto.TemplateCode,
-                ExportFileName=inDto.ExportFileName,
+                ExportFileName = inDto.ExportFileName,
-                hostEnvironment=_hostEnvironment,
+                hostEnvironment = _hostEnvironment,
-                IsEnglish=_userInfo.IsEn_Us,
+                IsEnglish = _userInfo.IsEn_Us,
             });
         }
 
@@ -213,7 +213,7 @@ namespace IRaCIS.Core.Application.Service
                     //为防止脏数据 这里也多判断一次  
                     var existCurrentVisitTaskList = _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId
                                 && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.TaskState == TaskState.Effect
-                                 && t.SourceSubjectVisitId == subjectVisit.Id).ToList();
+                                 && t.SourceSubjectVisitId == subjectVisit.Id && t.IsAnalysisCreate == false).ToList();
 
                     if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Double)
                     {
@@ -682,7 +682,7 @@ namespace IRaCIS.Core.Application.Service
 
                                         var existCurrentVisitTaskList = _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId
                                         && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect
-                                       /* && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null*/ && t.SourceSubjectVisitId == subjectVisit.Id).ToList();
+                                       /* && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null*/ && t.SourceSubjectVisitId == subjectVisit.Id && t.IsAnalysisCreate == false).ToList();
 
                                         VisitTask? task1 = existCurrentVisitTaskList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm1);
                                         VisitTask? task2 = existCurrentVisitTaskList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm2);
@@ -757,248 +757,30 @@ namespace IRaCIS.Core.Application.Service
 
                                             if (trialReadingCriterionConfig.TaskAllocateObjEnum == TaskAllocateObj.Subject)
                                             {
-                                                var allocateSubjectArmList = _visitTaskRepository.Where(t => t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.TrialId == trialId && t.DoctorUserId != null && t.ArmEnum != Arm.JudgeArm)
-                                                       .Select(t => new { t.DoctorUserId, t.ArmEnum }).Distinct().ToList();
 
-                                                //当前任务没有分配医生，初次分配  不处理 只生成任务，后续根据生成的任务 再进行分配
-                                                if (allocateSubjectArmList.Count == 0)
-                                                {
 
-                                                }
+                                                if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
-                                                else
                                                 {
-                                                    //并且配置了医生 
+                                                    #region 当前访视处理
-                                                    if (assignConfigList.Count > 0 && trialReadingCriterionConfig.IsFollowVisitAutoAssign)
+
+                                                    //配置了医生
+                                                    if (assignConfigList.Count > 0)
                                                     {
+                                                        //之前有回退到影像上传的访视 那么当前访视一致性核查通过的时候，当前访视生成但是不分配出去(排除失访的)
 
-                                                        #region 后续访视 未分配的进行再次分配，重置的或者失效的 需要重新生成新的任务  (PM 有序退回  或者PM  有序 申请重阅)
+                                                        var beforeBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum < subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
 
-
+                                                        //之前有回退的，那么当前访视任务生成但是不分配
-                                                        if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
+                                                        if (beforeBackVisitTask != null)
                                                         {
-                                                            //之前有回退到影像上传的访视 那么当前访视一致性核查通过的时候，当前访视生成但是不分配出去(排除失访的)
+                                                            //不用进行额外处理
-
-                                                            var beforeBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum < subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
-
-                                                            //之前有回退的，那么当前访视任务生成但是不分配
-                                                            if (beforeBackVisitTask != null)
-                                                            {
-                                                                //不用进行额外处理
-
-                                                                //访视2 PM 回退 基线回退  访视2先一致性核查通过，生成访视2任务，但是不分配
-                                                            }
-                                                            else
-                                                            {
-                                                                #region 当前访视根据配置规则分配出去
-
-                                                                var defaultState = trialReadingCriterionConfig.FollowVisitAutoAssignDefaultState == TaskAllocateDefaultState.InitAllocated ? TaskAllocationState.InitAllocated : TaskAllocationState.Allocated;
-
-                                                                if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && task1 != null)
-                                                                {
-                                                                    task1.TaskAllocationState = defaultState;
-                                                                    //分配给对应Arm的人
-                                                                    task1.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm1)!.DoctorUserId;
-                                                                    task1.AllocateTime = DateTime.Now;
-
-                                                                    task1.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
-                                                                }
-
-                                                                if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2) && task2 != null)
-                                                                {
-                                                                    task2.TaskAllocationState = defaultState;
-                                                                    task2.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm2)!.DoctorUserId;
-                                                                    task2.AllocateTime = DateTime.Now;
-                                                                    task2.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
-                                                                }
-
-                                                                #endregion
-                                                            }
-
-                                                            //后续最近的未一致性核查通过的访视任务
-                                                            var followBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
-
-                                                            //大于当前访视  同时小于最近的未一致性核查通过的访视任务分配 或者生成
-
-                                                            //存在退回访视1  又退回基线 这种情况   生成任务  考虑基线先一致性核查通过，但是访视1还未通过时  生成任务
-                                                            var followVisitTaskList = await _visitTaskRepository
-                                                                 .Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.SourceSubjectVisit.CheckState == CheckStateEnum.CVPassed && t.ReadingCategory == ReadingCategory.Visit && t.IsAnalysisCreate == false, true)
-                                                                 .WhereIf(followBackVisitTask != null, t => t.VisitTaskNum < followBackVisitTask!.VisitTaskNum)
-                                                                 .ToListAsync();
-
-                                                            var followVisitGroup = followVisitTaskList.GroupBy(t => t.VisitTaskNum);
-
-                                                            //每个访视去判断  是分配还是生成（因为影响哪里有些是取消分配，有些是重阅重置需要重新生成）
-                                                            foreach (var visitGroup in followVisitGroup)
-                                                            {
-
-                                                                var visit = await _subjectVisitRepository.Where(x => x.Id == visitGroup.First().SourceSubjectVisitId).Select(x => new
-                                                                {
-                                                                    x.PDState,
-                                                                    x.IsEnrollmentConfirm,
-                                                                    x.IsUrgent,
-                                                                }).FirstNotNullAsync();
-
-
-                                                                TaskUrgentType? urgentType = null;
-
-                                                                if (subjectVisitInfo.PDState == PDStateEnum.PDProgress)
-                                                                {
-                                                                    urgentType = TaskUrgentType.PDProgress;
-                                                                }
-                                                                else if (subjectVisitInfo.IsEnrollmentConfirm)
-                                                                {
-                                                                    urgentType = TaskUrgentType.EnrollmentConfirm;
-                                                                }
-                                                                else if (subjectVisitInfo.IsUrgent)
-                                                                {
-                                                                    urgentType = TaskUrgentType.VisitUrgent;
-                                                                }
-
-                                                                bool isCanEdit = urgentType == TaskUrgentType.EnrollmentConfirm || urgentType == TaskUrgentType.PDProgress ? false : true;
-
-                                                                //如果后续访视已分配有效 就不用处理
-                                                                if (visitGroup.Any(t => t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.Allocated && t.ArmEnum == Arm.DoubleReadingArm1))
-                                                                {
-                                                                    //不做处理
-                                                                }
-                                                                else
-                                                                {
-                                                                    var arm1 = visitGroup.FirstOrDefault(t => t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null && t.ArmEnum == Arm.DoubleReadingArm1);
-
-                                                                    if (arm1 != null)
-                                                                    {
-
-                                                                        //有可能仅仅只分配了一个Subject   未分配  那么
-                                                                        if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && task1 != null)
-                                                                        {
-                                                                            arm1.IsUrgent = visit.IsUrgent;
-                                                                            arm1.TaskUrgentType = urgentType;
-                                                                            arm1.IsCanEditUrgentState = isCanEdit;
-                                                                            arm1.TaskAllocationState = TaskAllocationState.Allocated;
-                                                                            arm1.AllocateTime = DateTime.Now;
-                                                                            arm1.DoctorUserId = task1.DoctorUserId;
-                                                                            arm1.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
-                                                                        }
-
-                                                                    }
-                                                                    else
-                                                                    {
-                                                                        var latestTask = visitGroup.Where(t => t.ArmEnum == Arm.DoubleReadingArm1).OrderByDescending(t => t.CreateTime).First();
-
-
-
-
-                                                                        var taskOne = await _visitTaskRepository.AddAsync(new VisitTask()
-                                                                        {
-                                                                            TrialId = trialId,
-                                                                            SubjectId = subjectVisit.SubjectId,
-                                                                            IsUrgent = visit.IsUrgent,
-                                                                            TaskUrgentType = urgentType,
-                                                                            IsCanEditUrgentState = isCanEdit,
-                                                                            ArmEnum = Arm.DoubleReadingArm1,//特殊
-                                                                            Code = currentMaxCodeInt + 1,
-                                                                            TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
-                                                                            ReadingCategory = ReadingCategory.Visit,
-
-                                                                            SourceSubjectVisitId = latestTask.SourceSubjectVisitId,
-                                                                            VisitTaskNum = latestTask.VisitTaskNum,
-                                                                            TaskBlindName = visitBlindConfig.BlindFollowUpPrefix + " " + visitNumList.IndexOf(latestTask.VisitTaskNum),
-                                                                            TaskName = latestTask.TaskName,
-
-                                                                            BlindSubjectCode = latestTask.BlindSubjectCode,
-                                                                            BlindTrialSiteCode = latestTask.BlindTrialSiteCode,
-                                                                            IsAnalysisCreate = latestTask.IsAnalysisCreate,
-                                                                            IsSelfAnalysis = latestTask.IsSelfAnalysis,
-                                                                            TaskAllocationState = TaskAllocationState.Allocated,
-                                                                            AllocateTime = DateTime.Now,
-                                                                            DoctorUserId = task1!.DoctorUserId,
-                                                                            SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget),
-                                                                            TrialReadingCriterionId = latestTask.TrialReadingCriterionId,
-                                                                            IsNeedClinicalDataSign = latestTask.IsNeedClinicalDataSign,
-                                                                            IsClinicalDataSign = latestTask.IsClinicalDataSign
-                                                                        });
-
-                                                                        currentMaxCodeInt = currentMaxCodeInt + 1;
-
-                                                                        _fusionCache.Set<int>(CacheKeys.TrialStudyMaxCode(trialId), currentMaxCodeInt, TimeSpan.FromMinutes(30));
-                                                                    }
-
-                                                                }
-
-                                                                //如果后续访视已分配有效 就不用处理
-                                                                if (visitGroup.Any(t => t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.Allocated && t.ArmEnum == Arm.DoubleReadingArm2))
-                                                                {
-                                                                    //不做处理
-                                                                }
-                                                                else
-                                                                {
-                                                                    var arm2 = visitGroup.FirstOrDefault(t => t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null && t.ArmEnum == Arm.DoubleReadingArm2);
-                                                                    if (arm2 != null)
-                                                                    {
-                                                                        //有可能仅仅只分配了一个Subject
-                                                                        if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2) && task2 != null)
-                                                                        {
-                                                                            arm2.IsUrgent = visit.IsUrgent;
-                                                                            arm2.TaskUrgentType = urgentType;
-                                                                            arm2.IsCanEditUrgentState = isCanEdit;
-                                                                            arm2.TaskAllocationState = TaskAllocationState.Allocated;
-                                                                            arm2.AllocateTime = DateTime.Now;
-                                                                            arm2.DoctorUserId = task2.DoctorUserId;
-                                                                            arm2.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
-                                                                        }
-
-                                                                    }
-                                                                    else
-                                                                    {
-                                                                        var latestTask = visitGroup.Where(t => t.ArmEnum == Arm.DoubleReadingArm2).OrderByDescending(t => t.CreateTime).First();
-
-                                                                        var taskTwo = await _visitTaskRepository.AddAsync(new VisitTask()
-                                                                        {
-                                                                            TrialId = trialId,
-                                                                            SubjectId = subjectVisit.SubjectId,
-                                                                            IsUrgent = visit.IsUrgent,
-                                                                            TaskUrgentType = urgentType,
-                                                                            IsCanEditUrgentState = isCanEdit,
-
-                                                                            //CheckPassedTime = subjectVisit.CheckPassedTime,
-                                                                            ArmEnum = Arm.DoubleReadingArm2,//特殊
-                                                                            Code = currentMaxCodeInt + 1,
-                                                                            TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
-                                                                            ReadingCategory = ReadingCategory.Visit,
-
-                                                                            SourceSubjectVisitId = latestTask.SourceSubjectVisitId,
-                                                                            VisitTaskNum = latestTask.VisitTaskNum,
-                                                                            TaskBlindName = visitBlindConfig.BlindFollowUpPrefix + " " + visitNumList.IndexOf(latestTask.VisitTaskNum),
-                                                                            TaskName = latestTask.TaskName,
-
-                                                                            BlindSubjectCode = latestTask.BlindSubjectCode,
-                                                                            BlindTrialSiteCode = latestTask.BlindTrialSiteCode,
-                                                                            IsAnalysisCreate = latestTask.IsAnalysisCreate,
-                                                                            IsSelfAnalysis = latestTask.IsSelfAnalysis,
-                                                                            TaskAllocationState = TaskAllocationState.Allocated,
-
-                                                                            AllocateTime = DateTime.Now,
-                                                                            DoctorUserId = task2!.DoctorUserId,
-                                                                            SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget),
-
-                                                                            TrialReadingCriterionId = latestTask.TrialReadingCriterionId,
-                                                                            IsNeedClinicalDataSign = latestTask.IsNeedClinicalDataSign,
-                                                                            IsClinicalDataSign = latestTask.IsClinicalDataSign
-                                                                        });
-
-                                                                        currentMaxCodeInt = currentMaxCodeInt + 1;
-
-                                                                        _fusionCache.Set<int>(CacheKeys.TrialStudyMaxCode(trialId), currentMaxCodeInt, TimeSpan.FromMinutes(30));
-                                                                    }
-                                                                }
-
-                                                            }
-
 
+                                                            //访视2 PM 回退 基线回退  访视2先一致性核查通过，生成访视2任务，但是不分配
                                                         }
-                                                        //无序的时候    生成任务并分配出去
                                                         else
                                                         {
+                                                            #region 当前访视根据配置规则分配出去
+
                                                             var defaultState = trialReadingCriterionConfig.FollowVisitAutoAssignDefaultState == TaskAllocateDefaultState.InitAllocated ? TaskAllocationState.InitAllocated : TaskAllocationState.Allocated;
 
                                                             if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && task1 != null)
@@ -1019,21 +801,237 @@ namespace IRaCIS.Core.Application.Service
                                                                 task2.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
                                                             }
 
+                                                            #endregion
                                                         }
-
-
-                                                        #endregion
-
                                                     }
-                                                    else
+                                                    #endregion
-                                                    //后续访视不自动分配，或者配置的医生数量不足，就不进行分配
+
+                                                    #region 后续访视处理
+
+
+
+
+                                                    //后续最近的未一致性核查通过的访视任务
+                                                    var followBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
+
+                                                    //大于当前访视  同时小于最近的未一致性核查通过的访视任务分配 或者生成
+
+                                                    //存在退回访视1  又退回基线 这种情况   生成任务  考虑基线先一致性核查通过，但是访视1还未通过时  生成任务
+                                                    var followVisitTaskList = await _visitTaskRepository
+                                                         .Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.SourceSubjectVisit.CheckState == CheckStateEnum.CVPassed && t.ReadingCategory == ReadingCategory.Visit && t.IsAnalysisCreate == false, true)
+                                                         .WhereIf(followBackVisitTask != null, t => t.VisitTaskNum < followBackVisitTask!.VisitTaskNum)
+                                                         .ToListAsync();
+
+                                                    var followVisitGroup = followVisitTaskList.GroupBy(t => t.VisitTaskNum);
+
+                                                    //每个访视去判断  是分配还是生成（因为影响哪里有些是取消分配，有些是重阅重置需要重新生成）
+                                                    foreach (var visitGroup in followVisitGroup)
                                                     {
 
+                                                        var visit = await _subjectVisitRepository.Where(x => x.Id == visitGroup.First().SourceSubjectVisitId).Select(x => new
+                                                        {
+                                                            x.PDState,
+                                                            x.IsEnrollmentConfirm,
+                                                            x.IsUrgent,
+                                                        }).FirstNotNullAsync();
+
+
+                                                        TaskUrgentType? urgentType = null;
+
+                                                        if (subjectVisitInfo.PDState == PDStateEnum.PDProgress)
+                                                        {
+                                                            urgentType = TaskUrgentType.PDProgress;
+                                                        }
+                                                        else if (subjectVisitInfo.IsEnrollmentConfirm)
+                                                        {
+                                                            urgentType = TaskUrgentType.EnrollmentConfirm;
+                                                        }
+                                                        else if (subjectVisitInfo.IsUrgent)
+                                                        {
+                                                            urgentType = TaskUrgentType.VisitUrgent;
+                                                        }
+
+                                                        bool isCanEdit = urgentType == TaskUrgentType.EnrollmentConfirm || urgentType == TaskUrgentType.PDProgress ? false : true;
+
+                                                        //如果后续访视已分配有效 就不用处理
+                                                        if (visitGroup.Any(t => t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.Allocated && t.ArmEnum == Arm.DoubleReadingArm1))
+                                                        {
+                                                            //不做处理
+                                                        }
+                                                        else
+                                                        {
+                                                            var arm1 = visitGroup.FirstOrDefault(t => t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null && t.ArmEnum == Arm.DoubleReadingArm1);
+
+                                                            if (arm1 != null)
+                                                            {
+                                                                arm1.IsUrgent = visit.IsUrgent;
+                                                                arm1.TaskUrgentType = urgentType;
+                                                                arm1.IsCanEditUrgentState = isCanEdit;
+
+                                                                //有可能仅仅只分配了一个Subject   未分配  那么
+                                                                if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && task1 != null)
+                                                                {
+                                                                    arm1.TaskAllocationState = TaskAllocationState.Allocated;
+                                                                    arm1.AllocateTime = DateTime.Now;
+                                                                    arm1.DoctorUserId = task1.DoctorUserId;
+                                                                    arm1.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
+                                                                }
+
+                                                            }
+                                                            else
+                                                            {
+                                                                var latestTask = visitGroup.Where(t => t.ArmEnum == Arm.DoubleReadingArm1).OrderByDescending(t => t.CreateTime).First();
+
+                                                                var taskOne = await _visitTaskRepository.AddAsync(new VisitTask()
+                                                                {
+                                                                    TrialId = trialId,
+                                                                    SubjectId = subjectVisit.SubjectId,
+                                                                    IsUrgent = visit.IsUrgent,
+                                                                    TaskUrgentType = urgentType,
+                                                                    IsCanEditUrgentState = isCanEdit,
+                                                                    ArmEnum = Arm.DoubleReadingArm1,//特殊
+                                                                    Code = currentMaxCodeInt + 1,
+                                                                    TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
+                                                                    ReadingCategory = ReadingCategory.Visit,
+
+                                                                    SourceSubjectVisitId = latestTask.SourceSubjectVisitId,
+                                                                    VisitTaskNum = latestTask.VisitTaskNum,
+                                                                    TaskBlindName = visitBlindConfig.BlindFollowUpPrefix + " " + visitNumList.IndexOf(latestTask.VisitTaskNum),
+                                                                    TaskName = latestTask.TaskName,
+
+                                                                    BlindSubjectCode = latestTask.BlindSubjectCode,
+                                                                    BlindTrialSiteCode = latestTask.BlindTrialSiteCode,
+                                                                    IsAnalysisCreate = latestTask.IsAnalysisCreate,
+                                                                    IsSelfAnalysis = latestTask.IsSelfAnalysis,
+
+                                                                    TrialReadingCriterionId = latestTask.TrialReadingCriterionId,
+                                                                    IsNeedClinicalDataSign = latestTask.IsNeedClinicalDataSign,
+                                                                    IsClinicalDataSign = latestTask.IsClinicalDataSign
+                                                                });
+
+                                                                if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && task1 != null)
+                                                                {
+                                                                    taskOne.TaskAllocationState = TaskAllocationState.Allocated;
+                                                                    taskOne.AllocateTime = DateTime.Now;
+                                                                    taskOne.DoctorUserId = task1!.DoctorUserId;
+                                                                    taskOne.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
+                                                                }
+
+
+                                                                currentMaxCodeInt = currentMaxCodeInt + 1;
+
+                                                                _fusionCache.Set<int>(CacheKeys.TrialStudyMaxCode(trialId), currentMaxCodeInt, TimeSpan.FromMinutes(30));
+                                                            }
+
+                                                        }
+
+                                                        //如果后续访视已分配有效 就不用处理
+                                                        if (visitGroup.Any(t => t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.Allocated && t.ArmEnum == Arm.DoubleReadingArm2))
+                                                        {
+                                                            //不做处理
+                                                        }
+                                                        else
+                                                        {
+                                                            var arm2 = visitGroup.FirstOrDefault(t => t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null && t.ArmEnum == Arm.DoubleReadingArm2);
+                                                            if (arm2 != null)
+                                                            {
+                                                                arm2.IsUrgent = visit.IsUrgent;
+                                                                arm2.TaskUrgentType = urgentType;
+                                                                arm2.IsCanEditUrgentState = isCanEdit;
+
+                                                                //有可能仅仅只分配了一个Subject
+                                                                if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2) && task2 != null)
+                                                                {
+                                                                    arm2.TaskAllocationState = TaskAllocationState.Allocated;
+                                                                    arm2.AllocateTime = DateTime.Now;
+                                                                    arm2.DoctorUserId = task2.DoctorUserId;
+                                                                    arm2.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
+                                                                }
+
+                                                            }
+                                                            else
+                                                            {
+                                                                var latestTask = visitGroup.Where(t => t.ArmEnum == Arm.DoubleReadingArm2).OrderByDescending(t => t.CreateTime).First();
+
+                                                                var taskTwo = await _visitTaskRepository.AddAsync(new VisitTask()
+                                                                {
+                                                                    TrialId = trialId,
+                                                                    SubjectId = subjectVisit.SubjectId,
+                                                                    IsUrgent = visit.IsUrgent,
+                                                                    TaskUrgentType = urgentType,
+                                                                    IsCanEditUrgentState = isCanEdit,
+
+                                                                    //CheckPassedTime = subjectVisit.CheckPassedTime,
+                                                                    ArmEnum = Arm.DoubleReadingArm2,//特殊
+                                                                    Code = currentMaxCodeInt + 1,
+                                                                    TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
+                                                                    ReadingCategory = ReadingCategory.Visit,
+
+                                                                    SourceSubjectVisitId = latestTask.SourceSubjectVisitId,
+                                                                    VisitTaskNum = latestTask.VisitTaskNum,
+                                                                    TaskBlindName = visitBlindConfig.BlindFollowUpPrefix + " " + visitNumList.IndexOf(latestTask.VisitTaskNum),
+                                                                    TaskName = latestTask.TaskName,
+
+                                                                    BlindSubjectCode = latestTask.BlindSubjectCode,
+                                                                    BlindTrialSiteCode = latestTask.BlindTrialSiteCode,
+                                                                    IsAnalysisCreate = latestTask.IsAnalysisCreate,
+                                                                    IsSelfAnalysis = latestTask.IsSelfAnalysis,
+
+                                                                    TrialReadingCriterionId = latestTask.TrialReadingCriterionId,
+                                                                    IsNeedClinicalDataSign = latestTask.IsNeedClinicalDataSign,
+                                                                    IsClinicalDataSign = latestTask.IsClinicalDataSign
+                                                                });
+
+                                                                if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2) && task2 != null)
+                                                                {
+                                                                    taskTwo.TaskAllocationState = TaskAllocationState.Allocated;
+                                                                    taskTwo.AllocateTime = DateTime.Now;
+                                                                    taskTwo.DoctorUserId = task2!.DoctorUserId;
+                                                                    taskTwo.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
+                                                                }
+
+                                                                currentMaxCodeInt = currentMaxCodeInt + 1;
+
+                                                                _fusionCache.Set<int>(CacheKeys.TrialStudyMaxCode(trialId), currentMaxCodeInt, TimeSpan.FromMinutes(30));
+                                                            }
+                                                        }
+
                                                     }
 
-                                                }
+                                                    #endregion
 
 
+
+                                                }
+                                                else
+                                                {
+                                                    //无序的时候    生成任务并分配出去
+                                                    if (assignConfigList.Count > 0 && trialReadingCriterionConfig.IsFollowVisitAutoAssign)
+                                                    {
+                                                        var defaultState = trialReadingCriterionConfig.FollowVisitAutoAssignDefaultState == TaskAllocateDefaultState.InitAllocated ? TaskAllocationState.InitAllocated : TaskAllocationState.Allocated;
+
+                                                        if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && task1 != null)
+                                                        {
+                                                            task1.TaskAllocationState = defaultState;
+                                                            //分配给对应Arm的人
+                                                            task1.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm1)!.DoctorUserId;
+                                                            task1.AllocateTime = DateTime.Now;
+
+                                                            task1.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
+                                                        }
+
+                                                        if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2) && task2 != null)
+                                                        {
+                                                            task2.TaskAllocationState = defaultState;
+                                                            task2.DoctorUserId = assignConfigList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm2)!.DoctorUserId;
+                                                            task2.AllocateTime = DateTime.Now;
+                                                            task2.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
+                                                        }
+                                                    }
+
+
+                                                }
+
                                             }
 
 
@@ -1086,7 +1084,7 @@ namespace IRaCIS.Core.Application.Service
 
 
                                                     //该Subject 之前是否有已分配的   如果改变配置  可能会出现  一个Subject 分配的同一个医生 有的在Arm1 有的在Arm2
-                                                    var allocateSubjectArmList = _visitTaskRepository.Where(t => t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.TrialId == trialId && t.DoctorUserId != null && t.ArmEnum != Arm.JudgeArm)
+                                                    var allocateSubjectArmList = _visitTaskRepository.Where(t => t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.TrialId == trialId && t.DoctorUserId != null && t.ArmEnum != Arm.JudgeArm && t.IsAnalysisCreate == false)
                                                         .Select(t => new { t.DoctorUserId, t.ArmEnum }).Distinct().ToList();
 
                                                     //不是初次分配
@@ -1107,7 +1105,7 @@ namespace IRaCIS.Core.Application.Service
                                                             if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
                                                             {
                                                                 //之前有回退到影像上传的访视 那么当前访视一致性核查通过的时候，当前访视生成但是不分配出去(排除失访的)
-                                                                var beforeBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.VisitTaskNum < subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
+                                                                var beforeBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.VisitTaskNum < subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false && t.IsAnalysisCreate == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
 
 
                                                                 if (beforeBackVisitTask == null)
@@ -1132,7 +1130,7 @@ namespace IRaCIS.Core.Application.Service
                                                                     #endregion
 
 
-                                                                    var followBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
+                                                                    var followBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false && t.IsAnalysisCreate == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
 
                                                                     //存在退回访视1  又退回基线 这种情况   生成任务  考虑基线先一致性核查通过，但是访视1还未通过时  生成任务
                                                                     var followVisitTaskList = await _visitTaskRepository
@@ -1411,31 +1409,35 @@ namespace IRaCIS.Core.Application.Service
                         .Where(x => x.ClinicalDataTrialSet.UploadRole == UploadRole.PM || x.FileCount > 0)
                         .Include(t => t.ReadingClinicalDataPDFList).Include(t => t.ClinicalDataTrialSet).ToList();
 
-
+                    //防止多标准重复插入
-                    foreach (var clinicalData in clinicalDataList)
+                    if (!_readingConsistentClinicalDataRepository.Any(t => t.SubjectId == subjectId))
                     {
-                        var consistnentClinicalData = _mapper.Map<ReadingConsistentClinicalData>(clinicalData);
+                        foreach (var clinicalData in clinicalDataList)
-                        var id = NewId.NextSequentialGuid();
-                        consistnentClinicalData.Id = id;
-
-                        if (consistnentClinicalData.ClinicalDataTrialSet.ClinicalUploadType == ClinicalUploadType.PDF)
                         {
-                            consistnentClinicalData.IsSign = false;
+                            var consistnentClinicalData = _mapper.Map<ReadingConsistentClinicalData>(clinicalData);
-                            consistnentClinicalData.IsBlind = false;
+                            var id = NewId.NextSequentialGuid();
-                            consistnentClinicalData.IsComplete = true;
+                            consistnentClinicalData.Id = id;
-                            consistnentClinicalData.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded;
+
-                            consistnentClinicalData.ClinicalDataTrialSet = null;
+                            if (consistnentClinicalData.ClinicalDataTrialSet.ClinicalUploadType == ClinicalUploadType.PDF)
+                            {
+                                consistnentClinicalData.IsSign = false;
+                                consistnentClinicalData.IsBlind = false;
+                                consistnentClinicalData.IsComplete = true;
+                                consistnentClinicalData.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded;
+                                consistnentClinicalData.ClinicalDataTrialSet = null;
+                            }
+
+                            var consistanClinicalDataPdfList = _mapper.Map<List<ReadingConsistentClinicalDataPDF>>(clinicalData.ReadingClinicalDataPDFList);
+
+                            consistanClinicalDataPdfList.ForEach(t => { t.ReadingConsistentClinicalDataId = id; t.Id = Guid.Empty; });
+
+                            consistnentClinicalData.ReadingClinicalDataPDFList = consistanClinicalDataPdfList;
+
+                            await _readingConsistentClinicalDataRepository.AddAsync(consistnentClinicalData);
                         }
-
-                        var consistanClinicalDataPdfList = _mapper.Map<List<ReadingConsistentClinicalDataPDF>>(clinicalData.ReadingClinicalDataPDFList);
-
-                        consistanClinicalDataPdfList.ForEach(t => { t.ReadingConsistentClinicalDataId = id; t.Id = Guid.Empty; });
-
-                        consistnentClinicalData.ReadingClinicalDataPDFList = consistanClinicalDataPdfList;
-
-                        await _readingConsistentClinicalDataRepository.AddAsync(consistnentClinicalData);
                     }
 
+
                     foreach (var task in generateTaskCommand.GenerataConsistentTaskList)
                     {
 

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

@@ -16,6 +16,7 @@ using IRaCIS.Core.Infrastructure;
 using MassTransit;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 using System.Linq.Dynamic.Core;
 using Subject = IRaCIS.Core.Domain.Models.Subject;
 
@@ -45,7 +46,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     IRepository<SubjectCanceDoctor> _subjectCanceDoctorRepository,
     IRepository<ReadingTaskQuestionMark> _readingTaskQuestionMarkRepository,
     IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository,
-    IRepository<ReadingCustomTag> _readingCustomTagRepository,
+    //IRepository<ReadingCustomTag> _readingCustomTagRepository,
     IRepository<TaskInfluence> _taskInfluenceRepository,
     IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository,
     ILogger<VisitTaskService> _logger,
@@ -74,7 +75,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         return await _visitTaskRepository.SaveChangesAsync();
     }
 
-    public async Task<List<TrialReadingCriterionDto>> GetTrialCriterionList(Guid trialId, bool isHaveSigned = true, bool? isAutoCreate = null)
+    public async Task<List<TrialReadingCriterionDto>> GetTrialCriterionList(Guid trialId, bool isHaveSigned = true, bool? isAutoCreate = null, bool? isRandom = null)
     {
         var list = await _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsConfirm)
 
@@ -107,7 +108,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
 
         return list.AsQueryable().WhereIf(isHaveSigned == true, t => t.ReadingInfoSignTime != null)
-             .WhereIf(isAutoCreate == false, t => t.IsAutoCreate == isAutoCreate).ToList();
+             .WhereIf(isAutoCreate == false, t => t.IsAutoCreate == isAutoCreate)
+              .WhereIf(isRandom == true, t => t.IsReadingTaskViewInOrder == ReadingOrder.Random).ToList();
     }
 
 
@@ -761,6 +763,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
            .WhereIf(inQuery.EndAllocateDate != null, t => t.AllocateTime < inQuery.EndAllocateDate)
            .WhereIf(inQuery.BeginSignTime != null, t => t.SignTime > inQuery.BeginSignTime)
            .WhereIf(inQuery.EndSignTime != null, t => t.SignTime < inQuery.EndSignTime)
+            .WhereIf(inQuery.RandomOrder != null, t => t.RandomOrder == inQuery.RandomOrder)
+             .WhereIf(inQuery.IsRandomOrderList == true, t => (t.ReadingTaskState == ReadingTaskState.WaitReading || t.ReadingTaskState == ReadingTaskState.Reading) && t.TaskAllocationState == TaskAllocationState.Allocated)
            .ProjectTo<ReadingTaskView>(_mapper.ConfigurationProvider);
 
         var defalutSortArray = new string[] { nameof(ReadingTaskView.IsUrgent) + " desc", nameof(ReadingTaskView.SubjectCode), nameof(ReadingTaskView.VisitTaskNum) };
@@ -961,7 +965,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         //随机阅片
         else
         {
-            var taskQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.UserRoleId && x.TaskState == TaskState.Effect && x.TrialReadingCriterionId == trialReadingCriterionId)
+            var taskQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.UserRoleId && x.TaskState == TaskState.Effect && x.TrialReadingCriterionId == trialReadingCriterionId && x.Subject.IsSubjectQuit == false)
                    .Where(x => !x.Subject.IsDeleted).Where(x => (x.IsNeedClinicalDataSign && x.IsClinicalDataSign) || !x.IsNeedClinicalDataSign);
 
             iRUnReadOut = new IRUnReadOutDto()
@@ -1005,14 +1009,18 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
         if (critrion.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
         {
-            var visitQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.UserRoleId && x.TaskState == TaskState.Effect)
+            var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr }).FirstOrDefault();
+
+            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)
 
            .WhereIf(inQuery.SubjectId != null, x => x.SubjectId == inQuery.SubjectId)
             //前序 不存在  未生成任务的访视
             .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.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum >= sv.VisitNum))
+           .Where(t => !t.Subject.SubjectVisitList.Where(t => extralConfig.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)
@@ -1035,14 +1043,15 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                 UnReadTaskCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned).Count(),
 
                 //未读 里可读任务量   
-                UnReadCanReadTaskCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned && y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)
+                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)
                 //不能对包含聚合或子查询的表达式执行聚合函数
                 //&& !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(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
+                .Where(t => extralConfig.IsOpenLostVistRead ? true : t.IsFrontTaskNeedSignButNotSign == false)
+                .Where(y => /*y.IsFrontTaskNeedSignButNotSign == false &&*/ (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
                 .OrderBy(x => x.VisitTaskNum)
                 .Select(u => new IRUnreadTaskView()
                 {
@@ -1055,6 +1064,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                     ReadingCategory = u.ReadingCategory,
                     IsAnalysisCreate = u.IsAnalysisCreate,
                     ArmEnum = u.ArmEnum,
+                    IsExistUnprocessedFeedback = u.UserFeedBackList.Any(t => t.State == 0),
                     TrialReadingCriterionId = u.TrialReadingCriterionId,
                     IsNeedClinicalDataSign = u.IsNeedClinicalDataSign,
                     IsClinicalDataSign = u.IsClinicalDataSign,
@@ -1085,6 +1095,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                     ReadingCategory = u.ReadingCategory,
                     IsAnalysisCreate = u.IsAnalysisCreate,
                     ArmEnum = u.ArmEnum,
+                    IsExistUnprocessedFeedback = u.UserFeedBackList.Any(t => t.State == 0),
                     TrialReadingCriterionId = u.TrialReadingCriterionId,
                     IsNeedClinicalDataSign = u.IsNeedClinicalDataSign,
                     IsClinicalDataSign = u.IsClinicalDataSign,
@@ -1194,6 +1205,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                     ReadingCategory = u.ReadingCategory,
                     IsAnalysisCreate = u.IsAnalysisCreate,
                     ArmEnum = u.ArmEnum,
+                    IsExistUnprocessedFeedback = u.UserFeedBackList.Any(t => t.State == 0),
                     TrialReadingCriterionId = u.TrialReadingCriterionId,
                     IsNeedClinicalDataSign = u.IsNeedClinicalDataSign,
                     IsClinicalDataSign = u.IsClinicalDataSign,
@@ -1392,6 +1404,12 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
                 task.ReReadingApplyState = ReReadingApplyState.TrialGroupHaveApplyed;
 
+                if (!isSPMjoin)
+                {
+                    task.ReReadingApplyState = ReReadingApplyState.Agree;
+                    task.PMBackReason = applyReReadingCommand.RequestReReadingReason;
+                }
+
 
             }
 
@@ -1603,13 +1621,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             var origenalTask = (await _visitTaskRepository.Where(t => item.OriginalReReadingTaskId == t.Id).FirstOrDefaultAsync()).IfNullThrowException();
 
 
-            if ((origenalTask.TaskState != TaskState.Effect && origenalTask.TaskState != TaskState.Freeze))
-            {
-                await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new VisitTaskReReading() { RequestReReadingConfirmUserId = _userInfo.UserRoleId, RequestReReadingResultEnum = RequestReReadingResult.Invalid });
 
-                //---当前申请重阅任务的状态，已被其他任务重阅已影响，不允许对该状态下的任务进行重阅同意与否操作
-                throw new BusinessValidationFailedException(_localizer["VisitTask_ReapplyStatusConflict"]);
-            }
 
             //更新申请信息
             var visitTaskReReadingAppply = await _visitTaskReReadingRepository.FirstOrDefaultAsync(t => t.Id == item.Id);
@@ -1622,6 +1634,13 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
             if (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree)
             {
+                if ((origenalTask.TaskState != TaskState.Effect && origenalTask.TaskState != TaskState.Freeze))
+                {
+                    await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new VisitTaskReReading() { RequestReReadingConfirmUserId = _userInfo.UserRoleId, RequestReReadingResultEnum = RequestReReadingResult.Invalid });
+
+                    //---当前申请重阅任务的状态，已被其他任务重阅已影响，不允许对该状态下的任务进行重阅同意与否操作
+                    throw new BusinessValidationFailedException(_localizer["VisitTask_ReapplyStatusConflict"]);
+                }
 
                 await AgreeReReading(origenalTask.Id, visitTaskReReadingAppply.RequestReReadingType, visitTaskReReadingAppply);
 
@@ -1698,12 +1717,12 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment)
         {
             // PM申请 SPM / CPM审批
-            if (requestReReadingType == RequestReReadingType.TrialGroupApply)
+            //if (requestReReadingType == RequestReReadingType.TrialGroupApply)
-            {
+            //{
-                filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
+            //    filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
-            }
+            //}
             //IR 申请  PM审批
-            else
+            if (requestReReadingType != RequestReReadingType.TrialGroupApply)
             {
 
                 // 1.1 基线任务影响BM任务
@@ -1722,8 +1741,11 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         }
         else
         {
-            //默认影响的都是该标准的任务
+            if (requestReReadingType != RequestReReadingType.TrialGroupApply)
-            filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId);
+            {
+                //默认影响的都是该标准的任务
+                filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId);
+            }
         }
 
         //PM申请   SPM / CPM审批   回退访视，因此这里不生成访视任务  影响多个标准的任务
@@ -2194,15 +2216,16 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     {
 
         //自定义
-        var readingCustomTagList = _readingCustomTagRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
+        //var readingCustomTagList = _readingCustomTagRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
 
-        foreach (var item in readingCustomTagList)
+        //foreach (var item in readingCustomTagList)
-        {
+        //{
-            item.Id = Guid.Empty;
+        //    item.Id = Guid.Empty;
-            item.VisitTaskId = newTask.Id;
+        //    item.VisitTaskId = newTask.Id;
-        }
+        //    item.MeasureData = item.MeasureData.Replace(origenalTask.Id.ToString(), newTask.Id.ToString());
+        //}
 
-        _ = _readingCustomTagRepository.AddRangeAsync(readingCustomTagList).Result;
+        //_ = _readingCustomTagRepository.AddRangeAsync(readingCustomTagList).Result;
 
 
 
@@ -2213,6 +2236,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         {
             item.Id = Guid.Empty;
             item.VisitTaskId = newTask.Id;
+
         }
         _ = _readingTaskQuestionAnswerRepository.AddRangeAsync(readingTaskQuestionAnswerList).Result;
 
@@ -2224,6 +2248,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             item.Id = Guid.Empty;
             item.FristAddTaskId = item.VisitTaskId == item.FristAddTaskId ? newTask.Id : item.FristAddTaskId;
             item.VisitTaskId = newTask.Id;
+
+            item.MeasureData = item.MeasureData.Replace(origenalTask.Id.ToString(), newTask.Id.ToString());
         }
 
 
@@ -2237,7 +2263,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             var originalVisitTaskId = item.VisitTaskId;
             var originalFristAddTaskId = item.FristAddTaskId;
 
-            var newRowId= NewId.NextSequentialGuid();
+            var newRowId = NewId.NextSequentialGuid();
 
             foreach (var mark in readingTaskQuestionMarkList)
             {
@@ -2250,6 +2276,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             //默认值是当前任务添加的
             item.FristAddTaskId = originalVisitTaskId == originalFristAddTaskId ? newTask.Id : item.FristAddTaskId;
 
+            item.MeasureData = item.MeasureData.Replace(origenalTask.Id.ToString(), newTask.Id.ToString());
 
             foreach (var item2 in item.LesionAnswerList)
             {
@@ -2273,11 +2300,11 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     /// PM  设置任务 退回
     /// </summary>
     /// <returns></returns>
-    [HttpPut("{trialId:guid}/{taskId:guid}")]
+    [HttpPut("{trialId:guid}/{taskId:guid}/{pmBackReason}")]
     [UnitOfWork]
     [TrialGlobalLimit("AfterStopCannNotOpt")]
 
-    public async Task<IResponseOutput> PMSetTaskBack(Guid trialId, Guid taskId)
+    public async Task<IResponseOutput> PMSetTaskBack(Guid trialId, Guid taskId, string pmBackReason)
     {
 
         //var trialConfig = (await _trialRepository.Where(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.IsReadingTaskViewInOrder, t.ReadingType }).FirstOrDefaultAsync()).IfNullThrowException();
@@ -2338,7 +2365,6 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
             #region 有序 无序公用流程
 
-
             //执行类似一致性核查回退流程  回退访视到影像上传流程
             await VisitBackAsync(task.SourceSubjectVisitId);
 
@@ -2455,6 +2481,9 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
             }
 
+            var trackTask = await _visitTaskRepository.FindAsync(task.Id);
+            trackTask.PMBackReason = pmBackReason;
+
         }
         else
         {
@@ -2567,7 +2596,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         sv.CurrentActionUserId = null;
         sv.PreliminaryAuditUserId = null;
         sv.ReviewAuditUserId = null;
-
+        sv.SecondReviewState = SecondReviewState.None;
 
         if (sv.IsBaseLine)
         {
@@ -2606,7 +2635,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
     private bool IsSpmOrCPM()
     {
-        return _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM ;
+        return _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM;
     }
 
     /// <summary>
@@ -2617,7 +2646,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     /// <param name="applyId"> 申请记录的Id</param>
     /// <returns></returns>
     [HttpGet("{taskId:guid}/{isReReading:bool}")]
-    public async Task<(List<InfluenceTaskInfo>, object)> GetReReadingOrBackInfluenceTaskList(Guid taskId, bool isReReading, Guid? applyId)
+    public async Task<IResponseOutput<List<InfluenceTaskInfo>>> GetReReadingOrBackInfluenceTaskList(Guid taskId, bool isReReading, Guid? applyId)
     {
         var isIRAppyTaskInfluenced = false;
 
@@ -2635,13 +2664,16 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         //IR 申请1.1 基线重阅，影响附加评估所有的任务
         var isIR1Point1AdditionalAssessmentBaseline = false;
 
+        //是IR 申请 PM 审批流程
+        var isIRApplyPMApprovalProcess = (IsPMOrAPm() && applyId != null && await _visitTaskReReadingRepository.AnyAsync(t => t.Id == applyId && t.CreateUserRole.UserTypeEnum == UserTypeEnum.IndependentReviewer))
+            || (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer && applyId == null);
+
         //附加评估  IR  和PM 看到的影响列表不一样
         if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment)
         {
 
             //  IR 申请  PM 同意  
-            if (((IsPMOrAPm() && applyId != null && await _visitTaskReReadingRepository.AnyAsync(t => t.Id == applyId && t.CreateUserRole.UserTypeEnum == UserTypeEnum.IndependentReviewer))
+            if (isIRApplyPMApprovalProcess)
-                || (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer && applyId == null)))
             {
 
                 // 1.1 基线任务影响BM任务
@@ -2660,17 +2692,20 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                 }
 
             }
-            //（1、PM回退，PM申请重阅，SPM同意回退）
+            //（1、PM回退，PM申请重阅，SPM同意回退）--20250804-感觉这里没用，不用限制
-            else
+            //else
-            {
+            //{
-                filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
+            //    filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
 
-            }
+            //}
         }
         else
         {
-            //默认影响的都是该标准的任务
+            if (isReReading == true && isIRApplyPMApprovalProcess)
-            filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId);
+            {
+                //默认影响的都是该标准的任务
+                filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId);
+            }
         }
 
 
@@ -2911,8 +2946,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         }
         #endregion
 
-
+        //IsIRAppyTaskInfluenced 列表中存在IR已申请重阅的任务！
-        return (list, new { IsIRAppyTaskInfluenced = isIRAppyTaskInfluenced });
+        return ResponseOutput.Ok(list, new { IsIRAppyTaskInfluenced = isIRAppyTaskInfluenced });
 
     }
 
@@ -2931,6 +2966,88 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     }
 
 
+    #region 完全随机设置序号
+    [HttpPost]
+    [UnitOfWork]
+    [TrialGlobalLimit("AfterStopCannNotOpt")]
+    public async Task<IResponseOutput> SetRandomTaskOrder(SetRandomTaskOrderCommand inCommand)
+    {
+
+        if (inCommand.IsAutoSet)
+        {
+            //找到所有的已分配的，未阅片的，生效的 非一致性分析
+
+            var needRandomOrderList = _visitTaskRepository.Where(t => t.TrialId == inCommand.TrialId && t.TrialReadingCriterionId == inCommand.TrialReadingCriterionId && t.DoctorUserId == inCommand.DoctorUserId)
+                  .Where(t => t.TaskAllocationState == TaskAllocationState.Allocated && t.ReadingTaskState == ReadingTaskState.WaitReading && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze))
+                  .Select(t => t.Id).ToList();
+
+
+            //var haveSignOrderList = _visitTaskRepository.Where(t => t.TrialId == inCommand.TrialId && t.TrialReadingCriterionId == inCommand.TrialReadingCriterionId && t.DoctorUserId == inCommand.DoctorUserId)
+            //    .Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned && t.SignTime != null && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze))
+            //    .Select(t => t.RandomOrder).ToList();
+
+            //已阅，阅片中任务的序号
+            await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == inCommand.TrialId && t.TrialReadingCriterionId == inCommand.TrialReadingCriterionId
+            && t.DoctorUserId == inCommand.DoctorUserId && t.ReadingTaskState != ReadingTaskState.WaitReading, u => new VisitTask() { RandomOrder = null });
+
+            //随机赋值编号  比如要处理5个任务，实例化一个包含1-5的数组，每次随机取出一个
+            List<int> availableNumbers = Enumerable.Range(1, needRandomOrderList.Count).ToList();
+            Random rng = new Random();
+            foreach (var id in needRandomOrderList)
+            {
+                int randomIndex = rng.Next(availableNumbers.Count);
+
+                var num = availableNumbers[randomIndex];
+
+                var order = 11 + 5 * (num - 1);
+
+                await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.Id == id, t => new VisitTask() { RandomOrder = order });
+
+                availableNumbers.RemoveAt(randomIndex);
+            }
+
+        }
+        else
+        {
+            foreach (var item in inCommand.SetList)
+            {
+                var task = await _visitTaskRepository.Where(t => t.Id == item.Id).Select(t => new { t.RandomOrder, t.ReadingTaskState, t.TaskAllocationState, t.DoctorUserId }).FirstNotNullAsync();
+
+                if (task.ReadingTaskState != ReadingTaskState.WaitReading || task.DoctorUserId != inCommand.DoctorUserId
+                    || task.TaskAllocationState != TaskAllocationState.Allocated)
+                {
+                    //"任务不符合设置阅片序号条件"
+                    return ResponseOutput.NotOk(_localizer["VisitTask_NotRandomOrderTask"]);
+                }
+
+                //设置交换序号的任务，可能不符合条件
+
+                //没有序号，直接设置
+                if (task.RandomOrder == null)
+                {
+                    await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, t => new VisitTask() { RandomOrder = item.RandomOrder });
+                }
+                else
+                {
+                    if (!_visitTaskRepository.Any(t => t.TrialId == inCommand.TrialId && t.TrialReadingCriterionId == inCommand.TrialReadingCriterionId && t.DoctorUserId == inCommand.DoctorUserId
+                       && t.TaskAllocationState == TaskAllocationState.Allocated && t.ReadingTaskState == ReadingTaskState.WaitReading && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze)
+                       && t.RandomOrder == item.RandomOrder))
+                    {
+                        await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, t => new VisitTask() { RandomOrder = item.RandomOrder });
+                    }
+                    else
+                    {
+                        //"序号已被占用！"
+                        return ResponseOutput.NotOk(_localizer["VisitTask_RandomOrderUserd"]);
+                    }
+                }
+            }
+        }
+
+        return ResponseOutput.Ok();
+    }
+
+    #endregion
     #region 暂时废弃
 
 

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

@@ -2,6 +2,7 @@
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infra.EFCore.Migrations;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -117,7 +118,9 @@ namespace IRaCIS.Core.Application.Service
                      .ForMember(o => o.IsReadingShowPreviousResults, t => t.MapFrom(u => u.TrialReadingCriterion.IsReadingShowPreviousResults))
                       .ForMember(o => o.DigitPlaces, t => t.MapFrom(u => u.TrialReadingCriterion.DigitPlaces))
                        .ForMember(o => o.IseCRFShowInDicomReading, t => t.MapFrom(u => u.TrialReadingCriterion.IseCRFShowInDicomReading))
-                       .ForMember(o => o.CriterionType, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionType));
+                       .ForMember(o => o.CriterionType, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionType))
+                        .ForMember(o => o.IsSubjectQuit, t => t.MapFrom(u => u.Subject.IsSubjectQuit))
+                       ;
 
             CreateMap<VisitTask, VisitTaskView>().IncludeBase<VisitTask, VisitTaskViewBasic>()
 
@@ -160,8 +163,10 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<VisitTaskReReading, ReReadingTaskView>()
+                 .ForMember(o => o.ApplicantName, t => t.MapFrom(u => u.CreateUserRole.IdentityUser.FullName))
                  .ForMember(o => o.ReReadingNewTaskCode, t => t.MapFrom(u => u.NewReReadingTask.TaskCode))
                  .ForMember(o => o.OriginalReReadingTask, t => t.MapFrom(u => u.OriginalReReadingTask))
+                  //.ForMember(o => o.IsSubjectQuit, t => t.MapFrom(u => u.OriginalReReadingTask.Subject.IsSubjectQuit))
                  ;
 
 
@@ -221,6 +226,7 @@ namespace IRaCIS.Core.Application.Service
                   .ForMember(o => o.IseCRFShowInDicomReading, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.IseCRFShowInDicomReading))
                   .ForMember(o => o.CriterionType, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.CriterionType))
 
+                   .ForMember(o => o.IsSubjectQuit, t => t.MapFrom(u => u.VisitTask.Subject.IsSubjectQuit))
                  .ForMember(o => o.Id, t => t.MapFrom(u => u.Id))
                  .ForMember(o => o.MedicalNo, t => t.MapFrom(u => u.VisitTask.Subject.MedicalNo))
                  .ForMember(o => o.DoctorUser, t => t.MapFrom(u => u.VisitTask.DoctorUser))

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

@@ -36,6 +36,14 @@ namespace IRaCIS.Core.Application.Service
             return await commonDocumentQueryable.ToPagedListAsync(queryCommonDocument);
         }
 
+        [HttpGet]
+        public async Task<CommonDocument> GetCommonDocument(string code)
+        {
+            var find = await _commonDocumentRepository.Where(t => t.Code == code).FirstOrDefaultAsync();
+
+            return find;
+        }
+        
 
         public async Task<IResponseOutput> AddOrUpdateCommonDocument(CommonDocumentAddOrEdit addOrEditCommonDocument)
         {

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

@@ -39,6 +39,10 @@ namespace IRaCIS.Application.Contracts
         public string ValueCN { get; set; } = string.Empty;
     }
 
+    public class ChildInQuery:SortInput
+    {
+        public Guid ParentId { get; set; }
+    }
 
     public class AddOrEditBasicDic
     {

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

@@ -96,9 +96,6 @@ namespace IRaCIS.Core.Application.Contracts
         public bool IsDeleted { get; set; }
 
 
-
-        public CriterionType? CriterionTypeEnum { get; set; }
-
         /// <summary> 业务模块 /// </summary>
         public int BusinessModuleEnum { get; set; }
 
@@ -140,6 +137,24 @@ namespace IRaCIS.Core.Application.Contracts
 
         public int? EmailDelaySeconds { get; set; }
 
+
+
+        [Comment("邮件配置的多个标准")]
+        public List<CriterionType>? CriterionTypeList { get; set; }
+
+        //public CriterionType? CriterionTypeEnum { get; set; }
+
+    }
+
+
+    public class BatchUpdateEmailTopicCommand
+    {
+        [NotDefault]
+        public Guid Id { get; set; }
+
+        public string EmailTopic { get; set; } = string.Empty;
+
+        public string EmailTopicCN { get; set; } = string.Empty;
     }
 
 

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

@@ -3,6 +3,7 @@
 //	   生成时间 2022-03-28 16:43:52 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
+using DocumentFormat.OpenXml.Wordprocessing;
 using IRaCIS.Core.Infra.EFCore.Common;
 using System.ComponentModel.DataAnnotations;
 
@@ -63,6 +64,26 @@ namespace IRaCIS.Core.Application.ViewModel
 
     }
 
+
+    public class ModuleTypeData
+    {
+
+        public bool IsShow { get; set; }
+
+        public Guid Id { get; set; }
+        public Guid? ParentId { get; set; }
+        public Guid DictionaryId { get; set; }
+
+        public int ShowOrder { get; set; }
+        public string DictionaryValue { get; set; }
+      
+    }
+
+    public class GetModuleTypeListInDto
+    {
+        public Guid TrialId { get; set; }
+    }
+
     /// <summary>
     /// 复制其他对象到当前对象
     /// </summary>
@@ -148,6 +169,11 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid UpdateUserId { get; set; }
         public string Code { get; set; } = string.Empty;
 
+        /// <summary>
+        /// 是否默认选择
+        /// </summary>
+        public bool IsDefaultChoice { get; set; } = false;
+
         /// <summary>
         /// 字段的英文值
         /// </summary>
@@ -303,7 +329,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public bool IsConfig { get; set; }
         public string DictionaryKey { get; set; } = string.Empty;
 
-
+        public bool IsBeforeModifyView { get; set; } = true;
 
 
         //byzhouahng

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

@@ -96,6 +96,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public int State { get; set; }
 
+        public Guid? PublishLogId { get; set; }
+
         public List<BatchAddInternationalizationDto> AddList { get; set; }
     }
 
@@ -112,6 +114,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public int? State { get; set; }
 
+        public int InternationalizationType { get; set; }
+
     }
 
     public class BatchAddInternationalizationDto : BatchInternationalizationDto
@@ -121,6 +125,9 @@ namespace IRaCIS.Core.Application.ViewModel
 
     public class InternationalizationSimpleDto : BatchInternationalizationDto
     {
+        public string Version { get; set; }
+
+        public DateTime CreateTime { get; set; }
 
     }
 

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

@@ -182,13 +182,12 @@ namespace IRaCIS.Core.Application.Service
         /// <summary>
         /// 获取子项数组
         /// </summary>
-        /// <param name="parentId"></param>
         /// <returns></returns>
-        [HttpGet("{parentId:guid}")]
+        [HttpPost]
-        public async Task<List<BasicDicView>> GetChildList(Guid parentId)
+        public async Task<List<BasicDicView>> GetChildList(ChildInQuery inQuery)
         {
-            return await _dicRepository.Where(t => t.ParentId == parentId)
+            return await _dicRepository.Where(t => t.ParentId == inQuery.ParentId)
-                .OrderBy(t => t.ShowOrder).ProjectTo<BasicDicView>(_mapper.ConfigurationProvider).ToListAsync();
+                .ProjectTo<BasicDicView>(_mapper.ConfigurationProvider).SortToListAsync(inQuery);
         }
 
 

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

@@ -4,8 +4,10 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
+using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Mvc;
+using NPOI.SS.Formula.Functions;
 using System.Text.RegularExpressions;
 
 namespace IRaCIS.Core.Application.Contracts
@@ -26,7 +28,7 @@ namespace IRaCIS.Core.Application.Contracts
             .WhereIf(inQuery.SystemLevel != null, t => t.SystemLevel == inQuery.SystemLevel)
             .WhereIf(inQuery.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == inQuery.IsDistinguishCriteria)
              .WhereIf(inQuery.BusinessLevelEnum != null, t => t.BusinessLevelEnum == inQuery.BusinessLevelEnum)
-            .WhereIf(inQuery.CriterionTypeEnum != null, t => t.CriterionTypeEnum == inQuery.CriterionTypeEnum)
+            .WhereIf(inQuery.CriterionTypeEnum != null, t => t.CriterionTypeList.Any(t=>t==inQuery.CriterionTypeEnum))
              .WhereIf(inQuery.BusinessModuleEnum != null, t => t.BusinessModuleEnum == inQuery.BusinessModuleEnum)
             .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
             .WhereIf(inQuery.IsReturnRequired != null, t => t.IsReturnRequired == inQuery.IsReturnRequired)
@@ -39,14 +41,83 @@ namespace IRaCIS.Core.Application.Contracts
             return await emailNoticeConfigQueryable.ToPagedListAsync(inQuery);
         }
 
+        /// <summary>
+        /// 批量更新邮件主题中英文
+        /// </summary>
+        /// <param name="inCommandList"></param>
+        /// <returns></returns>
+        public async Task<IResponseOutput> BatchUpdateEmail(List<BatchUpdateEmailTopicCommand> inCommandList)
+        {
+            var findIdList = inCommandList.Select(x => x.Id).ToList();
+
+            var regex = new Regex(@"\{\s*\d+\s*\}");
+
+            foreach (var inCommand in inCommandList)
+            {
+                if (regex.Matches($"{inCommand.EmailTopic}{inCommand.EmailTopicCN}")
+                              .Any(t => t.Value.Contains(" ")))
+                {
+                    //邮件模板占位符不允许有空格,请核查占位符的地方
+                    return ResponseOutput.NotOk(I18n.T("EmailNoticeConfig_ContainEmpty"));
+                }
+            }
+
+            var list = _emailNoticeConfigrepository.Where(t => findIdList.Contains(t.Id), true).ToList();
+
+            foreach (var item in list)
+            {
+                var exist = inCommandList.FirstOrDefault(t => t.Id == item.Id);
+                if (exist != null)
+                {
+                    item.EmailTopic = exist.EmailTopic;
+                    item.EmailTopicCN = exist.EmailTopicCN;
+                }
+            }
+
+            await _emailNoticeConfigrepository.SaveChangesAsync();
+
+
+            return ResponseOutput.Ok();
+        }
 
         public async Task<IResponseOutput> AddOrUpdateEmailNoticeConfig(EmailNoticeConfigAddOrEdit addOrEditEmailNoticeConfig)
         {
-            var verifyExp1 = new EntityVerifyExp<EmailNoticeConfig>()
+            //var verifyExp1 = new EntityVerifyExp<EmailNoticeConfig>()
-            {
+            //{
-                VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.CriterionTypeEnum== addOrEditEmailNoticeConfig.CriterionTypeEnum,
+            //    VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.CriterionTypeEnum == addOrEditEmailNoticeConfig.CriterionTypeEnum,
 
-                VerifyMsg = _localizer["EmailNoticeConfig_RepeatEmailScenario"]
+            //    VerifyMsg = _localizer["EmailNoticeConfig_RepeatEmailScenario"]
+
+            //};
+
+            var criterionList = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.IsEnable == true)
+                .Where(t => t.CriterionTypeList != null)
+                .WhereIf(addOrEditEmailNoticeConfig.Id != null, t => t.Id != addOrEditEmailNoticeConfig.Id)
+                .Select(t => t.CriterionTypeList).ToList();//不能使用selectMany  会当成关联对象，不能当成字符串
+
+
+            if (addOrEditEmailNoticeConfig.CriterionTypeList != null)
+            {
+                foreach (var item in addOrEditEmailNoticeConfig.CriterionTypeList)
+                {
+                    foreach (var itemList in criterionList)
+                    {
+                        if (itemList.Any(t => t == item))
+                        {
+                            return ResponseOutput.NotOk(_localizer["EmailNoticeConfig_RepeatEmailScenario"]);
+                        }
+                    }
+
+                }
+            }
+
+
+
+            var verifyExp2 = new EntityVerifyExp<EmailNoticeConfig>()
+            {
+                VerifyExp = t => t.Code == addOrEditEmailNoticeConfig.Code && t.IsDistinguishCriteria == addOrEditEmailNoticeConfig.IsDistinguishCriteria && t.SystemLevel == addOrEditEmailNoticeConfig.SystemLevel,
+
+                VerifyMsg = _localizer["EmailNoticeConfig_RepeatCode"]
 
             };
 
@@ -61,10 +132,14 @@ namespace IRaCIS.Core.Application.Contracts
             }
 
 
+
+
+            var entity = new EmailNoticeConfig() { };
+
             if (addOrEditEmailNoticeConfig.Id == null)
             {
 
-                var entity = _mapper.Map<EmailNoticeConfig>(addOrEditEmailNoticeConfig);
+                entity = _mapper.Map<EmailNoticeConfig>(addOrEditEmailNoticeConfig);
 
 
                 foreach (var item in addOrEditEmailNoticeConfig.ToUserTypeList)
@@ -80,9 +155,9 @@ namespace IRaCIS.Core.Application.Contracts
                 }
 
 
-                await _emailNoticeConfigrepository.AddAsync(entity, true, verifyExp1);
+                await _emailNoticeConfigrepository.AddAsync(entity, true, verifyExp2);
+
 
-                return ResponseOutput.Ok(entity.Id.ToString());
             }
             else
             {
@@ -103,14 +178,32 @@ namespace IRaCIS.Core.Application.Contracts
                 }
 
 
-                var entity = await _emailNoticeConfigrepository.UpdateFromDTOAsync(addOrEditEmailNoticeConfig, true, false, verifyExp1);
+                entity = await _emailNoticeConfigrepository.UpdateFromDTOAsync(addOrEditEmailNoticeConfig, true, false, verifyExp2);
+
 
-                return ResponseOutput.Ok(entity.Id.ToString());
 
 
             }
 
 
+            if (addOrEditEmailNoticeConfig.EmailCron != string.Empty)
+            {
+                var jobId = $"{entity.Id}_({addOrEditEmailNoticeConfig.BusinessScenarioEnum})";
+
+                HangfireJobHelper.RemoveCronJob(jobId);
+
+                //有的job 可能编辑控制直接不发，需要移除已存在的
+                if (entity.IsAutoSend && entity.IsEnable)
+                {
+                    HangfireJobHelper.AddOrUpdateTimingCronJob(jobId, addOrEditEmailNoticeConfig.BusinessScenarioEnum, addOrEditEmailNoticeConfig.EmailCron);
+                }
+
+            }
+
+
+            return ResponseOutput.Ok(entity.Id.ToString());
+
+
         }
 
 

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

@@ -94,7 +94,7 @@ namespace IRaCIS.Core.Application.Service
     #region DTO
     public class DoctorDownloadInfo
     {
-        public Guid Id { get; set; }
+        public Guid? Id { get; set; }
         public string Name { get; set; }
         public string ReviewerCode { get; set; }
 
@@ -111,7 +111,7 @@ namespace IRaCIS.Core.Application.Service
     {
         public int Language { get; set; }
 
-        public List<Guid> DoctorIdList { get; set; }
+        public List<Guid?> DoctorIdList { get; set; }
     }
 
     public class GetDoctoreAttachPathCommand

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

@@ -31,5 +31,7 @@ namespace IRaCIS.Application.Interfaces
 
         Task<Dictionary<string, List<BasicDicSelectCopy>>> GetBasicDataSelect(string[] searchArray);
 
+        Task<List<BasicDicSelect>> GetBasicDataSelect(string searchKey);
+
     }
 }

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

@@ -45,6 +45,11 @@ namespace IRaCIS.Core.Application.Service
                     ValueCN = t.ValueCN,
                     FrontType = t.FrontType,
                     Description = t.Description,
+                    Module = t.Module,
+                    State = t.State,
+                    Version = t.PublishLog.Version,
+                    CreateTime = t.CreateTime,
+                    InternationalizationType = t.InternationalizationType
                 }).ToListAsync();
 
                 await _fusionCache.SetAsync<List<InternationalizationSimpleDto>>(CacheKeys.FrontInternational, list, TimeSpan.FromDays(1));
@@ -55,7 +60,7 @@ namespace IRaCIS.Core.Application.Service
         }
 
         /// <summary>
-        /// 前端批量提交，后端判断不存在就添加，存在就更新
+        /// 前端批量提交，后端查询判断不存在就添加，存在就更新   （这里提交接口也能提交后端的标识，对后端标识进行更新）
         /// </summary>
         /// <returns></returns>
         [AllowAnonymous]
@@ -65,7 +70,7 @@ namespace IRaCIS.Core.Application.Service
 
             foreach (var item in batchList)
             {
-                var find = await _internationalizationRepository.FirstOrDefaultAsync(t => t.Code == item.Code && t.Description == item.Description && t.InternationalizationType == 0);
+                var find = await _internationalizationRepository.FirstOrDefaultAsync(t => t.Code == item.Code && t.InternationalizationType == item.InternationalizationType);
 
                 if (find != null)
                 {
@@ -77,7 +82,7 @@ namespace IRaCIS.Core.Application.Service
                     var frontState = item.State == null ? 0 : (int)item.State;
 
                     var mapItem = _mapper.Map<Internationalization>(item);
-                    mapItem.InternationalizationType = 0;
+                    //mapItem.InternationalizationType = 0;
 
                     // 0 是预翻译  1是已确认  2是后端废弃
                     mapItem.State = frontState;
@@ -138,6 +143,7 @@ namespace IRaCIS.Core.Application.Service
 
                 mapItem.InternationalizationType = batchAdd.InternationalizationType;
                 mapItem.State = batchAdd.State;
+                mapItem.PublishLogId = batchAdd.PublishLogId;
 
                 var verifyExp1 = new EntityVerifyExp<Internationalization>()
                 {

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

@@ -10,9 +10,41 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
 using MimeKit;
+using System.Runtime.CompilerServices;
 
 namespace IRaCIS.Core.Application.Service
 {
+
+    public static class SafeMailHelper
+    {
+        public static async Task Run(Func<Task> func, [CallerMemberName] string caller = "")
+        {
+            try
+            {
+                await func();
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error($"【邮件失败 - {caller}】: {ex.Message}");
+
+            }
+        }
+
+        public static async Task<T?> Run<T>(Func<Task<T>> func, [CallerMemberName] string caller = "")
+        {
+            try
+            {
+                return await func();
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error($"【邮件失败 - {caller}】: {ex.Message}");
+            }
+            return default;
+        }
+    }
+
+
     public interface IMailVerificationService
     {
 
@@ -68,6 +100,8 @@ namespace IRaCIS.Core.Application.Service
 
             if (configInfo == null)
             {
+                Log.Logger.Error($"系统未找到当前场景:{scenario}邮件配置信息");
+
                 throw new BusinessValidationFailedException("系统未找到当前场景邮件配置信息，请联系运维人员核查");
             }
 
@@ -81,6 +115,7 @@ namespace IRaCIS.Core.Application.Service
             }
             catch (Exception ex)
             {
+                Log.Logger.Error($"邮件模板内容有误，填充内容出现问题,需要核查{scenario}场景邮件配置信息");
 
                 throw new BusinessValidationFailedException("邮件模板内容有误，填充内容出现问题，请联系运维人员核查");
             }
@@ -103,6 +138,8 @@ namespace IRaCIS.Core.Application.Service
 
             if (configInfo == null)
             {
+                Log.Logger.Error($"系统未找到当前场景:{scenario}邮件配置信息");
+
                 throw new BusinessValidationFailedException("系统未找到当前场景邮件配置信息，请联系运维人员核查");
             }
 
@@ -225,9 +262,10 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
-        //中心调研 登陆
+        //中心调研 登陆 发送验证码
         public async Task AnolymousSendEmail(string researchProgramNo, string emailAddress, int verificationCode)
         {
+            //throw new BusinessValidationFailedException("模拟邮件取数据或者发送异常！！！");
 
             var messageToSend = new MimeMessage();
             //发件地址
@@ -393,7 +431,6 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
-
         //不登录  通过邮箱重置密码
         public async Task AnolymousSendEmailForResetAccount(string emailAddress, int verificationCode)
         {
@@ -583,6 +620,8 @@ namespace IRaCIS.Core.Application.Service
                         saveItem.IsTestUser = true;
                     }
 
+                    saveItem.UserCeateSource = UserCeateSource.ReviewerSelect;
+                    saveItem.TrialId = trialId;
 
                     saveItem.Code = _identityUserRepository.Select(t => t.Code).DefaultIfEmpty().Max() + 1;
 

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

@@ -81,7 +81,7 @@ namespace IRaCIS.Core.Application.Service
         }
 
         [AllowAnonymous]
-        public async Task<PublishLogView> GetCurrentPublishInfo([FromServices] IOptionsMonitor<SystemEmailSendConfig> _sysEmialConfigOPtion)
+        public async Task<IResponseOutput<PublishLogView> > GetCurrentPublishInfo([FromServices] IOptionsMonitor<SystemEmailSendConfig> _sysEmialConfigOPtion)
         {
             var result = await _publishLogRepository.Where(t => t.IsCurrentVersion == true).ProjectTo<PublishLogView>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
 
@@ -92,7 +92,13 @@ namespace IRaCIS.Core.Application.Service
             }
 
             result.IsEnv_US = _sysEmialConfigOPtion.CurrentValue.IsEnv_US;
-            return result;
+
+            var emailConfig = _sysEmialConfigOPtion.CurrentValue;
+
+            var companyInfo = new SystemEmailSendConfigView() { CompanyName = emailConfig.CompanyName, CompanyNameCN = emailConfig.CompanyNameCN, CompanyShortName = emailConfig.CompanyShortName, CompanyShortNameCN = emailConfig.CompanyShortNameCN, SystemShortName = emailConfig.SystemShortName, EmailRegexStr = emailConfig.EmailRegexStr };
+
+
+            return ResponseOutput.Ok(result, companyInfo) ;
         }
 
 

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

@@ -0,0 +1,339 @@
+using DocumentFormat.OpenXml.EMMA;
+using FellowOakDicom;
+using FellowOakDicom.Imaging;
+using FellowOakDicom.Imaging.Render;
+using FellowOakDicom.IO.Buffer;
+using IRaCIS.Core.Application.Helper;
+using MassTransit;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using SharpCompress.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Web;
+using static IRaCIS.Core.Domain.Share.StaticData;
+
+namespace IRaCIS.Core.Application.Service
+{
+
+    /// <summary>
+    /// 项目影像后台下载，不打包
+    /// </summary>
+    /// <param name="_trialRepository"></param>
+    /// <param name="_oSSService"></param>
+    [ApiExplorerSettings(GroupName = "Common")]
+    public class TrialImageDownloadService(IRepository<Trial> _trialRepository, IOSSService _oSSService, IWebHostEnvironment _hostEnvironment) : BaseService
+    {
+
+
+
+
+
+
+
+        /// <summary>
+        /// 后端api swagger 下载项目影像
+        /// </summary>
+        /// <param name="trialId"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<IResponseOutput> DownloadTrialImage(Guid trialId)
+        {
+            //var subjectCodeList = new List<string>() { "05002", "07006", "07026" };
+            var downloadInfo = _trialRepository.Where(t => t.Id == trialId).Select(t => new
+            {
+                t.ResearchProgramNo,
+
+                VisitList = t.SubjectVisitList
+                //.Where(t=>subjectCodeList.Contains(t.Subject.Code))
+                .Select(sv => new
+                {
+                    TrialSiteCode = sv.TrialSite.TrialSiteCode,
+                    SubjectCode = sv.Subject.Code,
+                    VisitName = sv.VisitName,
+                    StudyList = sv.StudyList.Select(u => new
+                    {
+                        u.PatientId,
+                        u.StudyTime,
+                        u.StudyCode,
+
+                        SeriesList = u.SeriesList.Where(t => t.IsReading).Select(z => new
+                        {
+                            z.Modality,
+
+                            InstancePathList = z.DicomInstanceList.Where(t => t.IsReading).Select(k => new
+                            {
+                                k.Path
+                            }).ToList()
+                        })
+
+                    }).ToList(),
+
+                    NoneDicomStudyList = sv.NoneDicomStudyList.Where(t => t.IsReading).Select(nd => new
+                    {
+                        nd.Modality,
+                        nd.StudyCode,
+                        nd.ImageDate,
+
+                        FileList = nd.NoneDicomFileList.Where(t => t.IsReading).Select(file => new
+                        {
+                            file.FileName,
+                            file.Path,
+                            file.FileType
+                        }).ToList()
+                    }).ToList()
+                }).ToList()
+
+            }).FirstOrDefault();
+
+
+            var count = downloadInfo.VisitList.SelectMany(t => t.NoneDicomStudyList).SelectMany(t => t.FileList).Count();
+            var count2 = downloadInfo.VisitList.SelectMany(t => t.StudyList).SelectMany(t => t.SeriesList).SelectMany(t => t.InstancePathList).Count();
+
+            Console.WriteLine($"下载总数量：{count}+{count2}={count + count2}");
+
+            if (downloadInfo != null)
+            {
+                var downloadJobs = new List<Func<Task>>();
+
+                var rootFolder = @"E:\DownloadImage";
+
+                //var rootFolder = FileStoreHelper.GetDonwnloadImageFolder(_hostEnvironment);
+
+                // 获取无效字符（系统定义的）
+                string invalidChars = new string(Path.GetInvalidFileNameChars()) + new string(Path.GetInvalidPathChars());
+
+                // 用正则表达式替换所有非法字符为下划线或空字符
+                string pattern = $"[{Regex.Escape(invalidChars)}]";
+
+                var regexNo = Regex.Replace(downloadInfo.ResearchProgramNo, pattern, "_");
+
+                // 创建一个临时文件夹来存放文件
+                string trialFolderPath = Path.Combine(rootFolder, $"{regexNo}_{NewId.NextGuid()}");
+                Directory.CreateDirectory(trialFolderPath);
+
+                foreach (var visitItem in downloadInfo.VisitList)
+                {
+                    if (visitItem.StudyList.Count() == 0 && visitItem.NoneDicomStudyList.Count() == 0)
+                    {
+                        continue;
+                    }
+
+                    #region 处理 中心，受试者dicom non-dicom 文件夹层级
+
+                    var siteFolderPath = Path.Combine(trialFolderPath, visitItem.TrialSiteCode);
+                    if (!Directory.Exists(siteFolderPath))
+                    {
+                        Directory.CreateDirectory(siteFolderPath);
+                    }
+
+                    #endregion
+
+
+                    foreach (var studyInfo in visitItem.StudyList)
+                    {
+                        // 遍历 Series
+                        foreach (var seriesInfo in studyInfo.SeriesList)
+                        {
+                            string studyDicomFolderPath = Path.Combine(siteFolderPath, $"{visitItem.SubjectCode}_{visitItem.VisitName}_DICOM", $"{studyInfo.StudyCode}_{studyInfo.StudyTime?.ToString("yyyy-MM-dd")}_{seriesInfo.Modality}");
+
+                            // 创建 影像 文件夹
+                            Directory.CreateDirectory(studyDicomFolderPath);
+
+                            // 遍历 InstancePathList
+                            foreach (var instanceInfo in seriesInfo.InstancePathList)
+                            {
+                                // 复制文件到相应的文件夹
+                                string destinationPath = Path.Combine(studyDicomFolderPath, Path.GetFileName(instanceInfo.Path));
+
+
+                                //加入到下载任务里
+                                downloadJobs.Add(() => _oSSService.DownLoadFromOSSAsync(instanceInfo.Path, destinationPath));
+
+                                //下载到当前目录
+                                //await _oSSService.DownLoadFromOSSAsync(instanceInfo.Path, destinationPath);
+                            }
+                        }
+
+
+                    }
+
+                    foreach (var noneDicomStudy in visitItem.NoneDicomStudyList)
+                    {
+                        string studyNoneDicomFolderPath = Path.Combine(siteFolderPath, $"{visitItem.SubjectCode}_{visitItem.VisitName}_Non-DICOM", $"{noneDicomStudy.StudyCode}_{noneDicomStudy.ImageDate.ToString("yyyy-MM-dd")}_{noneDicomStudy.Modality}");
+
+                        Directory.CreateDirectory(studyNoneDicomFolderPath);
+
+                        foreach (var file in noneDicomStudy.FileList)
+                        {
+                            string destinationPath = Path.Combine(studyNoneDicomFolderPath, Path.GetFileName(file.FileName));
+
+                            //加入到下载任务里
+                            downloadJobs.Add(() => _oSSService.DownLoadFromOSSAsync(HttpUtility.UrlDecode(file.Path), destinationPath));
+                            //下载到当前目录
+                            //await _oSSService.DownLoadFromOSSAsync(HttpUtility.UrlDecode(file.Path), destinationPath);
+                        }
+                    }
+
+
+                }
+
+                #region 异步方式处理
+
+                int totalCount = downloadJobs.Count;
+                int downloadedCount = 0;
+
+                foreach (var job in downloadJobs)
+                {
+                    try
+                    {
+                        await job();
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine($"下载失败: {ex.Message}");
+                    }
+
+                    downloadedCount++;
+
+                    // 每处理50个，输出一次进度（或最后一个时也输出）
+                    if (downloadedCount % 50 == 0 || downloadedCount == totalCount)
+                    {
+                        Console.WriteLine($"已下载 {downloadedCount} / {totalCount} 个文件，完成 {(downloadedCount * 100.0 / totalCount):F2}%");
+                    }
+                }
+                #endregion
+
+                #region 多线程测试
+
+                //const int batchSize = 15;
+                //int totalCount = downloadJobs.Count;
+                //int downloadedCount = 0;
+
+                //for (int i = 0; i < downloadJobs.Count; i += batchSize)
+                //{
+                //    var batch = downloadJobs.Skip(i).Take(batchSize).Select(job => job());
+
+                //    await Task.WhenAll(batch);
+
+                //    downloadedCount += batch.Count();
+
+                //    Console.WriteLine($"已下载 {downloadedCount} / {totalCount} 个文件，完成 {(downloadedCount * 100.0 / totalCount):F2}%");
+                //}
+                #endregion
+
+            }
+
+            return ResponseOutput.Ok();
+
+
+        }
+
+
+        /// <summary>
+        /// 下载影像  维护dir信息  并回传到OSS
+        /// </summary>
+        /// <param name="trialId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<IResponseOutput> DownloadAndUploadTrialData(Guid trialId, [FromServices] IRepository<DicomInstance> _instanceRepository,
+            [FromServices] IRepository<DicomStudy> _studyRepository,
+            [FromServices] IRepository<DicomSeries> _seriesRepository)
+        {
+            var list = await _instanceRepository.Where(t => t.TrialId == trialId && t.SubjectVisitId == Guid.Parse("01000000-0a00-0242-bd20-08dcce543ded" ) && t.DicomStudy.ModalityForEdit == "IVUS")
+                  .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.Path }).ToListAsync();
+
+            int totalCount = list.Count;
+            int dealCount = 0;
+            foreach (var item in list)
+            {
+
+                var stream = await _oSSService.GetStreamFromOSSAsync(item.Path);
+
+                var dicomFile = DicomFile.Open(stream);
+
+                // 获取 Pixel Data 标签
+                var pixelData = DicomPixelData.Create(dicomFile.Dataset);
+
+                //获取像素是否为封装形式
+                var syntax = dicomFile.Dataset.InternalTransferSyntax;
+
+                //对于封装像素的文件做转换
+                if (syntax.IsEncapsulated)
+                {
+                    // 创建一个新的片段序列
+                    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));
+                    }
+                    // 替换原有的片段序列
+                    dicomFile.Dataset.AddOrUpdate(newFragments);
+                }
+
+
+                #region 获取dir信息  维护数据库三个表数据
+
+                var dirInfo = DicomDIRHelper.ReadDicomDIRInfo(dicomFile);
+
+                await _instanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id,
+                    u => new DicomInstance()
+                    {
+                        IsEncapsulated= syntax.IsEncapsulated,
+                        TransferSytaxUID = dirInfo.TransferSytaxUID,
+                        SOPClassUID = dirInfo.SOPClassUID,
+                        MediaStorageSOPClassUID = dirInfo.MediaStorageSOPClassUID,
+                        MediaStorageSOPInstanceUID = dirInfo.MediaStorageSOPInstanceUID
+                    }, false);
+
+                await _seriesRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.SeriesId,
+                  u => new DicomSeries()
+                  {
+                      DicomSeriesDate = dirInfo.DicomSeriesDate,
+                      DicomSeriesTime = dirInfo.DicomSeriesTime,
+                  }, false);
+
+                await _studyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.StudyId,
+                  u => new DicomStudy()
+                  {
+                      DicomStudyDate = dirInfo.DicomStudyDate,
+                      DicomStudyTime = dirInfo.DicomStudyTime
+                  }, false);
+
+                #endregion
+
+
+
+                //保存到内存流
+                using var memoryStream = new MemoryStream();
+                dicomFile.Save(memoryStream);
+                memoryStream.Position = 0;
+
+                //获取原始目录 和文件名
+                var folder = item.Path.Substring(0, item.Path.LastIndexOf('/')).TrimStart('/');
+                var fileName = Path.GetFileName(item.Path);
+
+                //dicomFile.Save($"download_{Guid.NewGuid()}");
+
+                await _oSSService.UploadToOSSAsync(memoryStream, folder, fileName, false);
+
+                dealCount++;
+
+                Console.WriteLine($"{DateTime.Now}已下载 {dealCount} / {totalCount} 个文件，完成 {(dealCount * 100.0 / totalCount):F2}%");
+            }
+
+            return ResponseOutput.Ok();
+        }
+
+    }
+
+}

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

@@ -1,5 +1,8 @@
 using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
+using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Mvc;
 using Panda.DynamicWebApi.Attributes;
 
@@ -9,7 +12,11 @@ namespace IRaCIS.Core.Application.Service
     /// 医生文档关联关系维护
     /// </summary>
     [ApiExplorerSettings(GroupName = "Reviewer")]
-    public class AttachmentService(IRepository<Attachment> _attachmentrepository, IRepository<Doctor> _doctorrepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IAttachmentService
+    public class AttachmentService(IRepository<Attachment> _attachmentrepository,
+        IRepository<Dictionary> _dictionaryRepository,
+        IRepository<Enroll> _enrollRepository,
+        IOSSService _oSSService,
+        IRepository<Doctor> _doctorrepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IAttachmentService
     {
 
 
@@ -89,6 +96,150 @@ namespace IRaCIS.Core.Application.Service
             return attachmentList;
         }
 
+
+        /// <summary>
+        /// 获取项目医生附件
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<PageOutput<AttachmentDTO>> GetTrialAttachments(GetTrialAttachmentsInDto inDto)
+        {
+        
+
+
+            var dicList=await _dictionaryRepository.Where(x => x.Parent.Code == "CertificateFileType").Select(x=>x.Code).ToListAsync();
+
+            var attachmentList = await _attachmentrepository
+                .Where(a =>a.Doctor.EnrollList.Any(x=>x.TrialId == inDto.TrialId && x.EnrollStatus >= EnrollStatus.InviteIntoGroup)|| a.TrialId == inDto.TrialId)
+                .WhereIf(inDto.DoctorId!=null,x=>x.DoctorId==inDto.DoctorId)
+                 .WhereIf(inDto.IsAuthorizedView != null, x => x.IsAuthorizedView == inDto.IsAuthorizedView)
+                  .WhereIf(inDto.Type.IsNotNullOrEmpty(), x => x.Type == inDto.Type)
+                  .WhereIf(inDto.FileName.IsNotNullOrEmpty(), x => inDto.FileName.Contains(x.FileName))
+
+                .Where(a => dicList.Contains(a.Type)||a.Type==string.Empty)
+                  
+
+
+                .ProjectTo<AttachmentDTO>(_mapper.ConfigurationProvider, new { TrialId = inDto.TrialId }).ToPagedListAsync(inDto);
+
+
+            return attachmentList;
+
+        }
+
+
+        /// <summary>
+        /// 获取医生列表
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<List<GetTrialDoctorListOutDto>> GetTrialDoctorList(GetTrialDoctorSelectInDto inDto)
+        {
+          var result=  await _enrollRepository.Where(x => x.TrialId == inDto.TrialId && x.EnrollStatus >= EnrollStatus.InviteIntoGroup).Select(x => x.Doctor)
+
+                .ProjectTo<GetTrialDoctorListOutDto>(_mapper.ConfigurationProvider).OrderBy(x=>x.BlindName).ToListAsync();
+
+
+            return result;
+        }
+
+
+        /// <summary>
+        /// 修改稽查状态
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> SetAuthorizedView(SetAttachmentAuthorizedView inDto)
+        {
+            await _attachmentrepository.UpdatePartialFromQueryAsync(x => inDto.Ids.Contains(x.Id), x => new Attachment() { IsAuthorizedView = inDto.IsAuthorizedView });
+
+            await _attachmentrepository.SaveChangesAsync();
+            return ResponseOutput.Ok();
+        }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> DeleteAttachment(DeleteAttachment inDto)
+        {
+            var success = await _attachmentrepository.DeleteFromQueryAsync(t => inDto.Ids.Contains(t.Id));
+            await _attachmentrepository.SaveChangesAsync();
+            return ResponseOutput.Ok();
+        }
+
+
+        /// <summary>
+        /// 上传项目医生
+        /// </summary>
+        /// <param name="attachmentList"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IEnumerable<AttachmentDTO>> SaveTrialAttachments(IEnumerable<AttachmentDTO> attachmentList)
+        {
+          
+                foreach (var item in attachmentList)
+                {
+                    if (item.DoctorId != null)
+                    {
+                        await _attachmentrepository.BatchDeleteNoTrackingAsync(a => a.DoctorId == item.DoctorId && a.Type == item.Type);
+                    }
+                }
+
+                var attachments = _mapper.Map<IEnumerable<Attachment>>(attachmentList).ToList();
+                var newAttachment = attachments.Where(t => t.Id == Guid.Empty);
+                await _attachmentrepository.AddRangeAsync(newAttachment);
+                await _attachmentrepository.SaveChangesAsync();
+
+                var list = _mapper.Map<IEnumerable<AttachmentDTO>>(attachments).ToList();
+
+                list.ForEach(t => t.FullPath = t.Path + "?access_token=" + _userInfo.UserToken);
+
+                return list;
+         
+        }
+
+        /// <summary>
+        /// 更新医生资质
+        /// </summary>
+        /// <param name="attachment"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> UpdateTrialAttachments(AttachmentDTO attachment)
+        {
+
+            if (!attachment.Path.Contains(attachment.DoctorId.ToString()))
+            {
+                var attachmentData= await _attachmentrepository.Where(a => a.Id == attachment.Id).FirstNotNullAsync();
+
+                var  fileName= attachmentData.Path.Split("/").Last();
+
+
+                attachment.Path = $"/systemData/reviewe/{attachment.Type}/{attachment.DoctorId}/{fileName}";
+
+                await  _oSSService.MoveObject(attachmentData.Path, attachment.Path);
+
+            }
+
+            if (attachment.DoctorId != null)
+            {
+                await _attachmentrepository.DeleteFromQueryAsync(a =>a.Id!=attachment.Id&& a.DoctorId == attachment.DoctorId && a.Type == attachment.Type);
+            }
+
+            attachment.UpdateTime = DateTime.Now;
+            await _attachmentrepository.UpdateFromDTOAsync(attachment);
+
+            await _attachmentrepository.SaveChangesAsync();
+            return ResponseOutput.Ok();
+        }
+
+
+
         [NonDynamicMethod]
         public async Task<AttachmentDTO> GetDetailById(Guid attachmentId)
         {

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

@@ -2,19 +2,80 @@
 {
     public class AttachmentDTO
     {
-        public Guid Id { get; set; }
+        public Guid? Id { get; set; }
-        public Guid DoctorId { get; set; }
+        public Guid? DoctorId { get; set; }
         public bool IsOfficial { get; set; }
         public string Type { get; set; } = string.Empty;
         public string Path { get; set; } = string.Empty;
         public string FullPath { get; set; } = string.Empty;
         public string FileName { get; set; } = string.Empty;
         public DateTime? CreateTime { get; set; }
+
+        public DateTime? UpdateTime { get; set; }
         public int Language { get; set; }
 
         public bool ReUpload { get; set; } = false;
+
+        public Guid? TrialId { get; set; }
+
+        /// <summary>
+        /// 是否授权
+        /// </summary>
+
+        public bool IsAuthorizedView { get; set; } = false;
+
+        public string BlindName { get; set; } = string.Empty;
+
+        public string BlindNameCN { get; set; } = string.Empty;
+        public string ChineseName { get; set; } = string.Empty;
+        public string FirstName { get; set; } = string.Empty;
+        public string FullName => LastName + " / " + FirstName;
+        public string LastName { get; set; } = string.Empty;
+
+        public string UserName { get; set; } = string.Empty;
     }
 
+    public class SetAttachmentAuthorizedView
+    {
+        public  List<Guid>  Ids { get; set; }
+
+        public bool IsAuthorizedView { get; set; }
+    }
+
+    public class DeleteAttachment
+    {
+        public List<Guid> Ids { get; set; }
+    }
+
+    public class GetTrialDoctorSelectInDto
+    {
+        public Guid TrialId { get; set; }
+    }
+
+    public class GetTrialDoctorListOutDto
+    {
+        public Guid Id { get; set; }
+        public string BlindName { get; set; } = string.Empty;
+
+        public string BlindNameCN { get; set; } = string.Empty;
+        public string ChineseName { get; set; } = string.Empty;
+        public string FirstName { get; set; } = string.Empty;
+        public string FullName => LastName + " / " + FirstName;
+        public string LastName { get; set; } = string.Empty;
+    }
+
+    public class GetTrialAttachmentsInDto:PageInput
+    {
+        public Guid TrialId { get; set; }
+
+        public string? Type { get; set; }
+
+        public Guid? DoctorId { get; set; }
+
+        public string? FileName { get; set; }
+
+        public bool? IsAuthorizedView { get; set; }
+    }
     public class ReviewerAckDTO
     {
         public Guid Id { get; set; }

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

@@ -169,6 +169,16 @@ namespace IRaCIS.Application.Contracts
     public class ReviewerConfirmationQueryDTO : PageInput
     {
         public Guid TrialId { get; set; } = Guid.Empty;
+
+        public DateTime? OptStartTime{ get; set; }
+
+        public DateTime? OptEndTime { get; set; }
+
+        public string? Code { get; set; }
+
+        public UserTypeEnum? UserTypeEnum { get; set; }
+
+        public string? OptUserName { get; set; }
     }
 
     public class SelectionReviewerDTO : DoctorDTO
@@ -194,17 +204,58 @@ namespace IRaCIS.Application.Contracts
 
         public string City { get; set; } = string.Empty;
         public string HospitalName { get; set; } = string.Empty;
+
+        public string HospitalNameCN { get; set; } = string.Empty;
         public string Country { get; set; } = string.Empty;
     }
 
 
+    public class GetTrialDoctorListInDto : PageInput
+    {
+        public Guid TrialId { get; set; } = Guid.Empty;
+
+        /// <summary>
+        /// 亚专业
+        /// </summary>
+        public Guid? SubspecialityId { get; set; }
+
+        /// <summary>
+        /// 专业
+        /// </summary>
+        public Guid? SpecialityId { get; set; }
+
+        /// <summary>
+        /// 机构
+        /// </summary>
+        public Guid? HospitalId { get; set; }
+    }
+
+    public class TrialDoctorInfo : ConfirmationReviewerDTO
+    {
+
+
+
+        public List<string> SubspecialityList => DictionaryList.Where(t => t.ParentCode == StaticData.Subspeciality).OrderBy(t => t.ShowOrder).Select(t => t.Value).ToList();
+
+        public List<string> SubspecialityCNList => DictionaryList.Where(t => t.ParentCode == StaticData.Subspeciality).OrderBy(t => t.ShowOrder).Select(t => t.ValueCN).ToList();
+    }
+
     public class ConfirmationReviewerDTO : DoctorOptDTO
     {
+        public Guid DoctorId { get; set; }
+
         public int DoctorTrialState { get; set; }
         public string OptUserName { get; set; } = string.Empty;
+
+        public UserTypeEnum? UserTypeEnum { get; set; }
         public DateTime? OptTime { get; set; }
         public string? OptTimeStr => OptTime?.ToString("yyyy-MM-dd HH:mm:ss");
 
+        public UserTypeEnum? AuditTypeEnum { get; set; }
+        public DateTime? AuditTime { get; set; }
+        public string AuditUserName { get; set; } = string.Empty;
+        public string? AuditTimeStr => AuditTime?.ToString("yyyy-MM-dd HH:mm:ss");
+
         //SPM  需要看到
         public DateTime? SubmmitTime { get; set; }
         public string SubmmitUserName { get; set; } = string.Empty;
@@ -223,6 +274,10 @@ namespace IRaCIS.Application.Contracts
         public List<Guid> SubspecialityIds => DictionaryList.Where(t => t.ParentCode == StaticData.Subspeciality).OrderBy(t => t.ShowOrder).Select(t => t.Id).ToList();
 
         public Guid? HospitalId { get; set; }
+
+        public Guid EnrollId { get; set; }
+
+
     }
 
 
@@ -235,6 +290,10 @@ namespace IRaCIS.Application.Contracts
         public string OptUserName { get; set; } = String.Empty;
         public DateTime? OptTime { get; set; }
 
+        public int OptUserType { get; set; }
+
+        public UserTypeEnum UserTypeEnum { get; set; }
+
     }
 
     #endregion
@@ -523,6 +582,8 @@ namespace IRaCIS.Application.Contracts
     {
         public string BlindName { get; set; }
 
+        public bool IsHaveAccount { get; set; } = false;
+
         public string BlindNameCN { get; set; } = string.Empty;
 
         public List<DicView> DoctorDicViewDtos = new List<DicView>();

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

@@ -243,11 +243,150 @@ namespace IRaCIS.Core.Application.Service
         {
 
 
+            #region 连表查询
+            //var query = from enroll in _enrollRepository.Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus >= EnrollStatus.InviteIntoGroup)
+            //            join enrollDetail in _enrollDetailRepository.Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus >= EnrollStatus.InviteIntoGroup) on new { enroll.DoctorId, enroll.EnrollStatus } equals new { enrollDetail.DoctorId, enrollDetail.EnrollStatus } into enrollDetailtemp
+            //            from leftenrollDetail in enrollDetailtemp.DefaultIfEmpty()
+            //            select new ConfirmationReviewerDTO()
+            //            {
+            //                DoctorTrialState = (int)leftenrollDetail.EnrollStatus,
+            //                OptTime = leftenrollDetail.CreateTime,
+            //                UserTypeEnum = leftenrollDetail.CreateUserRole.UserTypeEnum,
+            //                OptUserName = leftenrollDetail.CreateUserRole.UserName,
+            //                SubmmitTime = leftenrollDetail.CreateTime,
+            //                SubmmitUserName = leftenrollDetail.CreateUserRole.UserName,
+            //                //BlindName= enroll.BlindName,
+            //                //BlindNameCN= enroll.BlindNameCN,
+            //                SpecialityId = enroll.Doctor.SpecialityId,
+            //                SpecialityCN = enroll.Doctor.Speciality.ValueCN,
+            //                Speciality = enroll.Doctor.Speciality.Value,
+            //                //SpecialityOther=enroll.Doctor.Speciality.SpecialityOther,
+            //                //SpecialityOtherCN= enroll.Doctor.Speciality.SpecialityOtherCN,
+            //                DictionaryList = enroll.Doctor.DoctorDicRelationList.Where(t => t.KeyName == StaticData.ReadingType || t.KeyName == StaticData.Subspeciality).Select(t => t.Dictionary).OrderBy(t => t.ShowOrder).Select(x => new DicView()
+            //                {
+            //                    Id = x.Id,
+            //                    ParentCode = x.Parent.Code,
+            //                    ShowOrder = x.ShowOrder,
+            //                    Value = x.Value,
+            //                    ValueCN = x.ValueCN
+            //                }).ToList(),
+
+            //                //HospitalId= enroll.BlindName
+
+            //                Id = enroll.Doctor.Id,
+            //                Code = enroll.DoctorUser.UserName,
+            //                //FirstName=enroll.FirstName,
+            //                //LastName = enroll.LastName,
+            //                //ChineseName = enroll.ChineseName,
+            //                //City = enroll.City,
+            //                //HospitalName = enroll.HospitalName,
+            //                //Country = enroll.Country,
+            //            };
+
+
+            //var result = await query
+            //     .WhereIf(inQuery.OptStartTime != null, x => x.OptTime >= inQuery.OptStartTime)
+            //     .WhereIf(inQuery.OptEndTime != null, x => x.OptTime <= inQuery.OptEndTime)
+            //       .WhereIf(inQuery.UserTypeEnum != null, x => x.UserTypeEnum == inQuery.UserTypeEnum)
+            //         .WhereIf(inQuery.Code.IsNotNullOrEmpty(), x => x.Code.Contains(inQuery.Code))
+
+            //        .WhereIf(inQuery.OptUserName.IsNotNullOrEmpty(), x => x.OptUserName.Contains(inQuery.OptUserName))
+            //       .ToPagedListAsync(inQuery);
+            #endregion
+
+
+            #region 查询第一个
+
+            // 这里这样写的原因是因为 要取最新的入组详情  然后还要根据时间筛选  入组信息
+            var query = _enrollDetailRepository
+                .Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus >= EnrollStatus.InviteIntoGroup);
+            var enrollStateList = await query
+                 .ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync();
+
+            enrollStateList = enrollStateList
+               .WhereIf(inQuery.OptStartTime != null, x => x.OptTime >= inQuery.OptStartTime)
+              .WhereIf(inQuery.OptEndTime != null, x => x.OptTime <= inQuery.OptEndTime)
+              .WhereIf(inQuery.UserTypeEnum != null, x => x.UserTypeEnum == inQuery.UserTypeEnum)
+              .ToList();
+            #endregion
+
+
+
+
+
+            var doctorids =  enrollStateList.Select(x => x.DoctorId).ToList();
+
+
             var doctorQuery = _enrollRepository.Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus >= EnrollStatus.InviteIntoGroup)
-               .ProjectTo<ConfirmationReviewerDTO>(_mapper.ConfigurationProvider);
+
+
+
+
+
+           .WhereIf(inQuery.OptStartTime != null || inQuery.OptEndTime != null || inQuery.UserTypeEnum != null, x => doctorids.Contains(x.DoctorId))
+            .ProjectTo<ConfirmationReviewerDTO>(_mapper.ConfigurationProvider)
+            .WhereIf(inQuery.Code.IsNotNullOrEmpty(), x => x.Code.Contains(inQuery.Code))
+           
+            .WhereIf(inQuery.OptUserName.IsNotNullOrEmpty(), x => x.OptUserName.Contains(inQuery.OptUserName));
 
             var doctorPageList = await doctorQuery.ToPagedListAsync(inQuery);
 
+
+            doctorPageList.CurrentPageData.ToList().ForEach(u =>
+            {
+                u.DoctorTrialState = (int)EnrollStatus.InviteIntoGroup;
+               
+                var lastState= enrollStateList.OrderByDescending(x=>x.OptTime).FirstOrDefault(t => t.DoctorId == u.Id);
+                if (lastState != null)
+                {
+                    u.DoctorTrialState = lastState.IntoGroupState;
+                }
+                var opt = enrollStateList.Where(x => x.IntoGroupState == 10).FirstOrDefault(t => t.DoctorId == u.Id);
+                if (opt != null)
+                {
+                
+                    u.OptTime = opt.OptTime;
+                    u.UserTypeEnum = opt.UserTypeEnum;
+                    u.OptUserName = opt.OptUserName;
+                }
+
+                var approved = enrollStateList.Where(x => x.IntoGroupState == 8).FirstOrDefault(t => t.DoctorId == u.Id);
+
+                if (approved != null)
+                {
+                    u.AuditTime = approved.OptTime;
+                    u.AuditTypeEnum = approved.UserTypeEnum;
+                    u.AuditUserName = approved.OptUserName;
+                }
+            });
+
+            return doctorPageList;
+
+        }
+
+
+
+        /// <summary>
+        /// 获取项目下医生列表
+        /// </summary>
+        /// <param name="inQuery"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<PageOutput<TrialDoctorInfo>> GetTrialDoctorList(
+            GetTrialDoctorListInDto inQuery)
+        {
+
+
+            var doctorQuery = _enrollRepository.Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus == EnrollStatus.ConfirmIntoGroup)
+                
+               .ProjectTo<TrialDoctorInfo>(_mapper.ConfigurationProvider);
+
+            var doctorPageList = await doctorQuery
+                .WhereIf(inQuery.HospitalId!=null,x=>x.HospitalId==inQuery.HospitalId.Value)
+                .WhereIf(inQuery.SpecialityId != null, x => x.SpecialityId == inQuery.SpecialityId.Value)
+                .WhereIf(inQuery.SubspecialityId != null, x => x.DictionaryList.Any(x=>x.Id==inQuery.SubspecialityId.Value))
+                .ToPagedListAsync(inQuery);
+
             var enrollStateList = await _enrollDetailRepository.Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus > EnrollStatus.InviteIntoGroup)
                  .ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync();
 

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

@@ -1,4 +1,5 @@
 using DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments;
+using DocumentFormat.OpenXml.Spreadsheet;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Application.Helper;
@@ -17,6 +18,7 @@ namespace IRaCIS.Core.Application.Service
         IRepository<DoctorDictionary> _doctorDictionaryRepository,
            IRepository<DoctorSummarize> _doctorSummarizeRepository,
         IRepository<Enroll> _enrollRepository,
+          IRepository<UserRole> _userRoleRepository,
            IRepository<Hospital> _hospitalRepository,
           IRepository<Dictionary> _dictionaryRepository,
         IRepository<Attachment> _attachmentRepository,
@@ -230,9 +232,9 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<(DoctorSummarize,bool)> AddOrUpdateGneralSituation(SummarizeInfoDto inDto)
+        public async Task<(DoctorSummarize, bool)> AddOrUpdateGneralSituation(SummarizeInfoDto inDto)
         {
-            if (inDto.TrialId != null&&inDto.Id==null)
+            if (inDto.TrialId != null && inDto.Id == null)
             {
                 var systemCount = await _doctorSummarizeRepository.Where(x => x.DoctorId == inDto.DoctorId && x.TrialId == null).CountAsync();
                 if (systemCount == 0)
@@ -241,7 +243,7 @@ namespace IRaCIS.Core.Application.Service
                     var dictionery = await _dictionaryRepository.Where(x => x.Parent.Code == "Indication" && x.Code == trialinfo.IndicationEnum.ToString()).FirstNotNullAsync();
                     inDto.IndicationEn = dictionery.Value;
                     inDto.Indication = dictionery.ValueCN;
-                    var system=  inDto.Clone();
+                    var system = inDto.Clone();
                     system.TrialId = null;
                     system.IsMain = true;
                     await _doctorSummarizeRepository.InsertOrUpdateAsync(system, true);
@@ -262,10 +264,10 @@ namespace IRaCIS.Core.Application.Service
                     inDto.IndicationEn = "Default";
                 }
                 var exists = await _doctorSummarizeRepository
-                     .Where(x=> x.IndicationEn!=string.Empty && x.Indication!=string.Empty)
+                     .Where(x => x.IndicationEn != string.Empty && x.Indication != string.Empty)
-                     .Where( x => x.IndicationEn == inDto.IndicationEn|| x.Indication == inDto.Indication)
+                     .Where(x => x.IndicationEn == inDto.IndicationEn || x.Indication == inDto.Indication)
 
-                     .AnyAsync(x => x.DoctorId == inDto.DoctorId && x.TrialId == null&&x.Id!=inDto.Id);
+                     .AnyAsync(x => x.DoctorId == inDto.DoctorId && x.TrialId == null && x.Id != inDto.Id);
                 if (exists)
                 {
                     throw new BusinessValidationFailedException(_localizer["DoctorSummarize_repeat"]);
@@ -274,7 +276,7 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-            if (inDto.TrialId != null && inDto.SaveSummarizeInfoType!= SaveSummarizeInfo.SaveSelf)
+            if (inDto.TrialId != null && inDto.SaveSummarizeInfoType != SaveSummarizeInfo.SaveSelf)
             {
                 switch (inDto.SaveSummarizeInfoType)
                 {
@@ -314,14 +316,14 @@ namespace IRaCIS.Core.Application.Service
 
                 await _doctorSummarizeRepository.BatchUpdateNoTrackingAsync(x => x.DoctorId == inDto.DoctorId && x.TrialId == null,
                     x => new DoctorSummarize()
-                {
+                    {
-                    IsMain = false
+                        IsMain = false
-                });
+                    });
             }
 
 
             var entity = await _doctorSummarizeRepository.InsertOrUpdateAsync(inDto, true);
-            return (entity,true);
+            return (entity, true);
         }
 
         /// <summary>
@@ -332,7 +334,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<bool> DeleteSummarizeInfo(DeleteSummarizeInfoInDto inDto)
         {
-            var result = await _doctorSummarizeRepository.DeleteFromQueryAsync(x=>x.Id==inDto.Id);
+            var result = await _doctorSummarizeRepository.DeleteFromQueryAsync(x => x.Id == inDto.Id);
             return await _doctorSummarizeRepository.SaveChangesAsync();
         }
 
@@ -356,8 +358,9 @@ namespace IRaCIS.Core.Application.Service
             }
             var result = await _doctorSummarizeRepository.Where(t => t.DoctorId == inDto.DoctorId && t.TrialId == inDto.TrialId)
             .ProjectTo<SummarizeInfoDto>(_mapper.ConfigurationProvider).ToListAsync();
-            return new UpdateGneralSituationDto() { 
+            return new UpdateGneralSituationDto()
-            SummarizeList= result
+            {
+                SummarizeList = result
             };
         }
 
@@ -382,25 +385,31 @@ namespace IRaCIS.Core.Application.Service
 
             Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
             {
-            ;
+                ;
-                var topicStr = string.Format(input.topicStr,string.Empty);
+                var topicStr = string.Format(input.topicStr, string.Empty);
                 var htmlBodyStr = string.Format(
 
 
                        CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-                    _systemEmailConfig.SiteUrl.Replace("login",string.Empty)+inDto.Url
+                    _systemEmailConfig.SiteUrl.Replace("login", string.Empty) + inDto.Url
                     );
 
                 return (topicStr, htmlBodyStr);
             };
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
 
-              EmailBusinessScenario.Reviewer_CV_Collection,
+            var scenario = EmailBusinessScenario.Reviewer_CV_Collection;
+
+            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);
+            }
 
-                messageToSend, emailConfigFunc);
 
-            await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
 
             return true;
         }
@@ -490,7 +499,7 @@ namespace IRaCIS.Core.Application.Service
 
             var doctorBasicInfo = (await _doctorRepository.Where(t => t.Id == doctorId)
                 .ProjectTo<DoctorBasicInfoDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
-
+            doctorBasicInfo.IsHaveAccount = await _userRoleRepository.AnyAsync(x => x.DoctorId == doctorId);
             return doctorBasicInfo;
 
 

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

@@ -3,6 +3,7 @@ using AutoMapper.EquivalencyExpression;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Contracts.Pay;
 using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 
 namespace IRaCIS.Core.Application.Service
@@ -13,6 +14,8 @@ namespace IRaCIS.Core.Application.Service
         {
             var isEn_Us = false;
 
+            Guid TrialId = Guid.Empty;
+
             // 从 DateTime 映射到 DateOnly
             CreateMap<DateTime, DateOnly>().ConvertUsing(dt => DateOnly.FromDateTime(dt));
 
@@ -70,7 +73,15 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<Postgraduate, PostgraduateViewModel>();
               //    .ForMember(t => t.Hospital, c => c.MapFrom(d => d.HospitalEnt.HospitalName))
               //.ForMember(t => t.HospitalCN, c => c.MapFrom(d => d.HospitalEnt.HospitalNameCN));
-            CreateMap<Attachment, AttachmentDTO>();
+            CreateMap<Attachment, AttachmentDTO>()
+            .ForMember(d => d.BlindName, u => u.MapFrom(t => t.Doctor.BlindName))
+            .ForMember(d => d.BlindNameCN, u => u.MapFrom(t => t.Doctor.BlindNameCN))
+            .ForMember(d => d.ChineseName, u => u.MapFrom(t => t.Doctor.ChineseName))
+            .ForMember(d => d.FirstName, u => u.MapFrom(t => t.Doctor.FirstName))
+            .ForMember(d => d.LastName, u => u.MapFrom(t => t.Doctor.LastName))
+            .ForMember(d => d.UserName, u => u.MapFrom(t => t.Doctor.EnrollList.Where(y=>y.TrialId== TrialId).Select(x=>x.DoctorUser.UserName).First()))
+                ;
+            CreateMap<Doctor, GetTrialDoctorListOutDto>();
             CreateMap<Doctor, ResumeConfirmDTO>();
 
             CreateMap<Doctor, DoctorSelectDTO>();
@@ -178,16 +189,32 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<Hospital, EmploymentDTO>();
 
             CreateMap<EnrollDetail, DoctorStateModelDTO>()
+                   .ForMember(d => d.UserTypeEnum, u => u.MapFrom(s => s.CreateUserRole.UserTypeEnum))
                 .ForMember(d => d.IntoGroupState, u => u.MapFrom(s => s.EnrollStatus))
                 .ForMember(d => d.OptTime, u => u.MapFrom(s => s.CreateTime))
                  .ForMember(d => d.OptUserName, u => u.MapFrom(s => s.CreateUserRole.IdentityUser.UserName));
 
+
+            CreateMap<Enroll, TrialDoctorInfo>().IncludeMembers(t => t.Doctor, t => t.Doctor.Hospital)
+              .ForMember(o => o.DictionaryList, t => t.MapFrom(u => u.Doctor.DoctorDicRelationList.Where(t => t.KeyName == StaticData.ReadingType || t.KeyName == StaticData.Subspeciality).Select(t => t.Dictionary).OrderBy(t => t.ShowOrder)))
+               .ForMember(d => d.Speciality, u => u.MapFrom(s => s.Doctor.Speciality.Value))
+                .ForMember(d => d.SpecialityCN, u => u.MapFrom(s => s.Doctor.Speciality.ValueCN))
+                .ForMember(d => d.Id, u => u.MapFrom(s => s.Doctor.Id))
+                .ForMember(d => d.Code, u => u.MapFrom(s => s.DoctorUser.UserName));
+
+            CreateMap<Doctor, TrialDoctorInfo>();
+            CreateMap<Hospital, TrialDoctorInfo>();
+
             CreateMap<Enroll, ConfirmationReviewerDTO>().IncludeMembers(t => t.Doctor, t => t.Doctor.Hospital)
                  .ForMember(o => o.DictionaryList, t => t.MapFrom(u => u.Doctor.DoctorDicRelationList.Where(t => t.KeyName == StaticData.ReadingType || t.KeyName == StaticData.Subspeciality).Select(t => t.Dictionary).OrderBy(t => t.ShowOrder)))
                   .ForMember(d => d.Speciality, u => u.MapFrom(s => s.Doctor.Speciality.Value))
                    .ForMember(d => d.SpecialityCN, u => u.MapFrom(s => s.Doctor.Speciality.ValueCN))
                    .ForMember(d => d.Id, u => u.MapFrom(s => s.Doctor.Id))
                    .ForMember(d => d.Code, u => u.MapFrom(s => s.DoctorUser.UserName))
+                     .ForMember(d => d.HospitalName, u => u.MapFrom(s => s.Doctor.HospitalName))
+                       .ForMember(d => d.HospitalNameCN, u => u.MapFrom(s => s.Doctor.HospitalNameCN))
+                       .ForMember(d => d.EnrollId, u => u.MapFrom(s => s.Id))
+                       
                    ;
             CreateMap<Doctor, ConfirmationReviewerDTO>();
             CreateMap<Hospital, ConfirmationReviewerDTO>();

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

@@ -0,0 +1,585 @@
+
+//--------------------------------------------------------------------
+//     此代码由liquid模板自动生成  byzhouhang 20240909
+//     生成时间 2025-03-27 06:13:33Z 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using IRaCIS.Core.Domain.Models;
+using Microsoft.AspNetCore.Mvc;
+using IRaCIS.Core.Application.Interfaces;
+using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Infrastructure.Extention;
+using System.Threading.Tasks;
+using IRaCIS.Core.Infra.EFCore;
+using AutoMapper.Execution;
+using System.Linq;
+using IRaCIS.Core.Infrastructure;
+using DocumentFormat.OpenXml.Office2010.Excel;
+using MassTransit;
+using NPOI.POIFS.Properties;
+using Org.BouncyCastle.Crypto;
+using Microsoft.AspNetCore.Http;
+namespace IRaCIS.Core.Application.Service;
+
+
+/// <summary>
+/// 稽查文档
+/// </summary>
+/// <returns></returns>
+[ApiExplorerSettings(GroupName = "FileRecord")]
+public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepository,
+                                  IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer): BaseService
+{
+
+	/// <summary>
+	/// 获取稽查文档
+	/// </summary>
+	/// <param name="inQuery"></param>
+	/// <returns></returns>
+	[HttpPost]
+	public async Task<PageOutput<AuditDocumentView>> GetAuditDocumentList(AuditDocumentQuery inQuery)
+	{
+		var auditDocumentQueryable = _auditDocumentRepository
+									.ProjectTo<AuditDocumentView>(_mapper.ConfigurationProvider);
+		var pageList = await auditDocumentQueryable.ToPagedListAsync(inQuery);
+
+		return pageList;
+	}
+
+	/// <summary>
+	/// 修改稽查文档
+	/// </summary>
+	/// <param name="inDto"></param>
+	/// <returns></returns>
+	[HttpPost]
+    public async Task<IResponseOutput> UpdateAuditDocument(AuditDocumentUpdateDto inDto)
+    {
+		AuditDocumentAddOrEdit addOrEdit = _mapper.Map<AuditDocumentAddOrEdit>(inDto);
+		addOrEdit.IsUpdate = true;
+
+		var result= await AddOrUpdateAuditDocument(addOrEdit);
+
+        return ResponseOutput.Ok(result.Id);
+    }
+
+    /// <summary>
+    /// 新增文件夹
+    /// </summary>
+    /// <param name="inDto"></param>
+    /// <returns></returns>
+    /// <exception cref="BusinessValidationFailedException"></exception>
+    [HttpPost]
+    public async Task<IResponseOutput> AddFolder(AuditDocumentAddOrEdit inDto)
+    {
+
+        if (await _auditDocumentRepository.AnyAsync(x => x.Name == inDto.Name && x.AuditDocumentTypeEnum == inDto.AuditDocumentTypeEnum && x.ParentId == inDto.ParentId))
+        {
+            throw new BusinessValidationFailedException(_localizer["AuditDocument_CanNotAddFolder"]);
+        }
+
+        List<AuditDocumentAddOrEdit> auditDocumentAddOrEdits = new List<AuditDocumentAddOrEdit>();
+
+        auditDocumentAddOrEdits.Add(inDto);
+        var result=   await AddAuditDocument(auditDocumentAddOrEdits);
+        return ResponseOutput.Ok(result);
+    }
+
+    /// <summary>
+    /// 新增稽查文档
+    /// </summary>
+    /// <param name="inDto"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public async Task<IResponseOutput> AddAuditDocument(List<AuditDocumentAddOrEdit> inDto)
+	{
+		List<Guid> resultData = new List<Guid>();
+        inDto.ForEach(x => x.IsUpdate = false);
+        await addData(inDto);
+
+        async Task addData(List<AuditDocumentAddOrEdit> data)
+		{
+			foreach(var item in data)
+			{
+               var result= await AddOrUpdateAuditDocument(item);
+
+				resultData.Add(result.Id);
+                item.Children.ForEach(x => {
+					x.ParentId = result.Id;
+					x.IsUpdate = false;
+
+                });
+
+                if (item.Children.Count() > 0)
+                {
+                    await addData(item.Children);
+                }
+            }
+		}
+
+		return ResponseOutput.Ok(resultData);
+    }
+
+
+
+    /// <summary>
+    /// 通用方法
+    /// </summary>
+    /// <param name="inDto"></param>
+    private async  Task<AuditDocument> AddOrUpdateAuditDocument(AuditDocumentAddOrEdit inDto)
+	{
+		
+			var alikeData = await _auditDocumentRepository.Where(x =>x.Id!=inDto.Id&& x.ParentId == inDto.ParentId&&x.Name==inDto.Name&&x.AuditDocumentTypeEnum==inDto.AuditDocumentTypeEnum).FirstOrDefaultAsync();
+			if (alikeData != null)
+			{
+				if (inDto.AuditDocumentTypeEnum == AuditDocumentType.Folder)
+				{
+					if (inDto.IsUpdate)
+					{
+						throw new BusinessValidationFailedException(_localizer["AuditDocument_CanNotAddFolder"]);
+					}
+					else
+					{
+						return alikeData;
+                    }
+				}
+				else
+				{
+                    var entityData = await _auditDocumentRepository.InsertOrUpdateAsync(inDto, true);
+                    var historicalVersionIds = await _auditDocumentRepository.Where(x => x.MainFileId == alikeData.Id).OrderBy(x => x.Version).Select(x => x.Id).ToListAsync();
+                    historicalVersionIds.Add(alikeData.Id);
+                    int num = 1;
+
+                    foreach (var item in historicalVersionIds)
+                    {
+                        await _auditDocumentRepository.UpdatePartialFromQueryAsync(item, x => new AuditDocument()
+                        {
+                            MainFileId = entityData.Id,
+                            ParentId = null,
+                            Version = num,
+                            AuditDocumentTypeEnum = AuditDocumentType.HistoricalVersion
+                        },true);
+					    num++;
+                    }
+
+                    return entityData;
+                }
+			}
+		
+
+	   var entity = await _auditDocumentRepository.InsertOrUpdateAsync(inDto, true);
+       return entity;
+	}
+
+	/// <summary>
+	/// 获取面包屑导航
+	/// </summary>
+	/// <param name="inDto"></param>
+	/// <returns></returns>
+	[HttpPost]
+	public async Task<List<AuditDocumentUpdateDto>> GetBreadcrumbData(GetBreadcrumbDataInDto inDto)
+	{
+		List<AuditDocumentUpdateDto> result=new List<AuditDocumentUpdateDto>();
+
+		await findParent(result, inDto.Id);
+        async Task findParent(List<AuditDocumentUpdateDto> datas, Guid id)
+		{
+            var data= await _auditDocumentRepository.Where(x => x.Id == id).ProjectTo<AuditDocumentUpdateDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+            datas.Add(data);
+			if (data.ParentId != null)
+			{
+                await findParent(datas, data.ParentId.Value);
+            }
+
+        }
+
+		result.Reverse();
+
+        return result;
+
+    }
+
+    /// <summary>
+    /// 获取文件树形结构 (传Id 根节点就是自己)
+    /// </summary>
+    /// <param name="inDto"></param>
+    /// <returns></returns>
+    [HttpPost]
+	public async Task<PageOutput<AuditDocumentData>> GetAuditDocumentData(GetAuditDocumentDataInDto inDto)
+	{
+
+        var defalutSortArray = new string[] { nameof(AuditDocumentData.AuditDocumentTypeEnum), nameof(AuditDocumentData.Name) };
+        if (inDto.SortField.IsNotNullOrEmpty())
+        {
+            defalutSortArray = new string[] { nameof(AuditDocumentData.AuditDocumentTypeEnum), inDto.SortField + (inDto.Asc ? " asc" : " desc") };
+            inDto.SortField = string.Empty;
+        }
+		// 新取出来排序 然后再找子项
+        var data=  (await _auditDocumentRepository
+			.Where(x=>x.AuditDocumentTypeEnum!=AuditDocumentType.HistoricalVersion)
+			.WhereIf(inDto.IsAuthorization!=null,x=>x.IsAuthorization==inDto.IsAuthorization)
+			.ProjectTo<AuditDocumentData>(_mapper.ConfigurationProvider).ToPagedListAsync(new PageInput() { 
+			 PageIndex=1,
+			 PageSize=999999,
+			}, defalutSortArray) ).CurrentPageData.ToList();
+       
+		
+	
+        if (inDto.Name.IsNotNullOrEmpty())
+		{
+            List<Guid> findIds = new List<Guid>();
+            var findData = data.Where(x => x.Name.Contains(inDto.Name)).Select(x => x.Id.Value).ToList();
+            GetParentId(findIds, findData, data);
+            findIds.AddRange(findData);
+
+			data = data.Where(x => findIds.Distinct().Contains(x.Id.Value)).ToList();
+
+        }
+
+
+		var query = data
+            .WhereIf(inDto.SelfId != null, x => inDto.SelfId == x.Id)
+            .WhereIf(inDto.Id != null, x => inDto.Id == x.ParentId)
+			.WhereIf(inDto.Id == null&& inDto.SelfId == null, x => x.ParentId == null);
+
+
+
+		PageOutput<AuditDocumentData> result = new PageOutput<AuditDocumentData>()
+		{
+			PageIndex = inDto.PageIndex,
+			PageSize = inDto.PageSize,
+			TotalCount = query.Count(),
+        };
+        var root = query
+            .Skip(inDto.PageSize * (inDto.PageIndex - 1)).Take(inDto.PageSize).ToList();
+
+        var historicalVersionList = await _auditDocumentRepository
+            .Where(x => x.AuditDocumentTypeEnum == AuditDocumentType.HistoricalVersion).ProjectTo<AuditDocumentData>(_mapper.ConfigurationProvider).ToListAsync();
+
+        foreach (var item in root)
+		{
+            GetChildren(item, data, historicalVersionList);
+
+        }
+		result.CurrentPageData = root;
+		return result;
+
+    }
+
+	private void GetParentId(List<Guid> parentIds, List<Guid> ids, List<AuditDocumentData> dataList)
+	{
+        var parentid = dataList.Where(x => ids.Contains(x.Id.Value) && x.ParentId != null).Select(x => x.ParentId.Value).ToList();
+
+		if (parentid.Count() > 0)
+		{
+            parentIds.AddRange(parentid);
+
+            GetParentId(parentIds, parentid, dataList);
+        }
+      
+    }
+
+	private void GetChildren(AuditDocumentData item, List<AuditDocumentData> dataList, List<AuditDocumentData> historyList)
+    {
+        item.Children = dataList.Where(x => x.ParentId == item.Id).ToList();
+        item.HistoricalVersionsCount= historyList.Where(x => x.MainFileId == item.Id).Count();
+        foreach (var x in item.Children)
+        {
+            GetChildren(x, dataList, historyList);
+        }
+    }
+
+    /// <summary>
+    /// 删除稽查文档
+    /// </summary>
+    /// <param name="inDto"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public async Task<IResponseOutput> DeleteAuditDocument(DeleteAuditDocumentInDto inDto)
+	{
+		var data = await _auditDocumentRepository.Select(x => new DeleteAudit (){
+			Id=x.Id,
+			ParentId= x.ParentId, 
+			MainFileId= x.MainFileId 
+		}).ToListAsync();
+
+		List<Guid> DeleteId= inDto.Ids;
+
+        finId(inDto.Ids, data);
+
+        void finId(List<Guid> deletids, List<DeleteAudit> deletes)
+		{
+			DeleteId.AddRange(deletids);
+
+			var temp = deletes.Where(x =>(x.ParentId!=null&& deletids.Contains(x.ParentId.Value))||(x.MainFileId!=null&& deletids.Contains(x.MainFileId.Value))).Select(x => x.Id).ToList();
+			if (temp.Count() > 0)
+			{
+				finId(temp, deletes);
+            }
+        }
+
+		DeleteId = DeleteId.Distinct().ToList();
+		var mainFileId=await _auditDocumentRepository.Where(x => DeleteId.Contains(x.Id)&&x.MainFileId!=null).Select(x => x.MainFileId).Distinct().ToListAsync();
+        var success = await _auditDocumentRepository.DeleteFromQueryAsync(t => DeleteId.Distinct().Contains(t.Id), true);
+
+		foreach (var item in mainFileId)
+		{
+			var historicalVersionList = await _auditDocumentRepository.Where(x => x.MainFileId == item).OrderBy(x=>x.Version).ToListAsync();
+
+			var num = 1;
+			foreach (var historical in historicalVersionList)
+			{
+                await _auditDocumentRepository.UpdatePartialFromQueryAsync(historical.Id, x => new AuditDocument()
+                {
+                    Version = num,
+                }, true);
+                num++;
+            }
+
+          
+
+        }
+
+
+        return ResponseOutput.Ok();
+
+
+    }
+
+	/// <summary>
+	/// 移动文件或者文件夹 到其他文件夹
+	/// </summary>
+	/// <returns></returns>
+	[HttpPost]
+	public async Task<IResponseOutput> MovieFileOrFolder(MovieFileOrFolderInDto inDto)
+    {
+
+        var data = await _auditDocumentRepository.Select(x => new DeleteAudit()
+        {
+            Id = x.Id,
+            ParentId = x.ParentId,
+            AuditDocumentTypeEnum = x.AuditDocumentTypeEnum,
+            MainFileId = x.MainFileId
+        }).ToListAsync();
+
+		foreach (var id in inDto.Ids)
+		{
+            var file = data.Where(x => x.Id == id).FirstOrDefault();
+            if (file.AuditDocumentTypeEnum == AuditDocumentType.Folder)
+            {
+                if (finChild(new List<Guid> { id }, inDto.ParentId, data))
+                {
+                    throw new BusinessValidationFailedException(_localizer["AuditDocument_CanNotMove"]);
+                }
+            }
+        }
+
+        bool finChild(List<Guid> ids, Guid ChildId, List<DeleteAudit> data)
+        {
+            var child = data.Where(x => x.ParentId != null && ids.Contains(x.ParentId.Value)).ToList();
+            if (child.Count() == 0)
+            {
+                return false;
+            }
+            else if (child.Any(x => x.Id == ChildId))
+            {
+                return true;
+            }
+            else
+            {
+                var newids = child.Select(x => x.Id).ToList();
+
+                return finChild(newids, ChildId, data);
+
+            }
+        }
+
+        foreach (var id in inDto.Ids)
+		{
+            await _auditDocumentRepository.UpdatePartialFromQueryAsync(id, x => new AuditDocument()
+            {
+                ParentId = inDto.ParentId
+            });
+
+            await _auditDocumentRepository.SaveChangesAsync();
+        }
+		
+        return ResponseOutput.Ok();
+    }
+
+    /// <summary>
+    /// 复制文件或者文件夹
+    /// </summary>
+    /// <param name="inDto"></param>
+    /// <returns></returns>
+    [HttpPost]
+	public async Task<IResponseOutput> CopyFileOrFolder(MovieFileOrFolderInDto inDto)
+    {
+
+		foreach (var item in inDto.Ids)
+		{
+          var data =  (await GetAuditDocumentData(new GetAuditDocumentDataInDto()
+            {
+                SelfId =item,
+                
+				PageIndex=1,
+				PageSize= 1000
+            })).CurrentPageData;
+
+            List<AuditDocumentAddOrEdit> auditDocumentAddOrEdits = _mapper.Map<List<AuditDocumentAddOrEdit>>(data);
+            auditDocumentAddOrEdits.ForEach(x => {
+                x.IsUpdate = false;
+                x.Id = null;
+                x.ParentId = inDto.ParentId;
+            });
+            await addData(auditDocumentAddOrEdits);
+        }
+
+        async Task addData(List<AuditDocumentAddOrEdit> data)
+        {
+            foreach (var item in data)
+            {
+                item.Id = null;
+                var result = await AddOrUpdateAuditDocument(item);
+
+                item.Children.ForEach(x => {
+                    x.ParentId = result.Id;
+                    x.IsUpdate = false;
+                    x.Id = null;
+                });
+
+                if (item.Children.Count() > 0)
+                {
+                    await addData(item.Children);
+                }
+            }
+        }
+        return ResponseOutput.Ok();
+    }
+
+    /// <summary>
+    /// 获取历史版本
+    /// </summary>
+    /// <param name="inDto"></param>
+    /// <returns></returns>
+    [HttpPost]
+	public async Task<List<HistoricalVersionDto>> GetHistoricalVersion(GetHistoricalVersionInDto inDto)
+	{
+
+		List< HistoricalVersionDto > result=new List<HistoricalVersionDto>();
+
+		result = await _auditDocumentRepository.Where(x => x.MainFileId == inDto.Id).ProjectTo<HistoricalVersionDto>(_mapper.ConfigurationProvider).OrderByDescending(x => x.Version).ToListAsync();
+	    var	 currentData = await _auditDocumentRepository.Where(x => x.Id == inDto.Id).ProjectTo<HistoricalVersionDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+		currentData.IsCurrentVersion = true;
+
+        result.Insert(0, currentData);
+
+		return result;
+	}
+
+	/// <summary>
+	/// 把历史版本设置为当前版本
+	/// </summary>
+	/// <returns></returns>
+	[HttpPost]
+	public async Task<IResponseOutput> SetCurrentVersion(SetCurrentVersionInDto inDto) 
+	{
+        var file = await _auditDocumentRepository.Where(x => x.Id == inDto.Id).FirstNotNullAsync();
+		if (file.AuditDocumentTypeEnum != AuditDocumentType.HistoricalVersion)
+		{
+            throw new BusinessValidationFailedException(_localizer["AuditDocument_CanNotSetCurrentVersion"]);
+        }
+
+		var mainFile = await _auditDocumentRepository.Where(x => x.Id == file.MainFileId).FirstNotNullAsync();
+
+		var historicalVersionIds= await _auditDocumentRepository.Where(x => x.MainFileId == mainFile.Id&&x.Id!=inDto.Id).OrderBy(x=>x.Version).Select(x=>x.Id).ToListAsync();
+
+		historicalVersionIds.Add(mainFile.Id);
+        await _auditDocumentRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new AuditDocument() { 
+		  MainFileId=null,
+		  ParentId= mainFile.ParentId,
+		  AuditDocumentTypeEnum=AuditDocumentType.File,
+        });
+
+		int num = 1;
+		foreach (var item in historicalVersionIds)
+		{
+            await _auditDocumentRepository.UpdatePartialFromQueryAsync(item, x => new AuditDocument()
+            {
+                MainFileId = inDto.Id,
+                ParentId = null,
+				Version=num,
+				AuditDocumentTypeEnum= AuditDocumentType.HistoricalVersion
+            });
+			num++;
+        }
+
+		await _auditDocumentRepository.SaveChangesAsync();
+
+
+        return ResponseOutput.Ok();
+
+    }
+
+	/// <summary>
+	/// 设置是否授权
+	/// </summary>
+	/// <param name="inDto"></param>
+	/// <returns></returns>
+	[HttpPost]
+	public async Task<IResponseOutput> SetIsAuthorization(SetIsAuthorizationInDto inDto)
+	{
+		var data = await _auditDocumentRepository.Select(x => new DeleteAudit()
+		{
+			Id = x.Id,
+			ParentId = x.ParentId,
+			MainFileId = x.MainFileId
+		}).ToListAsync();
+
+		List<Guid> allid = new List<Guid>();
+		findChild(allid, inDto.Ids, data);
+        if (inDto.IsAuthorization)
+        {
+            findParent(allid, inDto.Ids, data);
+        }
+        allid= allid.Distinct().ToList();
+        await _auditDocumentRepository.UpdatePartialFromQueryAsync(t => allid.Contains(t.Id), x => new AuditDocument() { 
+		
+			IsAuthorization = inDto.IsAuthorization
+        });
+		await _auditDocumentRepository.SaveChangesAsync();
+		return ResponseOutput.Ok();
+
+        void findParent(List<Guid> allId, List<Guid> current, List<DeleteAudit> data)
+        {
+            allId.AddRange(current);
+            var parent =  data.Where(x => current.Contains(x.Id)).Select(x => x.ParentId).Where(x=>x!=null).Select(x=>(Guid)x).ToList();
+       
+            if (parent.Count() > 0)
+            {
+
+
+                findParent(allId, parent, data);
+
+            }
+        }
+
+        void findChild(List<Guid> allId,List<Guid> current, List<DeleteAudit>  data)
+		{
+			allId.AddRange(current);
+
+			var child = data.Where(x =>(x.ParentId!=null&& current.Contains(x.ParentId.Value))||(x.MainFileId!=null&&current.Contains(x.MainFileId.Value))).Select(x => x.Id).ToList();
+			if (child.Count() > 0)
+			{
+			
+
+                findChild(allId, child, data);
+
+            }
+
+        }
+    }
+
+}
+
+
+

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

@@ -0,0 +1,167 @@
+
+//--------------------------------------------------------------------
+//     此代码由liquid模板自动生成  byzhouhang 20240909
+//	   生成时间 2025-03-27 06:13:37Z 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.Collections.Generic;
+namespace IRaCIS.Core.Application.ViewModel;
+
+public class DeleteAudit
+{
+    public Guid Id { get; set; }
+
+    public AuditDocumentType AuditDocumentTypeEnum { get; set; }
+    public Guid? ParentId { get; set; }
+
+    public Guid? MainFileId { get; set; }
+}
+
+public class DeleteAuditDocumentInDto
+{
+    public List<Guid> Ids { get; set; }
+}
+
+public class GetAuditDocumentDataInDto:PageInput
+{
+    public  Guid? Id { get; set; }
+
+    public Guid? SelfId { get; set; }
+
+
+    public bool? IsAuthorization { get; set; }
+
+    public string Name { get; set; } = string.Empty;
+}
+
+public class GetAuditDocumentDataOutDto
+{
+    public List<AuditDocumentData> Data { get; set; } = new List<AuditDocumentData> { };
+}
+
+public class AuditDocumentData : AuditDocumentUpdateDto
+{
+    public DateTime CreateTime { get; set; }
+
+    public DateTime UpdateTime { get; set; }
+
+    public Guid? MainFileId { get; set; }
+
+
+    public int? Version { get; set; }
+
+    public int HistoricalVersionsCount { get; set; }
+    public  List<AuditDocumentData> Children { get; set; }=new List<AuditDocumentData> (){ };
+
+}
+
+public class AuditDocumentView : AuditDocumentAddOrEdit
+{
+    
+    public DateTime CreateTime { get; set; }
+    
+    public DateTime UpdateTime { get; set; }
+    
+}
+
+public class SetIsAuthorizationInDto
+{
+    public List<Guid> Ids { get; set; }
+
+    public bool IsAuthorization { get; set; }
+}
+
+public class SetCurrentVersionInDto
+{
+    public Guid Id { get; set; }
+}
+
+public class GetHistoricalVersionInDto
+{
+    public Guid Id    { get; set; }
+}
+
+public class GetHistoricalVersionOutDto
+{
+    public AuditDocumentData CurrentData { get; set; }
+    public List<AuditDocumentData> HistoricalVersionList { get; set; } = new List<AuditDocumentData> { };
+}
+
+public class MovieFileOrFolderInDto
+{
+    public List<Guid> Ids { get; set; }
+
+    public Guid ParentId { get; set; }
+}
+
+public class HistoricalVersionDto: AuditDocumentUpdateDto
+{
+    public bool IsCurrentVersion { get; set; } = false;
+
+    public int? Version { get; set; }
+
+    public DateTime CreateTime { get; set; }
+
+    public DateTime UpdateTime { get; set; }
+}
+
+public class AuditDocumentUpdateDto
+{
+    public Guid? Id { get; set; }
+
+    public AuditDocumentType AuditDocumentTypeEnum { get; set; }
+
+    public string? FileFormat { get; set; } 
+
+    public string? FilePath { get; set; }
+
+    public decimal? FileSize { get; set; }
+
+    public bool IsAuthorization { get; set; }
+
+    // public Guid? MainFileId { get; set; }
+
+    public string Name { get; set; }
+
+    public Guid? ParentId { get; set; }
+}
+
+public class GetBreadcrumbDataInDto
+{
+    public Guid Id { get; set; }
+}
+
+public class AuditDocumentAddOrEdit: AuditDocumentUpdateDto
+{
+  
+
+    public List<AuditDocumentAddOrEdit> Children { get; set; }=new  List<AuditDocumentAddOrEdit>() { };
+
+    public bool IsUpdate { get; set; } = true;
+}
+
+public class AuditDocumentQuery:PageInput
+{
+    public AuditDocumentType? AuditDocumentTypeEnum { get; set; }
+    
+    public string? FileFormat { get; set; }
+    
+    public string? FilePath { get; set; }
+    
+    public decimal?  FileSize { get; set; }
+    
+    public bool? IsAuthorization { get; set; }
+    
+    public Guid?  MainFileId { get; set; }
+    
+    public string? Name { get; set; }
+    
+    public Guid?  ParentId { get; set; }
+    
+    }
+
+
+
+

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

@@ -0,0 +1,68 @@
+
+//--------------------------------------------------------------------
+//     此代码由liquid模板自动生成  byzhouhang 20240909
+//	   生成时间 2025-02-21 07:47:30Z 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.Collections.Generic;
+namespace IRaCIS.Core.Application.ViewModel;
+
+public class SysFileTypeView : SysFileTypeAddOrEdit
+{
+
+    public DateTime CreateTime { get; set; }
+
+    public DateTime UpdateTime { get; set; }
+
+}
+
+
+public class SysFileTypeAddOrEdit
+{
+    public Guid? Id { get; set; }
+
+    public ArchiveType ArchiveTypeEnum { get; set; }
+
+    /// <summary>
+    /// 文档类型
+    /// </summary>
+    public SysTemplateType SysTemplateTypeEnum { get; set; }
+
+    public bool IsConfirmRecord { get; set; }
+
+    public bool IsEnable { get; set; }
+
+    public string Name { get; set; }
+
+    public string NameCN { get; set; }
+
+    /// <summary>
+    /// 显示顺序    
+    /// </summary>
+    public int ShowOrder { get; set; }
+
+    public SubIdentification SubIdentificationEnum { get; set; }
+}
+
+public class SysFileTypeQuery : PageInput
+{
+    public ArchiveType? ArchiveTypeEnum { get; set; }
+
+    public SysTemplateType? SysTemplateTypeEnum { get; set; }
+
+    public bool? IsConfirmRecord { get; set; }
+
+    public bool? IsEnable { get; set; }
+
+    public string? Name { get; set; }
+
+    public string? NameCN { get; set; }
+
+    public SubIdentification? SubIdentificationEnum { get; set; }
+}
+
+
+
+