角色禁用不发邮件

This reverts commit 5064630d1f.

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.SecurityToken" Version="3.7.400.36" />
-	  <PackageReference Include="DistributedLock.Core" Version="1.0.7" />
-	  <PackageReference Include="DistributedLock.SqlServer" Version="1.0.5" />
-	  <PackageReference Include="fo-dicom" Version="5.1.3" />
-	  <PackageReference Include="fo-dicom.Codecs" Version="5.15.1" />
-	  <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.3" />
+	  <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.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()
-       .RegisterServices(s =>
-            s.AddFellowOakDicom()
-              .AddTranscoderManager<NativeTranscoderManager>()
-              //.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
-              .AddImageManager<ImageSharpImageManager>())
-       .SkipValidation()
-       .Build();
+//new DicomSetupBuilder()
+//       .RegisterServices(s =>
+//            s.AddFellowOakDicom()
+//              .AddTranscoderManager<NativeTranscoderManager>()
+//              //.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
+//              .AddImageManager<ImageSharpImageManager>())
+//       .SkipValidation()
+//       .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/Properties/launchSettings.json

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

IRC.Core.SCP/Service/CStoreSCPService.cs

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

IRC.Core.SCP/appsettings.US_Prod_SCP.json

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

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,5 +1,7 @@
-using Amazon.Auth.AccessControlPolicy;
+using AlibabaCloud.SDK.Sts20150401;
+using Amazon.Auth.AccessControlPolicy;
 using Amazon.SecurityToken;
+using AutoMapper;
 using Azure.Core;
 using IdentityModel.Client;
 using IdentityModel.OidcClient;
@@ -20,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;
@@ -105,196 +109,6 @@ namespace IRaCIS.Api.Controllers
 
 
 
-        /// <summary>  系统用户登录接口[New] </summary>
-        [HttpPost, Route("user/login")]
-        [AllowAnonymous]
-        public async Task<IResponseOutput> Login(UserLoginDTO loginUser,
-            [FromServices] IFusionCache _fusionCache,
-            [FromServices] IUserService _userService,
-            [FromServices] ITokenService _tokenService,
-            [FromServices] IReadingImageTaskService readingImageTaskService,
-            [FromServices] IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig,
-            [FromServices] IOptionsMonitor<SystemEmailSendConfig> _emailConfig,
-
-            [FromServices] IMailVerificationService _mailVerificationService)
-        {
-            var emailConfig = _emailConfig.CurrentValue;
-            var companyInfo = new SystemEmailSendConfigView() { CompanyName = emailConfig.CompanyName, CompanyNameCN = emailConfig.CompanyNameCN, CompanyShortName = emailConfig.CompanyShortName, CompanyShortNameCN = emailConfig.CompanyShortNameCN };
-
-            //MFA 邮箱验证  前端传递用户Id  和MFACode
-            if (loginUser.UserId != null && _verifyConfig.CurrentValue.OpenLoginMFA)
-            {
-                Guid userId = (Guid)loginUser.UserId;
-
-                //验证MFA 编码是否有问题 ,前端要拆开，自己调用验证的逻辑
-                //await _userService.VerifyMFACodeAsync(userId, loginUser.MFACode);
-
-                //var loginUser = await _userRepository.Where(u => u.UserName.Equals(userName) && u.Password == password).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
-
-                var basicInfo = await _userService.GetUserBasicInfo(userId, loginUser.Password);
-
-                var loginReturn = new LoginReturnDTO() { BasicInfo = basicInfo };
-
-                loginReturn.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(loginReturn.BasicInfo));
-
-
-                // 创建一个 CookieOptions 对象，用于设置 Cookie 的属性
-                var option = new CookieOptions
-                {
-                    Expires = DateTime.Now.AddMonths(1), // 设置过期时间为 30 分钟之后
-                    HttpOnly = false, // 确保 cookie 只能通过 HTTP 访问
-                    SameSite = Microsoft.AspNetCore.Http.SameSiteMode.None, // 设置 SameSite 属性
-                    Secure = false // 确保 cookie 只能通过 HTTPS 访问
-                };
-
-                HttpContext.Response.Cookies.Append("access_token", loginReturn.JWTStr, option);
-
-                // 验证阅片休息时间
-                await readingImageTaskService.ResetReadingRestTime(userId);
-
-                await _fusionCache.SetAsync(CacheKeys.UserToken(userId), loginReturn.JWTStr, TimeSpan.FromDays(7));
-
-                await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(userId), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes));
-
-                loginReturn.CompanyInfo = companyInfo;
-                return ResponseOutput.Ok(loginReturn);
-
-            }
-            else
-            {
-                var returnModel = await _userService.Login(loginUser.UserName, loginUser.Password);
-
-                if (returnModel.IsSuccess)
-                {
-                    #region GRPC 调用鉴权中心，因为服务器IIS问题 http/2   故而没法使用
-
-                    ////重试策略
-                    //var defaultMethodConfig = new MethodConfig
-                    //{
-                    //    Names = { MethodName.Default },
-                    //    RetryPolicy = new RetryPolicy
-                    //    {
-                    //        MaxAttempts = 3,
-                    //        InitialBackoff = TimeSpan.FromSeconds(1),
-                    //        MaxBackoff = TimeSpan.FromSeconds(5),
-                    //        BackoffMultiplier = 1.5,
-                    //        RetryableStatusCodes = { Grpc.Core.StatusCode.Unavailable }
-                    //    }
-                    //};
-
-                    //#region  unable to trust the certificate then the gRPC client can be configured to ignore the invalid certificate
-
-                    //var httpHandler = new HttpClientHandler();
-                    //// Return `true` to allow certificates that are untrusted/invalid
-                    //httpHandler.ServerCertificateCustomValidationCallback =
-                    //    HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
-
-
-                    //////这一句是让grpc支持本地 http  如果本地访问部署在服务器上，那么是访问不成功的 
-                    //AppContext.SetSwitch(
-                    //    "System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport", true);
-
-                    //#endregion
-
-
-
-                    //var grpcAdress = configuration.GetValue<string>("GrpcAddress");
-                    ////var grpcAdress = "http://localhost:7200";
-
-                    //var channel = GrpcChannel.ForAddress(grpcAdress, new GrpcChannelOptions
-                    //{
-                    //    HttpHandler = httpHandler,
-                    //    ServiceConfig = new ServiceConfig { MethodConfigs = { defaultMethodConfig } }
-
-                    //});
-                    ////var channel = GrpcChannel.ForAddress(grpcAdress);
-                    //var grpcClient = new TokenGrpcService.TokenGrpcServiceClient(channel);
-
-                    //var userInfo = returnModel.Data.BasicInfo;
-
-                    //var tokenResponse = grpcClient.GetUserToken(new GetTokenReuqest()
-                    //{
-                    //    Id = userInfo.Id.ToString(),
-                    //    ReviewerCode = userInfo.ReviewerCode,
-                    //    IsAdmin = userInfo.IsAdmin,
-                    //    RealName = userInfo.RealName,
-                    //    UserTypeEnumInt = (int)userInfo.UserTypeEnum,
-                    //    UserTypeShortName = userInfo.UserTypeShortName,
-                    //    UserName = userInfo.UserName
-                    //});
-
-                    //returnModel.Data.JWTStr = tokenResponse.Token;
-
-                    #endregion
-
-                    var userId = returnModel.Data.BasicInfo.Id;
-
-                    if (_verifyConfig.CurrentValue.OpenLoginMFA)
-                    {
-
-
-
-
-                        //MFA 发送邮件
-
-                        returnModel.Data.IsMFA = true;
-
-                        var email = returnModel.Data.BasicInfo.EMail;
-
-                        var hiddenEmail = IRCEmailPasswordHelper.MaskEmail(email);
-
-                        returnModel.Data.BasicInfo.EMail = hiddenEmail;
-
-                        //修改密码
-                        if (returnModel.Data.BasicInfo.IsFirstAdd || returnModel.Data.BasicInfo.LoginState == 1)
-                        {
-                            returnModel.Data.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(returnModel.Data.BasicInfo));
-                        }
-                        else
-                        {
-                            //正常登录才发送邮件
-                            await _userService.SendMFAEmail(userId);
-
-                        }
-
-                    }
-                    else
-                    {
-                        returnModel.Data.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(returnModel.Data.BasicInfo));
-
-                        // 创建一个 CookieOptions 对象，用于设置 Cookie 的属性
-                        var option = new CookieOptions
-                        {
-                            Expires = DateTime.Now.AddMonths(1), // 设置过期时间为 30 分钟之后
-                            HttpOnly = false, // 确保 cookie 只能通过 HTTP 访问
-                            SameSite = Microsoft.AspNetCore.Http.SameSiteMode.None, // 设置 SameSite 属性
-                            Secure = false // 确保 cookie 只能通过 HTTPS 访问
-                        };
-
-                        HttpContext.Response.Cookies.Append("access_token", returnModel.Data.JWTStr, option);
-
-
-
-                        // 验证阅片休息时间
-                        await readingImageTaskService.ResetReadingRestTime(returnModel.Data.BasicInfo.Id);
-
-                        await _fusionCache.SetAsync(CacheKeys.UserToken(userId), returnModel.Data.JWTStr, TimeSpan.FromDays(7));
-
-                        await _fusionCache.SetAsync(CacheKeys.UserAutoLoginOut(userId), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes));
-                    }
-
-                }
-
-                returnModel.Data.CompanyInfo = companyInfo;
-                return returnModel;
-
-            }
-
-
-
-
-        }
-
         [AllowAnonymous]
         [HttpGet, Route("user/getPublicKey")]
         public IResponseOutput GetPublicKey([FromServices] IOptionsMonitor<IRCEncreptOption> _IRCEncreptOption)
@@ -309,18 +123,13 @@ namespace IRaCIS.Api.Controllers
         [AllowAnonymous]
         public IResponseOutput ShareImage([FromServices] ITokenService _tokenService)
         {
-            var token = _tokenService.GetToken(IRaCISClaims.Create(new UserBasicInfo()
+            var token = _tokenService.GetToken(new UserTokenInfo()
             {
-                Id = Guid.NewGuid(),
-                IsReviewer = false,
-                IsAdmin = false,
-                RealName = "Share001",
+                IdentityUserId = Guid.NewGuid(),
                 UserName = "Share001",
-                Sex = 0,
-                //UserType = "ShareType",
                 UserTypeEnum = UserTypeEnum.ShareImage,
-                Code = "ShareCode001",
-            }));
+
+            });
             return ResponseOutput.Ok("/showdicom?studyId=f7b67793-8155-0223-2f15-118f2642efb8&type=Share&token=" + token);
         }
 
@@ -375,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<User> _userRepository, 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);
@@ -394,10 +266,22 @@ namespace IRaCIS.Api.Controllers
 
             var errorUrl = domainStrList[0] + "//" + domainStrList[2] + "/error";
 
-
-            if (!await _userRepository.AnyAsync(t => t.Id == Guid.Parse(userId) && t.EmailToken == token && t.IsFirstAdd))
+            if (lang == "zh")
             {
-                decodeUrl = errorUrl + $"?lang={lang}&ErrorMessage={System.Web.HttpUtility.UrlEncode(lang == "zh" ? "您的初始化链接已过期" : "Error！The initialization link has expired.    Return")} ";
+                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/FinancialChangeController.cs

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

IRaCIS.Core.API/Controllers/InspectionController.cs

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

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

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

IRaCIS.Core.API/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
 {
@@ -55,6 +57,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,23 @@
 
 	<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.18" />
 		<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="Invio.Extensions.Authentication.JwtBearer" Version="2.0.1" />
-		<PackageReference Include="LogDashboard" Version="1.4.8" />
+		<PackageReference Include="Hangfire.SqlServer" Version="1.8.18" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
-		<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
+		<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
 		<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
 		<PackageReference Include="Serilog.Sinks.Email" Version="4.0.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.9.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.1" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -114,6 +113,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/IRaCIS.Core.API.xml

@@ -34,9 +34,6 @@
             <param name="doctorId"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Api.Controllers.ExtraController.Login(IRaCIS.Application.Contracts.UserLoginDTO,ZiggyCreatures.Caching.Fusion.IFusionCache,IRaCIS.Core.Application.Service.IUserService,IRaCIS.Core.Application.Auth.ITokenService,IRaCIS.Core.Application.Contracts.IReadingImageTaskService,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},IRaCIS.Core.Application.Service.IMailVerificationService)">
-            <summary>  系统用户登录接口[New] </summary>
-        </member>
         <member name="M:IRaCIS.Api.Controllers.ExtraController.OAuthCallBack(System.String,System.String)">
             <summary>
             回调到前端，前端调用后端的接口 
@@ -284,7 +281,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.ConfirmReReading(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.ViewModel.ConfirmReReadingCommand},IRaCIS.Core.Application.Service.IVisitTaskHelpeService,IRaCIS.Core.Application.Service.IVisitTaskService)">
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.ConfirmReReading(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.ViewModel.ConfirmReReadingCommand},IRaCIS.Core.Application.Service.IVisitTaskService)">
             <summary>
             重阅同意
             </summary>

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"
     },
@@ -69,6 +70,14 @@
         "ASPNETCORE_ENVIRONMENT": "US_Uat_IRC"
       },
       "applicationUrl": "http://localhost:6100"
+    },
+    "IRaCIS.US_Prod_IRC": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "US_Prod_IRC"
+      },
+      "applicationUrl": "http://localhost:6100"
     }
 
   }

IRaCIS.Core.API/SignalRHub/UploadHub.cs

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

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

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

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

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

IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs

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

IRaCIS.Core.API/_ServiceExtensions/LogDashboardSetup.cs

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

@@ -31,7 +31,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/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",
-    "Hangfire": "Server=47.117.164.182,1434;Database=Event_IRC_Hangfire;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=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",
-    //"Hangfire": "Server=101.132.193.237,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
-    "RemoteNew": "Server=prod_mssql_standard,1433;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
-    "Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
+    "RemoteNew": "Server=101.132.193.237,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
+    "Hangfire": "Server=101.132.193.237,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
+    //"RemoteNew": "Server=prod_mssql_standard,1433;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
+    //"Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
   },
   "ObjectStoreService": {
     "ObjectStoreUse": "AliyunOSS",
@@ -43,27 +43,27 @@
     "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
     "LoginFailLockMinutes": 30,
-
-    "AutoLoginOutMinutes": 360,
+    "AutoLoginOutMinutes": 120,
 
     "OpenLoginMFA": false,
 
     "ContinuousReadingTimeMin": 120,
-
     "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",
+    "FromEmail": "irc@extimaging.com",
+    "FromName": "irc",
     "AuthorizationCode": "ExtImg@2022",
     "SiteUrl": "http://irc.extimaging.com/login",
+    "SystemShortName": "IRC",
     "OrganizationName": "Extlmaging",
     "OrganizationNameCN": "Extlmaging",
     "CompanyName": "Extensive Imaging",

IRaCIS.Core.API/appsettings.Test_IRC.json

@@ -23,9 +23,11 @@
       "AccessKeySecret": "FLizxkHsMm4CGYHtkV8E3PNJJZU7oV",
       "RoleArn": "acs:ram::1899121822495495:role/dev-oss-access",
       "BucketName": "zy-irc-test-store",
-      "ViewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
+      //"ViewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
+      "ViewEndpoint": "https://zy-irc-test-dev-cache.oss-cn-shanghai.aliyuncs.com",
       "Region": "oss-cn-shanghai",
-      "DurationSeconds": 7200
+      "DurationSeconds": 7200,
+      "PreviewEndpoint": "https://test-oss.test.extimaging.com"
     },
     "MinIO": {
       "EndPoint": "hir-oss.test.extimaging.com",
@@ -52,28 +54,26 @@
   "BasicSystemConfig": {
 
     "OpenUserComplexPassword": false,
-
     "OpenSignDocumentBeforeWork": false,
 
-    "OpenTrialRelationDelete": true,
-
     "OpenLoginLimit": false,
-
     "LoginMaxFailCount": 5,
-
     "LoginFailLockMinutes": 1,
-
-    "AutoLoginOutMinutes": 1,
+    "AutoLoginOutMinutes": 10,
 
     "OpenLoginMFA": false,
 
     "ContinuousReadingTimeMin": 120,
-
     "ReadingRestTimeMin": 10,
-    "IsNeedChangePassWord": true,
 
+    "IsNeedChangePassWord": true,
     "ChangePassWordDays": 90,
 
+    // 模板类型 1 Elevate  2 Extensive
+    "TemplateType": 2,
+
+    "OpenTrialRelationDelete": true,
+
     "ThirdPdfUrl": "http://106.14.89.110:30088/api/v1/convert/file/pdf"
   },
 
@@ -85,6 +85,7 @@
     "AuthorizationCode": "SHzyyl2021",
     "SiteUrl": "http://irc.test.extimaging.com/login",
 
+    "SystemShortName": "IRC",
     "OrganizationName": "Extlmaging",
     "OrganizationNameCN": "Extlmaging",
     "CompanyName": "Extensive Imaging",

IRaCIS.Core.API/appsettings.US_Prod_IRC.json

@@ -7,8 +7,8 @@
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=us-prod-mssql-service,1433;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=us-prod-mssql-service,1433;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+    "RemoteNew": "Server=us-mssql-prod,1433;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=us-mssql-prod,1433;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
     //"RemoteNew": "Server=44.210.231.169,1435;Database=US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
     //"Hangfire": "Server=44.210.231.169,1435;Database=US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
   },
@@ -39,25 +39,26 @@
   },
   "BasicSystemConfig": {
 
-    "OpenUserComplexPassword": false,
-
-    "OpenSignDocumentBeforeWork": false,
-
-    "OpenTrialRelationDelete": true,
-
-    "OpenLoginLimit": false,
+    "OpenUserComplexPassword": true,
+    "OpenSignDocumentBeforeWork": true,
 
+    "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
-
     "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 60,
+    "AutoLoginOutMinutes": 120,
+
+    "OpenLoginMFA": true,
 
     "ContinuousReadingTimeMin": 120,
-
     "ReadingRestTimeMin": 10,
-    "IsNeedChangePassWord": true,
 
-    "ChangePassWordDays": 90
+    "IsNeedChangePassWord": true,
+    "ChangePassWordDays": 90,
+    // 模板类型 1 Elevate  2 Extensive
+    "TemplateType": 1,
+
+    "OpenTrialRelationDelete": false
+
   },
 
   "SystemEmailSendConfig": {
@@ -67,6 +68,7 @@
     "FromName": "LiLi",
     "AuthorizationCode": "Q#669869497420ul",
 
+    "SystemShortName": "LiLi",
     "OrganizationName": "Elevate Imaging",
     "OrganizationNameCN": "Elevate Imaging",
     "CompanyName": "Elevate Imaging Inc.",
@@ -75,7 +77,7 @@
     "CompanyShortNameCN": "展影医疗",
     "SiteUrl": "https://lili.elevateimaging.ai/login",
     "IsEnv_US": true,
-    "IsOpenErrorNoticeEmail": true,
+    "IsOpenErrorNoticeEmail": false,
     "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
   },
 
@@ -75,6 +76,7 @@
     "FromName": "LiLi",
     "AuthorizationCode": "Q#669869497420ul",
 
+    "SystemShortName": "LiLi",
     "OrganizationName": "Elevate Imaging",
     "OrganizationNameCN": "Elevate Imaging",
     "CompanyName": "Elevate Imaging Inc.",

IRaCIS.Core.API/appsettings.US_Uat_IRC.json

@@ -50,26 +50,22 @@
   "BasicSystemConfig": {
 
     "OpenUserComplexPassword": true,
-
     "OpenSignDocumentBeforeWork": true,
 
-    "OpenTrialRelationDelete": true,
-
-    "OpenLoginLimit": false,
-
+    "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
-
     "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 60,
+    "AutoLoginOutMinutes": 120,
+
+    "OpenLoginMFA": true,
 
     "ContinuousReadingTimeMin": 120,
-
     "ReadingRestTimeMin": 10,
+
     "IsNeedChangePassWord": true,
-
     "ChangePassWordDays": 90,
-
-    "OpenLoginMFA": false
+    // 模板类型 1 Elevate  2 Extensive
+    "TemplateType": 1
   },
 
   "SystemEmailSendConfig": {
@@ -79,13 +75,14 @@
     "FromName": "LiLi",
     "AuthorizationCode": "Q#669869497420ul",
 
+    "SystemShortName": "LiLi",
     "OrganizationName": "Elevate Imaging",
     "OrganizationNameCN": "Elevate Imaging",
     "CompanyName": "Elevate Imaging Inc.",
     "CompanyNameCN": "上海展影医疗科技有限公司",
     "CompanyShortName": "Elevate Imaging",
     "CompanyShortNameCN": "展影医疗",
-    "SiteUrl": "https://lili.test.elevateimaging.ai/login",
+    "SiteUrl": "https://lili.uat.elevateimaging.ai/login",
     "IsEnv_US": true,
     "IsOpenErrorNoticeEmail": false,
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -56,22 +56,23 @@
   "BasicSystemConfig": {
 
     "OpenUserComplexPassword": true,
-
     "OpenSignDocumentBeforeWork": true,
 
     "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
 
     "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 60,
+    "AutoLoginOutMinutes": 120,
+
     "OpenLoginMFA": false,
 
     "ContinuousReadingTimeMin": 120,
-
     "ReadingRestTimeMin": 10,
-    "IsNeedChangePassWord": true,
 
-    "ChangePassWordDays": 90
+    "IsNeedChangePassWord": true,
+    "ChangePassWordDays": 90,
+    // 模板类型 1 Elevate  2 Extensive
+    "TemplateType": 2
 
   },
   "SystemEmailSendConfig": {
@@ -81,6 +82,8 @@
     "FromName": "UAT_IRC",
     "AuthorizationCode": "SHzyyl2021",
     "SiteUrl": "http://irc.uat.extimaging.com/login",
+
+    "SystemShortName": "IRC",
     "OrganizationName": "Extlmaging",
     "OrganizationNameCN": "Extlmaging",
     "CompanyName": "Extensive Imaging",
@@ -94,7 +97,7 @@
 
   "SystemPacsConfig": {
     "Port": "11113",
-    "IP": "47.117.164.182"
+    "IP": "101.132.253.119"
   }
 
 }

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.API/wwwroot/swagger/ui/abp.swagger.js

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

IRaCIS.Core.Application/Auth/IRaCISClaims.cs

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

IRaCIS.Core.Application/Auth/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

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

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

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

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

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

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

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

@@ -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;
 
@@ -71,6 +75,7 @@ public class SystemEmailSendConfig
 
 public class SystemEmailSendConfigView
 {
+   public string SystemShortName { get; set; } = string.Empty;
     public string CompanyName { get; set; } = string.Empty;
 
     public string CompanyNameCN { get; set; } = string.Empty;
@@ -140,7 +145,7 @@ public static class AppSettings
             case nameof(Doctor):
                 return IRaCISBasicConfig.DoctorCodePrefix + codeInt.ToString("D4");
 
-            case nameof(User):
+            case nameof(IdentityUser):
                 return IRaCISBasicConfig.UserCodePrefix + codeInt.ToString("D4");
 
             case nameof(QCChallenge):

IRaCIS.Core.Application/GlobalUsings.cs

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

IRaCIS.Core.Application/Helper/CacheHelper.cs

@@ -27,6 +27,11 @@ public static class CacheKeys
     //超时没请求接口自动退出
     public static string UserAutoLoginOut(Guid userId) => $"UserAutoLoginOut:{userId}";
 
+
+    public static string UserDisable(Guid userId) => $"UserDisable:{userId}";
+
+    public static string UserRoleDisable(Guid userRoleId) => $"UserRoleDisable:{userRoleId}";
+
     /// <summary>
     /// 用户登录错误 限制登录
     /// </summary>

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

@@ -64,7 +64,7 @@ public static class ExcelExportHelper
             foreach (var key in dic.Keys)
             {
                 //是数组 那么找到对应的属性 进行翻译
-                if (dic[key]!=null && dic[key].GetType().GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IList<>)))
+                if (dic[key] != null && dic[key].GetType().GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IList<>)))
                 {
 
                     var newObjList = new List<object>();
@@ -243,6 +243,7 @@ public static class ExcelExportHelper
 
     }
 
+
     public class DynamicColumnConfig
     {
         /// <summary>
@@ -255,13 +256,19 @@ public static class ExcelExportHelper
         /// </summary>
         public int AutoColumnTitleRowIndex { get; set; }
 
-
+        /// <summary>
+        /// 模板列最后的索引
+        /// </summary>
         public int TempalteLastColumnIndex { get; set; }
 
+        public bool IsCDISCExport { get; set; }=false;
+
+        //public List<string> CDISCList { get; set; } = new List<string>();
+
         /// <summary>
-        /// 动态的列名
+        /// 动态的列名  如果Id 重复，那么就按照名称填充，否则就按照Id 填充列数据
         /// </summary>
-        public List<string> ColumnNameList { get; set; } = new List<string>();
+        public List<ColumItem> ColumnIdNameList { get; set; }
 
         /// <summary>
         /// 动态翻译的字典名
@@ -288,7 +295,31 @@ public static class ExcelExportHelper
         /// </summary>
         public string DynamicItemTitleName { get; set; }
 
+        public string DynamicItemTitleId { get; set; }
+
         public List<int> RemoveColunmIndexList { get; set; } = new List<int>();
+
+        public class ColumItem
+        {
+            public Guid Id { get; set; }
+            public string Name { get; set; }
+
+            public 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();
+        public List<string> ColumnNameList => ColumnIdNameList == null ? new List<string>() : ColumnIdNameList.Select(t => t.Name).ToList();
     }
 
 
@@ -421,7 +452,7 @@ public static class ExcelExportHelper
                 workbook.RemoveSheetAt(1);
             }
 
-            //中文替换项目术语
+            #region 中文替换项目术语
             if (data.TrialObjectNameList?.Count > 0)
             {
                 var replaceObjectList = data.TrialObjectNameList;
@@ -457,21 +488,378 @@ public static class ExcelExportHelper
                     }
                 }
             }
+            #endregion
+
+
 
             if (dynamicColumnConfig != null)
             {
+                //var isCdics = dynamicColumnConfig.CDISCList.Count > 0;
+
+                var isCdics = dynamicColumnConfig.IsCDISCExport;
+
                 var sheet = workbook.GetSheetAt(0);
 
+                var cdicsRow = sheet.GetRow(dynamicColumnConfig.AutoColumnTitleRowIndex - 1);
                 var titelRow = sheet.GetRow(dynamicColumnConfig.AutoColumnTitleRowIndex);
                 var templateRow = sheet.GetRow(dynamicColumnConfig.AutoColumnTitleRowIndex + 1);
 
                 //动态移除列的数量
                 var dynamicRemoveColunmCount = dynamicColumnConfig.RemoveColunmIndexList.Count();
 
+                //在动态列开始前移除的数量
                 var beforeDynamicRemoveCount = dynamicColumnConfig.RemoveColunmIndexList.Where(t => t < dynamicColumnConfig.AutoColumnStartIndex).Count();
 
                 //动态添加列的数量
-                var needAddCount = dynamicColumnConfig.ColumnNameList.Count;
+                var needAddCount = dynamicColumnConfig.ColumnIdNameList.Count;
+
+                //原始表  最终索引
+                var originTotalEndIndex = dynamicColumnConfig.TempalteLastColumnIndex;
+
+                //减去动态移除后原始结束索引
+                var originRemoveEndIndex = originTotalEndIndex - dynamicRemoveColunmCount;
+
+                //最终表 动态列开始索引
+                var dynamicColunmStartIndex = dynamicColumnConfig.AutoColumnStartIndex - beforeDynamicRemoveCount;
+
+                //最终表 动态列的终止索引
+                var dynamicColunmEndIndex = dynamicColunmStartIndex + needAddCount - 1;
+
+                //最终表  最终索引
+                var totalColunmEndIndex = originTotalEndIndex + needAddCount - dynamicRemoveColunmCount;
+
+
+                //动态列后需要移动的数量
+                var backMoveCount = totalColunmEndIndex - dynamicColunmEndIndex;
+
+                //删除需要动态删除的列  从大到小移除，否则索引会变
+                foreach (var removeIndex in dynamicColumnConfig.RemoveColunmIndexList.OrderByDescending(t => t))
+                {
+                    //将后面的列向前移动
+                    for (var i = 0; i < originTotalEndIndex - removeIndex; i++)
+                    {
+                        Console.WriteLine(titelRow.GetCell(removeIndex + i + 1).StringCellValue);
+                        titelRow.GetCell(removeIndex + i).SetCellValue(titelRow.GetCell(removeIndex + i + 1).StringCellValue);
+                        templateRow.GetCell(removeIndex + i).SetCellValue(templateRow.GetCell(removeIndex + i + 1).StringCellValue);
+
+                        //后面的数据要清空
+                        titelRow.GetCell(removeIndex + i + 1).SetCellValue("");
+                        templateRow.GetCell(removeIndex + i + 1).SetCellValue("");
+
+                    }
+
+                }
+
+                //创建新的列
+                for (int i = originRemoveEndIndex; i < originRemoveEndIndex + needAddCount; i++)
+                {
+
+                    titelRow.CreateCell(i + 1);
+                    templateRow.CreateCell(i + 1);
+
+                    if (isCdics)
+                    {
+                        cdicsRow.CreateCell(i + 1);
+                    }
+                }
+                //移动Title 和下面的模板标识
+
+                var gap = totalColunmEndIndex - originRemoveEndIndex;
+
+                for (int i = totalColunmEndIndex; i > dynamicColunmEndIndex; i--)
+                {
+
+                    titelRow.GetCell(i).SetCellValue(titelRow.GetCell(i - gap).StringCellValue);
+
+                    templateRow.GetCell(i).SetCellValue(templateRow.GetCell(i - gap).StringCellValue);
+
+                    if (isCdics)
+                    {
+                        cdicsRow.GetCell(i).SetCellValue(cdicsRow.GetCell(i - gap).StringCellValue);
+                    }
+                }
+
+
+
+                //设置动态Tilte
+
+                for (int i = dynamicColunmStartIndex; i < dynamicColunmStartIndex + needAddCount; i++)
+                {
+
+                    var name = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].Name;
+
+                    titelRow.GetCell(i).SetCellValue(name);
+                    templateRow.GetCell(i).SetCellValue("");
+
+                    if (isCdics)
+                    {
+                        var cdicsCode = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].CDISCCode;
+
+                        cdicsRow.GetCell(i).SetCellValue(cdicsCode);
+                    }
+                }
+
+            }
+
+
+            using (var memoryStream2 = new MemoryStream())
+            {
+                workbook.Write(memoryStream2, true);
+
+                memoryStream2.Seek(0, SeekOrigin.Begin);
+
+                templateStream = memoryStream2;
+            }
+
+        }
+
+        #endregion
+
+        #region MiniExcel
+
+        var memoryStream = new MemoryStream();
+
+        var config = new OpenXmlConfiguration()
+        {
+            IgnoreTemplateParameterMissing = true,
+        };
+
+        //await MiniExcel.SaveAsByTemplateAsync("testmini.xlsx", templateStream.ToArray(), translateData);
+
+        await MiniExcel.SaveAsByTemplateAsync(memoryStream, templateStream.ToArray(), translateData, config);
+
+
+        memoryStream.Seek(0, SeekOrigin.Begin);
+
+        if (dynamicColumnConfig != null)
+        {
+            //Excel 列是按照名称填充 还是Id 填充
+            var isExcelAddDataWithName = dynamicColumnConfig.ColumnIdNameList.Select(t => t.Id).Distinct().Count() == 1;
+
+            var dynamicTranslateDataList = await _dictionaryService.GetBasicDataSelect(dynamicColumnConfig.TranslateDicNameList.ToArray());
+
+            // 使用NPOI  进行二次处理
+            var wb = new XSSFWorkbook(memoryStream);
+            var sheet = wb.GetSheetAt(0);
+
+            var list = translatedDic["List"] as IList;
+
+            foreach (var itemResult in list)
+            {
+                var index = list.IndexOf(itemResult);
+
+                //从第四行开始处理动态列
+                var row = sheet.GetRow(index + dynamicColumnConfig.AutoColumnTitleRowIndex + 1);
+
+                var itemDic = itemResult.ToDictionary();
+
+                var itemList = itemDic[dynamicColumnConfig.DynamicListName] as IList;
+
+                //这个数组是动态的，有的多，有的少，所以在此对比Title 一致才赋值
+                foreach (var itemObj in itemList)
+                {
+
+                    var iteObjDic = itemObj.ToDictionary();
+
+                    var itemDicName = iteObjDic[dynamicColumnConfig.DynamicItemDicName]?.ToString();
+                    var itemValue = iteObjDic[dynamicColumnConfig.DynamicItemValueName]?.ToString();
+
+                    //var writeIndex = itemList.IndexOf(itemObj) + dynamicColumnConfig.AutoColumnStartIndex;
+
+                    var writeIndex = 0;
+
+                    if (isExcelAddDataWithName)
+                    {
+                        writeIndex = dynamicColumnConfig.ColumnNameList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleName].ToString()) + dynamicColumnConfig.AutoColumnStartIndex;
+                    }
+                    else
+                    {
+                        writeIndex = dynamicColumnConfig.ColumnIdList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleId].ToString()) + dynamicColumnConfig.AutoColumnStartIndex;
+                    }
+
+
+                    if (itemDicName.IsNotNullOrEmpty())
+                    {
+
+                        var translatedItemData = dynamicTranslateDataList[itemDicName].Where(t => t.Code.ToLower() == itemValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
+
+                        row.GetCell(writeIndex).SetCellValue(translatedItemData);
+                    }
+                    else
+                    {
+                        row.GetCell(writeIndex).SetCellValue(itemValue);
+
+                    }
+
+                }
+            }
+
+            var memoryStream2 = new MemoryStream();
+            wb.Write(memoryStream2, true);
+            memoryStream2.Seek(0, SeekOrigin.Begin);
+
+            memoryStream = memoryStream2;
+
+        }
+
+
+        return (memoryStream, fileName);
+
+
+
+
+        #endregion
+    }
+
+    /// <summary>
+    /// 暂时废弃--合并到上面
+    /// </summary>
+    /// <param name="code"></param>
+    /// <param name="data"></param>
+    /// <param name="_commonDocumentRepository"></param>
+    /// <param name="_hostEnvironment"></param>
+    /// <param name="_dictionaryService"></param>
+    /// <param name="translateType"></param>
+    /// <param name="criterionType"></param>
+    /// <param name="dynamicColumnConfig"></param>
+    /// <returns></returns>
+    public static async Task<(MemoryStream, string)> CDISC_DataExport_Async(string code, ExcelExportInfo data, IRepository<CommonDocument> _commonDocumentRepository, IWebHostEnvironment _hostEnvironment, IDictionaryService? _dictionaryService = null, Type? translateType = null, CriterionType? criterionType = null, DynamicColumnConfig? dynamicColumnConfig = null)
+    {
+        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+        //判断是否有字典翻译
+
+        object translateData = data;
+
+        Dictionary<string, object> translatedDic = default;
+
+        if (_dictionaryService != null && translateType != null)
+        {
+
+            //一个值 对应不同的字典翻译
+            var needTranslatePropertyList = translateType.GetProperties().Where(t => t.IsDefined(typeof(DictionaryTranslateAttribute), true))
+                .SelectMany(c =>
+                c.GetCustomAttributes(typeof(DictionaryTranslateAttribute), false).Select(f => (DictionaryTranslateAttribute?)f).Where(t => t.CriterionType == criterionType || t.CriterionType == null)
+                .Select(k => new { c.Name, k.DicParentCode, k.IsTranslateDenpendOtherProperty, k.DependPropertyName, k.DependPropertyValueStr })
+                ).ToList();
+
+
+
+            //字典表查询出所有需要翻译的数据
+
+            var translateDataList = await _dictionaryService.GetBasicDataSelect(needTranslatePropertyList.Select(t => t.DicParentCode).Distinct().ToArray());
+
+            var dic = data.ConvertToDictionary();
+            //var dic = (JsonConvert.DeserializeObject<IDictionary<string, object>>(data.ToJsonNotIgnoreNull())).IfNullThrowException();
+
+            foreach (var key in dic.Keys)
+            {
+                //是数组 那么找到对应的属性 进行翻译
+                if (dic[key] != null && dic[key].GetType().GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IList<>)))
+                //if (dic[key].GetType().IsAssignableFrom(typeof(JArray)))
+                {
+
+                    var newObjList = new List<object>();
+                    var no = 1;
+                    foreach (var item in dic[key] as IList)
+                    //foreach (var item in dic[key] as JArray)
+                    {
+                        //var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
+                        var itemDic = item.ConvertToDictionary();
+
+                        foreach (var needTranslateProperty in needTranslatePropertyList)
+                        {
+                            if (itemDic.Keys.Any(t => t == needTranslateProperty.Name))
+                            {
+                                //翻译的属性依赖其他属性
+                                if (needTranslateProperty.IsTranslateDenpendOtherProperty)
+                                {
+                                    if (itemDic[needTranslateProperty.DependPropertyName]?.ToString().ToLower() == needTranslateProperty.DependPropertyValueStr.ToLower())
+                                    {
+                                        var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
+
+                                        itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
+                                    }
+                                }
+                                //普通翻译 或者某一标准翻译
+                                else
+                                {
+                                    var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
+
+
+                                    itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
+                                }
+                            }
+
+
+
+
+                        }
+
+                        itemDic.Add("No", no++);
+                        newObjList.Add(itemDic);
+                    }
+
+                    dic[key] = newObjList;
+
+                }
+            }
+
+
+            //data = dic;
+            translateData = dic;
+            translatedDic = dic;
+
+        }
+
+
+        var (physicalPath, fileName) = await FileStoreHelper.GetCommonDocPhysicalFilePathAsync(_hostEnvironment, _commonDocumentRepository, code);
+
+
+        //模板路径
+        var tplPath = physicalPath;
+
+        #region 根据中英文  删除模板sheet
+
+        // 打开模板文件
+        var templateFile = new FileStream(tplPath, FileMode.Open, FileAccess.Read);
+
+        // 获取文件流
+        var templateStream = new MemoryStream();
+        templateFile.CopyTo(templateStream);
+        templateStream.Seek(0, SeekOrigin.Begin);
+
+        var workbook = new XSSFWorkbook(templateStream);
+
+        int sheetCount = workbook.NumberOfSheets;
+
+        if (sheetCount == 2)
+        {
+            if (isEn_US)
+            {
+                workbook.RemoveSheetAt(0);
+            }
+            else
+            {
+                workbook.RemoveSheetAt(1);
+            }
+
+            if (dynamicColumnConfig != null)
+            {
+                var sheet = workbook.GetSheetAt(0);
+
+
+                var cdicsRow = sheet.GetRow(dynamicColumnConfig.AutoColumnTitleRowIndex - 1);
+                var titelRow = sheet.GetRow(dynamicColumnConfig.AutoColumnTitleRowIndex);
+                var templateRow = sheet.GetRow(dynamicColumnConfig.AutoColumnTitleRowIndex + 1);
+
+                //动态移除列的数量
+                var dynamicRemoveColunmCount = dynamicColumnConfig.RemoveColunmIndexList.Count();
+
+                //在动态列开始前移除的数量
+                var beforeDynamicRemoveCount = dynamicColumnConfig.RemoveColunmIndexList.Where(t => t < dynamicColumnConfig.AutoColumnStartIndex).Count();
+
+                //动态添加列的数量
+                var needAddCount = dynamicColumnConfig.ColumnIdNameList.Count;
 
                 //原始表  最终索引
                 var originTotalEndIndex = dynamicColumnConfig.TempalteLastColumnIndex;
@@ -513,6 +901,7 @@ public static class ExcelExportHelper
                 //创建新的列
                 for (int i = originTotalEndIndex; i < originTotalEndIndex + needAddCount; i++)
                 {
+                    cdicsRow.CreateCell(i + 1);
                     titelRow.CreateCell(i + 1);
                     templateRow.CreateCell(i + 1);
                 }
@@ -534,8 +923,11 @@ public static class ExcelExportHelper
 
                 for (int i = dynamicColunmStartIndex; i < dynamicColunmStartIndex + needAddCount; i++)
                 {
-                    var name = dynamicColumnConfig.ColumnNameList[i - dynamicColunmStartIndex];
+                    var name = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].Name;
 
+                    var cdicsCode = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].CDISCCode;
+
+                    cdicsRow.GetCell(i).SetCellValue(cdicsCode);
                     titelRow.GetCell(i).SetCellValue(name);
                     templateRow.GetCell(i).SetCellValue("");
                 }
@@ -569,6 +961,8 @@ public static class ExcelExportHelper
 
         if (dynamicColumnConfig != null)
         {
+            var isExcelAddDataWithName = dynamicColumnConfig.ColumnIdNameList.Select(t => t.Id).Count() == 1;
+
             var dynamicTranslateDataList = await _dictionaryService.GetBasicDataSelect(dynamicColumnConfig.TranslateDicNameList.ToArray());
 
             // 使用NPOI  进行二次处理
@@ -599,7 +993,15 @@ public static class ExcelExportHelper
 
                     //var writeIndex = itemList.IndexOf(itemObj) + dynamicColumnConfig.AutoColumnStartIndex;
 
-                    var writeIndex = dynamicColumnConfig.ColumnNameList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleName].ToString()) + dynamicColumnConfig.AutoColumnStartIndex;
+                    var writeIndex = 0;
+                    if (isExcelAddDataWithName)
+                    {
+                        writeIndex = dynamicColumnConfig.ColumnNameList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleName].ToString()) + dynamicColumnConfig.AutoColumnStartIndex;
+                    }
+                    else
+                    {
+                        writeIndex = dynamicColumnConfig.ColumnIdList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleId].ToString()) + dynamicColumnConfig.AutoColumnStartIndex;
+                    }
 
                     if (itemDicName.IsNotNullOrEmpty())
                     {
@@ -635,6 +1037,7 @@ public static class ExcelExportHelper
     }
 
 
+
     /// <summary>
     /// 导出文件模板
     /// </summary>

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)
@@ -77,13 +77,32 @@ namespace IRaCIS.Core.Application.Helper
                 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,9 +10,12 @@ 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;
 
@@ -59,7 +63,7 @@ public class AliyunOSSOptions
 
     public int DurationSeconds { get; set; }
 
-
+    public string PreviewEndpoint { get; set; }
 
 }
 
@@ -105,6 +109,7 @@ public class AliyunOSSTempToken
     public string SecurityToken { get; set; }
     public DateTime Expiration { get; set; }
 
+    public string PreviewEndpoint { get; set; }
 
 }
 
@@ -143,9 +148,17 @@ public interface IOSSService
 
     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);
 }
 
 
@@ -346,8 +359,12 @@ public class OSSService : IOSSService
 
 
     public async Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath)
+    {
+        if (isFirstCall)
         {
             GetObjectStoreTempToken();
+            isFirstCall = false;
+        }
 
         ossRelativePath = ossRelativePath.TrimStart('/');
         try
@@ -526,12 +543,240 @@ 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>
+    /// <returns></returns>
+    public List<string> GetRootFolderNames()
+    {
+        GetObjectStoreTempToken();
+        var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+        var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint,
+                                        AliyunOSSTempToken.AccessKeyId,
+                                        AliyunOSSTempToken.AccessKeySecret,
+                                        AliyunOSSTempToken.SecurityToken);
+
+        List<string> rootFolders = new List<string>();
+        string nextMarker = null;
+
+        try
+        {
+            ObjectListing objectListing = null;
+            do
+            {
+                // 列出根目录下的对象和文件夹
+                objectListing = _ossClient.ListObjects(new Aliyun.OSS.ListObjectsRequest(aliConfig.BucketName)
+                {
+
+                    MaxKeys = 1000,
+                    Marker = nextMarker,
+                    Delimiter = "/"  // 使用分隔符来模拟文件夹
+                });
+
+                // 遍历 CommonPrefixes 获取根文件夹名称
+                foreach (var prefix in objectListing.CommonPrefixes)
+                {
+                    rootFolders.Add(prefix.TrimEnd('/')); // 去掉末尾的斜杠
+                }
+
+                // 设置 NextMarker 以获取下一页的数据
+                nextMarker = objectListing.NextMarker;
+
+            } while (objectListing.IsTruncated);
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Error: {ex.Message}");
+        }
+
+        return rootFolders;
+    }
+
     /// <summary>
     /// 删除某个目录的文件
     /// </summary>
     /// <param name="prefix"></param>
     /// <returns></returns>
-    public async Task DeleteFromPrefix(string prefix)
+    public async Task DeleteFromPrefix(string prefix, bool isCache = false)
     {
         GetObjectStoreTempToken();
 
@@ -541,6 +786,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
             {
@@ -549,7 +809,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,
@@ -561,7 +821,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 以获取下一页的数据
@@ -618,7 +878,6 @@ public class OSSService : IOSSService
 
             var awsConfig = ObjectStoreServiceOptions.AWS;
 
-
             // 提供awsAccessKeyId和awsSecretAccessKey构造凭证
             var credentials = new SessionAWSCredentials(AWSTempToken.AccessKeyId, AWSTempToken.SecretAccessKey, AWSTempToken.SessionToken);
 
@@ -670,6 +929,159 @@ 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("未定义的存储介质类型");
+        }
+    }
+
+    private bool isFirstCall = true;
+    public async Task<long> GetObjectSizeAsync(string sourcePath)
+    {
+        if (isFirstCall)
+        {
+            GetObjectStoreTempToken();
+            isFirstCall = false;
+        }
+
+
+        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 metadata = _ossClient.GetObjectMetadata(aliConfig.BucketName, objectkey);
+
+            long fileSize = metadata.ContentLength; // 文件大小（字节）
+
+            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()
     {
@@ -713,6 +1125,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/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="AWSSDK.SecurityToken" Version="3.7.400.36" />
+		<PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.5" />
+		<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.401.81" />
 		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
-		<PackageReference Include="AWSSDK.S3" Version="3.7.405" />
-		<PackageReference Include="DocX" Version="3.0.1" />	
+		<PackageReference Include="AWSSDK.S3" Version="3.7.416.8" />
+		<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="Hangfire.Core" Version="1.8.18" />
 		<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="fo-dicom" Version="5.1.3" />
-		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.3" />
-		<PackageReference Include="fo-dicom.Codecs" Version="5.15.1" />
+		<PackageReference Include="DistributedLock.SqlServer" Version="1.0.6" />
+		<PackageReference Include="fo-dicom" Version="5.2.1" />
+		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.1" />
+		<PackageReference Include="fo-dicom.Codecs" Version="5.16.1" />
 		<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.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
-		<PackageReference Include="MimeKit" Version="4.7.1" />
-		<PackageReference Include="MiniExcel" Version="1.34.2" />
-		<PackageReference Include="Minio" Version="6.0.3" />
-		<PackageReference Include="MiniWord" Version="0.8.0" />
+		<PackageReference Include="MimeKit" Version="4.11.0" />
+		<PackageReference Include="MiniExcel" Version="1.41.2" />
+		<PackageReference Include="Minio" Version="6.0.4" />
+		<PackageReference Include="MiniWord" Version="0.9.2" />
 		<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.3" />
 		<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.7" />
 		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
-		<PackageReference Include="ZiggyCreatures.FusionCache" Version="1.4.0" />
+		<PackageReference Include="ZiggyCreatures.FusionCache" Version="2.1.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,
-        EnumValue=x.Code,
-        Value=x.Value,
-        ValueCN=x.ValueCN
+            DictionaryCode = x.Parent.Code,
+            EnumValue = x.Code,
+            Value = x.Value,
+            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;
@@ -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,17 +208,17 @@ 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)可能同时存在多种模态影像。准确核实后，请回复该访视正确的影像检查情况。");
                             dbSV.CheckState = CheckStateEnum.CVPassed;
-                            dbSV.CheckUserId = _userInfo.Id;
+                            dbSV.CheckUserId = _userInfo.UserRoleId;
                             dbSV.CheckPassedTime = DateTime.Now;
                             dbSV.CheckChallengeState = CheckChanllengeTypeEnum.Closed;
 
                             //---核对EDC数据，完全一致
-                            dbSV.CheckResult = _localizer["ConsistencyVerification_EDCB"];
+                            dbSV.CheckResult = _localizer["ConsistencyVerification_EDCB", _systemEmailConfig.SystemShortName];
                             //---自动核查通过
                             dbSV.ManualPassReason = _localizer["ConsistencyVerification_Auto"];
 
@@ -217,14 +239,14 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
                         else
                         {
                             //"Problems are as follows:
-                            dialogMsg.AppendLine($"<br/><div style='color: red'>{_localizer["ConsistencyVerification_Prob"]}</div>");
+                            dialogMsg.AppendLine($"<br/><div>{_localizer["ConsistencyVerification_Prob"]}</div>");
 
                             num = 0;
                             foreach (var item in dbExceptExcel)
                             {
                                 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"] +
-                                    String.Join(" | ", dbExceptExcel.Select(t => $"{_localizer["ConsistencyVerification_EdcL", t.StudyDate, t.Modality]}")) + "  |  "
-                                    + String.Join(" | ", excelExceptDB.Select(t => $"{_localizer["ConsistencyVerification_IrcLi", t.StudyDate, t.Modality]}"));
+                            dbSV.CheckResult =
+                                    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, _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,522 @@
+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);
+
+        // 根据不同场景获取不同角色的用户
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == inDto.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 == inDto.EmailNoticeConfig.Id).ToListAsync();
+        var userTypeEnum = emailNoticeUserList.Select(x => x.UserType).ToList();
+        if (inDto.UserTypes != null)
+        {
+            userTypeEnum = inDto.UserTypes;
+        }
+        var crcUserList = new List<UserRole>() { };
+        if (userTypeEnum.Contains(UserTypeEnum.ClinicalResearchCoordinator))
+        {
+            crcUserList = await _trialSiteRepository.Where(x => x.Id == inDto.SubjectVisit.TrialSiteId).SelectMany(x => x.CRCUserList.Select(y => y.UserRole)).ToListAsync();
+        }
+
+        if (inDto.UserTypes == null)
+        {
+            var toList = emailNoticeUserList.Where(x => x.EmailUserType == EmailUserType.To && x.UserType != UserTypeEnum.ClinicalResearchCoordinator).Select(x => x.UserType).ToList();
+
+            toUserList = trialUser.Where(x => toList.Contains(x.UserTypeEnum)).ToList();
+
+            if (emailNoticeUserList.Any(x => x.EmailUserType == EmailUserType.To && x.UserType == UserTypeEnum.ClinicalResearchCoordinator))
+            {
+                toUserList.AddRange(crcUserList);
+            }
+        }
+        else
+        {
+            var toList = inDto.UserTypes.Where(x => x != UserTypeEnum.ClinicalResearchCoordinator).ToList();
+
+            toUserList = trialUser.Where(x => toList.Contains(x.UserTypeEnum)).ToList();
+
+            if (inDto.UserTypes.Any(x => x == UserTypeEnum.ClinicalResearchCoordinator))
+            {
+                toUserList.AddRange(crcUserList);
+            }
+        }
+
+
+        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 (emailNoticeUserList.Any(x => x.EmailUserType == EmailUserType.Copy && x.UserType == UserTypeEnum.ClinicalResearchCoordinator))
+        {
+            ccUserList.AddRange(crcUserList);
+        }
+
+        // 如果没有收件人，则不发送邮件
+        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

@@ -22,14 +22,14 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer;
 /// 加急的医学反馈任务  通知MIM
 /// </summary>
 public class UrgentMedicalReviewAddedEventConsumer(
-      IRepository<User> _userRepository,
+      IRepository<UserRole> _userRoleRepository,
        IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
       IRepository<Trial> _trialRepository,
         IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
       IRepository<VisitTask> _visitTaskRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+      IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig
     ) : IConsumer<UrgentMedicalReviewAddedEvent>
 {
@@ -48,19 +48,29 @@ 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 _userRepository.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 trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+        if (trialEmailConfig != null)
+        {
+
+
+            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;
@@ -93,7 +103,7 @@ public class UrgentMedicalReviewAddedEventConsumer(
              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 =>
             {
@@ -116,26 +126,25 @@ public class UrgentMedicalReviewAddedEventConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
-
-         context.Message.IsPD ? EmailBusinessScenario.PDVerification_MedicalQC :   EmailBusinessScenario.EligibilityVerification_MedicalQC,
-            
-            messageToSend, emailConfigFunc);
+             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+
+        }
+
     }
 }
 
 //IR 回复医学反馈通知MIM
 public class UrgentIRRepliedMedicalReviewConsumer(
-      IRepository<User> _userRepository,
+      IRepository<UserRole> _userRoleRepository,
        IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
       IRepository<Trial> _trialRepository,
         IRepository<SubjectVisit> _subjectVisitRepository,
       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,15 +160,24 @@ 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 trialId = medicalReview.TrialId;
+
+        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();
+
+        if (trialEmailConfig != null)
+        {
+
+
+          
             var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == medicalReview.VisitTask.TrialReadingCriterionId);
-        var userinfo = await _userRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();
+            var userinfo = await _userRoleRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();
 
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReview.VisitTaskId).Include(x => x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();
 
@@ -216,29 +234,26 @@ public class UrgentIRRepliedMedicalReviewConsumer(
 
                 return (topicStr, htmlBodyStr);
             };
-
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
-
-         context.Message.IsPD ? EmailBusinessScenario.PDVerification_ExpeditedMedicalQCResponse : EmailBusinessScenario.EligibilityVerification_ExpeditedMedicalQCResponse,
-
-            messageToSend, emailConfigFunc);
+             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
+
+    }
 }
 
 /// <summary>
 /// MIM 回复医学返回通知IR
 /// </summary>
 public class UrgentMIMRepliedMedicalReviewConsumer(
-      IRepository<User> _userRepository,
+      IRepository<UserRole> _userRoleRepository,
        IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
       IRepository<Trial> _trialRepository,
         IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
       IRepository<VisitTask> _visitTaskRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+      IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<UrgentMIMRepliedMedicalReview>
 {
 
@@ -254,21 +269,31 @@ 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 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 criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == medicalReview.VisitTask.TrialReadingCriterionId);
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReview.VisitTaskId).Include(x => x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();
 
-        var userinfo = await _userRepository.Where(x => x.Id == taskInfo.DoctorUserId).FirstOrDefaultAsync();
+            var userinfo = await _userRoleRepository.Where(x => x.Id == taskInfo.DoctorUserId).FirstOrDefaultAsync();
 
 
 
@@ -302,11 +327,6 @@ public class UrgentMIMRepliedMedicalReviewConsumer(
              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(), }, //是否加急         
-
- 
-          
-          
-         
             }
             });
 
@@ -332,29 +352,26 @@ public class UrgentMIMRepliedMedicalReviewConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
-
-          EmailBusinessScenario.ExpeditedMedicalQCToIR,
-
-            messageToSend, emailConfigFunc);
+             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
+    }
 }
 
 /// <summary>
 /// 加急阅片 IR 申请重阅  或者PM 申请重阅
 /// </summary>
 public class UrgentIRApplyedReReadingConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
       IRepository<Trial> _trialRepository,
         IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
       IRepository<VisitTask> _visitTaskRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+      IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<UrgentApplyedReReading>
 {
 
@@ -367,17 +384,28 @@ 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 trialId=taskInfo.TrialId;
+
+        var scenario = context.Message.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed ? EmailBusinessScenario.ReReadFromPMApproval : EmailBusinessScenario.ReReadFromIRApproval;
+
+        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+        if (trialEmailConfig != null)
+        {
+
+          
             var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == taskInfo.TrialReadingCriterionId);
 
 
-        var doctorInfo = await _userRepository.Where(x => x.Id == taskInfo.DoctorUserId).FirstOrDefaultAsync();
+            var doctorInfo = await _userRoleRepository.Where(x => x.Id == taskInfo.DoctorUserId).FirstOrDefaultAsync();
 
-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == taskInfo.TrialId).Include(x => x.User).Select(x=>x.User).ToListAsync();
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == taskInfo.TrialId && x.TrialUser.IsDeleted==false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
 
-        var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.ProjectManager||x.UserTypeEnum==UserTypeEnum.APM).ToList();
+            var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.ProjectManager || x.UserTypeEnum == UserTypeEnum.APM).ToList();
             if (context.Message.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
             {
-            userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.CPM || x.UserTypeEnum == UserTypeEnum.SPM).ToList();
+                userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.CPM || x.UserTypeEnum == UserTypeEnum.SPM).ToList();
             }
 
             var visitid = taskInfo.SourceSubjectVisit == null ? taskInfo.ReadModule.SubjectVisitId : taskInfo.SourceSubjectVisitId;
@@ -433,14 +461,11 @@ public class UrgentIRApplyedReReadingConsumer(
                     return (topicStr, htmlBodyStr);
                 };
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
-
-             context.Message.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed? EmailBusinessScenario.ReReadFromPMApproval: EmailBusinessScenario.ReReadFromIRApproval,
-
-                messageToSend, emailConfigFunc);
+                 await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
                 await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
             }
+        }
 
 
     }

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

@@ -25,12 +25,12 @@ using System.Threading.Tasks;
 namespace IRaCIS.Core.Application.MassTransit.Consumer;
 
 /// <summary>
-/// 用户提交 发送邮件 通知SPM 或者PM
+/// 用户提交 发送邮件 通知SPM 或者PM   项目默认邮件，不用添加到项目中，直接发送的
 /// </summary>
 public class UserSiteSurveySubmitedEventConsumer(
       IRepository<Trial> _trialRepository,
       IRepository<TrialSite> _trialSiteRepository,
-       IRepository<TrialUser> _trialUserRepository,
+       IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
       IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig
@@ -47,9 +47,18 @@ public class UserSiteSurveySubmitedEventConsumer(
 
         var trialId = siteSurveyInfo.TrialId;
 
-        var trialUserList = await _trialUserRepository.Where(t => t.TrialId == siteSurveyInfo.TrialId)
-            .Where(t => t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM || t.User.UserTypeEnum == UserTypeEnum.ProjectManager || t.User.UserTypeEnum == UserTypeEnum.APM)
-            .Select(t => new { t.User.FullName, t.User.EMail, t.User.UserTypeEnum }).ToListAsync();
+        var scenario = _trialSiteSurveyRepository.Where(t => t.Id != trialSiteSurveyId && t.TrialId == siteSurveyInfo.TrialId && t.TrialSiteId == siteSurveyInfo.TrialSiteId).IgnoreQueryFilters().Any() ?
+        EmailBusinessScenario.Approval_UpdateSiteSurvey : EmailBusinessScenario.Approval_SubmitSiteSurvey;
+
+
+        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();
@@ -110,12 +119,11 @@ public class UserSiteSurveySubmitedEventConsumer(
                 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;
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, scenario, messageToSend, emailConfigFunc);
+             await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+        }
 
     }
 }
@@ -125,7 +133,7 @@ public class UserSiteSurveySubmitedEventConsumer(
 /// </summary>
 public class SiteSurveySPMSubmitedEventConsumer(
       IRepository<Trial> _trialRepository,
-      IRepository<TrialUser> _trialUserRepository,
+      IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<TrialSite> _trialSiteRepository,
       IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
       IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
@@ -143,11 +151,17 @@ public class SiteSurveySPMSubmitedEventConsumer(
 
         var trialId = siteSurveyInfo.TrialId;
 
+        var scenario = EmailBusinessScenario.Approval_SubmitSiteSurvey;
+
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+        if (emailConfig != null)
+        {
             var messageToSend = new MimeMessage();
 
-        var trialUserList = _trialUserRepository.Where(t => t.TrialId == trialId)
-            .Where(t => t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM || t.User.UserTypeEnum == UserTypeEnum.ProjectManager || t.User.UserTypeEnum == UserTypeEnum.APM)
-            .Select(t => new { t.User.EMail, t.User.FullName, t.User.UserTypeEnum }).ToList();
+            var trialUserList = _trialUserRoleRepository.Where(t => t.TrialId == trialId && 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();
@@ -177,22 +191,26 @@ public class SiteSurveySPMSubmitedEventConsumer(
                 var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo);
                 var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
                 toUserName,
-            siteInfo.TrialSiteCode,
-            siteInfo.TrialSiteAliasName,
+                siteInfo.TrialSiteCode,  //中心编号
+                siteInfo.TrialSiteAliasName,//中心名称
 
-           siteSurveyInfo.UserName,
-           siteSurveyInfo.Email,
-           siteSurveyInfo.Phone,
+               siteSurveyInfo.UserName, //联系人
+               siteSurveyInfo.Email,  //联系邮箱
+               siteSurveyInfo.Phone,  //联系电话
                _systemEmailConfig.SiteUrl 
                     );
 
                 return (topicStr, htmlBodyStr);
             };
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.Approval_SubmitSiteSurvey, messageToSend, emailConfigFunc);
+             await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
+
+
+
+    }
 }
 
 
@@ -200,7 +218,7 @@ public class SiteSurveySPMSubmitedEventConsumer(
 /// 调研表驳回发送邮件    之前已有，需要迁移过来
 /// </summary>
 public class SiteSurverRejectedEventConsumer(
-       IRepository<TrialUser> _trialUserRepository,
+       IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<Trial> _trialRepository,
       IRepository<TrialSite> _trialSiteRepository,
       IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
@@ -216,10 +234,18 @@ 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 scenario = EmailBusinessScenario.SiteSurveyReject;
+
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+        if (emailConfig != null)
+        {
+           
+
             var messageToSend = new MimeMessage();
 
             var toUserName = siteSurveyInfo.UserName;
@@ -229,13 +255,13 @@ public class SiteSurverRejectedEventConsumer(
                 //PM 驳回到SPM
                 if (siteSurveyInfo.State == TrialSiteSurveyEnum.CRCSubmitted)
                 {
-                //var user = await _userRepository.FirstOrDefaultAsync(t => t.Id == siteSurveyInfo.PreliminaryUserId);
+                    //var user = await _userRoleRepository.FirstOrDefaultAsync(t => t.Id == siteSurveyInfo.PreliminaryUserId);
 
                     //name = user.FullName;
 
-                var sPMOrCPMList = _trialUserRepository.Where(t => t.TrialId == trialId)
-                  .Where(t => t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM)
-                  .Select(t => new { t.User.EMail, t.User.FullName, t.User.UserTypeEnum }).ToList();
+                    var sPMOrCPMList = _trialUserRoleRepository.Where(t => t.TrialId == trialId && 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)
@@ -274,25 +300,29 @@ public class SiteSurverRejectedEventConsumer(
 
             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),
                toUserName,
                 trialInfo.TrialCode,
                 trialInfo.ResearchProgramNo,
                 trialInfo.ExperimentName,
-            siteInfo.TrialSiteCode,
-            siteInfo.TrialSiteAliasName,
-               siteSurveyInfo.LatestBackReason,
-            _systemEmailConfig.SiteUrl,
+
+                siteInfo.TrialSiteCode,  //中心编号
+                siteInfo.TrialSiteAliasName,//中心名称
+                siteSurveyInfo.LatestBackReason,  //驳回原因
+                _systemEmailConfig.SiteUrl,  //链接
                    (siteSurveyInfo.State == TrialSiteSurveyEnum.ToSubmit ? "inline - block" : "none")
                     );
 
                 return (topicStr, htmlBodyStr);
             };
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.SiteSurveyReject, messageToSend, emailConfigFunc);
+            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+        }
+
+
 
 
     }

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

@@ -23,14 +23,14 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer;
 /// CRC 提交了 通知QC进行质控  Code005，006
 /// </summary>
 public class CRCSubmitedAndQCToAuditEventConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+      IRepository<TrialUserRole> _trialUseRoleRepository,
       IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<Trial> _trialRepository,
       IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
       IRepository<VisitTask> _visitTaskRepository,
       IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<CRCSubmitedAndQCToAuditEvent>
 {
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
@@ -41,14 +41,23 @@ 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 _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).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();
+
+        if (trialEmailConfig != null)
+        {
+
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+
+            var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.IQC).ToList();
 
 
-        var pmandAPm = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).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);
 
@@ -111,13 +120,10 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
-
-             context.Message.IsPd ? EmailBusinessScenario.PDVerification_PendingImageQCClaim : EmailBusinessScenario.EligibilityVerification_PendingClaim,
-
-                messageToSend, emailConfigFunc);
+            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+        }
 
     }
 }
@@ -127,14 +133,14 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
 /// CRC 回复质控质疑 通知QC  Code012，013
 /// </summary>
 public class CRCRepliedQCChallengeEventConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<Trial> _trialRepository,
       IRepository<QCChallenge> _qCChallengeRepository,
       IRepository<QCChallengeDialog> _qCChallengeDialogRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<CRCRepliedQCChallengeEvent>
 {
 
@@ -148,18 +154,23 @@ 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 scenario = context.Message.IsPd ? EmailBusinessScenario.PDVerification_UnderQCQuery : EmailBusinessScenario.EligibilityVerification_Pending;
+
+        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+        if (trialEmailConfig != null)
+        {
+
 
             var qCChallengeDialog = await _qCChallengeDialogRepository.Where(x => x.Id == context.Message.QCChallengeDialogId).Include(x => x.QCChallenge).FirstNotNullAsync();
 
 
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
 
-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).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 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);
@@ -208,15 +219,11 @@ public class CRCRepliedQCChallengeEventConsumer(
 
                 return (topicStr, htmlBodyStr);
             };
-
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
-
-         context.Message.IsPd ? EmailBusinessScenario.PDVerification_UnderQCQuery : EmailBusinessScenario.EligibilityVerification_Pending,
-
-            messageToSend, emailConfigFunc);
+            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
+    }
 }
 
 
@@ -224,14 +231,14 @@ public class CRCRepliedQCChallengeEventConsumer(
 /// QC回复 质控质疑，通知CRC (014，015)
 /// </summary>
 public class QCRepliedQCChallengeEventConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<Trial> _trialRepository,
       IRepository<QCChallenge> _qCChallengeRepository,
       IRepository<QCChallengeDialog> _qCChallengeDialogRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<QCRepliedQCChallengeEvent>
 {
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
@@ -240,6 +247,20 @@ public class QCRepliedQCChallengeEventConsumer(
         Console.WriteLine("发送(014，015) 【  QC回复 质控质疑，通知CRC】邮件！！！");
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
+        var subjectVisitId = context.Message.SubjectVisitId;
+
+        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).FirstNotNullAsync();
+
+        var trialId = subjectVisit.TrialId;
+
+        var scenario = context.Message.IsPd ? EmailBusinessScenario.PDVerification_ImageQuery : EmailBusinessScenario.EligibilityVerification_ImageQuery;
+
+        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+        if (trialEmailConfig != null)
+        {
+
+
             string talkContent = string.Empty;
             var isclose = false;
             if (context.Message.QCChallengeDialogId != null)
@@ -248,22 +269,20 @@ public class QCRepliedQCChallengeEventConsumer(
                 talkContent = qCChallengeDialog.TalkContent;
                 isclose = qCChallengeDialog.QCChallenge.IsClosed;
             }
-        else if(context.Message.QCChallengeId != null)
+            else if (context.Message.QCChallengeId != null)
             {
                 var qCChallenge = await _qCChallengeRepository.Where(x => x.Id == context.Message.QCChallengeId.Value).FirstNotNullAsync();
                 talkContent = qCChallenge.Content;
                 isclose = qCChallenge.IsClosed;
             }
 
-        var subjectVisitId = context.Message.SubjectVisitId;
 
-        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).FirstNotNullAsync();
 
-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
 
-        var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).ToList();
+            var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).ToList();
 
-        var craInfo = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.CRA).FirstOrDefault();
+            var craInfo = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.CRA).FirstOrDefault();
 
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
 
@@ -317,15 +336,13 @@ public class QCRepliedQCChallengeEventConsumer(
                     return (topicStr, htmlBodyStr);
                 };
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
 
-             context.Message.IsPd ? EmailBusinessScenario.PDVerification_ImageQuery : EmailBusinessScenario.EligibilityVerification_ImageQuery,
-
-                messageToSend, emailConfigFunc);
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
                 await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
             }
         }
+    }
 }
 
 
@@ -333,14 +350,14 @@ public class QCRepliedQCChallengeEventConsumer(
 /// CRC 回复一致性核查质疑 通知PM  (019,020)
 /// </summary>
 public class CRCRepliedCheckChallengeEventConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<Trial> _trialRepository,
       IRepository<QCChallenge> _qCChallengeRepository,
       IRepository<QCChallengeDialog> _qCChallengeDialogRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<CRCRepliedCheckChallengeEvent>
 {
 
@@ -350,13 +367,25 @@ 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 _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).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();
+
+        if (trialEmailConfig != null)
+        {
+
+
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+
+            var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).ToList();
 
 
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
@@ -407,15 +436,13 @@ public class CRCRepliedCheckChallengeEventConsumer(
                     return (topicStr, htmlBodyStr);
                 };
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
 
-             context.Message.IsPd ? EmailBusinessScenario.PDVerification_UnderDRForPMOrAPM : EmailBusinessScenario.EligibilityVerification_UnderDRForPMOrAPM,
-
-                messageToSend, emailConfigFunc);
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
                 await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
             }
         }
+    }
 }
 
 
@@ -425,14 +452,14 @@ public class CRCRepliedCheckChallengeEventConsumer(
 
 /// </summary>
 public class PMRepliedCheckChallengeEventConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<Trial> _trialRepository,
       IRepository<CheckChallengeDialog> _checkChallengeDialogRepository,
       IRepository<QCChallengeDialog> _qCChallengeDialogRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<PMRepliedCheckChallengeEvent>
 {
 
@@ -441,22 +468,35 @@ 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 _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).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 scenario = context.Message.IsPd ? EmailBusinessScenario.PDVerification_UnderDR : EmailBusinessScenario.EligibilityVerification_UnderDR;
+
+        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+        if (trialEmailConfig != null)
+        {
+
+            var checkChallengeDialog = await _checkChallengeDialogRepository.Where(x => x.Id == context.Message.CheckChallengeDialogId).FirstNotNullAsync();
+
+
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+
+            var 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)
+            modalities = subjectVisit.NoneDicomStudyList.Select(t => t.Modality)
      .Union(subjectVisit.StudyList.Select(k => k.ModalityForEdit)).ToList();
 
             var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
@@ -486,8 +526,6 @@ public class PMRepliedCheckChallengeEventConsumer(
                 var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
 
-
-
                 Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                 {
                     var subjectCode = subjectVisit.Subject.Code;
@@ -508,15 +546,13 @@ public class PMRepliedCheckChallengeEventConsumer(
                     return (topicStr, htmlBodyStr);
                 };
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
 
-             context.Message.IsPd ? EmailBusinessScenario.PDVerification_UnderDR : EmailBusinessScenario.EligibilityVerification_UnderDR,
-
-                messageToSend, emailConfigFunc);
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
                 await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
             }
         }
+    }
 }
 
 
@@ -524,14 +560,14 @@ public class PMRepliedCheckChallengeEventConsumer(
 /// 通知PM 进行一致性核查 (018,030)
 /// </summary>
 public class CheckStateChangedToAuditEventConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<Trial> _trialRepository,
       IRepository<QCChallenge> _qCChallengeRepository,
       IRepository<QCChallengeDialog> _qCChallengeDialogRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<CheckStateChangedToAuditEvent>
 {
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
@@ -540,13 +576,25 @@ 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 _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).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();
+
+        if (trialEmailConfig != null)
+        {
+
+
+
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+
+            var userinfoList = trialUserList.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).ToList();
 
 
             var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == subjectVisit.TrialId);
@@ -586,8 +634,8 @@ public class CheckStateChangedToAuditEventConsumer(
                     var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, subjectVisit.VisitName);
                     var htmlBodyStr = string.Format(
                        CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                        userinfo.FullName,   // 姓名  {0}
                         trialInfo.ExperimentName,        // 项目   {1}                       
-                   userinfo.FullName,              // 用户名  {1}
                        subjectCode, // 受试者 {2}
                        subjectVisit.VisitName,             // 访视  {3}
                        dictionValue[0],    // 核查状态 {4}
@@ -597,29 +645,27 @@ public class CheckStateChangedToAuditEventConsumer(
                     return (topicStr, htmlBodyStr);
                 };
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
 
-             context.Message.IsPd ? EmailBusinessScenario.PDVerification_DR : EmailBusinessScenario.EligibilityVerification_DR,
-
-                messageToSend, emailConfigFunc);
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
                 await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
             }
         }
+    }
 }
 
 /// <summary>
 /// QC 领取了质控任务 (007，008) 
 /// </summary>
 public class QCClaimTaskEventConsumer(
-      IRepository<User> _userRepository,
-        IRepository<TrialUser> _trialUseRepository,
+      IRepository<UserRole> _userRoleRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
       IRepository<Trial> _trialRepository,
       IRepository<QCChallenge> _qCChallengeRepository,
       IRepository<QCChallengeDialog> _qCChallengeDialogRepository,
          IRepository<Dictionary> _dictionaryRepository,
-      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+       IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<QCClaimTaskEvent>
 {
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
@@ -628,24 +674,29 @@ 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 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 subjectVisitList = await _subjectVisitRepository.Where(x => x.CurrentActionUserId == context.Message.CurrentActionUserId && x.TrialId == subjectVisit.TrialId).Include(x => x.Subject).ToListAsync();
 
 
+            var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId && x.TrialUser.IsDeleted == false).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
 
 
-
-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
-
-
-
-
-      
-        var pmandAPm = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).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);
@@ -703,12 +754,10 @@ public class QCClaimTaskEventConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
 
-         context.Message.IsPd ? EmailBusinessScenario.PDVerification_PendingImageQC : EmailBusinessScenario.EligibilityVerification_PendingImageQC,
-
-            messageToSend, emailConfigFunc);
+            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
+    }
 }

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

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

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

@@ -1,4 +1,5 @@
 using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Spreadsheet;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Helper;
@@ -26,8 +27,8 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
         IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository,
         IRepository<VisitTask> _visitTaskRepository,
          IRepository<Dictionary> _dictionaryRepository,
-        IRepository<TrialUser> _trialUserRepository,
-        IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+        IRepository<TrialUserRole> _trialUserRoleRepository,
+        IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
         IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<UrgentIRUnReadTaskRecurringEvent>
     {
         private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
@@ -35,9 +36,15 @@ 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 scenario = EmailBusinessScenario.ExpeditedReading;
+            var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+            if (trialEmailConfig != null)
+            {
+
+
                 var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
                 {
                     DictionaryRepository = _dictionaryRepository,
@@ -52,12 +59,12 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
 
                 Expression<Func<VisitTask, bool>> comonTaskFilter = t => t.TrialId == trialId && t.TaskState == TaskState.Effect && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskAllocationState == TaskAllocationState.Allocated;
 
-            var trialUserList = _trialUserRepository.Where(t => t.TrialId == trialId).Select(t => new
+                var trialUserList = _trialUserRoleRepository.Where(t => t.TrialId == trialId && t.TrialUser.JoinTime != null).Select(t => new
                 {
                     t.UserId,
-                t.User.FullName,
-                t.User.EMail,
-                t.User.UserName,
+                    t.UserRole.FullName,
+                    t.UserRole.IdentityUser.EMail,
+                    t.UserRole.IdentityUser.UserName,
                     t.Trial.TrialCode,
                     t.Trial.ResearchProgramNo
                     //TrialReadingCriterionList = t.Trial.TrialReadingCriterionList.Select(t => new { t.CriterionName, TrialReadingCriterionId = t.Id }).ToList()
@@ -69,7 +76,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
 
                     var userId = trialUser.UserId;
 
-                var doctorCriterionList = await _trialReadingCriterionRepository.Where(t => t.IsSigned && t.IsConfirm && t.TrialId == trialId && t.Trial.TrialUserList.Any(t => t.UserId == 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
                          {
 
@@ -152,7 +159,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                             return (topicStr, htmlBodyStr);
                         };
 
-                    await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.ExpeditedReading, messageToSend, emailConfigFunc);
+                         await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
                         await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
 
@@ -168,6 +175,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
 
 
 
+            }
 
 
 

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

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

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

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

IRaCIS.Core.Application/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

@@ -214,6 +214,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; }
     }
 
 
@@ -233,7 +237,7 @@ namespace IRaCIS.Core.Application.ViewModel
         //重阅原始编号
         //public string ReReadingOriginalTaskCode { get; set; }
 
-
+        public string ApplicantName { get; set; }
 
         public Guid Id { get; set; }
 
@@ -339,6 +343,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 +370,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 +484,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 +913,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/Interface/IVisitTaskService.cs

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

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

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

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

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

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

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

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

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

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

@@ -51,12 +51,12 @@ namespace IRaCIS.Core.Application.Service
         {
             return await ExcelExportHelper.ExportTemplateAsync(new ExportTemplateServiceDto()
             {
-                Data=inDto.Data,
-                commonDocumentRepository= _commonDocumentRepository,
-                TemplateCode=inDto.TemplateCode,
-                ExportFileName=inDto.ExportFileName,
-                hostEnvironment=_hostEnvironment,
-                IsEnglish=_userInfo.IsEn_Us,
+                Data = inDto.Data,
+                commonDocumentRepository = _commonDocumentRepository,
+                TemplateCode = inDto.TemplateCode,
+                ExportFileName = inDto.ExportFileName,
+                hostEnvironment = _hostEnvironment,
+                IsEnglish = _userInfo.IsEn_Us,
             });
         }
 
@@ -757,24 +757,14 @@ 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)
-                                                {
-
-                                                }
-                                                else
-                                                {
-                                                    //并且配置了医生 
-                                                    if (assignConfigList.Count > 0 && trialReadingCriterionConfig.IsFollowVisitAutoAssign)
-                                                    {
-
-                                                        #region 后续访视 未分配的进行再次分配，重置的或者失效的 需要重新生成新的任务  (PM 有序退回  或者PM  有序 申请重阅)
 
 
                                                 if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
+                                                {
+                                                    #region 当前访视处理
+
+                                                    //配置了医生
+                                                    if (assignConfigList.Count > 0)
                                                     {
                                                         //之前有回退到影像上传的访视 那么当前访视一致性核查通过的时候，当前访视生成但是不分配出去(排除失访的)
 
@@ -813,6 +803,13 @@ namespace IRaCIS.Core.Application.Service
 
                                                             #endregion
                                                         }
+                                                    }
+                                                    #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();
@@ -867,13 +864,13 @@ namespace IRaCIS.Core.Application.Service
 
                                                             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.IsUrgent = visit.IsUrgent;
-                                                                            arm1.TaskUrgentType = urgentType;
-                                                                            arm1.IsCanEditUrgentState = isCanEdit;
                                                                     arm1.TaskAllocationState = TaskAllocationState.Allocated;
                                                                     arm1.AllocateTime = DateTime.Now;
                                                                     arm1.DoctorUserId = task1.DoctorUserId;
@@ -885,9 +882,6 @@ namespace IRaCIS.Core.Application.Service
                                                             {
                                                                 var latestTask = visitGroup.Where(t => t.ArmEnum == Arm.DoubleReadingArm1).OrderByDescending(t => t.CreateTime).First();
 
-
-
-
                                                                 var taskOne = await _visitTaskRepository.AddAsync(new VisitTask()
                                                                 {
                                                                     TrialId = trialId,
@@ -909,15 +903,21 @@ namespace IRaCIS.Core.Application.Service
                                                                     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
                                                                 });
 
+                                                                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));
@@ -934,13 +934,14 @@ namespace IRaCIS.Core.Application.Service
                                                         {
                                                             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;
+
+                                                                //有可能仅仅只分配了一个Subject
+                                                                if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2) && task2 != null)
+                                                                {
                                                                     arm2.TaskAllocationState = TaskAllocationState.Allocated;
                                                                     arm2.AllocateTime = DateTime.Now;
                                                                     arm2.DoctorUserId = task2.DoctorUserId;
@@ -975,17 +976,20 @@ namespace IRaCIS.Core.Application.Service
                                                                     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
                                                                 });
 
+                                                                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));
@@ -994,10 +998,15 @@ namespace IRaCIS.Core.Application.Service
 
                                                     }
 
+                                                    #endregion
+
+
 
                                                 }
-                                                        //无序的时候    生成任务并分配出去
                                                 else
+                                                {
+                                                    //无序的时候    生成任务并分配出去
+                                                    if (assignConfigList.Count > 0 && trialReadingCriterionConfig.IsFollowVisitAutoAssign)
                                                     {
                                                         var defaultState = trialReadingCriterionConfig.FollowVisitAutoAssignDefaultState == TaskAllocateDefaultState.InitAllocated ? TaskAllocationState.InitAllocated : TaskAllocationState.Allocated;
 
@@ -1018,21 +1027,10 @@ namespace IRaCIS.Core.Application.Service
                                                             task2.AllocateTime = DateTime.Now;
                                                             task2.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
                                                         }
-
                                                     }
 
 
-                                                        #endregion
-
                                                 }
-                                                    else
-                                                    //后续访视不自动分配，或者配置的医生数量不足，就不进行分配
-                                                    {
-
-                                                    }
-
-                                                }
-
 
                                             }
 

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

@@ -8,6 +8,7 @@ using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Domain.Share.Reading;
 using IRaCIS.Core.Infra.EFCore.Common;
@@ -48,6 +49,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     IRepository<TaskInfluence> _taskInfluenceRepository,
     IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository,
     ILogger<VisitTaskService> _logger,
+    IVisitTaskHelpeService _visitTaskCommonService,
     IRepository<SubjectCriteriaEvaluationVisitStudyFilter> _subjectCriteriaEvaluationVisitStudyFilterRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IVisitTaskService
 {
 
@@ -72,7 +74,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)
 
@@ -105,7 +107,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();
     }
 
 
@@ -759,6 +762,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) };
@@ -841,7 +846,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
         var visitTaskQueryable = _visitTaskReReadingRepository
             .Where(t => t.RequestReReadingType == RequestReReadingType.DocotorApply)
-            .Where(t => t.OriginalReReadingTask.DoctorUserId == _userInfo.Id)
+            .Where(t => t.OriginalReReadingTask.DoctorUserId == _userInfo.UserRoleId)
             .Where(t => t.OriginalReReadingTask.TrialId == inQuery.TrialId)
              .WhereIf(inQuery.RequestReReadingResultEnum != null, t => t.RequestReReadingResultEnum == inQuery.RequestReReadingResultEnum)
             .WhereIf(inQuery.RootReReadingTaskId != null, t => t.RootReReadingTaskId == inQuery.RootReReadingTaskId || t.OriginalReReadingTaskId == inQuery.RootReReadingTaskId)
@@ -959,7 +964,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         //随机阅片
         else
         {
-            var taskQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.Id && 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)
                    .Where(x => !x.Subject.IsDeleted).Where(x => (x.IsNeedClinicalDataSign && x.IsClinicalDataSign) || !x.IsNeedClinicalDataSign);
 
             iRUnReadOut = new IRUnReadOutDto()
@@ -1003,7 +1008,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
         if (critrion.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
         {
-            var visitQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.Id && x.TaskState == TaskState.Effect)
+            var visitQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.UserRoleId && x.TaskState == TaskState.Effect)
 
            .WhereIf(inQuery.SubjectId != null, x => x.SubjectId == inQuery.SubjectId)
             //前序 不存在  未生成任务的访视
@@ -1053,6 +1058,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,
@@ -1083,6 +1089,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,
@@ -1124,19 +1131,19 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             if (subjectId != null)
             {
                 //找到 非一致性分析，未签名，状态正常的 并且任务名称是TimePoint的 任务
-                var needDealTaskList = await _visitTaskRepository.Where(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.Id
+                var needDealTaskList = await _visitTaskRepository.Where(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.UserRoleId
                    && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskBlindName == "Timepoint" && t.ReadingCategory == ReadingCategory.Visit
                    && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze), true).ToListAsync();
 
                 if (needDealTaskList.Count > 0)
                 {
                     //已完成的访视任务数量（包含重阅的）
-                    var haveFinishedTaskCount = await _visitTaskRepository.CountAsync(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.Id
+                    var haveFinishedTaskCount = await _visitTaskRepository.CountAsync(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.UserRoleId
                     && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit);
 
                     //已经处理过的任务名称的数量
 
-                    var haveDealedTaskCount = await _visitTaskRepository.CountAsync(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.Id
+                    var haveDealedTaskCount = await _visitTaskRepository.CountAsync(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.DoctorUserId == _userInfo.UserRoleId
                     && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit && t.TaskBlindName != "Timepoint");
 
 
@@ -1156,7 +1163,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                 }
             }
 
-            var visitQuery = _visitTaskRepository.Where(x => x.TrialId == trialId && x.DoctorUserId == _userInfo.Id && x.TaskState == TaskState.Effect)
+            var visitQuery = _visitTaskRepository.Where(x => x.TrialId == trialId && x.DoctorUserId == _userInfo.UserRoleId && x.TaskState == TaskState.Effect)
                 .WhereIf(inQuery.SubjectId != null, x => x.SubjectId == inQuery.SubjectId)
                 .WhereIf(!string.IsNullOrEmpty(subjectCode), t => (t.Subject.Code.Contains(subjectCode!) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(subjectCode!) && t.IsAnalysisCreate));
 
@@ -1192,6 +1199,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,
@@ -1219,7 +1227,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
 
         var visitTaskQueryable = _visitTaskRepository.Where(t => t.TrialId == inQuery.TrialId)
-             .Where(t => t.DoctorUserId == _userInfo.Id && t.ReadingTaskState == ReadingTaskState.HaveSigned)//该医生 已经签名的数据
+             .Where(t => t.DoctorUserId == _userInfo.UserRoleId && t.ReadingTaskState == ReadingTaskState.HaveSigned)//该医生 已经签名的数据
 
 
             .WhereIf(inQuery.TrialSiteId != null, t => t.Subject.TrialSiteId == inQuery.TrialSiteId)
@@ -1249,12 +1257,12 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
     [HttpPost]
     [UnitOfWork]
-    public async Task<IResponseOutput> AIRReReading(AIRReReadingCommand command, [FromServices] IVisitTaskHelpeService _visitTaskCommonService)
+    public async Task<IResponseOutput> AIRReReading(AIRReReadingCommand command)
     {
-        var baseLineTaskList = await _visitTaskRepository.Where(t => t.TrialId == command.TrialId && t.TrialReadingCriterionId == command.TrialReadingCriterionId && t.DoctorUserId == _userInfo.Id
+        var baseLineTaskList = await _visitTaskRepository.Where(t => t.TrialId == command.TrialId && t.TrialReadingCriterionId == command.TrialReadingCriterionId && t.DoctorUserId == _userInfo.UserRoleId
              && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.SourceSubjectVisit.IsBaseLine == true).ToListAsync();
 
-        var judegeList = await _visitTaskRepository.Where(t => t.TrialId == command.TrialId && t.TrialReadingCriterionId == command.TrialReadingCriterionId && t.DoctorUserId == _userInfo.Id
+        var judegeList = await _visitTaskRepository.Where(t => t.TrialId == command.TrialId && t.TrialReadingCriterionId == command.TrialReadingCriterionId && t.DoctorUserId == _userInfo.UserRoleId
          && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Judge && t.ReadingTaskState == ReadingTaskState.HaveSigned).ToListAsync();
 
         foreach (var item in judegeList)
@@ -1282,7 +1290,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
 
 
-        var requestRecordList = await _visitTaskReReadingRepository.Where(t => baseLineTaskIdList.Contains(t.OriginalReReadingTaskId) && t.RequestReReadingUserId == _userInfo.Id && t.RequestReReadingReason == "AIR自动重阅基线").ToListAsync();
+        var requestRecordList = await _visitTaskReReadingRepository.Where(t => baseLineTaskIdList.Contains(t.OriginalReReadingTaskId) && t.RequestReReadingUserId == _userInfo.UserRoleId && t.RequestReReadingReason == "AIR自动重阅基线").ToListAsync();
 
         if (requestRecordList.Count != baseLineTaskIdList.Count)
         {
@@ -1294,9 +1302,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         {
             TrialId = command.TrialId,
             RequestReReadingResultEnum = RequestReReadingResult.Agree,
-            //ConfirmReReadingList = new List<ConfirmReReadingDTO>() { new ConfirmReReadingDTO() { Id = requestRecord.Id, OriginalReReadingTaskId = task.Id } }
             ConfirmReReadingList = requestRecordList.Select(t => new ConfirmReReadingDTO() { Id = t.Id, OriginalReReadingTaskId = t.OriginalReReadingTaskId }).ToList()
-        }, _visitTaskCommonService);
+        });
 
         return ResponseOutput.Ok();
 
@@ -1315,7 +1322,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
     public async Task<IResponseOutput> ApplyReReading(ApplyReReadingCommand applyReReadingCommand)
     {
-
+        var trialId = applyReReadingCommand.TrialId;
 
         var taskList = await _visitTaskRepository.Where(t => applyReReadingCommand.TaskIdList.Contains(t.Id), true).ToListAsync();
 
@@ -1324,6 +1331,16 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == trialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsAutoCreate, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
 
 
+        var isSPMJoinReReadingApproval = _trialRepository.Any(t => t.Id == trialId && t.IsSPMJoinReReadingApproval);
+
+        var hasSPMOrCPM = await _trialRepository.Where(t => t.Id == trialId).SelectMany(t => t.TrialIdentityUserList).AnyAsync(t => t.TrialUserRoleList.Any(t =>
+            t.UserRole.IdentityUser.Status == UserStateEnum.Enable
+            && t.UserRole.IsUserRoleDisabled == false
+            && (t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM)
+        ));
+
+        var isSPMjoin = isSPMJoinReReadingApproval && hasSPMOrCPM;
+
         foreach (var task in taskList)
         {
 
@@ -1334,7 +1351,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                 throw new BusinessValidationFailedException(_localizer["VisitTask_BackendData"]);
             }
 
-            _logger.LogError("重阅申请状态"+ (int)task.ReReadingApplyState);
+            _logger.LogError("重阅申请状态" + (int)task.ReReadingApplyState);
 
             if (task.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || task.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed || task.ReReadingApplyState == ReReadingApplyState.Agree)
             {
@@ -1383,7 +1400,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
 
             }
-            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer)
+
+            else if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer)
             {
                 task.ReReadingApplyState = ReReadingApplyState.DocotorHaveApplyed;
 
@@ -1478,13 +1496,24 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             }
 
             //AIR  不加验证
-            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.AIR)
+            else if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.AIR)
             {
                 task.ReReadingApplyState = ReReadingApplyState.DocotorHaveApplyed;
             }
 
 
+            //pm 申请重阅，并且SPM不参与，那么不增加申请记录，直接退回
+            if (!isSPMjoin && IsPMOrAPm())
+            {
+                //不想看到申请记录
+                foreach (var item in applyReReadingCommand.TaskIdList)
+                {
+                    await AgreeReReading(item, RequestReReadingType.TrialGroupApply, null);
+                }
 
+            }
+            else
+            {
                 var rootReReadingTaskId = _visitTaskReReadingRepository.Where(t => t.NewReReadingTaskId == task.Id).Select(u => u.RootReReadingTaskId).FirstOrDefault();
 
                 //添加申请记录
@@ -1494,7 +1523,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                     RootReReadingTaskId = rootReReadingTaskId == Guid.Empty ? task.Id : rootReReadingTaskId,
                     OriginalReReadingTaskId = task.Id,
                     RequestReReadingTime = DateTime.Now,
-                RequestReReadingUserId = _userInfo.Id,
+                    RequestReReadingUserId = _userInfo.UserRoleId,
                     IsCopyOrigenalForms = applyReReadingCommand.IsCopyOrigenalForms,
                     IsCopyFollowForms = applyReReadingCommand.IsCopyFollowForms,
                     RequestReReadingReason = applyReReadingCommand.RequestReReadingReason,
@@ -1504,32 +1533,17 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             }
 
 
+        }
+
+
         await _visitTaskRepository.SaveChangesAsync();
 
+
         return ResponseOutput.Ok();
     }
 
 
-    /// <summary>
-    ///  重阅原任务跟踪处理   
-    /// </summary>
-    /// <param name="origenalTask"></param>
-    /// <param name="agreeReReadingCommand"></param>
-    /// <exception cref="BusinessValidationFailedException"></exception>
-    private void ReReadingTaskTrackingDeal(VisitTask origenalTask, ConfirmReReadingCommand agreeReReadingCommand)
-    {
-        if (origenalTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || origenalTask.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
-        {
-            origenalTask.ReReadingApplyState = agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? ReReadingApplyState.Agree : ReReadingApplyState.Reject;
-            origenalTask.TaskState = agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? TaskState.HaveReturned : origenalTask.TaskState;
-        }
-        else
-        {
-            //---当前重阅任务状态不为已申请状态，不允许进行处理，请刷新页面
-            throw new BusinessValidationFailedException(_localizer["VisitTask_InvalidReapplyStatus"]);
-        }
 
-    }
 
     private async Task SetMedicalReviewInvalidAsync(List<VisitTask> influenceTaskList, bool isPMApply = true)
     {
@@ -1579,13 +1593,12 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     /// 确认重阅与否  1同意 2 拒绝
     /// </summary>
     /// <param name="agreeReReadingCommand"></param>
-    /// <param name="_visitTaskCommonService"></param>
     /// <returns></returns>
     [HttpPost]
     [UnitOfWork]
     [TrialGlobalLimit("AfterStopCannNotOpt")]
 
-    public async Task<IResponseOutput> ConfirmReReading(ConfirmReReadingCommand agreeReReadingCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService)
+    public async Task<IResponseOutput> ConfirmReReading(ConfirmReReadingCommand agreeReReadingCommand)
     {
 
         var trialId = agreeReReadingCommand.TrialId;
@@ -1598,23 +1611,86 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
             if ((origenalTask.TaskState != TaskState.Effect && origenalTask.TaskState != TaskState.Freeze))
             {
-                await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new VisitTaskReReading() { RequestReReadingConfirmUserId = _userInfo.Id, RequestReReadingResultEnum = RequestReReadingResult.Invalid });
+                await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new VisitTaskReReading() { RequestReReadingConfirmUserId = _userInfo.UserRoleId, RequestReReadingResultEnum = RequestReReadingResult.Invalid });
 
                 //---当前申请重阅任务的状态，已被其他任务重阅已影响，不允许对该状态下的任务进行重阅同意与否操作
-                return ResponseOutput.Ok(string.Empty, msg: _localizer["VisitTask_ReapplyStatusConflict"]);
+                throw new BusinessValidationFailedException(_localizer["VisitTask_ReapplyStatusConflict"]);
             }
 
-
-            var criterionConfig = await _trialReadingCriterionRepository.Where(x => x.Id == origenalTask.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.CriterionType, x.IsAdditionalAssessment, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync();
-
             //更新申请信息
             var visitTaskReReadingAppply = await _visitTaskReReadingRepository.FirstOrDefaultAsync(t => t.Id == item.Id);
-            visitTaskReReadingAppply.RequestReReadingConfirmUserId = _userInfo.Id;
+            visitTaskReReadingAppply.RequestReReadingConfirmUserId = _userInfo.UserRoleId;
             visitTaskReReadingAppply.RequestReReadingResultEnum = agreeReReadingCommand.RequestReReadingResultEnum;
             visitTaskReReadingAppply.RequestReReadingRejectReason = agreeReReadingCommand.RequestReReadingRejectReason;
 
 
-            Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == origenalTask.SubjectId && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze) && t.TaskAllocationState == TaskAllocationState.Allocated;
+
+
+            if (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree)
+            {
+
+                await AgreeReReading(origenalTask.Id, visitTaskReReadingAppply.RequestReReadingType, visitTaskReReadingAppply);
+
+                //找到跟踪的实体
+                var influenceTask = await _visitTaskRepository.FindAsync(origenalTask.Id);
+
+                if (origenalTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || origenalTask.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
+                {
+                    influenceTask.ReReadingApplyState = agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? ReReadingApplyState.Agree : ReReadingApplyState.Reject;
+                    influenceTask.TaskState = agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? TaskState.HaveReturned : origenalTask.TaskState;
+                }
+                else
+                {
+                    //---当前重阅任务状态不为已申请状态，不允许进行处理，请刷新页面
+                    throw new BusinessValidationFailedException(_localizer["VisitTask_InvalidReapplyStatus"]);
+                }
+
+
+
+            }
+            else if (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Reject)
+            {
+                if (origenalTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || origenalTask.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
+                {
+                    await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == origenalTask.Id, u => new VisitTask()
+                    {
+                        ReReadingApplyState = ReReadingApplyState.Reject
+                    });
+                }
+                else
+                {
+                    //---当前重阅任务状态不为已申请状态，不允许进行处理，请刷新页面
+                    throw new BusinessValidationFailedException(_localizer["VisitTask_InvalidReapplyStatus"]);
+                }
+
+            }
+
+
+
+
+        }
+
+
+
+
+
+        await _visitTaskRepository.SaveChangesAsync();
+
+        return ResponseOutput.Ok();
+    }
+
+    private async Task AgreeReReading(Guid visiTaskId, RequestReReadingType requestReReadingType, VisitTaskReReading? visitTaskReReadingAppply = null)
+    {
+
+
+        var origenalTask = (await _visitTaskRepository.Where(t => t.Id == visiTaskId).FirstOrDefaultAsync()).IfNullThrowException();
+        var trialId = origenalTask.TrialId;
+
+
+        var criterionConfig = await _trialReadingCriterionRepository.Where(x => x.Id == origenalTask.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.CriterionType, x.IsAdditionalAssessment, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync();
+
+
+        Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == origenalTask.SubjectId && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze) /*&& t.TaskAllocationState == TaskAllocationState.Allocated*/;
 
         //是否是一致性分析任务  正常申请 会影响一致性分析任务
         filterExpression = filterExpression.And(t => t.IsAnalysisCreate == origenalTask.IsAnalysisCreate);
@@ -1628,7 +1704,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment)
         {
             // PM申请 SPM / CPM审批
-                if (visitTaskReReadingAppply.RequestReReadingType == RequestReReadingType.TrialGroupApply && (IsSpmOrCPM()))
+            if (requestReReadingType == RequestReReadingType.TrialGroupApply)
             {
                 filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
             }
@@ -1656,11 +1732,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId);
         }
 
-
-            if (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree)
-            {
         //PM申请   SPM / CPM审批   回退访视，因此这里不生成访视任务  影响多个标准的任务
-                if (visitTaskReReadingAppply.RequestReReadingType == RequestReReadingType.TrialGroupApply && (IsSpmOrCPM()))
+        if (requestReReadingType == RequestReReadingType.TrialGroupApply)
         {
 
             // 不管有序 无序  都会  回退访视
@@ -1698,7 +1771,6 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                     //处理申请的任务
                     if (influenceTask.Id == origenalTask.Id)
                     {
-                                ReReadingTaskTrackingDeal(influenceTask, agreeReReadingCommand);
 
                         await InfluenceAddtioncalEvaluationCritrionAsync(origenalTask, influenceTaskList.Where(t => t.Id != origenalTask.Id).Where(t => t.SourceSubjectVisitId != null).Select(t => t.SourceSubjectVisitId!.Value).Distinct().ToList());
 
@@ -1748,7 +1820,6 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                     //处理申请的任务
                     if (influenceTask.Id == origenalTask.Id)
                     {
-                                ReReadingTaskTrackingDeal(influenceTask, agreeReReadingCommand);
 
 
                         await PMReReadingConfirmOrBackInfluenceAnalysisAsync(origenalTask.SubjectId);
@@ -1780,7 +1851,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
         }
         //IR申请  PM 审批  注意这里有一致性分析的申请同意  不会回退访视，在此要生成影响的访视任务
-                else if (visitTaskReReadingAppply.RequestReReadingType == RequestReReadingType.DocotorApply && (IsPMOrAPm() || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.AIR))
+        else if (requestReReadingType == RequestReReadingType.DocotorApply && (IsPMOrAPm() || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.AIR))
         {
 
 
@@ -1899,7 +1970,6 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                     //处理申请的任务
                     if (influenceTask.Id == origenalTask.Id)
                     {
-                                ReReadingTaskTrackingDeal(influenceTask, agreeReReadingCommand);
 
 
                         await SetMedicalReviewInvalidAsync(influenceTaskList, false);
@@ -1966,8 +2036,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                             //同步才可以
                             Action = (newTask) =>
                             {
-                                        //申请表 设置新任务Id
-                                        visitTaskReReadingAppply.NewReReadingTaskId = newTask.Id;
+
 
                                 //生成的任务分配给原始医生
                                 newTask.DoctorUserId = origenalTask.DoctorUserId;
@@ -1975,6 +2044,11 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                                 newTask.AllocateTime = DateTime.Now;
                                 newTask.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
 
+                                if (visitTaskReReadingAppply != null)
+                                {
+                                    //申请表 设置新任务Id
+                                    visitTaskReReadingAppply.NewReReadingTaskId = newTask.Id;
+
                                     //拷贝原始表单
                                     if (visitTaskReReadingAppply.IsCopyOrigenalForms && influenceTask.Id == origenalTask.Id)
                                     {
@@ -1996,6 +2070,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
 
                                     }
+                                }
 
                             }
                         });
@@ -2031,7 +2106,6 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                     //申请原任务处理
                     if (influenceTask.Id == origenalTask.Id)
                     {
-                                ReReadingTaskTrackingDeal(influenceTask, agreeReReadingCommand);
 
                         await SetMedicalReviewInvalidAsync(influenceTaskList, false);
 
@@ -2068,8 +2142,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                             //同步才可以
                             Action = (newTask) =>
                             {
-                                        //申请表 设置新任务Id
-                                        visitTaskReReadingAppply.NewReReadingTaskId = newTask.Id;
+
 
                                 ////生成的任务分配给原始医生
                                 newTask.DoctorUserId = origenalTask.DoctorUserId;
@@ -2080,6 +2153,10 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
                                 //裁判任务 需要进行特殊处理  在重阅逻辑里面处理
 
+                                if (visitTaskReReadingAppply != null)
+                                {
+                                    //申请表 设置新任务Id
+                                    visitTaskReReadingAppply.NewReReadingTaskId = newTask.Id;
 
                                     if (visitTaskReReadingAppply.IsCopyOrigenalForms && influenceTask.Id == origenalTask.Id)
                                     {
@@ -2100,8 +2177,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
                                         }
                                     }
-
-
+                                }
                             }
                         });
 
@@ -2118,37 +2194,6 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             //---不符合  PM申请   SPM / CPM审批 | IR申请  PM 审批 
             throw new BusinessValidationFailedException(_localizer["VisitTask_ReReadTaskAlreadyAffected"]);
         }
-
-            }
-            else if (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Reject)
-            {
-                if (origenalTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || origenalTask.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
-                {
-                    await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == origenalTask.Id, u => new VisitTask()
-                    {
-                        ReReadingApplyState = ReReadingApplyState.Reject
-                    });
-                }
-                else
-                {
-                    //---当前重阅任务状态不为已申请状态，不允许进行处理，请刷新页面
-                    throw new BusinessValidationFailedException(_localizer["VisitTask_InvalidReapplyStatus"]);
-                }
-
-            }
-
-
-
-
-        }
-
-
-
-
-
-        await _visitTaskRepository.SaveChangesAsync();
-
-        return ResponseOutput.Ok();
     }
 
     private void CopyForms(VisitTask newTask, VisitTask origenalTask)
@@ -2161,20 +2206,13 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         {
             item.Id = Guid.Empty;
             item.VisitTaskId = newTask.Id;
+            item.MeasureData = item.MeasureData.Replace(origenalTask.Id.ToString(), newTask.Id.ToString());
         }
 
         _ = _readingCustomTagRepository.AddRangeAsync(readingCustomTagList).Result;
 
 
-        var readingTaskQuestionMarkList = _readingTaskQuestionMarkRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
 
-        foreach (var item in readingTaskQuestionMarkList)
-        {
-            item.Id = Guid.Empty;
-            item.VisitTaskId = newTask.Id;
-        }
-
-        _ = _readingTaskQuestionMarkRepository.AddRangeAsync(readingTaskQuestionMarkList).Result;
 
         var readingTaskQuestionAnswerList = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
 
@@ -2182,10 +2220,23 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         {
             item.Id = Guid.Empty;
             item.VisitTaskId = newTask.Id;
+
         }
         _ = _readingTaskQuestionAnswerRepository.AddRangeAsync(readingTaskQuestionAnswerList).Result;
 
 
+        var readingTaskQuestionMarkList = _readingTaskQuestionMarkRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
+
+        foreach (var item in readingTaskQuestionMarkList)
+        {
+            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());
+        }
+
+
 
         //ReadingTableAnswerRowInfo  ReadingTableQuestionAnswer 一起加
         var readingTableAnswerRowInfoList = _readingTableAnswerRowInfoRepository.Where(t => t.VisitTaskId == origenalTask.Id).Include(t => t.LesionAnswerList).ToList();
@@ -2196,12 +2247,20 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             var originalVisitTaskId = item.VisitTaskId;
             var originalFristAddTaskId = item.FristAddTaskId;
 
-            item.Id = NewId.NextSequentialGuid();
+            var newRowId = NewId.NextSequentialGuid();
+
+            foreach (var mark in readingTaskQuestionMarkList)
+            {
+                mark.RowId = mark.RowId == item.Id ? newRowId : mark.RowId;
+            }
+
+            item.Id = newRowId;
             item.VisitTaskId = newTask.Id;
 
             //默认值是当前任务添加的
             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)
             {
@@ -2211,6 +2270,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             }
         }
 
+        _ = _readingTaskQuestionMarkRepository.AddRangeAsync(readingTaskQuestionMarkList).Result;
         _ = _readingTableAnswerRowInfoRepository.AddRangeAsync(readingTableAnswerRowInfoList).Result;
 
 
@@ -2224,11 +2284,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();
@@ -2264,7 +2324,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             return ResponseOutput.NotOk(_localizer["VisitTask_ConsistencyTaskCannotBeReturned"]);
         }
 
-        Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == task.SubjectId && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze) && t.TaskAllocationState == TaskAllocationState.Allocated;
+        Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == task.SubjectId && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze) /*&& t.TaskAllocationState == TaskAllocationState.Allocated*/;
 
 
         #region 退回到访视 不区分标准
@@ -2289,7 +2349,6 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
             #region 有序 无序公用流程
 
-
             //执行类似一致性核查回退流程  回退访视到影像上传流程
             await VisitBackAsync(task.SourceSubjectVisitId);
 
@@ -2406,6 +2465,9 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
             }
 
+            var trackTask = await _visitTaskRepository.FindAsync(task.Id);
+            trackTask.PMBackReason = pmBackReason;
+
         }
         else
         {
@@ -2554,6 +2616,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         return _userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM;
     }
 
+
     private bool IsSpmOrCPM()
     {
         return _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM;
@@ -2576,7 +2639,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
         var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == filterObj.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.CriterionType, x.IsAdditionalAssessment, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
 
-        Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == filterObj.SubjectId && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze) && t.TaskAllocationState == TaskAllocationState.Allocated;
+        Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == filterObj.SubjectId && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze) /*&& t.TaskAllocationState == TaskAllocationState.Allocated*/;
 
         //是否是一致性分析任务 （一致性分析的任务 不会产生裁判 肿瘤学  仅仅有生成的访视和全局）
 
@@ -2590,7 +2653,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         {
 
             //  IR 申请  PM 同意  
-            if (((IsPMOrAPm() && applyId != null && await _visitTaskReReadingRepository.AnyAsync(t => t.Id == applyId && t.CreateUser.UserTypeEnum == UserTypeEnum.IndependentReviewer))
+            if (((IsPMOrAPm() && applyId != null && await _visitTaskReReadingRepository.AnyAsync(t => t.Id == applyId && t.CreateUserRole.UserTypeEnum == UserTypeEnum.IndependentReviewer))
                 || (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer && applyId == null)))
             {
 
@@ -2621,6 +2684,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         {
             //默认影响的都是该标准的任务
             filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId);
+
         }
 
 
@@ -2633,7 +2697,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
             //IR 申请  PM 同意  仅仅影响自己
 
-            if ((IsPMOrAPm() && applyId != null && await _visitTaskReReadingRepository.AnyAsync(t => t.Id == applyId && t.CreateUser.UserTypeEnum == UserTypeEnum.IndependentReviewer))
+            if ((IsPMOrAPm() && applyId != null && await _visitTaskReReadingRepository.AnyAsync(t => t.Id == applyId && t.CreateUserRole.UserTypeEnum == UserTypeEnum.IndependentReviewer))
                 || (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer && applyId == null))
             {
 
@@ -2752,7 +2816,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             //PM     影响所有阅片人 仅仅针对访视   SPM  CPM  调用
 
             else if (((IsSpmOrCPM()) && applyId != null &&
-                       await _visitTaskReReadingRepository.AnyAsync(t => t.Id == applyId && (t.CreateUser.UserTypeEnum == UserTypeEnum.ProjectManager || t.CreateUser.UserTypeEnum == UserTypeEnum.APM)) && filterObj.IsAnalysisCreate == false && filterObj.ReadingCategory == ReadingCategory.Visit)
+                       await _visitTaskReReadingRepository.AnyAsync(t => t.Id == applyId && (t.CreateUserRole.UserTypeEnum == UserTypeEnum.ProjectManager || t.CreateUserRole.UserTypeEnum == UserTypeEnum.APM)) && filterObj.IsAnalysisCreate == false && filterObj.ReadingCategory == ReadingCategory.Visit)
                    || (IsPMOrAPm() && applyId == null))
             {
 
@@ -2850,7 +2914,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
         var list = await _visitTaskRepository.Where(filterExpression)
             //IR 申请的时候，仅仅看到影响自己的
-            .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer, t => t.DoctorUserId == _userInfo.Id)
+            .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer, t => t.DoctorUserId == _userInfo.UserRoleId)
             .OrderBy(t => t.VisitTaskNum).ProjectTo<InfluenceTaskInfo>(_mapper.ConfigurationProvider).ToListAsync();
 
         #region 影响后的操作
@@ -2881,6 +2945,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

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

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

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

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>

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; }
     }
 
@@ -110,6 +112,10 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string Module { get; set; } = string.Empty;
 
+        public int? State { get; set; }
+
+        public int InternationalizationType { get; set; }
+
     }
 
     public class BatchAddInternationalizationDto : BatchInternationalizationDto
@@ -119,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}")]
-        public async Task<List<BasicDicView>> GetChildList(Guid parentId)
+        [HttpPost]
+        public async Task<List<BasicDicView>> GetChildList(ChildInQuery inQuery)
         {
-            return await _dicRepository.Where(t => t.ParentId == parentId)
-                .OrderBy(t => t.ShowOrder).ProjectTo<BasicDicView>(_mapper.ConfigurationProvider).ToListAsync();
+            return await _dicRepository.Where(t => t.ParentId == inQuery.ParentId)
+                .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>()
-            {
-                VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.CriterionTypeEnum== addOrEditEmailNoticeConfig.CriterionTypeEnum,
+            //var verifyExp1 = new EntityVerifyExp<EmailNoticeConfig>()
+            //{
+            //    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/ExploreRecommendService.cs

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