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

This reverts commit 9bf639dac0.

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

@@ -19,7 +19,7 @@
 	  <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="Minio" Version="6.0.3" />
 	  <PackageReference Include="My.Extensions.Localization.Json" Version="3.3.0">
 		  <TreatAsUsed>true</TreatAsUsed>
 	  </PackageReference>

IRC.Core.SCP/Service/CStoreSCPService.cs

@@ -21,6 +21,8 @@ using FellowOakDicom.Imaging;
 using SharpCompress.Common;
 using SixLabors.ImageSharp.Formats.Jpeg;
 using IRaCIS.Core.Infrastructure;
+using IRaCIS.Core.Infrastructure.Extention;
+using FellowOakDicom.IO.Buffer;
 
 namespace IRaCIS.Core.SCP.Service
 {
@@ -39,7 +41,9 @@ namespace IRaCIS.Core.SCP.Service
     {
         private IServiceProvider _serviceProvider { get; set; }
 
-        private List<Guid> _SCPStudyIdList { get; set; } = new List<Guid>();
+        private List<Guid> _SCPStudyIdList => _ImageUploadList.Where(t => t.SCPStudyId != Guid.Empty).Select(t => t.SCPStudyId).ToList();
+
+        private List<ImageUploadInfo> _ImageUploadList { get; set; } = new List<ImageUploadInfo>();
 
         private SCPImageUpload _upload { get; set; }
 
@@ -162,27 +166,48 @@ namespace IRaCIS.Core.SCP.Service
 
         public async Task OnReceiveAssociationReleaseRequestAsync()
         {
-            await DataMaintenanceAsaync();
+            var _distributedLockProvider = _serviceProvider.GetService<IDistributedLockProvider>();
 
+            var @lock = _distributedLockProvider.CreateLock($"{_upload.CallingAE}");
+
+            using (await @lock.AcquireAsync())
+            {
+
+                await DataMaintenanceAsaync();
+
+                //记录监控
+
+                await AddUploadLogAsync();
+
+
+
+                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 AddUploadLogAsync()
+        {
             //记录监控
 
             var _SCPImageUploadRepository = _serviceProvider.GetService<IRepository<SCPImageUpload>>();
 
             _upload.EndTime = DateTime.Now;
-            _upload.StudyCount = _SCPStudyIdList.Count;
+            _upload.StudyCount = _ImageUploadList.Count;
             _upload.TrialId = _trialId;
             _upload.TrialSiteId = _trialSiteId;
 
-            await _SCPImageUploadRepository.AddAsync(_upload, true);
+            _upload.UploadJsonStr = (new SCPImageLog() { UploadList = _ImageUploadList }).ToJsonStr();
 
-
-            var _studyRepository = _serviceProvider.GetService<IRepository<SCPStudy>>();
-            //将检查设置为传输结束
-            await _studyRepository.BatchUpdateNoTrackingAsync(t => _SCPStudyIdList.Contains(t.Id), u => new SCPStudy() { IsUploadFinished = true });
-
-            await _studyRepository.SaveChangesAndClearAllTrackingAsync();
-
-            await SendAssociationReleaseResponseAsync();
+            //可能是测试echo 导致记录了
+            await _SCPImageUploadRepository.AddAsync(_upload, _upload.FileCount > 0 ? true : false);
         }
 
 
@@ -248,6 +273,11 @@ namespace IRaCIS.Core.SCP.Service
 
                 //await _studyRepository.SaveChangesAndClearAllTrackingAsync();
             }
+            else
+            {
+                //记录日志
+                await AddUploadLogAsync();
+            }
 
             Log.Logger.Warning($"连接关闭 {exception?.Message} {exception?.InnerException?.Message}");
         }
@@ -258,9 +288,23 @@ namespace IRaCIS.Core.SCP.Service
         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);
+            string studyInstanceUid = request.Dataset.GetSingleValueOrDefault(DicomTag.StudyInstanceUID, string.Empty);
+            string seriesInstanceUid = request.Dataset.GetSingleValueOrDefault(DicomTag.SeriesInstanceUID, string.Empty);
+            string sopInstanceUid = request.Dataset.GetSingleValueOrDefault(DicomTag.SOPInstanceUID, string.Empty);
+            string patientIdStr = request.Dataset.GetSingleValueOrDefault(DicomTag.PatientID, string.Empty);
+
+            if (studyInstanceUid.IsNullOrEmpty() || seriesInstanceUid.IsNullOrEmpty() || sopInstanceUid.IsNullOrEmpty())
+            {
+                Log.Logger.Error($"接收数据读取StudyInstanceUID：{studyInstanceUid}、SeriesInstanceUID：{seriesInstanceUid}、SOPInstanceUID：{sopInstanceUid}有空 ");
+
+                return new DicomCStoreResponse(request, DicomStatus.Success);
+            }
+
+            //确保来了影像集合存在
+            if (!_ImageUploadList.Any(t => t.StudyInstanceUid == studyInstanceUid))
+            {
+                _ImageUploadList.Add(new ImageUploadInfo() { StudyInstanceUid = studyInstanceUid });
+            }
 
             //Guid studyId = IdentifierHelper.CreateGuid(studyInstanceUid, trialId.ToString());
             Guid seriesId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, _trialId.ToString());
@@ -280,11 +324,70 @@ namespace IRaCIS.Core.SCP.Service
             long fileSize = 0;
             try
             {
-
                 using (MemoryStream ms = new MemoryStream())
                 {
                     await request.File.SaveAsync(ms);
 
+                    #region 1帧拆成多个固定大小的，方便移动端浏览
+
+                    // 回到开头，读取 dicom
+                    ms.Position = 0;
+                    var dicomFile = DicomFile.Open(ms);
+
+                    var pixelData = DicomPixelData.Create(dicomFile.Dataset);
+                    var syntax = pixelData.Syntax;
+
+                    // 每个 fragment 固定大小 (64KB 示例，可以自己调整)
+                    int fragmentSize = 20 * 1024;
+
+                    if (syntax.IsEncapsulated)
+                    {
+                        var newFragments = new DicomOtherByteFragment(DicomTag.PixelData);
+
+                        for (int n = 0; n < pixelData.NumberOfFrames; n++)
+                        {
+                            var frameData = pixelData.GetFrame(n); // 获取完整一帧
+                            var data = frameData.Data;
+                            int offset = 0;
+
+                            while (offset < data.Length)
+                            {
+                                int size = Math.Min(fragmentSize, data.Length - offset);
+                                var buffer = new byte[size];
+                                Buffer.BlockCopy(data, offset, buffer, 0, size);
+
+                                newFragments.Fragments.Add(new MemoryByteBuffer(buffer));
+                                offset += size;
+                            }
+                        }
+
+                        // 替换原 PixelData
+                        dicomFile.Dataset.AddOrUpdate(newFragments);
+
+
+                        // 重新保存 dicom 到流
+                        ms.SetLength(0);
+                        dicomFile.Save(ms);
+                    }
+
+
+                    ms.Position = 0;
+
+                    #endregion
+
+
+                    #region 本地测试
+                    //// --- 保存到本地文件测试 ---
+                    //var localPath = @"D:\TestDicom.dcm";
+                    //using (var fs = new FileStream(localPath, FileMode.Create, FileAccess.Write))
+                    //{
+                    //    ms.CopyTo(fs);
+                    //}
+                    //return new DicomCStoreResponse(request, DicomStatus.Success);
+
+                    #endregion
+
+
                     //irc 从路径最后一截取Guid
                     storeRelativePath = await ossService.UploadToOSSAsync(ms, ossFolderPath, instanceId.ToString(), false);
 
@@ -307,12 +410,8 @@ namespace IRaCIS.Core.SCP.Service
             {
                 try
                 {
-                    var scpStudyId = await dicomArchiveService.ArchiveDicomFileAsync(request.Dataset, _trialId, _trialSiteId, storeRelativePath, Association.CallingAE, Association.CalledAE,fileSize);
+                    var scpStudyId = await dicomArchiveService.ArchiveDicomFileAsync(request.File, _trialId, _trialSiteId, storeRelativePath, Association.CallingAE, Association.CalledAE,fileSize);
 
-                    if (!_SCPStudyIdList.Contains(scpStudyId))
-                    {
-                        _SCPStudyIdList.Add(scpStudyId);
-                    }
 
                     var series = await _seriesRepository.FirstOrDefaultAsync(t => t.Id == seriesId);
 
@@ -341,12 +440,40 @@ namespace IRaCIS.Core.SCP.Service
 
 
                     await _seriesRepository.SaveChangesAsync();
+
+                    if (_ImageUploadList.Any(t => t.StudyInstanceUid == studyInstanceUid))
+                    {
+                        var find = _ImageUploadList.FirstOrDefault(t => t.StudyInstanceUid.Equals(studyInstanceUid));
+
+
+                        find.SuccessImageCount++;
+
+                        if (!find.PatientNameList.Any(t => t == patientIdStr) && patientIdStr.IsNotNullOrEmpty())
+                        {
+                            find.PatientNameList.Add(patientIdStr);
+                        }
+
+                        //首次 （默认是Guid 空，数据库归档出了Id）
+                        if (find.SCPStudyId != scpStudyId)
+                        {
+                            find.SCPStudyId = scpStudyId;
+
+                        }
+                    }
                 }
                 catch (Exception ex)
                 {
 
                     Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE} 传输处理异常：{ex.ToString()}");
 
+                    if (_ImageUploadList.Any(t => t.StudyInstanceUid == studyInstanceUid))
+                    {
+                        var find = _ImageUploadList.FirstOrDefault(t => t.StudyInstanceUid.Equals(studyInstanceUid));
+
+                        find.FailedImageCount++;
+
+                    }
+
                 }
 
             }

IRC.Core.SCP/Service/DicomArchiveService.cs

@@ -13,6 +13,7 @@ using IRaCIS.Core.Infra.EFCore;
 using MassTransit;
 using System.Runtime.Intrinsics.X86;
 using Serilog.Sinks.File;
+using IRaCIS.Core.Infrastructure.Extention;
 
 namespace IRaCIS.Core.SCP.Service
 {
@@ -52,8 +53,10 @@ namespace IRaCIS.Core.SCP.Service
         /// <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)
+        public async Task<Guid> ArchiveDicomFileAsync(DicomFile dicomFile, Guid trialId, Guid trialSiteId, string fileRelativePath, string callingAE, string calledAE,long fileSize)
         {
+            var dataset = dicomFile.Dataset;
+
             string studyInstanceUid = dataset.GetString(DicomTag.StudyInstanceUID);
             string seriesInstanceUid = dataset.GetString(DicomTag.SeriesInstanceUID);
             string sopInstanceUid = dataset.GetString(DicomTag.SOPInstanceUID);
@@ -82,7 +85,7 @@ namespace IRaCIS.Core.SCP.Service
                 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)
+                if (findPatient == null /*&& findStudy==null*/)
                 {
                     isPatientNeedAdd = true;
 
@@ -151,6 +154,32 @@ namespace IRaCIS.Core.SCP.Service
                     }
 
                     findPatient.LatestPushTime = DateTime.Now;
+                    findPatient.PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty);
+                    findPatient.PatientSex = dataset.GetSingleValueOrDefault(DicomTag.PatientSex, string.Empty);
+                    findPatient.PatientAge = dataset.GetSingleValueOrDefault(DicomTag.PatientAge, string.Empty);
+                    findPatient.PatientBirthDate = dataset.GetSingleValueOrDefault(DicomTag.PatientBirthDate, string.Empty);
+
+                    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;
+
+                        }
+                        else
+                        {
+                            findPatient.PatientBirthDate = string.Empty;
+                        }
+
+                    }
                 }
 
                 if (findStudy == null)
@@ -167,6 +196,9 @@ namespace IRaCIS.Core.SCP.Service
                         TrialSiteId = trialSiteId,
                         StudyInstanceUid = studyInstanceUid,
                         StudyTime = studyTime,
+                        DicomStudyDate = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, string.Empty),
+                        DicomStudyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyTime, string.Empty),
+
                         Modalities = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty),
                         //ModalityForEdit = modalityForEdit,
                         Description = dataset.GetSingleValueOrDefault(DicomTag.StudyDescription, string.Empty),
@@ -201,6 +233,19 @@ namespace IRaCIS.Core.SCP.Service
                         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]}";
                     }
                 }
+                else
+                {
+                    findStudy.DicomStudyDate = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, string.Empty);
+                    findStudy.DicomStudyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyTime, string.Empty);
+                    findStudy.CalledAE = calledAE;
+                    findStudy.CallingAE = callingAE;
+                    findStudy.PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty);
+                    findStudy.PatientSex = dataset.GetSingleValueOrDefault(DicomTag.PatientSex, string.Empty);
+                    findStudy.PatientAge = dataset.GetSingleValueOrDefault(DicomTag.PatientAge, string.Empty);
+                    findStudy.UpdateTime = DateTime.Now;
+
+                    await _patientRepository.BatchUpdateNoTrackingAsync(t => t.Id == findStudy.PatientId, u => new SCPPatient() { LatestPushTime = DateTime.Now });
+                }
 
 
                 if (findSerice == null)
@@ -218,6 +263,9 @@ namespace IRaCIS.Core.SCP.Service
                         //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),
+                        DicomSeriesDate = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, string.Empty),
+                        DicomSeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, string.Empty),
+
                         Modality = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty),
                         Description = dataset.GetSingleValueOrDefault(DicomTag.SeriesDescription, string.Empty),
                         SliceThickness = dataset.GetSingleValueOrDefault(DicomTag.SliceThickness, string.Empty),
@@ -239,7 +287,20 @@ namespace IRaCIS.Core.SCP.Service
 
                     ++findStudy.SeriesCount;
                 }
+                else
+                {
+                    findSerice.DicomSeriesDate = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, string.Empty);
+                    findSerice.DicomSeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, string.Empty);
+                    findSerice.UpdateTime = DateTime.Now;
+                }
 
+                var transferSyntaxUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.TransferSyntaxUID, string.Empty);
+
+                var isEncapsulated = false;
+                if (transferSyntaxUID.IsNotNullOrEmpty())
+                {
+                    isEncapsulated = DicomTransferSyntax.Lookup(DicomUID.Parse(transferSyntaxUID)).IsEncapsulated;
+                }
 
                 if (findInstance == null)
                 {
@@ -280,6 +341,15 @@ namespace IRaCIS.Core.SCP.Service
                     ++findStudy.InstanceCount;
                     ++findSerice.InstanceCount;
                 }
+                else
+                {
+                    findInstance.SOPClassUID = dataset.GetSingleValueOrDefault(DicomTag.SOPClassUID, string.Empty);
+                    findInstance.MediaStorageSOPClassUID = dataset.GetSingleValueOrDefault(DicomTag.MediaStorageSOPClassUID, string.Empty);
+                    findInstance.TransferSytaxUID = transferSyntaxUID;
+                    findInstance.MediaStorageSOPInstanceUID = dataset.GetSingleValueOrDefault(DicomTag.MediaStorageSOPInstanceUID, string.Empty);
+                    findInstance.IsEncapsulated = isEncapsulated;
+                    findInstance.UpdateTime = DateTime.Now;
+                }
 
                 if (isPatientNeedAdd)
                 {

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

@@ -5,7 +5,7 @@ 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);
+        Task<Guid> ArchiveDicomFileAsync(DicomFile dicomFile, Guid trialId,Guid trialSiteId, string fileRelativePath,string callingAE,string calledAE,long fileSize);
 
     }
 }

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

@@ -2,6 +2,7 @@
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Application.BusinessFilter;
 using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Contracts.DTO;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Image.QA;
 using IRaCIS.Core.Application.Service;
@@ -34,6 +35,31 @@ namespace IRaCIS.Core.API.Controllers
         ) : ControllerBase
     {
 
+
+        [HttpPost, Route("Inspection/NoneDicomStudy/UpdateNoneDicomStudy")]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [UnitOfWork]
+
+        public async Task<IResponseOutput> UpdateNoneDicomStudy(DataInspectionDto<NoneDicomEdit> opt, [FromServices] INoneDicomStudyService _noneDicomStudyService)
+        {
+            var singId = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _noneDicomStudyService.UpdateNoneDicomStudy(opt.Data);
+            await _inspectionService.CompletedSign(singId, result);
+            return result;
+        }
+
+        [HttpPost, Route("Inspection/QCOperation/UpdateDicomStudyInfo")]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [UnitOfWork]
+
+        public async Task<IResponseOutput> UpdateDicomStudyInfo(DataInspectionDto<DicomStudyEdit> opt, [FromServices] IQCOperationService _qcOperationService)
+        {
+            var singId = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _qcOperationService.UpdateDicomStudyInfo(opt.Data);
+            await _inspectionService.CompletedSign(singId, result);
+            return result;
+        }
+
         #region 获取稽查数据
         /// <summary>
         /// 获取稽查数据

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

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

IRaCIS.Core.API/HostService/HangfireHostService.cs

@@ -41,6 +41,21 @@ public class HangfireHostService(IRecurringMessageScheduler _recurringMessageSch
             HangfireJobHelper.RemoveCronJob(jobId);
         }
 
+        // 清除所有可能存在的定时任务，防止类型加载错误
+        var allJobIdList = JobStorage.Current.GetConnection().GetRecurringJobs().Select(t => t.Id).ToList();
+        foreach (var jobId in allJobIdList)
+        {
+            try
+            {
+                HangfireJobHelper.RemoveCronJob(jobId);
+                _logger.LogInformation($"已清除定时任务: {jobId}");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning($"清除定时任务 {jobId} 时出错: {ex.Message}");
+            }
+        }
+
 
         var taskInfoList = await _trialEmailNoticeConfigRepository.Where(t => t.Trial.TrialStatusStr == StaticData.TrialState.TrialOngoing && t.EmailCron != string.Empty && t.IsAutoSend)
               .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
@@ -67,7 +82,7 @@ public class HangfireHostService(IRecurringMessageScheduler _recurringMessageSch
             //利用主键作为任务Id
             var jobId = $"{task.Id}_({task.BusinessScenarioEnum})";
 
-            HangfireJobHelper.AddOrUpdateSystemCronJob(jobId, task.BusinessScenarioEnum, task.EmailCron);
+            HangfireJobHelper.AddOrUpdateTimingCronJob(jobId, task.BusinessScenarioEnum, task.EmailCron);
         }
 
 

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

@@ -76,16 +76,15 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="ConfigMapFileProvider" Version="2.0.1" />
-		<PackageReference Include="Hangfire.AspNetCore" Version="1.8.18" />
+		<PackageReference Include="Hangfire.AspNetCore" Version="1.8.20" />
 		<PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
 		<PackageReference Include="Hangfire.InMemory" Version="1.0.0" />
-		<PackageReference Include="Hangfire.SqlServer" Version="1.8.18" />
+		<PackageReference Include="Hangfire.SqlServer" Version="1.8.20" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
-		<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="8.1.1" />
+		<PackageReference Include="Serilog.Sinks.Email" Version="4.1.0" />
+		<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>

IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/JSONTimeZoneConverter.cs

@@ -126,6 +126,51 @@ namespace IRaCIS.Core.API
     }
 
 
+    public class DateOnlyUniversalJsonConverter : JsonConverter
+    {
+        private readonly string _format;
+
+        public DateOnlyUniversalJsonConverter(string format = "yyyy-MM-dd")
+        {
+            _format = format;
+        }
+
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(DateOnly) || objectType == typeof(DateOnly?);
+        }
+
+        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+        {
+            if (value == null)
+            {
+                writer.WriteValue(""); // null -> 空字符串
+                return;
+            }
+
+            var date = (DateOnly)value;
+            if (date == default)
+            {
+                writer.WriteValue(""); // default(DateOnly) -> 空字符串
+            }
+            else
+            {
+                writer.WriteValue(date.ToString(_format));
+            }
+        }
+
+        public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+        {
+            var str = reader.TokenType == JsonToken.Null ? null : reader.Value?.ToString();
+
+            if (string.IsNullOrWhiteSpace(str) || !DateOnly.TryParse(str, out var date))
+            {
+                return objectType == typeof(DateOnly?) ? null : default(DateOnly);
+            }
+
+            return date;
+        }
+    }
 
     #region 废弃
 

IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/NewtonsoftJsonSetup.cs

@@ -49,6 +49,8 @@ namespace IRaCIS.Core.API
                  //必须放在后面
                  options.SerializerSettings.Converters.Add(services.BuildServiceProvider().GetService<JSONTimeZoneConverter>());
 
+                 //options.SerializerSettings.Converters.Add(new DateOnlyUniversalJsonConverter("yyyy-MM-dd"));
+
 
              })
                 .AddControllersAsServices()//动态webApi属性注入需要

IRaCIS.Core.API/_ServiceExtensions/SerilogSetup.cs

@@ -22,16 +22,20 @@ namespace IRaCIS.Core.API
             var config = new LoggerConfiguration()
                    .MinimumLevel.Information()
                    .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                   .MinimumLevel.Override("MassTransit", LogEventLevel.Warning)
+                    //https://github.com/ZiggyCreatures/FusionCache/blob/main/docs/Logging.md
+                    .MinimumLevel.Override("ZiggyCreatures.Caching.Fusion", LogEventLevel.Warning)
+                   
                    // Filter out ASP.NET Core infrastructre logs that are Information and below  日志太多了 一个请求 记录好几条
                    .MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Warning)
                    .MinimumLevel.Override("Microsoft.AspNetCore.Hosting", LogEventLevel.Warning)
                    .MinimumLevel.Override("Microsoft.AspNetCore.Mvc", LogEventLevel.Warning)
                    .MinimumLevel.Override("Microsoft.AspNetCore.Routing", LogEventLevel.Warning)
                    .MinimumLevel.Override("Hangfire", LogEventLevel.Warning)
-                   .Enrich.FromLogContext()
+                   .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/hangfireSetup.cs

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

IRaCIS.Core.API/appsettings.Event_IRC.json

@@ -16,11 +16,11 @@
       "RegionId": "cn-shanghai",
       "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
       "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tNRTsqL6aWmHkDmTwoH",
-      "AccessKeySecret": "7mtGz3qrYWI6JMMBZiLeC119VWicZH",
-      "RoleArn": "acs:ram::1899121822495495:role/irc-oss-access",
-      "BucketName": "zy-irc-store",
-      "ViewEndpoint": "https://zy-irc-cache.oss-cn-shanghai.aliyuncs.com",
+      "AccessKeyId": "LTAI5tFUCCmz5TwghZHsj45Y",
+      "AccessKeySecret": "8evrBy1fVfzJG25i67Jm0xqn9Xcw2T",
+      "RoleArn": "acs:ram::1078130221702011:role/uat-oss-access",
+      "BucketName": "tl-med-irc-event-store",
+      "ViewEndpoint": "https://tl-med-irc-event-store.oss-cn-shanghai.aliyuncs.com",
       "Region": "oss-cn-shanghai",
       "DurationSeconds": 7200
     },

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",
@@ -60,7 +60,7 @@
     "Port": 465,
     "Host": "smtp.qiye.aliyun.com",
     "FromEmail": "irc@extimaging.com",
-    "FromName": "irc",
+    "FromName": "IRC Imaging System",
     "AuthorizationCode": "ExtImg@2022",
     "SiteUrl": "http://irc.extimaging.com/login",
     "SystemShortName": "IRC",
@@ -72,6 +72,7 @@
     "CompanyShortNameCN": "展影医疗",
     "IsEnv_US": false,
     "IsOpenErrorNoticeEmail": false,
+    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]
   },
   "SystemPacsConfig": {

IRaCIS.Core.API/appsettings.Test_IRC.json

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

IRaCIS.Core.API/appsettings.US_Prod_IRC.json

@@ -65,7 +65,7 @@
     "Port": 587,
     "Host": "smtp-mail.outlook.com",
     "FromEmail": "donotreply@elevateimaging.ai",
-    "FromName": "LiLi",
+    "FromName": "LiLi System",
     "AuthorizationCode": "Q#669869497420ul",
 
     "SystemShortName": "LiLi",
@@ -78,6 +78,7 @@
     "SiteUrl": "https://lili.elevateimaging.ai/login",
     "IsEnv_US": true,
     "IsOpenErrorNoticeEmail": false,
+    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]
   },
 

IRaCIS.Core.API/appsettings.US_Test_IRC.json

@@ -73,7 +73,7 @@
     "Port": 587,
     "Host": "smtp-mail.outlook.com",
     "FromEmail": "donotreply@elevateimaging.ai",
-    "FromName": "LiLi",
+    "FromName": "LiLi System",
     "AuthorizationCode": "Q#669869497420ul",
 
     "SystemShortName": "LiLi",

IRaCIS.Core.API/appsettings.US_Uat_IRC.json

@@ -72,7 +72,7 @@
     "Port": 587,
     "Host": "smtp-mail.outlook.com",
     "FromEmail": "donotreply@elevateimaging.ai",
-    "FromName": "LiLi",
+    "FromName": "LiLi System",
     "AuthorizationCode": "Q#669869497420ul",
 
     "SystemShortName": "LiLi",
@@ -85,6 +85,7 @@
     "SiteUrl": "https://lili.uat.elevateimaging.ai/login",
     "IsEnv_US": true,
     "IsOpenErrorNoticeEmail": false,
+    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]
   },
 

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -79,7 +79,7 @@
     "Port": 465,
     "Host": "smtp.qiye.aliyun.com",
     "FromEmail": "uat@extimaging.com",
-    "FromName": "UAT_IRC",
+    "FromName": "Uat IRC Imaging System",
     "AuthorizationCode": "SHzyyl2021",
     "SiteUrl": "http://irc.uat.extimaging.com/login",
 
@@ -92,6 +92,7 @@
     "CompanyShortNameCN": "展影医疗",
     "IsEnv_US": false,
     "IsOpenErrorNoticeEmail": false,
+    "EmailRegexStr": "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
     "ErrorNoticeEmailList": [ "872297557@qq.com" ]
   },
 

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

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

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

@@ -70,6 +70,8 @@ public class SystemEmailSendConfig
 
     public bool IsOpenErrorNoticeEmail { get; set; }
 
+    public string EmailRegexStr { get; set; }
+
     public List<string> ErrorNoticeEmailList { get; set; } =new List<string>();
 }
 
@@ -83,6 +85,8 @@ public class SystemEmailSendConfigView
     public string CompanyShortName { get; set; } = string.Empty;
 
     public string CompanyShortNameCN { get; set; } = string.Empty;
+
+    public string EmailRegexStr { get; set; }
 }
 
 public class SystemPacsConfig

IRaCIS.Core.Application/GlobalUsings.cs

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

IRaCIS.Core.Application/Helper/DicomDIRHelper.cs

@@ -0,0 +1,193 @@
+using FellowOakDicom;
+using FellowOakDicom.Media;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Helper
+{
+
+    public class StudyDIRInfo
+    {
+        public Guid SubjectId { get; set; }
+        public bool IsTaskStudy { get; set; }
+
+        public Guid SubjectVisitId { get; set; }
+        // Study
+        public Guid DicomStudyId { get; set; }
+
+        public string PatientId { get; set; }
+        public string PatientName { get; set; }
+        public string PatientBirthDate { get; set; }
+        public string PatientSex { get; set; }
+
+        public string StudyInstanceUid { get; set; }
+        public string StudyId { get; set; }
+        public string DicomStudyDate { get; set; }
+        public string DicomStudyTime { get; set; }
+        public string AccessionNumber { get; set; }
+        public string StudyDescription { get; set; }
+
+        // Series
+        public string SeriesInstanceUid { get; set; }
+        public string Modality { get; set; }
+        public string DicomSeriesDate { get; set; }
+        public string DicomSeriesTime { get; set; }
+        public int SeriesNumber { get; set; }
+        public string SeriesDescription { get; set; }
+
+        // Instance
+        public Guid InstanceId { get; set; }
+        public string SopInstanceUid { get; set; }
+        public string SOPClassUID { get; set; }
+        public int InstanceNumber { get; set; }
+        public string MediaStorageSOPClassUID { get; set; }
+        public string MediaStorageSOPInstanceUID { get; set; }
+        public string TransferSytaxUID { get; set; }
+    }
+    public static class DicomDIRHelper
+    {
+
+        public static async Task GenerateStudyDIRAndUploadAsync(List<StudyDIRInfo> list, Dictionary<string, string> dic, string ossFolder, IOSSService _oSSService)
+        {
+            var mappings = new List<string>();
+            int index = 1;
+
+
+            var dicomDir = new DicomDirectory();
+
+            foreach (var item in list.OrderBy(t => t.SeriesNumber).ThenBy(t => t.InstanceNumber))
+            {
+                var dicomUid = DicomUID.Enumerate().FirstOrDefault(uid => uid.UID == item.TransferSytaxUID);
+
+                if (dicomUid != null)
+                {
+                    var ts = DicomTransferSyntax.Query(dicomUid);
+
+                    var dataset = new DicomDataset(ts)
+                    {
+                        { DicomTag.PatientID, item.PatientId ?? string.Empty },
+                        { DicomTag.PatientName, item.PatientName ?? string.Empty },
+                        { DicomTag.PatientBirthDate, item.PatientBirthDate ?? string.Empty },
+                        { DicomTag.PatientSex, item.PatientSex ?? string.Empty },
+
+                        { DicomTag.StudyInstanceUID, item.StudyInstanceUid ?? string.Empty },
+                        { DicomTag.StudyID, item.StudyId ?? string.Empty },
+                        { DicomTag.StudyDate, item.DicomStudyDate ?? string.Empty },
+                        { DicomTag.StudyTime, item.DicomStudyTime ?? string.Empty },
+                        { DicomTag.AccessionNumber, item.AccessionNumber ?? string.Empty },
+                        { DicomTag.StudyDescription, item.StudyDescription ?? string.Empty },
+
+                        { DicomTag.SeriesInstanceUID, item.SeriesInstanceUid ?? string.Empty },
+                        { DicomTag.Modality, item.Modality ?? string.Empty },
+                        { DicomTag.SeriesDate, item.DicomSeriesDate ?? string.Empty },
+                        { DicomTag.SeriesTime, item.DicomSeriesTime ?? string.Empty },
+                        { DicomTag.SeriesNumber, item.SeriesNumber.ToString() ?? string.Empty },
+                        { DicomTag.SeriesDescription, item.SeriesDescription ?? string.Empty },
+
+                        { DicomTag.SOPInstanceUID, item.SopInstanceUid ?? string.Empty },
+                        { DicomTag.SOPClassUID, item.SOPClassUID ?? string.Empty },
+                        { DicomTag.InstanceNumber, item.InstanceNumber.ToString() ?? string.Empty },
+                        { DicomTag.MediaStorageSOPClassUID, item.MediaStorageSOPClassUID ?? string.Empty },
+                        { DicomTag.MediaStorageSOPInstanceUID, item.MediaStorageSOPInstanceUID ?? string.Empty },
+                        { DicomTag.TransferSyntaxUID, item.TransferSytaxUID ?? string.Empty },
+                    };
+
+                    var dicomFile = new DicomFile(dataset);
+
+                    // 文件名递增格式：IM_00001, IM_00002, ...
+                    string filename = $@"IMAGE/IM_{index:D5}";  // :D5 表示补足5位
+
+                    mappings.Add($"{filename} => {item.InstanceId}");
+
+                    dic.Add(item.InstanceId.ToString(), Path.GetFileName(filename));
+
+                    dicomDir.AddFile(dicomFile, filename);
+
+                    index++;
+                }
+
+
+            }
+
+            //有实际的文件
+            if (mappings.Count > 0)
+            {
+                #region 写入临时路径
+                var tempFilePath = Path.GetTempFileName();
+
+                // 保存 DICOMDIR 到临时文件  不能直接写入到流种
+                await dicomDir.SaveAsync(tempFilePath);
+
+                using (var memoryStream = new MemoryStream(File.ReadAllBytes(tempFilePath)))
+                {
+                    // 重置流位置
+                    memoryStream.Position = 0;
+
+                    await _oSSService.UploadToOSSAsync(memoryStream, ossFolder, "DICOMDIR", false);
+                }
+
+                //清理临时文件
+                File.Delete(tempFilePath);
+
+                #endregion
+
+                #region 映射上传
+
+                // 将映射写入内存流
+                var mappingText = string.Join(Environment.NewLine, mappings);
+                await using var mappingStream = new MemoryStream(Encoding.UTF8.GetBytes(mappingText));
+
+                await _oSSService.UploadToOSSAsync(mappingStream, ossFolder, $"Download_{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}", false);
+
+                #endregion
+            }
+
+        }
+
+
+
+        public static StudyDIRInfo ReadDicomDIRInfo(DicomFile dicomFile)
+        {
+            var dataset = dicomFile.Dataset;
+
+
+            var info = new StudyDIRInfo
+            {
+                PatientId = dataset.GetSingleValueOrDefault(DicomTag.PatientID, string.Empty),
+                PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty),
+                PatientBirthDate = dataset.GetSingleValueOrDefault(DicomTag.PatientBirthDate, string.Empty),
+                PatientSex = dataset.GetSingleValueOrDefault(DicomTag.PatientSex, string.Empty),
+
+                StudyInstanceUid = dataset.GetSingleValueOrDefault(DicomTag.StudyInstanceUID, string.Empty),
+                StudyId = dataset.GetSingleValueOrDefault(DicomTag.StudyID, string.Empty),
+                DicomStudyDate = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, string.Empty),
+                DicomStudyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyTime, string.Empty),
+                AccessionNumber = dataset.GetSingleValueOrDefault(DicomTag.AccessionNumber, string.Empty),
+                StudyDescription = dataset.GetSingleValueOrDefault(DicomTag.StudyDescription, string.Empty),
+
+                SeriesInstanceUid = dataset.GetSingleValueOrDefault(DicomTag.SeriesInstanceUID, string.Empty),
+                Modality = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty),
+                DicomSeriesDate = dataset.GetSingleValueOrDefault(DicomTag.SeriesDate, string.Empty),
+                DicomSeriesTime = dataset.GetSingleValueOrDefault(DicomTag.SeriesTime, string.Empty),
+                SeriesNumber = dataset.GetSingleValueOrDefault(DicomTag.SeriesNumber, 1),
+                SeriesDescription = dataset.GetSingleValueOrDefault(DicomTag.SeriesDescription, string.Empty),
+
+                SopInstanceUid = dataset.GetSingleValueOrDefault(DicomTag.SOPInstanceUID, string.Empty),
+                SOPClassUID = dataset.GetSingleValueOrDefault(DicomTag.SOPClassUID, string.Empty),
+                InstanceNumber = dataset.GetSingleValueOrDefault(DicomTag.InstanceNumber, 1),
+
+                MediaStorageSOPClassUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.MediaStorageSOPClassUID, string.Empty),
+                MediaStorageSOPInstanceUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.MediaStorageSOPInstanceUID, string.Empty),
+
+                TransferSytaxUID = dicomFile.FileMetaInfo.GetSingleValueOrDefault(DicomTag.TransferSyntaxUID, string.Empty)
+            };
+
+            return info;
+        }
+    }
+}

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

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

IRaCIS.Core.Application/Helper/FileDocProcess/Attribute/DictionaryTranslateAttribute.cs

@@ -60,4 +60,16 @@ namespace IRaCIS.Core.Application.Helper
         }
 
     }
+
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
+    public class DateTimeTranaslateAttribute : Attribute
+    {
+        public string Formart { get; set; }
+
+        public DateTimeTranaslateAttribute(string formart)
+        {
+            Formart = formart;
+
+        }
+    }
 }

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

@@ -1,15 +1,19 @@
 using DocumentFormat.OpenXml.Spreadsheet;
 using DocumentFormat.OpenXml.Wordprocessing;
+using FellowOakDicom.Imaging.LUT;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infra.EFCore.Migrations;
+using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Hosting;
 using MiniExcelLibs;
 using MiniExcelLibs.OpenXml;
+using Newtonsoft.Json;
 using NPOI.HSSF.UserModel;
 using NPOI.SS.Formula.Functions;
 using NPOI.SS.UserModel;
@@ -243,6 +247,7 @@ public static class ExcelExportHelper
 
     }
 
+
     public class DynamicColumnConfig
     {
         /// <summary>
@@ -260,7 +265,9 @@ public static class ExcelExportHelper
         /// </summary>
         public int TempalteLastColumnIndex { get; set; }
 
-        public List<string> CDISCList { get; set; } = new List<string>();
+        public bool IsCDISCExport { get; set; } = false;
+
+        //public List<string> CDISCList { get; set; } = new List<string>();
 
         /// <summary>
         /// 动态的列名  如果Id 重复，那么就按照名称填充，否则就按照Id 填充列数据
@@ -301,6 +308,8 @@ public static class ExcelExportHelper
             public Guid Id { get; set; }
             public string Name { get; set; }
 
+            public string CDISCCode { get; set; }
+
             public override bool Equals(object obj)
             {
                 if (obj is not ColumItem other) return false;
@@ -489,7 +498,9 @@ public static class ExcelExportHelper
 
             if (dynamicColumnConfig != null)
             {
-                var isCdics = dynamicColumnConfig.CDISCList.Count > 0;
+                //var isCdics = dynamicColumnConfig.CDISCList.Count > 0;
+
+                var isCdics = dynamicColumnConfig.IsCDISCExport;
 
                 var sheet = workbook.GetSheetAt(0);
 
@@ -544,9 +555,9 @@ public static class ExcelExportHelper
                 }
 
                 //创建新的列
-                for (int i = originTotalEndIndex; i < originTotalEndIndex + needAddCount; i++)
+                for (int i = originRemoveEndIndex; i < originRemoveEndIndex + needAddCount; i++)
                 {
-                   
+
                     titelRow.CreateCell(i + 1);
                     templateRow.CreateCell(i + 1);
 
@@ -565,6 +576,11 @@ public static class ExcelExportHelper
                     titelRow.GetCell(i).SetCellValue(titelRow.GetCell(i - gap).StringCellValue);
 
                     templateRow.GetCell(i).SetCellValue(templateRow.GetCell(i - gap).StringCellValue);
+
+                    if (isCdics)
+                    {
+                        cdicsRow.GetCell(i).SetCellValue(cdicsRow.GetCell(i - gap).StringCellValue);
+                    }
                 }
 
 
@@ -573,6 +589,7 @@ public static class ExcelExportHelper
 
                 for (int i = dynamicColunmStartIndex; i < dynamicColunmStartIndex + needAddCount; i++)
                 {
+
                     var name = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].Name;
 
                     titelRow.GetCell(i).SetCellValue(name);
@@ -580,13 +597,15 @@ public static class ExcelExportHelper
 
                     if (isCdics)
                     {
-                        var cdicsCode = dynamicColumnConfig.CDISCList[i - dynamicColunmStartIndex];
+                        var cdicsCode = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].CDISCCode;
 
                         cdicsRow.GetCell(i).SetCellValue(cdicsCode);
                     }
                 }
+
             }
 
+
             using (var memoryStream2 = new MemoryStream())
             {
                 workbook.Write(memoryStream2, true);
@@ -609,8 +628,11 @@ public static class ExcelExportHelper
             IgnoreTemplateParameterMissing = true,
         };
 
+        //await MiniExcel.SaveAsByTemplateAsync("testmini.xlsx", templateStream.ToArray(), translateData);
+
         await MiniExcel.SaveAsByTemplateAsync(memoryStream, templateStream.ToArray(), translateData, config);
 
+
         memoryStream.Seek(0, SeekOrigin.Begin);
 
         if (dynamicColumnConfig != null)
@@ -643,7 +665,7 @@ public static class ExcelExportHelper
 
                     var iteObjDic = itemObj.ToDictionary();
 
-                    var itemDicName = iteObjDic[dynamicColumnConfig.DynamicItemDicName]?.ToString();
+                    var itemDicName = iteObjDic.ContainsKey(dynamicColumnConfig.DynamicItemDicName) ? iteObjDic[dynamicColumnConfig.DynamicItemDicName]?.ToString() : "";
                     var itemValue = iteObjDic[dynamicColumnConfig.DynamicItemValueName]?.ToString();
 
                     //var writeIndex = itemList.IndexOf(itemObj) + dynamicColumnConfig.AutoColumnStartIndex;
@@ -663,9 +685,45 @@ public static class ExcelExportHelper
                     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;
+                        var optionTypeEnumStr = iteObjDic.ContainsKey("OptionTypeEnum") ? iteObjDic["OptionTypeEnum"]?.ToString() : "0";
+
+                        var translatedItemData = "";
+                        //多选
+                        if (optionTypeEnumStr == "1")
+                        {
+                            int[] enumValues = new int[0];
+                            // 1. 反序列化 JSON 数组 (字符串枚举)
+                            if (!itemValue.StartsWith("[") || !itemValue.EndsWith("]"))
+                            {
+                                enumValues = new int[1] { int.Parse(itemValue) };
+                            }
+                            else
+                            {
+                                 enumValues = JsonConvert.DeserializeObject<int[]>(itemValue)?? new int[0];
+
+                            }
+
+
+                            // 2. 翻译每一项并输出逗号拼接字符串
+                            translatedItemData = string.Join(",",
+                                enumValues.Select(code =>
+                                    dynamicTranslateDataList[itemDicName]
+                                        .FirstOrDefault(t =>
+                                           string.Equals(code.ToString(),t.Code, StringComparison.OrdinalIgnoreCase)
+                                        ) is var r && r != null
+                                            ? (isEn_US ? r.Value : r.ValueCN)
+                                            : string.Empty
+                                ));
+                        }
+                        else
+                        {
+
+                             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
                     {
@@ -907,7 +965,7 @@ public static class ExcelExportHelper
                 {
                     var name = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].Name;
 
-                    var cdicsCode = dynamicColumnConfig.CDISCList[i - dynamicColunmStartIndex];
+                    var cdicsCode = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].CDISCCode;
 
                     cdicsRow.GetCell(i).SetCellValue(cdicsCode);
                     titelRow.GetCell(i).SetCellValue(name);

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

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

IRaCIS.Core.Application/Helper/HangfireJobHelper.cs

@@ -83,15 +83,21 @@ namespace IRaCIS.Core.Application.Helper
 
         }
 
-        public static void AddOrUpdateSystemCronJob(string jobId, EmailBusinessScenario businessScenario, string emailCron)
+        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/OSSService.cs

@@ -18,6 +18,7 @@ using Minio.DataModel.Args;
 using Minio.Exceptions;
 using System.Reactive.Linq;
 using System.Runtime.InteropServices;
+using System.Web;
 
 namespace IRaCIS.Core.Application.Helper;
 
@@ -111,6 +112,8 @@ public class AliyunOSSTempToken
 
     public string PreviewEndpoint { get; set; }
 
+    public string DownloadEndPoint => EndPoint.Insert(EndPoint.IndexOf("//") + 2, BucketName + ".");
+
 }
 
 [LowerCamelCaseJson]
@@ -123,7 +126,7 @@ public class AWSTempToken
     public string SecretAccessKey { get; set; }
     public string BucketName { get; set; }
     public string ViewEndpoint { get; set; }
-    public DateTime Expiration { get; set; }
+    public DateTime? Expiration { get; set; }
 }
 
 public enum ObjectStoreUse
@@ -144,6 +147,8 @@ public interface IOSSService
 
     public Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath);
 
+    public Task<Stream> GetStreamFromOSSAsync(string ossRelativePath);
+
     public ObjectStoreServiceOptions ObjectStoreServiceOptions { get; set; }
 
     public Task<string> GetSignedUrl(string ossRelativePath);
@@ -189,7 +194,7 @@ public class OSSService : IOSSService
     /// <returns></returns>
     public async Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true)
     {
-        GetObjectStoreTempToken();
+        BackBatchGetToken();
 
         var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{fileRealName}" : $"{oosFolderPath}/{fileRealName}";
 
@@ -279,6 +284,37 @@ public class OSSService : IOSSService
     }
 
 
+    //后端批量上传 或者下载，不每个文件获取临时token
+    private void BackBatchGetToken()
+    {
+        if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+        {
+            if (AliyunOSSTempToken == null)
+            {
+                GetObjectStoreTempToken();
+            }
+            //token 过期了
+            if (AliyunOSSTempToken?.Expiration.AddSeconds(10) <= DateTime.Now)
+            {
+                GetObjectStoreTempToken();
+            }
+
+
+        }
+        else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+        {
+            if (AWSTempToken == null)
+            {
+                GetObjectStoreTempToken();
+            }
+            //token 过期了
+            if (AWSTempToken.Expiration?.AddSeconds(10) <= DateTime.Now)
+            {
+                GetObjectStoreTempToken();
+            }
+        }
+    }
+
 
     /// <summary>
     /// oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
@@ -290,7 +326,7 @@ public class OSSService : IOSSService
     /// <exception cref="BusinessValidationFailedException"></exception>
     public async Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true)
     {
-        GetObjectStoreTempToken();
+        BackBatchGetToken();
 
         var localFileName = Path.GetFileName(localFilePath);
 
@@ -360,7 +396,7 @@ public class OSSService : IOSSService
 
     public async Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath)
     {
-        GetObjectStoreTempToken();
+        BackBatchGetToken();
 
         ossRelativePath = ossRelativePath.TrimStart('/');
         try
@@ -373,14 +409,12 @@ public class OSSService : IOSSService
 
                 var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint, AliyunOSSTempToken.AccessKeyId, AliyunOSSTempToken.AccessKeySecret, AliyunOSSTempToken.SecurityToken);
 
-                // 上传文件
                 var result = _ossClient.GetObject(aliConfig.BucketName, ossRelativePath);
 
                 // 将下载的文件流保存到本地文件
                 using (var fs = File.OpenWrite(localFilePath))
                 {
-                    result.Content.CopyTo(fs);
-                    fs.Close();
+                    await result.Content.CopyToAsync(fs);
                 }
 
             }
@@ -444,6 +478,96 @@ public class OSSService : IOSSService
 
     }
 
+    public async Task<Stream> GetStreamFromOSSAsync(string ossRelativePath)
+    {
+        BackBatchGetToken();
+        ossRelativePath = ossRelativePath.TrimStart('/');
+
+        try
+        {
+            if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+            {
+                var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+
+                var _ossClient = new OssClient(
+                    RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.EndPoint : aliConfig.InternalEndpoint,
+                    AliyunOSSTempToken.AccessKeyId,
+                    AliyunOSSTempToken.AccessKeySecret,
+                    AliyunOSSTempToken.SecurityToken
+                );
+
+                var result = _ossClient.GetObject(aliConfig.BucketName, ossRelativePath);
+
+                // 将OSS返回的流复制到内存流中并返回
+                var memoryStream = new MemoryStream();
+                await result.Content.CopyToAsync(memoryStream);
+                memoryStream.Position = 0; // 重置位置以便读取
+                return memoryStream;
+            }
+            else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
+            {
+                var minIOConfig = ObjectStoreServiceOptions.MinIO;
+
+                var minioClient = new MinioClient()
+                    .WithEndpoint($"{minIOConfig.EndPoint}:{minIOConfig.Port}")
+                    .WithCredentials(minIOConfig.AccessKeyId, minIOConfig.SecretAccessKey)
+                    .WithSSL(minIOConfig.UseSSL)
+                    .Build();
+
+                var memoryStream = new MemoryStream();
+
+                var getObjectArgs = new GetObjectArgs()
+                    .WithBucket(minIOConfig.BucketName)
+                    .WithObject(ossRelativePath)
+                    .WithCallbackStream(stream => stream.CopyToAsync(memoryStream));
+
+                await minioClient.GetObjectAsync(getObjectArgs);
+                memoryStream.Position = 0;
+                return memoryStream;
+            }
+            else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+            {
+                var awsConfig = ObjectStoreServiceOptions.AWS;
+
+                var credentials = new SessionAWSCredentials(
+                    AWSTempToken.AccessKeyId,
+                    AWSTempToken.SecretAccessKey,
+                    AWSTempToken.SessionToken
+                );
+
+                var clientConfig = new AmazonS3Config
+                {
+                    RegionEndpoint = RegionEndpoint.USEast1,
+                    UseHttp = true,
+                };
+
+                var amazonS3Client = new AmazonS3Client(credentials, clientConfig);
+
+                var getObjectRequest = new Amazon.S3.Model.GetObjectRequest
+                {
+                    BucketName = awsConfig.BucketName,
+                    Key = ossRelativePath
+                };
+
+                var response = await amazonS3Client.GetObjectAsync(getObjectRequest);
+
+                var memoryStream = new MemoryStream();
+                await response.ResponseStream.CopyToAsync(memoryStream);
+                memoryStream.Position = 0;
+                return memoryStream;
+            }
+            else
+            {
+                throw new BusinessValidationFailedException("未定义的存储介质类型");
+            }
+        }
+        catch (Exception ex)
+        {
+            throw new BusinessValidationFailedException("oss流获取失败! " + ex.Message);
+        }
+    }
+
+
     public async Task<string> GetSignedUrl(string ossRelativePath)
     {
         GetObjectStoreTempToken();
@@ -1000,14 +1124,9 @@ public class OSSService : IOSSService
         }
     }
 
-    private bool isFirstCall = true;
     public async Task<long> GetObjectSizeAsync(string sourcePath)
     {
-        if (isFirstCall)
-        {
-            GetObjectStoreTempToken();
-            isFirstCall = false;
-        }
+        BackBatchGetToken();
 
 
         var objectkey = sourcePath.Trim('/');
@@ -1018,9 +1137,10 @@ public class OSSService : IOSSService
 
             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);
+            var key = HttpUtility.UrlDecode(objectkey);
+            var metadata = _ossClient.GetObjectMetadata(aliConfig.BucketName, key);
 
-            long fileSize = metadata.ContentLength; // 文件大小（字节）
+            long fileSize = metadata?.ContentLength ?? 0; // 文件大小（字节）
 
             return fileSize;
         }

IRaCIS.Core.Application/Helper/SafeBussinessHelper.cs

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

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

@@ -33,38 +33,38 @@
 
 	<ItemGroup>
 		<PackageReference Include="IdentityModel.OidcClient" Version="6.0.0" />
-		<PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.5" />
-		<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.401.81" />
+		<PackageReference Include="AlibabaCloud.SDK.Sts20150401" Version="1.1.6" />
+		<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.1.3" />
 		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
-		<PackageReference Include="AWSSDK.S3" Version="3.7.416.8" />
+		<PackageReference Include="AWSSDK.S3" Version="4.0.4.1" />
 		<PackageReference Include="DocX" Version="4.0.25105.5786" />	
 		<PackageReference Include="FreeSpire.Doc" Version="12.2.0" />
-		<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.Redis" Version="1.1.0" />
 		<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="fo-dicom" Version="5.2.2" />
+		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.2" />
+		<PackageReference Include="fo-dicom.Codecs" Version="5.16.4" />
 		<PackageReference Include="IP2Region.Net" Version="2.0.2" />
 		<PackageReference Include="MailKit" Version="4.11.0" />
 		<PackageReference Include="Masa.Contrib.Service.MinimalAPIs" Version="1.0.0" />
-		<PackageReference Include="MaxMind.GeoIP2" Version="5.2.0" />
+		<PackageReference Include="MaxMind.GeoIP2" Version="5.3.0" />
 		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
 		<PackageReference Include="MimeKit" Version="4.11.0" />
-		<PackageReference Include="MiniExcel" Version="1.41.3" />
-		<PackageReference Include="Minio" Version="6.0.4" />
+		<PackageReference Include="MiniExcel" Version="1.41.2" />
+		<PackageReference Include="Minio" Version="6.0.3" />
 		<PackageReference Include="MiniWord" Version="0.9.2" />
+		<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
 		<PackageReference Include="My.Extensions.Localization.Json" Version="3.3.0">
 		  <TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
-		<PackageReference Include="NPOI" Version="2.7.3" />
+		<PackageReference Include="NPOI" Version="2.7.4" />
 		<PackageReference Include="Panda.DynamicWebApi" Version="1.2.2" />
 		<PackageReference Include="RestSharp" Version="112.1.0" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
 		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
-		<PackageReference Include="ZiggyCreatures.FusionCache" Version="2.1.0" />
+		<PackageReference Include="ZiggyCreatures.FusionCache" Version="2.4.0" />
 	</ItemGroup>
 
 	<ItemGroup>

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

@@ -67,7 +67,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
 
             //subjectVisitLambda2= subjectVisitLambda2.And(x => x.CheckState == CheckStateEnum.ToCheck && x.AuditState == AuditStateEnum.QCPassed || (x.CheckState == CheckStateEnum.CVIng && x.AuditState == AuditStateEnum.QCPassed));
 
-            Expression<Func<SubjectVisit, bool>> subjectVisitLambda = x => x.TrialId == trialId &&
+            Expression<Func<SubjectVisit, bool>> subjectVisitLambda = x => x.TrialId == trialId && x.Subject.IsSubjectQuit == false &&
             (x.CheckState == CheckStateEnum.ToCheck && x.AuditState == AuditStateEnum.QCPassed || (x.CheckState == CheckStateEnum.CVIng && x.AuditState == AuditStateEnum.QCPassed));
 
             var dicomQuery = from sv in _subjectVisitRepository.Where(subjectVisitLambda)
@@ -86,7 +86,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
 
             var noneDicomQuey = from sv in _subjectVisitRepository.Where(subjectVisitLambda)
                                 join subject in _subjectRepository.AsQueryable() on sv.SubjectId equals subject.Id
-                                join noneDicomStudy in _noneDicomStudyRepository.AsQueryable() on sv.Id equals noneDicomStudy.SubjectVisitId
+                                join noneDicomStudy in _noneDicomStudyRepository.Where(t => t.FileCount > 0) on sv.Id equals noneDicomStudy.SubjectVisitId
                                 select new CheckDBModel()
                                 {
                                     SubjectVisitId = sv.Id,

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

@@ -266,57 +266,43 @@ public class ImageConsumer(
         // 获取项目信息
         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<UserTypeEnum> filterUserTypeList = new List<UserTypeEnum>() 
+        {
+           UserTypeEnum.ClinicalResearchCoordinator,
+           UserTypeEnum.CRA,
+        };
+
+        // 根据不同场景获取不同角色的用户  先排除CRC和CRA  
+        var trialUserList = await _trialUseRoleRepository.Where(x => x.TrialId == inDto.TrialId && !x.TrialUser.IsDeleted && !filterUserTypeList.Contains(x.UserRole.UserTypeEnum) ).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+
+        // CRC和CRA单独取
+        var crcAndcraUserList = await _trialSiteRepository.Where(x => x.Id == inDto.SubjectVisit.TrialSiteId).SelectMany(x => x.CRCUserList.Select(y => y.UserRole)).ToListAsync();
+        trialUserList.AddRange(crcAndcraUserList);
 
         // 根据场景确定收件人
         List<UserRole> toUserList = new List<UserRole>();
         List<UserRole> ccUserList = new List<UserRole>();
 
         var emailNoticeUserList = await _emailNoticeUserTypeRepository.Where(x => x.EmailNoticeConfigId == inDto.EmailNoticeConfig.Id).ToListAsync();
-        var userTypeEnum = emailNoticeUserList.Select(x => x.UserType).ToList();
+        var userTypeEnumList = 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();
+            userTypeEnumList = inDto.UserTypes;
         }
 
         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);
-            }
+            var toList = emailNoticeUserList.Where(x => x.EmailUserType == EmailUserType.To).Select(x => x.UserType).ToList();
+            toUserList = trialUserList.Where(x => toList.Contains(x.UserTypeEnum)).ToList();
         }
         else
         {
-            var toList = inDto.UserTypes.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 toList = inDto.UserTypes;
+            toUserList = trialUserList.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 (emailNoticeUserList.Any(x => x.EmailUserType == EmailUserType.Copy && x.UserType == UserTypeEnum.ClinicalResearchCoordinator))
-        {
-            ccUserList.AddRange(crcUserList);
-        }
+        var ccList = emailNoticeUserList.Where(x => x.EmailUserType == EmailUserType.Copy).Select(x => x.UserType).ToList();
+        ccUserList = trialUserList.Where(x => ccList.Contains(x.UserTypeEnum)).ToList();
 
         // 如果没有收件人，则不发送邮件
         if (toUserList.Count == 0)

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

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

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

@@ -25,9 +25,11 @@ public class QCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRepo
     IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
       IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<VisitTask> _visitTaskRepository,
+         IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig,
       IRepository<TrialSiteUserRole> _trialSiteUserRoleRepository,
       IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig) : IConsumer<QCImageQuestionRecurringEvent>
 {
+    private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
     public async Task Consume(ConsumeContext<QCImageQuestionRecurringEvent> context)
     {
         var trialId = context.Message.TrialId;
@@ -64,8 +66,9 @@ public class QCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRepo
                 Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc = trialEmailConfig =>
                 {
                     var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, trialInfo.ResearchProgramNo);
-                    var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
-                        user.FullName, DateTime.Now, sendStat.ToBeDealedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
+                    var htmlContent = isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN;
+                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlContent),
+                                   user.FullName, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), sendStat.ToBeDealedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
 
                     return (topicStr, htmlBodyStr, isEn_us, userId);
                 };
@@ -91,8 +94,10 @@ public class CRCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRep
       IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<VisitTask> _visitTaskRepository,
       IRepository<TrialSiteUserRole> _trialSiteUserRoleRepository,
+         IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig,
       IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig) : IConsumer<CRCImageQuestionRecurringEvent>
 {
+    private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
     public async Task Consume(ConsumeContext<CRCImageQuestionRecurringEvent> context)
     {
         var trialId = context.Message.TrialId;
@@ -131,9 +136,10 @@ public class CRCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRep
                 Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc = trialEmailConfig =>
                 {
                     var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, trialInfo.ResearchProgramNo);
-                    var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
+                    var htmlContent = isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN;
+                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlContent),
 
-                        user.FullName, DateTime.Now, sendStat.ToBeDealedCount - sendStat.ReUploadTobeDealedCount, sendStat.ReUploadTobeDealedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
+                                   user.FullName, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), sendStat.ToBeDealedCount - sendStat.ReUploadTobeDealedCount, sendStat.ReUploadTobeDealedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
 
 
                     return (topicStr, htmlBodyStr, false, userId);
@@ -158,8 +164,11 @@ public class ImageQCRecurringEventConsumer(IRepository<Trial> _trialRepository,
       IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<VisitTask> _visitTaskRepository,
       IRepository<TrialSiteUserRole> _trialSiteUserRoleRepository,
+         IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig,
       IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig) : IConsumer<ImageQCRecurringEvent>
 {
+
+    private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
     public async Task Consume(ConsumeContext<ImageQCRecurringEvent> context)
     {
         var trialId=context.Message.TrialId;
@@ -199,9 +208,12 @@ public class ImageQCRecurringEventConsumer(IRepository<Trial> _trialRepository,
 
                 Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc = trialEmailConfig =>
                 {
+                  
                     var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, trialInfo.ResearchProgramNo);
-                    var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
-                        user.FullName, DateTime.Now, sendStat.ToBeClaimedCount, sendStat.ToBeReviewedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
+
+                    var htmlContent = isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN;
+                    var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, htmlContent),
+                        user.FullName, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), sendStat.ToBeClaimedCount, sendStat.ToBeReviewedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
 
                     return (topicStr, htmlBodyStr, false, userId);
                 };

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

@@ -58,3 +58,24 @@ public class SystemDocumentPublishEvent : DomainEvent
 }
 
 
+/// <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/TrialDocumentConsumer.cs

@@ -0,0 +1,304 @@
+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 NPOI.SS.Formula.Functions;
+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
+             join identityUser in _identityUserRepository.AsQueryable(false).Where(u => u.Status == UserStateEnum.Enable)
+               on trialIdentityUser.IdentityUserId equals identityUser.Id
+          
+
+             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()
+             where trialIdentityUser.TrialUserRoleList.Any(ur => !ur.IsDeleted && trialDoc.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == ur.UserRole.UserTypeId))
+             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
+                join identityUser in _identityUserRepository.AsQueryable(false).Where(u => u.Status == UserStateEnum.Enable)
+              on trialIdentityUser.IdentityUserId equals identityUser.Id
+                where trialIdentityUser.TrialUserRoleList.Any(ur => !ur.IsDeleted && context.Message.NewUserTypeIds.Contains(ur.UserRole.UserTypeId) && trialDoc.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == ur.UserRole.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
+                join identityUser in _identityUserRepository.AsQueryable(false).Where(u => u.Status == UserStateEnum.Enable)   
+                 on trialIdentityUser.IdentityUserId equals identityUser.Id
+                where trialIdentityUser.TrialUserRoleList.Any(ur => !ur.IsDeleted &&trialDoc.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == ur.UserRole.UserTypeId))
+
+
+                select new UnionDocumentWithConfirmInfoView()
+                {
+                    IsSystemDoc = false,
+                    Id = trialDoc.Id,
+                    CreateTime = trialDoc.CreateTime,
+                    IsDeleted = trialDoc.IsDeleted,
+                    SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
+                    Name = trialDoc.Name,
+                    Path = trialDoc.Path,
+                    FileTypeId = trialDoc.FileTypeId,
+                    UpdateTime = trialDoc.UpdateTime,
+                    ConfirmUserId = identityUser.Id,
+                    RealName = identityUser.FullName,
+                    UserName = identityUser.UserName,
+                    IsNeedSendEmial = identityUser.IsZhiZhun ,
+                    FullFilePath = trialDoc.Path
+                };
+            }
+            var datalist = await systemDocQuery.IgnoreQueryFilters().ToListAsync();
+
+            var confirmUserIdList = datalist.Select(t => t.ConfirmUserId).Distinct().ToList();
+            var userinfoList = await _identityUserRepository.Where(x => confirmUserIdList.Contains(x.Id)).ToListAsync();
+            int index = 1;
+            foreach (var userinfo in userinfoList)
+            {
+                string msg = $"{index}项目生效通知,邮箱：{userinfo.EMail}，姓名{userinfo.UserName},";
+                index++;
+                try
+                {
+
+                    var messageToSend = new MimeMessage();
+                    //发件地址
+                    messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+                    messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+
+
+
+                    var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+                    Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
+                    {
+                        var topicStr = string.Format(input.topicStr, companyName);
+
+                        var htmlBodyStr = string.Format(
+                           CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                           userinfo.UserName,  // 用户名  {0}
+                           _systemEmailConfig.SiteUrl
+                            );
+
+                        return (topicStr, htmlBodyStr);
+                    };
+
+                    var scenario = EmailBusinessScenario.TrialTraining_EffectiveNotification;
+
+                    var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable).FirstOrDefault();
+
+                    if (emailConfig != null)
+                    {
+                        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
+
+                        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+                        msg += "发送成功";
+                    }
+
+
+                }
+                catch (Exception)
+                {
+                    msg += "发送失败";
+
+                }
+
+
+                Console.WriteLine(msg);
+            }
+
+        }
+    }
+}

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

@@ -71,6 +71,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public bool IsPMSetBack { get; set; }
 
+        public bool IsSubjectQuit { get; set; }
+
         #region 标准配置
         public Guid TrialReadingCriterionId { get; set; }
 
@@ -238,6 +240,7 @@ namespace IRaCIS.Core.Application.ViewModel
         //public string ReReadingOriginalTaskCode { get; set; }
 
 
+        public string ApplicantName { get; set; }
 
         public Guid Id { get; set; }
 
@@ -487,6 +490,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public int? RandomOrder { get; set; }
         public bool? IsRandomOrderList { get; set; }
+
+        public CriterionType? CriterionType { get; set; }
     }
 
 

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

@@ -48,7 +48,7 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         public async Task<IResponseOutput> AddOrUpdateTaskAllocationRule(TaskAllocationRuleAddOrEdit addOrEditTaskAllocationRule)
         {
@@ -79,7 +79,7 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [HttpDelete("{taskAllocationRuleId:guid}")]
         public async Task<IResponseOutput> DeleteTaskAllocationRule(Guid taskAllocationRuleId)
@@ -125,7 +125,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpGet("{trialId:guid}")]
         public async Task<List<TrialDoctorUserSelectView>> GetDoctorUserSelectList(Guid trialId, [FromServices] IRepository<Enroll> _enrollRepository)
         {
-            var query = from enroll in _enrollRepository.Where(t => t.TrialId == trialId && t.EnrollStatus >= EnrollStatus.ConfirmIntoGroup)
+            var query = from enroll in _enrollRepository.Where(t => t.TrialId == trialId /*&& t.TaskAllocationRule.IsEnable*/ && /*(t.EnrollStatus >= EnrollStatus.ConfirmIntoGroup ||*/ t.Trial.SubjectDoctorUserList.Any(v => v.DoctorUserId == t.DoctorUser.Id))
                         join user in _userRoleRepository.AsQueryable() on enroll.DoctorId equals user.DoctorId
                         select new TrialDoctorUserSelectView()
                         {

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

@@ -213,7 +213,7 @@ namespace IRaCIS.Core.Application.Service
                     //为防止脏数据 这里也多判断一次  
                     var existCurrentVisitTaskList = _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId
                                 && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.TaskState == TaskState.Effect
-                                 && t.SourceSubjectVisitId == subjectVisit.Id).ToList();
+                                 && t.SourceSubjectVisitId == subjectVisit.Id && t.IsAnalysisCreate == false).ToList();
 
                     if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Double)
                     {
@@ -682,7 +682,7 @@ namespace IRaCIS.Core.Application.Service
 
                                         var existCurrentVisitTaskList = _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId
                                         && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect
-                                       /* && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null*/ && t.SourceSubjectVisitId == subjectVisit.Id).ToList();
+                                       /* && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null*/ && t.SourceSubjectVisitId == subjectVisit.Id && t.IsAnalysisCreate == false).ToList();
 
                                         VisitTask? task1 = existCurrentVisitTaskList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm1);
                                         VisitTask? task2 = existCurrentVisitTaskList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm2);
@@ -870,7 +870,7 @@ namespace IRaCIS.Core.Application.Service
 
                                                                 //有可能仅仅只分配了一个Subject   未分配  那么
                                                                 if (assignConfigList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1) && task1 != null)
-                                                                {                                                                
+                                                                {
                                                                     arm1.TaskAllocationState = TaskAllocationState.Allocated;
                                                                     arm1.AllocateTime = DateTime.Now;
                                                                     arm1.DoctorUserId = task1.DoctorUserId;
@@ -903,7 +903,7 @@ namespace IRaCIS.Core.Application.Service
                                                                     BlindTrialSiteCode = latestTask.BlindTrialSiteCode,
                                                                     IsAnalysisCreate = latestTask.IsAnalysisCreate,
                                                                     IsSelfAnalysis = latestTask.IsSelfAnalysis,
-                                                                   
+
                                                                     TrialReadingCriterionId = latestTask.TrialReadingCriterionId,
                                                                     IsNeedClinicalDataSign = latestTask.IsNeedClinicalDataSign,
                                                                     IsClinicalDataSign = latestTask.IsClinicalDataSign
@@ -913,10 +913,10 @@ namespace IRaCIS.Core.Application.Service
                                                                 {
                                                                     taskOne.TaskAllocationState = TaskAllocationState.Allocated;
                                                                     taskOne.AllocateTime = DateTime.Now;
-                                                                    taskOne. DoctorUserId = task1!.DoctorUserId;
-                                                                    taskOne. SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
+                                                                    taskOne.DoctorUserId = task1!.DoctorUserId;
+                                                                    taskOne.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
                                                                 }
-                                                                
+
 
                                                                 currentMaxCodeInt = currentMaxCodeInt + 1;
 
@@ -976,7 +976,7 @@ namespace IRaCIS.Core.Application.Service
                                                                     BlindTrialSiteCode = latestTask.BlindTrialSiteCode,
                                                                     IsAnalysisCreate = latestTask.IsAnalysisCreate,
                                                                     IsSelfAnalysis = latestTask.IsSelfAnalysis,
-                                                                   
+
                                                                     TrialReadingCriterionId = latestTask.TrialReadingCriterionId,
                                                                     IsNeedClinicalDataSign = latestTask.IsNeedClinicalDataSign,
                                                                     IsClinicalDataSign = latestTask.IsClinicalDataSign
@@ -1084,7 +1084,7 @@ namespace IRaCIS.Core.Application.Service
 
 
                                                     //该Subject 之前是否有已分配的   如果改变配置  可能会出现  一个Subject 分配的同一个医生 有的在Arm1 有的在Arm2
-                                                    var allocateSubjectArmList = _visitTaskRepository.Where(t => t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.TrialId == trialId && t.DoctorUserId != null && t.ArmEnum != Arm.JudgeArm)
+                                                    var allocateSubjectArmList = _visitTaskRepository.Where(t => t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.TrialId == trialId && t.DoctorUserId != null && t.ArmEnum != Arm.JudgeArm && t.IsAnalysisCreate == false)
                                                         .Select(t => new { t.DoctorUserId, t.ArmEnum }).Distinct().ToList();
 
                                                     //不是初次分配
@@ -1105,7 +1105,7 @@ namespace IRaCIS.Core.Application.Service
                                                             if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
                                                             {
                                                                 //之前有回退到影像上传的访视 那么当前访视一致性核查通过的时候，当前访视生成但是不分配出去(排除失访的)
-                                                                var beforeBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.VisitTaskNum < subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
+                                                                var beforeBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.VisitTaskNum < subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false && t.IsAnalysisCreate == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
 
 
                                                                 if (beforeBackVisitTask == null)
@@ -1130,7 +1130,7 @@ namespace IRaCIS.Core.Application.Service
                                                                     #endregion
 
 
-                                                                    var followBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
+                                                                    var followBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false && t.IsAnalysisCreate == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
 
                                                                     //存在退回访视1  又退回基线 这种情况   生成任务  考虑基线先一致性核查通过，但是访视1还未通过时  生成任务
                                                                     var followVisitTaskList = await _visitTaskRepository
@@ -1409,31 +1409,35 @@ namespace IRaCIS.Core.Application.Service
                         .Where(x => x.ClinicalDataTrialSet.UploadRole == UploadRole.PM || x.FileCount > 0)
                         .Include(t => t.ReadingClinicalDataPDFList).Include(t => t.ClinicalDataTrialSet).ToList();
 
-
-                    foreach (var clinicalData in clinicalDataList)
+                    //防止多标准重复插入
+                    if (!_readingConsistentClinicalDataRepository.Any(t => t.SubjectId == subjectId))
                     {
-                        var consistnentClinicalData = _mapper.Map<ReadingConsistentClinicalData>(clinicalData);
-                        var id = NewId.NextSequentialGuid();
-                        consistnentClinicalData.Id = id;
-
-                        if (consistnentClinicalData.ClinicalDataTrialSet.ClinicalUploadType == ClinicalUploadType.PDF)
+                        foreach (var clinicalData in clinicalDataList)
                         {
-                            consistnentClinicalData.IsSign = false;
-                            consistnentClinicalData.IsBlind = false;
-                            consistnentClinicalData.IsComplete = true;
-                            consistnentClinicalData.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded;
-                            consistnentClinicalData.ClinicalDataTrialSet = null;
+                            var consistnentClinicalData = _mapper.Map<ReadingConsistentClinicalData>(clinicalData);
+                            var id = NewId.NextSequentialGuid();
+                            consistnentClinicalData.Id = id;
+
+                            if (consistnentClinicalData.ClinicalDataTrialSet.ClinicalUploadType == ClinicalUploadType.PDF)
+                            {
+                                consistnentClinicalData.IsSign = false;
+                                consistnentClinicalData.IsBlind = false;
+                                consistnentClinicalData.IsComplete = true;
+                                consistnentClinicalData.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded;
+                                consistnentClinicalData.ClinicalDataTrialSet = null;
+                            }
+
+                            var consistanClinicalDataPdfList = _mapper.Map<List<ReadingConsistentClinicalDataPDF>>(clinicalData.ReadingClinicalDataPDFList);
+
+                            consistanClinicalDataPdfList.ForEach(t => { t.ReadingConsistentClinicalDataId = id; t.Id = Guid.Empty; });
+
+                            consistnentClinicalData.ReadingClinicalDataPDFList = consistanClinicalDataPdfList;
+
+                            await _readingConsistentClinicalDataRepository.AddAsync(consistnentClinicalData);
                         }
-
-                        var consistanClinicalDataPdfList = _mapper.Map<List<ReadingConsistentClinicalDataPDF>>(clinicalData.ReadingClinicalDataPDFList);
-
-                        consistanClinicalDataPdfList.ForEach(t => { t.ReadingConsistentClinicalDataId = id; t.Id = Guid.Empty; });
-
-                        consistnentClinicalData.ReadingClinicalDataPDFList = consistanClinicalDataPdfList;
-
-                        await _readingConsistentClinicalDataRepository.AddAsync(consistnentClinicalData);
                     }
 
+
                     foreach (var task in generateTaskCommand.GenerataConsistentTaskList)
                     {
 

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

@@ -46,7 +46,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     IRepository<SubjectCanceDoctor> _subjectCanceDoctorRepository,
     IRepository<ReadingTaskQuestionMark> _readingTaskQuestionMarkRepository,
     IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository,
-    IRepository<ReadingCustomTag> _readingCustomTagRepository,
+    //IRepository<ReadingCustomTag> _readingCustomTagRepository,
     IRepository<TaskInfluence> _taskInfluenceRepository,
     IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository,
     ILogger<VisitTaskService> _logger,
@@ -764,7 +764,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
            .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)
+             .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) };
@@ -965,7 +965,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         //随机阅片
         else
         {
-            var taskQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.UserRoleId && x.TaskState == TaskState.Effect && x.TrialReadingCriterionId == trialReadingCriterionId)
+            var taskQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.UserRoleId && x.TaskState == TaskState.Effect && x.TrialReadingCriterionId == trialReadingCriterionId && x.Subject.IsSubjectQuit == false)
                    .Where(x => !x.Subject.IsDeleted).Where(x => (x.IsNeedClinicalDataSign && x.IsClinicalDataSign) || !x.IsNeedClinicalDataSign);
 
             iRUnReadOut = new IRUnReadOutDto()
@@ -1013,7 +1013,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
             var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig();
 
-            var visitQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.UserRoleId && x.TaskState == TaskState.Effect)
+            var visitQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.UserRoleId && x.TaskState == TaskState.Effect && x.Subject.IsSubjectQuit == false)
 
            .WhereIf(inQuery.SubjectId != null, x => x.SubjectId == inQuery.SubjectId)
             //前序 不存在  未生成任务的访视
@@ -1027,8 +1027,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
            //满足前序访视不存在 需要签署但是未签署  sql  相当复杂    同时想查询所有未读的统计数字 就无法统计   byzhouhang  
            //但是加字段 IsFrontTaskNeedSignButNotSign   那么签名临床数据的时候，要对该subject 该标准的有效的任务  这个字段需要在签名的时候维护   采取这种方式   统计数字灵活
            //.Where(t => t.Subject.SubjectVisitTaskList.AsQueryable().Where(visitTaskLambda).Any(c => c.IsNeedClinicalDataSign == true && c.IsClinicalDataSign == false && c.VisitTaskNum < t.VisitTaskNum))
-           .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => (t.Subject.Code.Contains(inQuery.SubjectCode!) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(inQuery.SubjectCode!) && t.IsAnalysisCreate));
-
+           .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => (t.Subject.Code.Contains(inQuery.SubjectCode!) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(inQuery.SubjectCode!) && t.IsAnalysisCreate))
+           ;
 
             var visitGroupQuery = visitQuery.GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode });
 
@@ -1171,7 +1171,9 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
             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));
+                .WhereIf(!string.IsNullOrEmpty(subjectCode), t => (t.Subject.Code.Contains(subjectCode!) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(subjectCode!) && t.IsAnalysisCreate))
+                .WhereIf(critrion.CriterionType == CriterionType.OCT, t => t.ReadingCategory == ReadingCategory.Visit ? t.SourceSubjectVisit.NoneDicomStudyList.SelectMany(t => t.ImageLabelNoneDicomFileList).Any() : true)
+                .WhereIf(critrion.CriterionType == CriterionType.IVUS, t => t.ReadingCategory == ReadingCategory.Visit ? t.SourceSubjectVisit.TaskStudyList.Any() : true);
 
             var visitGroupQuery = visitQuery.GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode });
 
@@ -1404,6 +1406,12 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
                 task.ReReadingApplyState = ReReadingApplyState.TrialGroupHaveApplyed;
 
+                if (!isSPMjoin)
+                {
+                    task.ReReadingApplyState = ReReadingApplyState.Agree;
+                    task.PMBackReason = applyReReadingCommand.RequestReReadingReason;
+                }
+
 
             }
 
@@ -1615,13 +1623,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             var origenalTask = (await _visitTaskRepository.Where(t => item.OriginalReReadingTaskId == t.Id).FirstOrDefaultAsync()).IfNullThrowException();
 
 
-            if ((origenalTask.TaskState != TaskState.Effect && origenalTask.TaskState != TaskState.Freeze))
-            {
-                await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new VisitTaskReReading() { RequestReReadingConfirmUserId = _userInfo.UserRoleId, RequestReReadingResultEnum = RequestReReadingResult.Invalid });
 
-                //---当前申请重阅任务的状态，已被其他任务重阅已影响，不允许对该状态下的任务进行重阅同意与否操作
-                throw new BusinessValidationFailedException(_localizer["VisitTask_ReapplyStatusConflict"]);
-            }
 
             //更新申请信息
             var visitTaskReReadingAppply = await _visitTaskReReadingRepository.FirstOrDefaultAsync(t => t.Id == item.Id);
@@ -1634,6 +1636,13 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
             if (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree)
             {
+                if ((origenalTask.TaskState != TaskState.Effect && origenalTask.TaskState != TaskState.Freeze))
+                {
+                    await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new VisitTaskReReading() { RequestReReadingConfirmUserId = _userInfo.UserRoleId, RequestReReadingResultEnum = RequestReReadingResult.Invalid });
+
+                    //---当前申请重阅任务的状态，已被其他任务重阅已影响，不允许对该状态下的任务进行重阅同意与否操作
+                    throw new BusinessValidationFailedException(_localizer["VisitTask_ReapplyStatusConflict"]);
+                }
 
                 await AgreeReReading(origenalTask.Id, visitTaskReReadingAppply.RequestReReadingType, visitTaskReReadingAppply);
 
@@ -1710,12 +1719,12 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment)
         {
             // PM申请 SPM / CPM审批
-            if (requestReReadingType == RequestReReadingType.TrialGroupApply)
-            {
-                filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
-            }
+            //if (requestReReadingType == RequestReReadingType.TrialGroupApply)
+            //{
+            //    filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
+            //}
             //IR 申请  PM审批
-            else
+            if (requestReReadingType != RequestReReadingType.TrialGroupApply)
             {
 
                 // 1.1 基线任务影响BM任务
@@ -1734,8 +1743,11 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         }
         else
         {
-            //默认影响的都是该标准的任务
-            filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId);
+            if (requestReReadingType != RequestReReadingType.TrialGroupApply)
+            {
+                //默认影响的都是该标准的任务
+                filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId);
+            }
         }
 
         //PM申请   SPM / CPM审批   回退访视，因此这里不生成访视任务  影响多个标准的任务
@@ -2206,16 +2218,16 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     {
 
         //自定义
-        var readingCustomTagList = _readingCustomTagRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
+        //var readingCustomTagList = _readingCustomTagRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
 
-        foreach (var item in readingCustomTagList)
-        {
-            item.Id = Guid.Empty;
-            item.VisitTaskId = newTask.Id;
-            item.MeasureData = item.MeasureData.Replace(origenalTask.Id.ToString(), newTask.Id.ToString());
-        }
+        //foreach (var item in readingCustomTagList)
+        //{
+        //    item.Id = Guid.Empty;
+        //    item.VisitTaskId = newTask.Id;
+        //    item.MeasureData = item.MeasureData.Replace(origenalTask.Id.ToString(), newTask.Id.ToString());
+        //}
 
-        _ = _readingCustomTagRepository.AddRangeAsync(readingCustomTagList).Result;
+        //_ = _readingCustomTagRepository.AddRangeAsync(readingCustomTagList).Result;
 
 
 
@@ -2636,7 +2648,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     /// <param name="applyId"> 申请记录的Id</param>
     /// <returns></returns>
     [HttpGet("{taskId:guid}/{isReReading:bool}")]
-    public async Task<(List<InfluenceTaskInfo>, object)> GetReReadingOrBackInfluenceTaskList(Guid taskId, bool isReReading, Guid? applyId)
+    public async Task<IResponseOutput<List<InfluenceTaskInfo>>> GetReReadingOrBackInfluenceTaskList(Guid taskId, bool isReReading, Guid? applyId)
     {
         var isIRAppyTaskInfluenced = false;
 
@@ -2654,13 +2666,16 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         //IR 申请1.1 基线重阅，影响附加评估所有的任务
         var isIR1Point1AdditionalAssessmentBaseline = false;
 
+        //是IR 申请 PM 审批流程
+        var isIRApplyPMApprovalProcess = (IsPMOrAPm() && applyId != null && await _visitTaskReReadingRepository.AnyAsync(t => t.Id == applyId && t.CreateUserRole.UserTypeEnum == UserTypeEnum.IndependentReviewer))
+            || (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer && applyId == null);
+
         //附加评估  IR  和PM 看到的影响列表不一样
         if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment)
         {
 
             //  IR 申请  PM 同意  
-            if (((IsPMOrAPm() && applyId != null && await _visitTaskReReadingRepository.AnyAsync(t => t.Id == applyId && t.CreateUserRole.UserTypeEnum == UserTypeEnum.IndependentReviewer))
-                || (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer && applyId == null)))
+            if (isIRApplyPMApprovalProcess)
             {
 
                 // 1.1 基线任务影响BM任务
@@ -2679,18 +2694,20 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                 }
 
             }
-            //（1、PM回退，PM申请重阅，SPM同意回退）
-            else
-            {
-                filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
+            //（1、PM回退，PM申请重阅，SPM同意回退）--20250804-感觉这里没用，不用限制
+            //else
+            //{
+            //    filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
 
-            }
+            //}
         }
         else
         {
-            //默认影响的都是该标准的任务
-            filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId);
-
+            if (isReReading == true && isIRApplyPMApprovalProcess)
+            {
+                //默认影响的都是该标准的任务
+                filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId);
+            }
         }
 
 
@@ -2931,8 +2948,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         }
         #endregion
 
-
-        return (list, new { IsIRAppyTaskInfluenced = isIRAppyTaskInfluenced });
+        //IsIRAppyTaskInfluenced 列表中存在IR已申请重阅的任务！
+        return ResponseOutput.Ok(list, new { IsIRAppyTaskInfluenced = isIRAppyTaskInfluenced });
 
     }
 
@@ -3014,7 +3031,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                 }
                 else
                 {
-                    if(!_visitTaskRepository.Any(t => t.TrialId == inCommand.TrialId && t.TrialReadingCriterionId == inCommand.TrialReadingCriterionId && t.DoctorUserId == inCommand.DoctorUserId
+                    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))
                     {

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

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

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

@@ -16,7 +16,7 @@ namespace IRaCIS.Core.Application.Service
     /// 系统模板文档配置表   
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Common")]
-    public class CommonDocumentService(IRepository<CommonDocument> _commonDocumentRepository, 
+    public class CommonDocumentService(IRepository<CommonDocument> _commonDocumentRepository,
         IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService, ICommonDocumentService
     {
 
@@ -36,6 +36,14 @@ namespace IRaCIS.Core.Application.Service
             return await commonDocumentQueryable.ToPagedListAsync(queryCommonDocument);
         }
 
+        [HttpGet]
+        public async Task<CommonDocument> GetCommonDocument(string code)
+        {
+            var find = await _commonDocumentRepository.Where(t => t.Code == code).FirstOrDefaultAsync();
+
+            return find;
+        }
+        
 
         public async Task<IResponseOutput> AddOrUpdateCommonDocument(CommonDocumentAddOrEdit addOrEditCommonDocument)
         {

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

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

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

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

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

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

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

@@ -28,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)
@@ -41,16 +41,77 @@ namespace IRaCIS.Core.Application.Contracts
             return await emailNoticeConfigQueryable.ToPagedListAsync(inQuery);
         }
 
+        /// <summary>
+        /// 批量更新邮件主题中英文
+        /// </summary>
+        /// <param name="inCommandList"></param>
+        /// <returns></returns>
+        public async Task<IResponseOutput> BatchUpdateEmail(List<BatchUpdateEmailTopicCommand> inCommandList)
+        {
+            var findIdList = inCommandList.Select(x => x.Id).ToList();
+
+            var regex = new Regex(@"\{\s*\d+\s*\}");
+
+            foreach (var inCommand in inCommandList)
+            {
+                if (regex.Matches($"{inCommand.EmailTopic}{inCommand.EmailTopicCN}")
+                              .Any(t => t.Value.Contains(" ")))
+                {
+                    //邮件模板占位符不允许有空格,请核查占位符的地方
+                    return ResponseOutput.NotOk(I18n.T("EmailNoticeConfig_ContainEmpty"));
+                }
+            }
+
+            var list = _emailNoticeConfigrepository.Where(t => findIdList.Contains(t.Id), true).ToList();
+
+            foreach (var item in list)
+            {
+                var exist = inCommandList.FirstOrDefault(t => t.Id == item.Id);
+                if (exist != null)
+                {
+                    item.EmailTopic = exist.EmailTopic;
+                    item.EmailTopicCN = exist.EmailTopicCN;
+                }
+            }
+
+            await _emailNoticeConfigrepository.SaveChangesAsync();
+
+
+            return ResponseOutput.Ok();
+        }
 
         public async Task<IResponseOutput> AddOrUpdateEmailNoticeConfig(EmailNoticeConfigAddOrEdit addOrEditEmailNoticeConfig)
         {
-            var verifyExp1 = new EntityVerifyExp<EmailNoticeConfig>()
+            //var verifyExp1 = new EntityVerifyExp<EmailNoticeConfig>()
+            //{
+            //    VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.CriterionTypeEnum == addOrEditEmailNoticeConfig.CriterionTypeEnum,
+
+            //    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)
             {
-                VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.CriterionTypeEnum == addOrEditEmailNoticeConfig.CriterionTypeEnum,
+                foreach (var item in addOrEditEmailNoticeConfig.CriterionTypeList)
+                {
+                    foreach (var itemList in criterionList)
+                    {
+                        if (itemList.Any(t => t == item))
+                        {
+                            return ResponseOutput.NotOk(_localizer["EmailNoticeConfig_RepeatEmailScenario"]);
+                        }
+                    }
+
+                }
+            }
 
-                VerifyMsg = _localizer["EmailNoticeConfig_RepeatEmailScenario"]
 
-            };
 
             var verifyExp2 = new EntityVerifyExp<EmailNoticeConfig>()
             {
@@ -94,7 +155,7 @@ namespace IRaCIS.Core.Application.Contracts
                 }
 
 
-                await _emailNoticeConfigrepository.AddAsync(entity, true, verifyExp1, verifyExp2);
+                await _emailNoticeConfigrepository.AddAsync(entity, true, verifyExp2);
 
 
             }
@@ -117,7 +178,7 @@ namespace IRaCIS.Core.Application.Contracts
                 }
 
 
-                entity = await _emailNoticeConfigrepository.UpdateFromDTOAsync(addOrEditEmailNoticeConfig, true, false, verifyExp1, verifyExp2);
+                entity = await _emailNoticeConfigrepository.UpdateFromDTOAsync(addOrEditEmailNoticeConfig, true, false, verifyExp2);
 
 
 
@@ -125,16 +186,16 @@ namespace IRaCIS.Core.Application.Contracts
             }
 
 
-            if (entity.EmailCron != string.Empty)
+            if (addOrEditEmailNoticeConfig.EmailCron != string.Empty)
             {
-                var jobId = $"{entity.Id}_({entity.BusinessScenarioEnum})";
+                var jobId = $"{entity.Id}_({addOrEditEmailNoticeConfig.BusinessScenarioEnum})";
 
-                //有的job 可能编辑控制直接不发，需要移除已存在的
                 HangfireJobHelper.RemoveCronJob(jobId);
 
+                //有的job 可能编辑控制直接不发，需要移除已存在的
                 if (entity.IsAutoSend && entity.IsEnable)
                 {
-                    HangfireJobHelper.AddOrUpdateSystemCronJob(jobId, entity.BusinessScenarioEnum, entity.EmailCron);
+                    HangfireJobHelper.AddOrUpdateTimingCronJob(jobId, addOrEditEmailNoticeConfig.BusinessScenarioEnum, addOrEditEmailNoticeConfig.EmailCron);
                 }
 
             }

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

@@ -0,0 +1,517 @@
+using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Helper;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Service.Common;
+
+public class TumorCommonQustionInfo
+{
+    //问题标识，肿瘤评估用于区分是什么问题
+    public QuestionType? QuestionType { get; set; }
+
+    public OptionType OptionTypeEnum { get; set; }
+
+    public Guid QuestionId { get; set; }
+    public string QuestionName { get; set; }
+
+    public string QuestionValue { get; set; }
+
+    public string TranslateDicName { get; set; }
+
+    public ValueUnit? Unit { get; set; }
+
+    public ValueOfType? ValueType { get; set; }
+}
+
+public class TumorLessionInfo
+{
+    public Guid Id { get; set; }
+
+    public Guid? OrganInfoId { get; set; }
+    //病灶编号
+    public string LessionCode { get; set; }
+
+    public LesionType? LessionType { get; set; }
+
+    public Guid? SplitRowId { get; set; }
+
+    public string? DicomModality { get; set; }
+
+    public string? NoneDicomModality { get; set; }
+
+    //病灶答案
+    public List<TumorLessionAnswerInfo> LessionAnswerList { get; set; }
+}
+
+public class TumorLessionAnswerInfo
+{
+    public QuestionMark? QuestionMark { get; set; }
+
+    public OptionType OptionTypeEnum { get; set; }
+
+    //病灶Id
+    public Guid RowId { get; set; }
+
+    //如果是4 就取CustomUnit  否则就是字典翻译
+    [Comment("单位")]
+    public ValueUnit? Unit { get; set; }
+
+
+    public int ShowOrder { get; set; }
+
+    public Guid TableQuesionId { get; set; }
+
+    public string QuestionName { get; set; }
+
+    public string QuestionValue { get; set; }
+
+    public string TranslateDicName { get; set; }
+}
+
+public class TumorGlobalQuestionAnserInfo
+{
+    [Comment("原任务ID")]
+    public Guid TaskId { get; set; }
+
+    public GlobalAnswerType GlobalAnswerType { get; set; }
+
+    [Comment("问题答案")]
+    public string Answer { get; set; } = string.Empty;
+}
+
+public class TumorExportBaseModel : TU_TR_RSBaseModel
+{
+    public List<TumorLessionInfo> LesionList { get; set; } = new List<TumorLessionInfo>();
+
+    public List<TumorCommonQustionInfo> QuestionAnswerList { get; set; }
+
+    public List<TumorGlobalQuestionAnserInfo> GlobalResultList { get; set; }
+
+    #region 后续处理额外添加字段
+
+
+
+    public DateTime? JudgeSignTime { get; set; }
+
+    public Guid? SourceSubjectVisitId { get; set; }
+
+    public List<decimal> SubjectCriterionReadingPeriodVisitNumList { get; set; }
+
+    public decimal VisitTaskNum { get; set; }
+
+    public ReadingTaskState ReadingTaskState { get; set; }
+
+    public ReadingCategory ReadingCategory { get; set; }
+
+    //裁判结果选择的访视或者全局任务Id
+    public Arm? JudgeArmEnum { get; set; }
+
+
+
+
+    //在当前访视触发裁判，或者在截止日期小于等于当前访视的阅片期触发裁判
+    [DictionaryTranslateAttribute("YesOrNoAudit")]
+    public bool? IsTrigerJudge { get; set; }
+
+    //（如果是访视点裁判，则仅在所选阅片人对应访视 显示；如果是阅片期裁判，则在所选阅片人 阅片期内的所有访视 显示此原因）
+    public string JudgeNote { get; set; } = string.Empty;
+
+    public string VisitNote { get; set; }
+    #endregion
+
+
+}
+
+
+public class TU_TR_RSBaseModel
+{
+    /// <summary>
+    /// 方案编号 STUDYID
+    /// </summary>
+    public string ResearchProgramNo { get; set; }
+
+
+
+    /// <summary>
+    /// 域 DOMAIN TU  TR RS
+    /// </summary>
+    public string Domain { get; set; }
+
+
+    /// <summary>
+    /// 取值类型 TUSPID  TRSPID RSSPID
+    /// </summary>
+    public string ValueType { get; set; }
+
+
+    /// <summary>
+    /// 受试者编号 USUBJID 实际展示TrialSiteSubjectCode
+    /// </summary>
+
+    public string SubjectCode { get; set; }
+
+
+    /// <summary>
+    /// 供应商 TUNAM (Extensive Imaging)
+    /// </summary>
+    public string Vendor { get; set; } = "Extensive Imaging";
+
+
+    /// <summary>
+    /// 阅片人 TUEVAL TREVAL  RSEVAL
+    /// </summary>
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// 阅片人标识 TUEVALID  TREVALID    RSEVALID
+    /// </summary>
+    public Arm ArmEnum { get; set; }
+
+    /// <summary>
+    /// 访视编号 VISITNUM
+    /// </summary>
+    public decimal? VisitNum { get; set; }
+
+    /// <summary>
+    /// 访视名称 VISIT
+    /// </summary>
+    public string? VisitName { get; set; }
+
+    /// <summary>
+    /// 拍片日期 TUDTC  TRDTC  RSDTC
+    /// </summary>
+    public DateTime? LatestScanDate { get; set; }
+
+    public DateTime? EarliestScanDate { get; set; }
+
+    /// <summary>
+    /// eCRF标识 TUREFID  TRREFID  RSREFID
+    /// </summary>
+    public Guid VisitTaskId { get; set; }
+
+
+    #region 移动位置
+
+    /// <summary>
+    /// RSCAT  阅片标准
+    /// </summary>
+    public string CriterionName { get; set; }
+
+    /// <summary>
+    /// RSACPTFL  裁定标记 TUACPTFL
+    /// </summary>    
+    //裁判选择标记
+    //根据裁判的任务结果 设置访视任务的这个字段  该字段表示  裁判认同该任务的结果
+    public bool? IsJudgeSelect { get; set; }
+
+    #endregion
+
+    public DateTime? SignTime { get; set; }
+
+    public string TaskName { get; set; }
+
+    #region 额外翻译字段
+
+
+
+    public string IsJudgeSelectStr => IsJudgeSelect == true ? "Y" : "";
+
+    public bool IsTargetPD { get; set; } = false;
+
+    public bool IsOverallResponsePD { get; set; } = false;
+
+    //TR表  靶病灶PD了，访视层级的都是最早拍片日期  RS表 整体肿瘤评估PD了，那么疗效评估的拍片日期都给最早的
+    public bool IsPD => Domain == "TR" ? IsTargetPD : IsOverallResponsePD;
+
+    public string ArmEnumStr { get; set; }
+    public string LatestScanDateStr
+    {
+        get
+        {
+            var date = IsPD ? EarliestScanDate : LatestScanDate;
+            return date?.ToString("yyyy-MM-dd") ?? "";
+        }
+    }
+    public string TrialSiteSubjectCode => ResearchProgramNo + SubjectCode;
+    #endregion
+}
+
+
+public class TU_Export : TU_TR_RSBaseModel
+{
+
+    ///// <summary>
+    ///// 取值类型 TUSPID
+    ///// </summary>
+    //public string TUValueType { get; set; }
+
+
+    /// <summary>
+    /// 序号 TUSEQ   (同一个访视，所有阅片人选择病灶给个顺序号)
+    /// </summary>
+    public int No { get; set; }
+
+
+
+    /// <summary>
+    /// 链接ID TULNKID (阅片人角色_病灶编号)不同访视可以重复
+    /// </summary>
+    public string ARM_TumorNo { get; set; }
+
+    /// <summary>
+    /// 肿瘤识别简称 TUTESTCD
+    /// </summary>
+    public string TumorIdentificationSimple { get; set; }
+
+    /// <summary>
+    /// 肿瘤识别全称 TUTEST
+    /// </summary>
+    public string TumorIdentificationFullName { get; set; }
+
+    /// <summary>
+    /// 肿瘤鉴定结果 TUORRES
+    /// </summary>
+    public string TumorIdentificationResult { get; set; }
+
+    /// <summary>
+    /// 肿瘤识别结果类型 TUSTRESC 
+    /// </summary>
+    public string TumorIdentificationResultType { get; set; }
+
+
+    /// <summary>
+    /// 部位 TULOC (对应病灶表的部位，需要国际化)
+    /// </summary>
+    public string BodyPart { get; set; }
+
+    /// <summary>
+    /// 鉴定方法 TUMETHOD (Modality?)
+    /// </summary>
+    public string IdentificationMethod { get; set; }
+
+
+
+    ///// <summary>
+    ///// 裁定标记 TUACPTFL
+    ///// </summary>
+    //public bool? IsJudgeSelect { get; set; }
+
+
+
+    /// <summary>
+    /// 部位描述 LOCTEXT
+    /// </summary>
+    public string BodyPartDes { get; set; }
+
+
+}
+
+
+public class TR_Export : TU_TR_RSBaseModel
+{
+
+    ///// <summary>
+    ///// 取值类型 TRSPID
+    ///// </summary>
+    //public string TRValueType { get; set; }
+
+
+    /// <summary>
+    /// 每个subject 按照顺序编号  TRSEQ
+    /// </summary>
+    public int TRSEQ { get; set; }
+
+
+    /// <summary>
+    ///TRGRPID  组ID  对应TU表肿瘤鉴定结果 TumorIdentificationResult
+    /// </summary>
+    public string TRGRPID { get; set; }
+
+    /// <summary>
+    /// TRLNKID  链接ID  对应TU表的链接ID  TumorNo(阅片人角色_病灶编号)
+    /// </summary>
+    public string ARM_TumorNo { get; set; }
+
+    /// <summary>
+    ///TRLNKGRP  链接组  ARM-任务名（访视名） 对应RS的链接组
+    /// </summary>
+    public string ARM_VisitName { get; set; }
+
+
+    /// <summary>
+    /// 肿瘤评估简称 TRTESTCD
+    /// </summary>
+    public string TumorAssessmentSimpleName { get; set; }
+
+    /// <summary>
+    /// 肿瘤评估全称 TRTEST
+    /// </summary>
+    public string TumorAssessmentFullName { get; set; }
+
+
+    /// <summary>
+    /// 原始测量 TRORRES
+    /// </summary>
+    public string OriginalMeasurements { get; set; }
+
+    /// <summary>
+    /// 原始单位 TRORRESU
+    /// </summary>
+    public string OriginalUnit { get; set; }
+
+    /// <summary>
+    /// 标准结果（字符） TRSTRESC
+    /// </summary>
+    public string StandardResult_Character => OriginalMeasurements;
+
+    /// <summary>
+    /// 标准结果（数值） TRORRESU
+    /// </summary>
+    public string StandardResult_Numeric => double.TryParse(OriginalMeasurements, out _) ||
+    (OriginalMeasurements?.EndsWith("%") == true &&
+     double.TryParse(OriginalMeasurements.TrimEnd('%'), out _))
+        ? OriginalMeasurements
+        : "";
+
+    /// <summary>
+    /// 标准单位 TRSTRESU
+    /// </summary>
+    public string StandardUnit => OriginalUnit;
+
+
+    /// <summary>
+    /// 完成状态 TRSTAT
+    /// </summary>
+    public string CompletionStatus { get; set; }
+
+
+    /// <summary>
+    /// 完成状态 TRMETHOD
+    /// </summary>
+    public string IdentificationMethod { get; set; }
+
+
+    /// <summary>
+    /// 无法测量原因 TRREASND
+    /// </summary>
+    public string NotMeasuredReason { get; set; }
+
+
+
+}
+
+
+public class RS_Export : TU_TR_RSBaseModel
+{
+    /// <summary>
+    /// RSSEQ  按照subject 的数据顺序编号
+    /// </summary>
+    public int RSSEQ { get; set; }
+
+    /// <summary>
+    /// RSLNKGRP 链接组  ARM_任务名(访视名)
+    /// </summary>
+    public string ARM_VisitName { get; set; }
+
+    /// <summary>
+    /// RSTESTCD 疗效评估简称
+    /// </summary>
+    public string EfficacyEvaluationSimpleName { get; set; }
+
+    /// <summary>
+    ///  RSTEST   疗效评估全称
+    /// </summary>
+    public string EfficacyEvaluationName { get; set; }
+
+    /// <summary>
+    /// RSORRES  响应评估原始结果
+    /// </summary>
+    public string RespondEfficacyAssessment { get; set; }
+    /// <summary>
+    /// RSSTRESC   标准疗效评估
+    /// </summary>
+    public string StandardEfficacyAssessment => RespondEfficacyAssessment;
+
+    /// <summary>
+    /// RSSTAT 完成状态
+    /// </summary>
+    public string CompletionStatus { get; set; }
+    /// <summary>
+    /// RSREASND  无法评估原因
+    /// </summary>
+    public string NotAssessmentReason { get; set; }
+
+
+
+    ///// <summary>
+    ///// 裁定标记 RSACPTFL
+    ///// </summary>
+    //public bool? IsJudgeSelect { get; set; }
+
+    /// <summary>
+    /// REASASM  评估原因
+    /// </summary>
+    public string AssessmentReason { get; set; }
+    /// <summary>
+    /// REASOVR  重新评估原因
+    /// </summary>
+    public string ReAssessmentReason { get; set; }
+
+    /// <summary>
+    /// REASUPD 更新评估原因
+    /// </summary>
+    public string UpdateAssessmentReason { get; set; }
+
+
+    [JsonIgnore]
+    public bool? IsOveralResponse { get; set; }
+
+}
+
+
+public class CO_Export : TU_TR_RSBaseModel
+{
+    /// <summary>
+    /// 关联域  RS：(访视点备注）  空：裁判选择原因
+    /// </summary>
+    public string RDOMAIN { get; set; }
+
+    /// <summary>
+    /// COSEQ  序号
+    /// </summary>
+    public int COSEQ { get; set; }
+
+    /// <summary>
+    /// IDVAR  标识变量    RSSEQ    空：裁判选择原因
+    /// </summary>
+    public string IdentificationVariable { get; set; }
+
+    /// <summary>
+    /// 标识  IDVARVAL  RSSEQ具体的值  空：裁判选择原因
+    /// </summary>
+    public string Identification { get; set; }
+
+    /// <summary>
+    /// COREF 备注引用
+    /// </summary>
+    public string RemarksQuote { get; set; }
+
+    /// <summary>
+    /// 备注 COVAL
+    /// </summary>
+    public string Remarks { get; set; }
+
+    /// <summary>
+    /// 裁决日期 CODTC
+    /// </summary>
+    public string CODTC { get; set; }
+
+
+
+}

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

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

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

@@ -10,9 +10,41 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
 using MimeKit;
+using System.Runtime.CompilerServices;
 
 namespace IRaCIS.Core.Application.Service
 {
+
+    public static class SafeMailHelper
+    {
+        public static async Task Run(Func<Task> func, [CallerMemberName] string caller = "")
+        {
+            try
+            {
+                await func();
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error($"【邮件失败 - {caller}】: {ex.Message}");
+
+            }
+        }
+
+        public static async Task<T?> Run<T>(Func<Task<T>> func, [CallerMemberName] string caller = "")
+        {
+            try
+            {
+                return await func();
+            }
+            catch (Exception ex)
+            {
+                Log.Logger.Error($"【邮件失败 - {caller}】: {ex.Message}");
+            }
+            return default;
+        }
+    }
+
+
     public interface IMailVerificationService
     {
 
@@ -68,6 +100,8 @@ namespace IRaCIS.Core.Application.Service
 
             if (configInfo == null)
             {
+                Log.Logger.Error($"系统未找到当前场景:{scenario}邮件配置信息");
+
                 throw new BusinessValidationFailedException("系统未找到当前场景邮件配置信息，请联系运维人员核查");
             }
 
@@ -81,6 +115,7 @@ namespace IRaCIS.Core.Application.Service
             }
             catch (Exception ex)
             {
+                Log.Logger.Error($"邮件模板内容有误，填充内容出现问题,需要核查{scenario}场景邮件配置信息");
 
                 throw new BusinessValidationFailedException("邮件模板内容有误，填充内容出现问题，请联系运维人员核查");
             }
@@ -103,6 +138,8 @@ namespace IRaCIS.Core.Application.Service
 
             if (configInfo == null)
             {
+                Log.Logger.Error($"系统未找到当前场景:{scenario}邮件配置信息");
+
                 throw new BusinessValidationFailedException("系统未找到当前场景邮件配置信息，请联系运维人员核查");
             }
 
@@ -225,9 +262,10 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
-        //中心调研 登陆
+        //中心调研 登陆 发送验证码
         public async Task AnolymousSendEmail(string researchProgramNo, string emailAddress, int verificationCode)
         {
+            //throw new BusinessValidationFailedException("模拟邮件取数据或者发送异常！！！");
 
             var messageToSend = new MimeMessage();
             //发件地址
@@ -292,7 +330,7 @@ namespace IRaCIS.Core.Application.Service
             var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
 
             var redirectUrl = $"{domain}/api/User/UserRedirect?url={System.Web.HttpUtility.UrlEncode(routeUrl)}";
-
+            
 
             var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
 
@@ -393,7 +431,6 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
-
         //不登录  通过邮箱重置密码
         public async Task AnolymousSendEmailForResetAccount(string emailAddress, int verificationCode)
         {
@@ -723,7 +760,7 @@ namespace IRaCIS.Core.Application.Service
             if (feedBack.VisitTaskId != null)
             {
 
-                var emailType = await _dictionaryRepository.Where(t => t.Parent.Code == "Email_BusinessScenario" && t.ParentId != null && t.Code == ((int)EmailBusinessScenario.IRImageError).ToString()).Select(t => _userInfo.IsEn_Us ? t.Value : t.ValueCN).FirstOrDefaultAsync();
+                var emailType = await _dictionaryRepository.Where(t => t.Parent.Code == "FeedBackTypeToIR" && t.ParentId != null && t.Code == ((int)feedBack.QuestionType).ToString()).Select(t => _userInfo.IsEn_Us ? t.Value : t.ValueCN).FirstOrDefaultAsync();
 
 
                 var info = await _visitTaskRepository.Where(t => t.Id == feedBack.VisitTaskId).Select(t => new { t.Trial.ResearchProgramNo, t.Trial.TrialCode, SubejctCode = t.Subject.Code, t.SourceSubjectVisit.VisitName }).FirstNotNullAsync();

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

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

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

@@ -2,6 +2,7 @@
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Helper;
+using IRaCIS.Core.Application.Service.Common;
 using IRaCIS.Core.Application.ViewModel;
 
 namespace IRaCIS.Core.Application.Service
@@ -104,6 +105,14 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.Subject.TrialSite.TrialSiteCode));
 
 
+            CreateMap<TumorExportBaseModel , TU_Export>();
+            CreateMap<TumorExportBaseModel, TR_Export>();
+            CreateMap<TumorExportBaseModel, RS_Export>();
+            CreateMap<TumorExportBaseModel, CO_Export>();
+
+            CreateMap<IVUS_OCTBaseDto, IvusExportDto>();
+            CreateMap<IVUS_OCTBaseDto, OctExportDto>();
+
         }
     }
 

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

@@ -242,6 +242,8 @@ namespace IRaCIS.Application.Contracts
 
     public class ConfirmationReviewerDTO : DoctorOptDTO
     {
+        public Guid DoctorId { get; set; }
+
         public int DoctorTrialState { get; set; }
         public string OptUserName { get; set; } = string.Empty;
 
@@ -249,6 +251,11 @@ namespace IRaCIS.Application.Contracts
         public DateTime? OptTime { get; set; }
         public string? OptTimeStr => OptTime?.ToString("yyyy-MM-dd HH:mm:ss");
 
+        public UserTypeEnum? AuditTypeEnum { get; set; }
+        public DateTime? AuditTime { get; set; }
+        public string AuditUserName { get; set; } = string.Empty;
+        public string? AuditTimeStr => AuditTime?.ToString("yyyy-MM-dd HH:mm:ss");
+
         //SPM  需要看到
         public DateTime? SubmmitTime { get; set; }
         public string SubmmitUserName { get; set; } = string.Empty;
@@ -268,6 +275,8 @@ namespace IRaCIS.Application.Contracts
 
         public Guid? HospitalId { get; set; }
 
+        public Guid EnrollId { get; set; }
+
 
     }
 

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

@@ -302,8 +302,6 @@ namespace IRaCIS.Core.Application.Service
                 .Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus >= EnrollStatus.InviteIntoGroup);
             var enrollStateList = await query
                  .ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync();
-            enrollStateList = enrollStateList.GroupBy(e => e.DoctorId)
-               .Select(g => g.OrderByDescending(e => e.OptTime).FirstOrDefault()).ToList();
 
             enrollStateList = enrollStateList
                .WhereIf(inQuery.OptStartTime != null, x => x.OptTime >= inQuery.OptStartTime)
@@ -337,14 +335,29 @@ namespace IRaCIS.Core.Application.Service
             doctorPageList.CurrentPageData.ToList().ForEach(u =>
             {
                 u.DoctorTrialState = (int)EnrollStatus.InviteIntoGroup;
-                var opt = enrollStateList.OrderByDescending(x=>x.OptTime).FirstOrDefault(t => t.DoctorId == u.Id);
+               
+                var lastState= enrollStateList.OrderByDescending(x=>x.OptTime).FirstOrDefault(t => t.DoctorId == u.Id);
+                if (lastState != null)
+                {
+                    u.DoctorTrialState = lastState.IntoGroupState;
+                }
+                var opt = enrollStateList.Where(x => x.IntoGroupState == 10).FirstOrDefault(t => t.DoctorId == u.Id);
                 if (opt != null)
                 {
-                    u.DoctorTrialState = opt.IntoGroupState;
+                
                     u.OptTime = opt.OptTime;
                     u.UserTypeEnum = opt.UserTypeEnum;
                     u.OptUserName = opt.OptUserName;
                 }
+
+                var approved = enrollStateList.Where(x => x.IntoGroupState == 8).FirstOrDefault(t => t.DoctorId == u.Id);
+
+                if (approved != null)
+                {
+                    u.AuditTime = approved.OptTime;
+                    u.AuditTypeEnum = approved.UserTypeEnum;
+                    u.AuditUserName = approved.OptUserName;
+                }
             });
 
             return doctorPageList;

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

@@ -3,6 +3,7 @@ using AutoMapper.EquivalencyExpression;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Contracts.Pay;
 using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 
 namespace IRaCIS.Core.Application.Service
@@ -212,6 +213,8 @@ namespace IRaCIS.Core.Application.Service
                    .ForMember(d => d.Code, u => u.MapFrom(s => s.DoctorUser.UserName))
                      .ForMember(d => d.HospitalName, u => u.MapFrom(s => s.Doctor.HospitalName))
                        .ForMember(d => d.HospitalNameCN, u => u.MapFrom(s => s.Doctor.HospitalNameCN))
+                       .ForMember(d => d.EnrollId, u => u.MapFrom(s => s.Id))
+                       
                    ;
             CreateMap<Doctor, ConfirmationReviewerDTO>();
             CreateMap<Hospital, ConfirmationReviewerDTO>();

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

@@ -9,6 +9,95 @@ using IRaCIS.Core.Domain.Share;
 using System.Collections.Generic;
 namespace IRaCIS.Core.Application.ViewModel;
 
+
+public class AuditRecordView : AuditRecordAddOrEdit
+{
+    public Guid CreateUserId { get; set; }
+    public DateTime CreateTime { get; set; }
+    public Guid UpdateUserId { get; set; }
+    public DateTime UpdateTime { get; set; }
+
+
+    public new List<Guid> IdnetityUserIdList => IdentityUserList.Select(t => t.Id).ToList();
+    public List<AuditIdentiUserInfo> IdentityUserList { get; set; }
+}
+
+public class AuditIdentiUserInfo
+{
+    public Guid Id { get; set; }
+
+    public string UserName { get; set; }
+
+    public string FullName { get; set; }
+}
+
+public class AuditRecordAddOrEdit
+{
+    public Guid? Id { get; set; }
+    public string CompanyName { get; set; }
+
+    public string AuditContent { get; set; }
+
+    public DateOnly AuditTime { get; set; }
+
+
+    public DateTime? BeginTime { get; set; }
+
+    public DateTime? EndTime { get; set; }
+
+    public AuditState AuditState { get; set; }
+
+    public AuditType AuditType { get; set; }
+
+    //public List<Guid> IdnetityUserIdList { get; set; }
+}
+
+public class AddOrDeleteAuditUserCommand
+{
+    public Guid AuditRecordId { get; set; }
+
+    public List<Guid> IdentityUserIdList { get; set; }
+
+    public bool IsAdd { get; set; }
+}
+
+public class AuditRecordQuery : PageInput
+{
+    public string? CompanyName { get; set; }
+
+    public string? AuditContent { get; set; }
+
+    public DateOnly? BeginAuditTime { get; set; }
+    public DateOnly? EndAuditTime { get; set; }
+
+
+    public DateTime? BeginTime { get; set; }
+
+    public DateTime? EndTime { get; set; }
+
+    public AuditState? AuditState { get; set; }
+
+    public AuditType? AuditType { get; set; }
+
+
+    public DateTime? BeginCreateTime { get; set; }
+
+    public DateTime? EndCreateTime { get; set; }
+
+    public string? IdentityUserName { get; set; }
+}
+
+public class SetAuditRecordPermissionCommand
+{
+
+    public List<Guid> AuditDocumentIdList { get; set; }
+
+    public Guid AuditRecordId { get; set; }
+
+    public bool IsAuthorization { get; set; }
+}
+
+
 public class DeleteAudit
 {
     public Guid Id { get; set; }
@@ -24,16 +113,21 @@ public class DeleteAuditDocumentInDto
     public List<Guid> Ids { get; set; }
 }
 
-public class GetAuditDocumentDataInDto:PageInput
+public class GetAuditDocumentDataInDto : PageInput
 {
-    public  Guid? Id { get; set; }
+    public Guid? Id { get; set; }
 
     public Guid? SelfId { get; set; }
 
 
     public bool? IsAuthorization { get; set; }
 
+    public bool? IsCurrentAuditRecordAuthorization { get; set; }
+
     public string Name { get; set; } = string.Empty;
+
+    //当前稽查记录Id
+    public Guid? AuditRecordId { get; set; }
 }
 
 public class GetAuditDocumentDataOutDto
@@ -53,17 +147,20 @@ public class AuditDocumentData : AuditDocumentUpdateDto
     public int? Version { get; set; }
 
     public int HistoricalVersionsCount { get; set; }
-    public  List<AuditDocumentData> Children { get; set; }=new List<AuditDocumentData> (){ };
+    public List<AuditDocumentData> Children { get; set; } = new List<AuditDocumentData>() { };
+
+
+    public bool? IsCurrentAuditRecordAuthorization { get; set; }
 
 }
 
 public class AuditDocumentView : AuditDocumentAddOrEdit
 {
-    
+
     public DateTime CreateTime { get; set; }
-    
+
     public DateTime UpdateTime { get; set; }
-    
+
 }
 
 public class SetIsAuthorizationInDto
@@ -80,7 +177,7 @@ public class SetCurrentVersionInDto
 
 public class GetHistoricalVersionInDto
 {
-    public Guid Id    { get; set; }
+    public Guid Id { get; set; }
 }
 
 public class GetHistoricalVersionOutDto
@@ -93,10 +190,10 @@ public class MovieFileOrFolderInDto
 {
     public List<Guid> Ids { get; set; }
 
-    public Guid ParentId { get; set; }
+    public Guid? ParentId { get; set; }
 }
 
-public class HistoricalVersionDto: AuditDocumentUpdateDto
+public class HistoricalVersionDto : AuditDocumentUpdateDto
 {
     public bool IsCurrentVersion { get; set; } = false;
 
@@ -113,7 +210,7 @@ public class AuditDocumentUpdateDto
 
     public AuditDocumentType AuditDocumentTypeEnum { get; set; }
 
-    public string? FileFormat { get; set; } 
+    public string? FileFormat { get; set; }
 
     public string? FilePath { get; set; }
 
@@ -133,34 +230,34 @@ public class GetBreadcrumbDataInDto
     public Guid Id { get; set; }
 }
 
-public class AuditDocumentAddOrEdit: AuditDocumentUpdateDto
+public class AuditDocumentAddOrEdit : AuditDocumentUpdateDto
 {
-  
 
-    public List<AuditDocumentAddOrEdit> Children { get; set; }=new  List<AuditDocumentAddOrEdit>() { };
+
+    public List<AuditDocumentAddOrEdit> Children { get; set; } = new List<AuditDocumentAddOrEdit>() { };
 
     public bool IsUpdate { get; set; } = true;
 }
 
-public class AuditDocumentQuery:PageInput
+public class AuditDocumentQuery : PageInput
 {
     public AuditDocumentType? AuditDocumentTypeEnum { get; set; }
-    
+
     public string? FileFormat { get; set; }
-    
+
     public string? FilePath { get; set; }
-    
-    public decimal?  FileSize { get; set; }
-    
+
+    public decimal? FileSize { get; set; }
+
     public bool? IsAuthorization { get; set; }
-    
-    public Guid?  MainFileId { get; set; }
-    
+
+    public Guid? MainFileId { get; set; }
+
     public string? Name { get; set; }
-    
-    public Guid?  ParentId { get; set; }
-    
-    }
+
+    public Guid? ParentId { get; set; }
+
+}
 
 
 

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

@@ -365,6 +365,57 @@ namespace IRaCIS.Core.Application.Contracts
         public List<Guid> Ids { get; set; }
     }
 
+    public class PublishTrialDocumentInDto
+    {
+        public List<Guid> Ids { get; set; }
+    }
+
+    public class TrialDocumentAttachmentView : TrialDocumentAttachmentAddOrEdit
+    {
+
+        public DateTime CreateTime { get; set; }
+
+        public DateTime UpdateTime { get; set; }
+
+    }
+
+
+    public class TrialDocumentAttachmentAddOrEdit
+    {
+        public Guid? Id { get; set; }
+
+        public string FileFormat { get; set; }
+
+        public string FileName { get; set; }
+
+        public string FilePath { get; set; }
+
+        public decimal? FileSize { get; set; }
+
+        public string Name { get; set; }
+
+        public bool OffLine { get; set; }
+
+        public Guid TrialDocumentId { get; set; }
+    }
+
+    public class TrialDocumentAttachmentQuery : PageInput
+    {
+        public string? FileFormat { get; set; }
+
+        public string? FileName { get; set; }
+
+        public string? FilePath { get; set; }
+
+        public decimal? FileSize { get; set; }
+
+        public string? Name { get; set; }
+
+        public bool? OffLine { get; set; }
+
+        public Guid? TrialDocumentId { get; set; }
+    }
+
     public class AddOrEditSystemDocument : SystemDocumentAddOrEdit
     {
 

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

@@ -13,6 +13,7 @@ namespace IRaCIS.Core.Application.Contracts
     {
         public string FullFilePath { get; set; } = String.Empty;
 
+        public int AttachmentCount { get; set; }
         public bool IsSomeUserSigned { get; set; }
 
         public DateTime CreateTime { get; set; }
@@ -60,6 +61,24 @@ namespace IRaCIS.Core.Application.Contracts
 
         public int SignViewMinimumMinutes { get; set; }
 
+
+        /// <summary>
+        /// 现有员工培训天数
+        /// </summary>
+        public int? CurrentStaffTrainDays { get; set; }
+
+
+        /// <summary>
+        /// 新员工培训天数
+        /// </summary>
+        public int? NewStaffTrainDays { get; set; }
+
+        /// <summary>
+        /// 是否发布
+        /// </summary>
+
+        public bool IsPublish { get; set; } = true;
+
     }
 
     public class AddOrEditTrialDocument : TrialDocumentAddOrEdit

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

@@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public new List<UserTypeEnum> ToUserTypeList => TrialEmailNoticeUserList.Where(t => t.EmailUserType == EmailUserType.To).Select(t => t.UserType).ToList();
         public new List<UserTypeEnum> CopyUserTypeList => TrialEmailNoticeUserList.Where(t => t.EmailUserType == EmailUserType.Copy).Select(t => t.UserType).ToList();
 
-
+        public List<CriterionType>? SysCriterionTypeList { get; set; }
     }
 
 
@@ -99,7 +99,7 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public EmailBusinessScenario? BusinessScenarioEnum { get; set; }
 
-        //public CriterionType? CriterionTypeEnum { get; set; }
+        public CriterionType? CriterionTypeEnum { get; set; }
 
         public Guid? TrialReadingCriterionId { get; set; }
 
@@ -146,9 +146,6 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid TrialId { get; set; }
 
 
-        public CriterionType? CriterionTypeEnum { get; set; }
-
-
         public List<UserTypeEnum> ToUserTypeList { get; set; }
         public List<UserTypeEnum> CopyUserTypeList { get; set; }
 
@@ -197,6 +194,11 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public int? EmailDelaySeconds { get; set; }
 
+        [Comment("邮件配置的多个标准")]
+        public List<CriterionType>? CriterionTypeList { get; set; }
+
+        public bool IsDistinguishCriteria { get; set; }
+
     }
 
 

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

@@ -14,7 +14,9 @@ namespace IRaCIS.Core.Application.ViewModel;
 
 public class TrialFinalRecordView : TrialFinalRecordAddOrEdit
 {
-    
+    public int HistoryCount { get; set; }
+
+
     public DateTime CreateTime { get; set; }
     
     public DateTime UpdateTime { get; set; }

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

@@ -0,0 +1,56 @@
+
+//--------------------------------------------------------------------
+//     此代码由liquid模板自动生成  byzhouhang 20240909
+//	   生成时间 2025-06-09 02:09:12Z 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.Collections.Generic;
+namespace IRaCIS.Core.Application.Service.DTO;
+
+public class TrialHistoryRecordFileView : TrialHistoryRecordFileAddOrEdit
+{
+    
+    public DateTime CreateTime { get; set; }
+    
+    public DateTime UpdateTime { get; set; }
+    
+}
+
+
+public class TrialHistoryRecordFileAddOrEdit
+{
+    public Guid? Id { get; set; }
+    
+    public string FileFormat { get; set; }
+    
+    public string FileName { get; set; }
+    
+    public string FilePath { get; set; }
+    
+    public string FileSize { get; set; }
+    
+    public Guid TrialFileTypeId { get; set; }
+    
+    public Guid TrialRecordId { get; set; }
+    }
+
+public class TrialHistoryRecordFileQuery:PageInput
+{
+    public string? FileFormat { get; set; }
+    
+    public string? FileName { get; set; }
+    
+    public string? FilePath { get; set; }
+    
+    public string? FileSize { get; set; }
+    
+    public Guid? TrialFileTypeId { get; set; }
+    
+    public Guid? TrialRecordId { get; set; }
+    }
+
+
+
+

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

@@ -11,7 +11,7 @@ namespace IRaCIS.Core.Application.ViewModel;
 
 public class TrialNormalRecordView : TrialNormalRecordAddOrEdit
 {
-    
+    public int HistoryCount { get; set; }
     public DateTime CreateTime { get; set; }
     
     public DateTime UpdateTime { get; set; }

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

@@ -11,7 +11,7 @@ namespace IRaCIS.Core.Application.ViewModel;
 
 public class TrialTrianingRecordView : TrialTrianingRecordAddOrEdit
 {
-    
+    public int HistoryCount { get; set; }
     public DateTime CreateTime { get; set; }
     
     public DateTime UpdateTime { get; set; }

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

@@ -11,7 +11,7 @@ namespace IRaCIS.Core.Application.Service
     {
         Task SendEnrollOrPdEmail(Guid visitTaskId, bool? isEnrollment, bool? isPDConfirm);
 
-        Task<(TrialEmailNoticeConfig?, SMTPEmailConfig?)> BuildEmailConfig(Guid trialId, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, Guid? siteId = null, Guid? trialReadingCriterionId = null);
+        Task<(TrialEmailNoticeConfig?, SMTPEmailConfig?)> BuildEmailConfig(Guid trialId, CriterionType criterionType, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, Guid? siteId = null);
     }
 
     public class EmailSendService(IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
@@ -57,6 +57,7 @@ namespace IRaCIS.Core.Application.Service
                 t.Trial.Sponsor.SponsorName,
                 t.SourceSubjectVisit.VisitName,
                 t.TrialId,
+                t.TrialReadingCriterion.CriterionType,
 
             }).FirstNotNullAsync();
 
@@ -77,7 +78,7 @@ namespace IRaCIS.Core.Application.Service
                     return (topicStr, htmlBodyStr, isEn_us, null);
                 };
 
-                await SendTrialEmailAsync(taskInfo.TrialId, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
+                await SendTrialEmailAsync(taskInfo.TrialId, taskInfo.CriterionType, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
             }
             else
             {
@@ -92,7 +93,7 @@ namespace IRaCIS.Core.Application.Service
                     return (topicStr, htmlBodyStr, isEn_us, null);
                 };
 
-                await SendTrialEmailAsync(taskInfo.TrialId, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
+                await SendTrialEmailAsync(taskInfo.TrialId, taskInfo.CriterionType, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
             }
 
 
@@ -102,9 +103,9 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-        public async Task SendTrialEmailAsync(Guid trialId, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, Guid? trialSiteId = null, Guid? trialReadingCriterionId = null, Func<TrialEmailNoticeConfig, SMTPEmailConfig, SMTPEmailConfig> emailAttachFunc = null)
+        public async Task SendTrialEmailAsync(Guid trialId, CriterionType criterionType, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, Guid? trialSiteId = null, Func<TrialEmailNoticeConfig, SMTPEmailConfig, SMTPEmailConfig> emailAttachFunc = null)
         {
-            var (trialEmailConfig, sendEmailConfig) = await BuildEmailConfig(trialId, businessScenario, topicAndHtmlFunc, trialSiteId, trialReadingCriterionId);
+            var (trialEmailConfig, sendEmailConfig) = await BuildEmailConfig(trialId, criterionType, businessScenario, topicAndHtmlFunc, trialSiteId);
 
             if (sendEmailConfig != null)
             {
@@ -114,10 +115,10 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
-        public async Task<(TrialEmailNoticeConfig?, SMTPEmailConfig?)> BuildEmailConfig(Guid trialId, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, Guid? trialSiteId = null, Guid? trialReadingCriterionId = null)
+        public async Task<(TrialEmailNoticeConfig?, SMTPEmailConfig?)> BuildEmailConfig(Guid trialId, CriterionType criterionType, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, 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 && t.CriterionTypeList.Any(t => t == criterionType), ignoreQueryFilters: true)
            .Include(t => t.TrialEmailNoticeUserList).Include(t => t.TrialEmailBlackUserList).FirstOrDefaultAsync();
 
 

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

@@ -0,0 +1,23 @@
+
+//--------------------------------------------------------------------
+//     此代码由liquid模板自动生成  byzhouhang 20240909
+//     生成时间 2025-06-09 02:09:12Z 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using System;
+using IRaCIS.Core.Infrastructure.Extention;
+using System.Threading.Tasks;
+using IRaCIS.Core.Application.Service.DTO;
+namespace IRaCIS.Core.Application.Interfaces;
+
+public interface ITrialHistoryRecordFileService
+{
+
+    Task<PageOutput<TrialHistoryRecordFileView>> GetTrialHistoryRecordFileList(TrialHistoryRecordFileQuery inQuery);
+
+    Task<IResponseOutput> AddOrUpdateTrialHistoryRecordFile(TrialHistoryRecordFileAddOrEdit addOrEditTrialHistoryRecordFile);
+
+    Task<IResponseOutput> DeleteTrialHistoryRecordFile(Guid trialHistoryRecordFileId);
+}
+
+

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

@@ -136,7 +136,7 @@ namespace IRaCIS.Core.Application.Services
                 var beforeUserTypeIds = document.NeedConfirmedUserTypeList.Select(x => x.NeedConfirmUserTypeId).ToList();
 
                 _mapper.Map(addOrEditSystemDocument, document);
-
+                document.UpdateTime = DateTime.Now;
                 #region 之前区分路径文件夹 现在不区分废弃
 
                 //if (document.FileTypeId != addOrEditSystemDocument.FileTypeId)

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

@@ -6,11 +6,15 @@
 
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
+using IRaCIS.Core.Application.MassTransit.Consumer;
+using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
+using MassTransit.Mediator;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
 using NPOI.SS.Formula.Functions;
 using System.Linq;
 using System.Linq.Dynamic.Core;
@@ -23,11 +27,13 @@ namespace IRaCIS.Core.Application.Services
     [ApiExplorerSettings(GroupName = "Trial")]
     public class TrialDocumentService(IRepository<TrialDocument> _trialDocumentRepository,
         IRepository<Trial> _trialRepository,
+        IRepository<TrialDocumentAttachment> _trialDocumentAttachmentRepository,
         ISystemDocumentService _systemDocumentService,
         IRepository<SystemDocConfirmedIdentityUser> _systemDocConfirmedUserRepository,
         IRepository<SystemDocNeedConfirmedUserType> _systemDocNeedConfirmedUserTypeRepository,
          IRepository<TrialDocNeedConfirmedUserType> _trialDocNeedConfirmedUserTypeRepository,
         IRepository<SystemDocument> _systemDocumentRepository,
+           IServiceScopeFactory serviceScopeFactory,
         IRepository<TrialIdentityUser> _trialIdentityUserRepository,
          IRepository<TrialUserRole> _trialUserRoleRepository,
           IRepository<IdentityUser> _identityUserRepository,
@@ -36,7 +42,118 @@ namespace IRaCIS.Core.Application.Services
     {
 
 
+        /// <summary>
+        /// 获取项目文档附件列表
+        /// </summary>
+        /// <param name="inQuery"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<PageOutput<TrialDocumentAttachmentView>> GetTrialDocumentAttachmentList(TrialDocumentAttachmentQuery inQuery)
+        {
 
+            var trialDocumentAttachmentQueryable = _trialDocumentAttachmentRepository
+                .WhereIf(inQuery.TrialDocumentId != null, x => x.TrialDocumentId == inQuery.TrialDocumentId)
+                  .WhereIf(inQuery.Name != null, x => x.Name.Contains(inQuery.Name))
+                    .WhereIf(inQuery.FileFormat != null, x => x.FileFormat == inQuery.FileFormat)
+                                        .ProjectTo<TrialDocumentAttachmentView>(_mapper.ConfigurationProvider);
+
+            var pageList = await trialDocumentAttachmentQueryable.ToPagedListAsync(inQuery);
+
+            return pageList;
+        }
+
+
+        /// <summary>
+        /// 添加或更新项目文档附件
+        /// </summary>
+        /// <param name="addOrEditTrialDocumentAttachment"></param>
+        /// <returns></returns>
+        public async Task<IResponseOutput> AddOrUpdateTrialDocumentAttachment(TrialDocumentAttachmentAddOrEdit addOrEditTrialDocumentAttachment)
+        {
+            //  在此处拷贝automapper 映射
+
+            var entity = await _trialDocumentAttachmentRepository.InsertOrUpdateAsync(addOrEditTrialDocumentAttachment, true);
+
+            return ResponseOutput.Ok(entity.Id.ToString());
+
+        }
+
+        /// <summary>
+        /// 删除项目文档附件
+        /// </summary>
+        /// <param name="trialDocumentAttachmentId"></param>
+        /// <returns></returns>
+        [HttpDelete("{trialDocumentAttachmentId:guid}")]
+        public async Task<IResponseOutput> DeleteTrialDocumentAttachment(Guid trialDocumentAttachmentId)
+        {
+            var success = await _trialDocumentAttachmentRepository.DeleteFromQueryAsync(t => t.Id == trialDocumentAttachmentId, true);
+            return ResponseOutput.Ok();
+        }
+
+        /// <summary>
+        /// 发布项目文档
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> PublishTrialDocument(PublishTrialDocumentInDto inDto)
+        {
+            await _trialDocumentRepository.UpdatePartialFromQueryAsync(x => inDto.Ids.Contains(x.Id), x => new TrialDocument()
+            {
+                IsPublish = true,
+                IsDeleted = false,
+            });
+            await _trialDocumentRepository.SaveChangesAsync();
+            Console.WriteLine("开始 发布项目文档");
+
+            Task.Run(async () =>
+            {
+                // 创建独立作用域
+                using (var scope = serviceScopeFactory.CreateScope())
+                {
+                    // 从新作用域解析服务
+                    var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
+                    await mediator.Publish(new TrialDocumentPublishEvent { Ids = inDto.Ids });
+                }
+            });
+
+
+            return ResponseOutput.Result(true);
+        }
+
+        /// <summary>
+        /// 测试邮件定时发送
+        /// </summary>
+        /// <returns></returns>
+        public async Task<IResponseOutput> TestPush()
+        {
+            Task.Run(async () =>
+            {
+                // 创建独立作用域
+                using (var scope = serviceScopeFactory.CreateScope())
+                {
+                    // 从新作用域解析服务
+                    var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
+                    await mediator.Publish(new TrialDocumentErverDayEvent { });
+                }
+            });
+            return ResponseOutput.Result(true);
+        }
+
+
+        public async Task<IResponseOutput> TestSendEmail()
+        {
+            Task.Run(async () =>
+            {
+                // 创建独立作用域
+                using (var scope = serviceScopeFactory.CreateScope())
+                {
+                    // 从新作用域解析服务
+                    var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
+                    await mediator.Publish(new ImageQCRecurringEvent { TrialId= Guid.Parse("08de2254-5d7d-581a-0242-0a0001000000") });
+                }
+            });
+            return ResponseOutput.Result(true);
+        }
 
         /// <summary>
         /// Setting 界面的  项目所有文档列表
@@ -74,6 +191,8 @@ namespace IRaCIS.Core.Application.Services
                                         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,
@@ -407,23 +526,35 @@ namespace IRaCIS.Core.Application.Services
                 .WhereIf(inQuery.IsSign == true, t => t.ConfirmTime != null)
                 .WhereIf(inQuery.IsSign == false, t => t.ConfirmTime == null);
 
+            var defalutSortArray = new string[] { nameof(UnionDocumentWithConfirmInfoView.IsDeleted), nameof(UnionDocumentWithConfirmInfoView.CreateTime) + " desc", nameof(UnionDocumentWithConfirmInfoView.ConfirmTime) };
 
-
-            var result = await unionQuery.ToPagedListAsync(inQuery);
+            var result = await unionQuery.ToPagedListAsync(inQuery, defalutSortArray);
 
             //Concat 不能用导航属性
             var sysids = result.CurrentPageData.Where(t => t.IsSystemDoc == true).Select(t => t.Id).ToList();
 
             var sysDataList = await _systemDocumentRepository.Where(x => sysids.Contains(x.Id)).Include(x => x.SystemDocumentAttachmentList).ToListAsync();
+
+
+
             result.CurrentPageData.ForEach(x =>
             {
                 if (sysDataList.Any(y => y.Id == x.Id))
                 {
                     x.AttachmentCount = sysDataList.Where(y => y.Id == x.Id).Select(x => x.SystemDocumentAttachmentList.Where(z => !z.OffLine).Count()).FirstOrDefault();
                 }
+            });
 
+            var trialids = result.CurrentPageData.Where(t => t.IsSystemDoc == false).Select(t => t.Id).ToList();
 
+            var trialDataList = await _trialDocumentRepository.Where(x => trialids.Contains(x.Id)).Include(x => x.TrialDocumentAttachmentList).ToListAsync();
 
+            result.CurrentPageData.ForEach(x =>
+            {
+                if (trialDataList.Any(y => y.Id == x.Id))
+                {
+                    x.AttachmentCount = trialDataList.Where(y => y.Id == x.Id).Select(x => x.TrialDocumentAttachmentList.Where(z => !z.OffLine).Count()).FirstOrDefault();
+                }
             });
             #endregion
 
@@ -785,7 +916,12 @@ namespace IRaCIS.Core.Application.Services
         /// <returns></returns>
         public async Task<IResponseOutput> GetSysDocSignUserList()
         {
-            var list = _systemDocConfirmedUserRepository.Where(t => t.ConfirmTime != null).Select(t => new { t.ConfirmUserId, t.ConfirmUser.UserName, t.ConfirmUser.FullName }).Distinct().ToList();
+            //EA 只能查看内部人员文档
+            var isEA = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.EA;
+
+            var list = _systemDocConfirmedUserRepository.Where(t => t.ConfirmTime != null)
+                .WhereIf(isEA, t => t.ConfirmUser.IsZhiZhun == true)
+                .Select(t => new { t.ConfirmUserId, t.ConfirmUser.UserName, t.ConfirmUser.FullName }).Distinct().ToList();
 
             return ResponseOutput.Ok(list);
         }
@@ -796,12 +932,15 @@ namespace IRaCIS.Core.Application.Services
 
             var isInternal = _userInfo.IsZhiZhun;
 
+            var isEA = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.EA;
+
             var systemDocQuery =
                from sysDoc in _systemDocumentRepository.AsQueryable(false)
                                               .Where(t => inQuery.UserTypeId != null ? t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId) : true)
-               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)))
+               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)))
                   .Where(t => inQuery.UserId != null ? t.Id == inQuery.UserId : true)
                   .Where(t => inQuery.UserTypeId != null ? t.UserRoleList.Any(t => t.UserTypeId == inQuery.UserTypeId && t.IsUserRoleDisabled == false) : true)
+                  .Where(t => isEA ? t.IsZhiZhun == true : true) //EA 只能查看内部人员文档
                join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = identityUser.Id, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
                from confirm in cc.DefaultIfEmpty()
                select new UnionDocumentWithConfirmInfoView()
@@ -827,7 +966,14 @@ namespace IRaCIS.Core.Application.Services
                    //UserTypeId = trialUser.UserRole.UserTypeId,
                    //UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName,
 
-                   FullFilePath = sysDoc.Path
+                   FullFilePath = sysDoc.Path,
+
+                   AttachmentCount = sysDoc.SystemDocumentAttachmentList.Where(t => t.OffLine == false).Count(),
+
+                   DocNeedSignUserTypeList = sysDoc.NeedConfirmedUserTypeList.Select(t => t.UserTypeRole.UserTypeShortName).ToList(),
+
+                   IdentityUserTypeList = identityUser.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Select(c => c.UserTypeRole.UserTypeShortName).ToList()
+
                };
 
             var unionQuery = systemDocQuery.IgnoreQueryFilters().Where(t => !(t.IsDeleted == true && t.ConfirmTime == null))
@@ -841,44 +987,44 @@ namespace IRaCIS.Core.Application.Services
                              .WhereIf(inQuery.EndCreateTime != null, t => t.CreateTime <= inQuery.EndCreateTime)
                             .WhereIf(!string.IsNullOrEmpty(inQuery.UserName), t => t.UserName.Contains(inQuery.UserName))
                             .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted)
-                            .WhereIf(isInternal == false, t => t.ConfirmTime != null);
+                            .WhereIf(isInternal == false, t => t.ConfirmTime != null); //不是内部的人，看有签名时间的
 
             var result = await unionQuery.ToPagedListAsync(inQuery);
 
             #region 处理文档 需要签署的角色类型  和每个人的角色信息
 
-            var trialDocIdList = result.CurrentPageData.Where(t => t.IsSystemDoc == false).Select(t => t.Id).ToList();
+            //var trialDocIdList = result.CurrentPageData.Where(t => t.IsSystemDoc == false).Select(t => t.Id).ToList();
 
-            var sysDocIdList = result.CurrentPageData.Where(t => t.IsSystemDoc == true).Select(t => t.Id).ToList();
+            //var sysDocIdList = result.CurrentPageData.Where(t => t.IsSystemDoc == true).Select(t => t.Id).ToList();
 
-            var identityUserIdList = result.CurrentPageData.Select(t => t.ConfirmUserId).Distinct().ToList();
+            //var identityUserIdList = result.CurrentPageData.Select(t => t.ConfirmUserId).Distinct().ToList();
 
 
-            var sysDocUserTypeList = _systemDocNeedConfirmedUserTypeRepository.Where(t => sysDocIdList.Contains(t.SystemDocumentId)).Select(t => new { t.SystemDocumentId, t.UserTypeRole.UserTypeShortName }).ToList();
+            //var sysDocUserTypeList = _systemDocNeedConfirmedUserTypeRepository.Where(t => sysDocIdList.Contains(t.SystemDocumentId)).Select(t => new { t.SystemDocumentId, t.UserTypeRole.UserTypeShortName }).ToList();
 
-            var identityUserUserTypeList = _identityUserRepository.Where(t => identityUserIdList.Contains(t.Id)).IgnoreQueryFilters().Select(t => new { IdentityUserId = t.Id, UserTypeList = t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Select(c => c.UserTypeRole.UserTypeShortName).ToList() });
+            //var identityUserUserTypeList = _identityUserRepository.Where(t => identityUserIdList.Contains(t.Id)).IgnoreQueryFilters().Select(t => new { IdentityUserId = t.Id, UserTypeList = t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Select(c => c.UserTypeRole.UserTypeShortName).ToList() });
 
-            //Concat 不能用导航属性
-            var sysids = result.CurrentPageData.Where(t => t.IsSystemDoc == true).Select(t => t.Id).ToList();
+            ////Concat 不能用导航属性
+            //var sysids = result.CurrentPageData.Where(t => t.IsSystemDoc == true).Select(t => t.Id).ToList();
 
-            var sysDataList = await _systemDocumentRepository.Where(x => sysids.Contains(x.Id)).Include(x => x.SystemDocumentAttachmentList).ToListAsync();
+            //var sysDataList = await _systemDocumentRepository.Where(x => sysids.Contains(x.Id)).Include(x => x.SystemDocumentAttachmentList).ToListAsync();
 
-            foreach (var item in result.CurrentPageData)
-            {
+            //foreach (var item in result.CurrentPageData)
+            //{
 
-                if (sysDataList.Any(y => y.Id == item.Id))
-                {
-                    item.AttachmentCount = sysDataList.Where(y => y.Id == item.Id).Select(x => x.SystemDocumentAttachmentList.Where(z => !z.OffLine).Count()).FirstOrDefault();
-                }
+            //    if (sysDataList.Any(y => y.Id == item.Id))
+            //    {
+            //        item.AttachmentCount = sysDataList.Where(y => y.Id == item.Id).Select(x => x.SystemDocumentAttachmentList.Where(z => !z.OffLine).Count()).FirstOrDefault();
+            //    }
 
-                if (item.IsSystemDoc)
-                {
-                    item.DocNeedSignUserTypeList = sysDocUserTypeList.Where(t => t.SystemDocumentId == item.Id).Select(t => t.UserTypeShortName).ToList();
-                }
+            //    if (item.IsSystemDoc)
+            //    {
+            //        item.DocNeedSignUserTypeList = sysDocUserTypeList.Where(t => t.SystemDocumentId == item.Id).Select(t => t.UserTypeShortName).ToList();
+            //    }
 
 
-                item.IdentityUserTypeList = identityUserUserTypeList.Where(t => t.IdentityUserId == item.ConfirmUserId).SelectMany(c => c.UserTypeList).ToList();
-            }
+            //    item.IdentityUserTypeList = identityUserUserTypeList.Where(t => t.IdentityUserId == item.ConfirmUserId).SelectMany(c => c.UserTypeList).ToList();
+            //}
 
 
             #endregion
@@ -944,10 +1090,12 @@ namespace IRaCIS.Core.Application.Services
 
                 var document = (await _trialDocumentRepository.Where(t => t.Id == addOrEditTrialDocument.Id, true).Include(t => t.NeedConfirmedUserTypeList).FirstOrDefaultAsync()).IfNullThrowException();
 
-
+                bool beforeIsPublish = document.IsPublish;
+                bool beforeIsDeleted = document.IsDeleted;
+                var beforeUserTypeIds = document.NeedConfirmedUserTypeList.Select(x => x.NeedConfirmUserTypeId).ToList();
 
                 _mapper.Map(addOrEditTrialDocument, document);
-
+                document.UpdateTime = DateTime.Now;
                 #region 不区分路径了
 
                 //if (document.FileTypeId != addOrEditTrialDocument.FileTypeId)
@@ -973,7 +1121,37 @@ namespace IRaCIS.Core.Application.Services
 
 
                 var success = await _trialDocumentRepository.SaveChangesAsync();
+                // 检查是否需要发送邮件给新增的角色
+                if (beforeIsPublish && document.IsPublish && !beforeIsDeleted && !document.IsDeleted)
+                {
+                    // 找出新增的用户角色ID
+                    var newUserTypeIds = addOrEditTrialDocument.NeedConfirmedUserTypeIdList
+                        .Where(id => !beforeUserTypeIds.Contains(id))
+                        .ToList();
 
+                    if (newUserTypeIds.Any() && newUserTypeIds.Count() > 0)
+                    {
+                        // 发送邮件给新增的角色
+                        Console.WriteLine("开始 发送项目文档更新邮件给新增角色");
+                        Console.WriteLine(string.Join(",", newUserTypeIds));
+
+                        Task.Run(async () =>
+                        {
+                            // 创建独立作用域
+                            using (var scope = serviceScopeFactory.CreateScope())
+                            {
+                                // 从新作用域解析服务
+                                var mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
+                                // 只发送给新增的角色
+                                await mediator.Publish(new TrialDocumentPublishEvent
+                                {
+                                    Ids = new List<Guid> { document.Id },
+                                    NewUserTypeIds = newUserTypeIds
+                                });
+                            }
+                        });
+                    }
+                }
                 return ResponseOutput.Ok(document.Id.ToString());
             }
         }

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

@@ -4,11 +4,14 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
+using Amazon.Runtime;
+using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.MassTransit.Consumer;
+using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Domain.Share.Common;
@@ -16,6 +19,7 @@ using IRaCIS.Core.Infra.EFCore.Common;
 using IRaCIS.Core.Infrastructure;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Spire.Doc;
 using System.Linq.Dynamic.Core;
@@ -43,6 +47,7 @@ namespace IRaCIS.Core.Application.Service
             IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository,
             IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
             IOptionsMonitor<SystemEmailSendConfig> _systemEmailSendConfig,
+            IDictionaryService _dictionaryService,
             IEmailSendService _emailSendService,
             IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService, ITrialEmailNoticeConfigService
     {
@@ -116,21 +121,29 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
-
-        private async Task<bool> DealMedicalReviewTasKGenerateAndIsSendAsync(Guid trialId, bool? isHandSend, string pdAnswer, List<Guid> taskIdList, List<Guid> minUserIdList)
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="trialId"></param>
+        /// <param name="isHandSend">为空 代表 正常任务自动发送，为true  代表医学审核手动发送  为false 代表医学审核自动发送 </param></param>
+        /// <param name="pdAnswer"></param>
+        /// <param name="taskIdList"></param>
+        /// <param name="minUserIdList"></param>
+        /// <returns></returns>
+        private async Task<bool> DealMedicalReviewTasKGenerateAndIsSendAsync(Guid trialId, bool? isHandSend, string answer, List<Guid> taskIdList, List<Guid> minUserIdList)
         {
 
             var isNeedSend = true;
 
             //手动发送的时候，也有可能答案是是  此时是 这里不发送，发送已经生成的文件
-            if (pdAnswer == "是" && isHandSend == null)
+            if (answer == "是" && isHandSend == null)
             {
                 isNeedSend = true;
 
             }
             else
             {
-                //正常阅片为否的
+                //正常阅片自动发送，阅片为否的产生医学审核
                 if (isHandSend == null)
                 {
                     isNeedSend = false;
@@ -153,12 +166,12 @@ namespace IRaCIS.Core.Application.Service
                 }
                 else if (isHandSend == true)
                 {
-                    //手动发送
+                    //医学审核手动发送
                     isNeedSend = false;
                 }
                 else
                 {
-                    // 医学审核确认未否了 才发
+                    // 医学审核自动发送
                     isNeedSend = true;
                 }
             }
@@ -167,6 +180,8 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
+
+
         /// <summary>
         /// 测试邮件 带附件 填充word 
         /// </summary>
@@ -181,6 +196,9 @@ namespace IRaCIS.Core.Application.Service
             var isEn_us = _userInfo.IsEn_Us;
             EmailBusinessScenario businessScenarioEnum = EmailBusinessScenario.None;
 
+            var enrollReplace = "";
+            var PdReplace = "";
+
             #region 任务关联的项目配置  标准信息及配置，subject 信息
             var taskInfo = await _visitTaskRepository.Where(t => t.Id == visitTaskId).Select(t => new
             {
@@ -219,6 +237,8 @@ namespace IRaCIS.Core.Application.Service
                 //单双中
                 t.TrialReadingCriterion.ReadingType,
 
+                t.TrialReadingCriterion.IsGlobalReading,
+
                 t.TrialReadingCriterion.CriterionType,
                 //有序与否
                 t.TrialReadingCriterion.IsReadingTaskViewInOrder,
@@ -288,7 +308,7 @@ namespace IRaCIS.Core.Application.Service
             };
 
 
-            var (trialEmailConfig, sendEmailConfig) = await _emailSendService.BuildEmailConfig(taskInfo.TrialId, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId, taskInfo.TrialReadingCriterionId);
+            var (trialEmailConfig, sendEmailConfig) = await _emailSendService.BuildEmailConfig(taskInfo.TrialId, taskInfo.CriterionType, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
 
             #endregion
 
@@ -298,7 +318,7 @@ namespace IRaCIS.Core.Application.Service
             {
                 #region 不同标准 不同项目配置 发送邮件的时机 处理具体逻辑
 
-                var answer = "否";
+                var answer = string.Empty;
                 var isNeedSend = true;
                 var minUserIdList = _trialUserRoleRepository.Where(t => t.UserRole.UserTypeEnum == Domain.Share.UserTypeEnum.MIM && t.TrialId == taskInfo.TrialId).Select(t => t.UserId).ToList();
 
@@ -307,12 +327,9 @@ namespace IRaCIS.Core.Application.Service
                 //入组确认  根据每个标准配置的是否自动发送，发送邮件与否
                 if (businessScenarioEnum == EmailBusinessScenario.EnrollConfirmed)
                 {
-                    if (await _readingTableQuestionAnswerRepository.Where().AnyAsync(x => x.VisitTaskId == visitTaskId && x.Answer == TargetState.Exist.GetEnumInt() &&
-                 x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State && x.ReadingQuestionTrial.LesionType == LesionType.TargetLesion))
-                    {
-                        answer = "是";
-                    }
+                    var findItem = (await _dictionaryService.GetBasicDataSelect("Trial_Enroll_Report")).Where(t => t.Code == ((int)taskInfo.CriterionType).ToString()).FirstOrDefault();
 
+                    enrollReplace = _userInfo.IsEn_Us ? findItem.Value : findItem.ValueCN;
 
                     //如果其他阅片人已经做了，说明发送了入组确认报告，第二个人做完就不发送了
 
@@ -328,27 +345,18 @@ namespace IRaCIS.Core.Application.Service
                     }
                     else
                     {
+                        bool isEnroll = false;
+
+                        (answer, isEnroll) = await DealEnrollAnswer(visitTaskId, (Guid)taskInfo.SourceSubjectVisitId, taskInfo.CriterionType, taskInfo.TrialReadingCriterionId);
+
                         isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, new List<Guid>() { visitTaskId }, minUserIdList);
-
-
-                        if (answer == "是")
-                        {
-                            //把另外一个人的任务设置为不加急（如果项目加急是否  subject 加急是否）
-                            var urgent = _subjectVisitRepository.Where(t => t.Id == taskInfo.SourceSubjectVisitId).Select(t => new { IsSubjectUrgent = t.Subject.IsUrgent, t.Trial.IsUrgent }).FirstOrDefault();
-
-                            if (urgent?.IsUrgent == false || urgent?.IsSubjectUrgent == false)
-                            {
-                                await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false &&
-                        t.Id != visitTaskId && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId, u => new VisitTask() { IsUrgent = false });
-                            }
-                        }
-
-
                     }
                 }
                 else if (businessScenarioEnum == EmailBusinessScenario.PDConfirmed)
                 {
+                    var findItem = (await _dictionaryService.GetBasicDataSelect("Trial_PD_Report")).Where(t => t.Code == ((int)taskInfo.CriterionType).ToString()).FirstOrDefault();
 
+                    PdReplace = _userInfo.IsEn_Us ? findItem.Value : findItem.ValueCN;
 
                     //有序
 
@@ -363,7 +371,7 @@ namespace IRaCIS.Core.Application.Service
 
 
                             //仲裁在访视上   就没有全局阅片 没有阅片期
-                            if (taskInfo.ArbitrationRule == ArbitrationRule.Visit)
+                            if (taskInfo.ArbitrationRule == ArbitrationRule.Visit || (taskInfo.ArbitrationRule == ArbitrationRule.Reading && taskInfo.IsGlobalReading == false))
                             {
                                 //找到 访视，裁判 所有有效任务(不可能有全局的)   访视和裁判任务的SourceSubjectVisitId 一样
                                 var taskList = await _visitTaskRepository.Where(t => t.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect &&
@@ -400,8 +408,8 @@ namespace IRaCIS.Core.Application.Service
 
 
                             }
-                            //仲裁在阅片期   
-                            else if (taskInfo.ArbitrationRule == ArbitrationRule.Reading)
+                            //仲裁在阅片期    并且有阅片期
+                            else if (taskInfo.ArbitrationRule == ArbitrationRule.Reading && taskInfo.IsGlobalReading)
                             {
                                 //是访视任务  不可能是裁判任务（访视上不会生成裁判），也不会是全局任务（全局任务 SourceSubjectVisitId=null ）
                                 if (taskInfo.SourceSubjectVisitId != null)
@@ -617,6 +625,8 @@ namespace IRaCIS.Core.Application.Service
 
                 var value = new Dictionary<string, object>()
                 {
+                    ["Criterion_Enroll_Replace"] = enrollReplace,
+                    ["Criterion_PD_Replace"] = PdReplace,
                     ["SponsorName"] = taskInfo.SponsorName,
                     ["ResearchProgramNo"] = taskInfo.ResearchProgramNo,
                     ["TrialSiteCode"] = taskInfo.TrialSiteCode,
@@ -630,6 +640,7 @@ namespace IRaCIS.Core.Application.Service
 
                 var path = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, _userInfo.IsEn_Us ? trialEmailConfig.AttachPath : trialEmailConfig.AttachCNPath);
 
+                //获取从word 到 PDF的路径
                 var (serverFilePath, relativePath, fileRealName) = FileStoreHelper.GetSubjectEnrollConfirmOrPDEmailPath(_hostEnvironment, Path.GetFileName(path), taskInfo.TrialId, taskInfo.TrialSiteId, taskInfo.SubjectId, true);
 
                 if (emailStoreMode == EmailStoreSendMode.StoreLocalSend || emailStoreMode == EmailStoreSendMode.OnlyStoreLocalNotSentEmail)
@@ -653,10 +664,12 @@ namespace IRaCIS.Core.Application.Service
                     {
                         var wordStoreServerPath = Path.Combine(Path.GetDirectoryName(serverFilePath), Path.GetFileNameWithoutExtension(serverFilePath) + ".docx");
 
+                        //模板写入数据先放本地才能转换为pdf
                         using (FileStream fileStream = new FileStream(wordStoreServerPath, FileMode.Create, FileAccess.Write))
                         {
                             wordMemoryStream.WriteTo(fileStream);
                         }
+
                         FileConvertHelper.ConvertWordToPdf(wordStoreServerPath, Path.GetDirectoryName(serverFilePath));
 
                         File.Delete(wordStoreServerPath);
@@ -696,6 +709,7 @@ namespace IRaCIS.Core.Application.Service
                     {
                         var wordStoreServerPath = Path.Combine(Path.GetDirectoryName(serverFilePath), Path.GetFileNameWithoutExtension(serverFilePath) + ".docx");
 
+                        //模板写入数据先放本地才能转换为pdf
                         using (FileStream fileStream = new FileStream(wordStoreServerPath, FileMode.Create, FileAccess.Write))
                         {
                             wordMemoryStream.WriteTo(fileStream);
@@ -856,13 +870,14 @@ namespace IRaCIS.Core.Application.Service
                 var currentLatestPdVisitId = pdSubjectVisitIdList.Last();
                 //标准配置
                 var trialReadingCriterionConfig = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == trialReadingCriterionId).Select(t => new
-                { TrialReadingCriterionId = t.Id, t.ReadingType, t.IsReadingTaskViewInOrder, t.CriterionType, t.ArbitrationRule }).FirstNotNullAsync();
+                { TrialReadingCriterionId = t.Id, t.ReadingType, t.IsReadingTaskViewInOrder, t.CriterionType, t.ArbitrationRule, t.IsGlobalReading }).FirstNotNullAsync();
 
                 // 项目双重
                 if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Double && trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
                 {
-                    //仲裁在访视上面
-                    if (trialReadingCriterionConfig.ArbitrationRule == ArbitrationRule.Visit)
+                    //仲裁在访视上面  或者有阅片期 但是没有全局任务
+                    if (trialReadingCriterionConfig.ArbitrationRule == ArbitrationRule.Visit ||
+                        (trialReadingCriterionConfig.ArbitrationRule == ArbitrationRule.Reading && trialReadingCriterionConfig.IsGlobalReading == false))
                     {
                         //在两位阅片人读完访视后，如果有裁判者等裁判读完，如果无裁判则等第二个人的读完
 
@@ -898,8 +913,8 @@ namespace IRaCIS.Core.Application.Service
                         }
 
                     }
-                    //仲裁在阅片期上
-                    else if (trialReadingCriterionConfig.ArbitrationRule == ArbitrationRule.Reading)
+                    //仲裁在阅片期上 并且有全局任务
+                    else if (trialReadingCriterionConfig.ArbitrationRule == ArbitrationRule.Reading && trialReadingCriterionConfig.IsGlobalReading)
                     {
                         var existReadModule = await _readModuleRepository.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.SubjectVisitId == currentLatestPdVisitId && t.ReadingSetType == ReadingSetType.ImageReading)
                         .FirstOrDefaultAsync();
@@ -911,6 +926,7 @@ namespace IRaCIS.Core.Application.Service
                         }
                         else
                         {
+
                             var taskList = await _visitTaskRepository.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect && t.SouceReadModuleId == existReadModule.Id
                              && (t.ReadingCategory == ReadingCategory.Global || t.ReadingCategory == ReadingCategory.Judge)).ToListAsync();
 
@@ -1042,7 +1058,108 @@ namespace IRaCIS.Core.Application.Service
         }
 
         /// <summary>
-        /// 
+        /// 获取入组结果
+        /// </summary>
+        /// <param name="visitTaskId"></param>
+        /// <param name="subjectVisitId"></param>
+        /// <param name="criterionType"></param>
+        /// <param name="trialReadingCriterionId"></param>
+        /// <returns></returns>
+        private async Task<(string enrollAnswer, bool isEnroll)> DealEnrollAnswer(Guid visitTaskId, Guid subjectVisitId, CriterionType criterionType, Guid trialReadingCriterionId)
+        {
+
+            var enrollAnswer = _userInfo.IsEn_Us ? "No" : "否";
+            var isEnroll = false;
+
+            switch (criterionType)
+            {
+
+                case CriterionType.RECIST1Point1:
+                case CriterionType.RECIST1Pointt1_MB:
+                case CriterionType.IRECIST1Point1:
+                case CriterionType.mRECISTHCC:
+
+                case CriterionType.Lugano2014:
+                case CriterionType.Lugano2014WithoutPET:
+
+                    if (await _readingTableQuestionAnswerRepository.Where().AnyAsync(x => x.VisitTaskId == visitTaskId && x.Answer == TargetState.Exist.GetEnumInt() &&
+               x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State && x.ReadingQuestionTrial.LesionType == LesionType.TargetLesion))
+                    {
+                        enrollAnswer = _userInfo.IsEn_Us ? "Yes" : "是";
+                        isEnroll = true;
+                    }
+
+                    break;
+
+                case CriterionType.PCWG3:
+
+                    var list = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == visitTaskId &&
+x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.ReadingQuestionTrial.LesionType == LesionType.BaselineLesions).Select(t => t.Answer).ToListAsync();
+
+                    bool exists = list.Any(s => int.TryParse(s, out var n) && n >= 1);
+                    if (exists)
+                    {
+                        enrollAnswer = _userInfo.IsEn_Us ? "Yes" : "是";
+                        isEnroll = true;
+                    }
+
+                    break;
+
+                case CriterionType.RANO_BM:
+                    break;
+                case CriterionType.RANO:
+                    break;
+                case CriterionType.IWCLL2018:
+                    break;
+
+                case CriterionType.Cheson2007:
+                    break;
+                case CriterionType.IMWG2016:
+                    break;
+
+                case CriterionType.mRECISTMesothelioma:
+                    break;
+                case CriterionType.RECIL:
+                    break;
+                case CriterionType.RECIST1Point0:
+                    break;
+                case CriterionType.WHO:
+                    break;
+                case CriterionType.PERCIST:
+                    break;
+                case CriterionType.Forrest:
+                    break;
+
+                case CriterionType.IVUS:
+                    break;
+                case CriterionType.OCT:
+                    break;
+                case CriterionType.MRIPDFF:
+                    break;
+                case CriterionType.NoCriterion:
+                    break;
+                case CriterionType.SelfDefine:
+                    break;
+                default:
+                    break;
+            }
+
+            if (enrollAnswer == "是" || enrollAnswer == "Yes")
+            {
+                //把另外一个人的任务设置为不加急（如果项目加急是否  subject 加急是否）
+                var urgent = _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new { IsSubjectUrgent = t.Subject.IsUrgent, t.Trial.IsUrgent }).FirstOrDefault();
+
+                if (urgent?.IsUrgent == false || urgent?.IsSubjectUrgent == false)
+                {
+                    await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.SourceSubjectVisitId == subjectVisitId && t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false &&
+            t.Id != visitTaskId && t.TrialReadingCriterionId == trialReadingCriterionId, u => new VisitTask() { IsUrgent = false });
+                }
+            }
+            return (enrollAnswer, isEnroll);
+        }
+
+        /// <summary>
+        /// 获取PD 结果
         /// </summary>
         /// <param name="visitTaskId"> 任务Id</param>
         /// <param name="readingCategory"> 任务类型</param>
@@ -1057,132 +1174,300 @@ namespace IRaCIS.Core.Application.Service
 
             ReadingTaskQuestionAnswer visitQuestionAnswer = null;
 
-            ReadingTaskQuestionAnswer globalQuestionAnswer = null;
+            ReadingGlobalTaskInfo readingGlobalTaskInfo = null;
 
 
 
+            if (readingCategory == ReadingCategory.Visit)
+            {
+
+
+                switch (criterionType)
+                {
+
+
+                    case CriterionType.RECIST1Point1:
+                    case CriterionType.RECIST1Pointt1_MB:
+                    case CriterionType.IRECIST1Point1:
+                    case CriterionType.mRECISTHCC:
+
+                        visitQuestionAnswer = await _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == visitTaskId && t.ReadingQuestionTrial.QuestionType == QuestionType.Tumor).FirstNotNullAsync();
+
+                        answer = visitQuestionAnswer.Answer;
+
+                        break;
+
+                    case CriterionType.Lugano2014:
+
+                        visitQuestionAnswer = await _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == visitTaskId && t.ReadingQuestionTrial.QuestionType == QuestionType.ImgOncology).FirstNotNullAsync();
+
+                        answer = visitQuestionAnswer.Answer;
+
+                        break;
+
+                    case CriterionType.Lugano2014WithoutPET:
+
+                        visitQuestionAnswer = await _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == visitTaskId && t.ReadingQuestionTrial.QuestionType == QuestionType.CTandMRI).FirstNotNullAsync();
+
+                        answer = visitQuestionAnswer.Answer;
+
+                        break;
+
+                    case CriterionType.PCWG3:
+
+                        visitQuestionAnswer = await _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == visitTaskId && t.ReadingQuestionTrial.QuestionType == QuestionType.SiteVisitForTumorEvaluation).FirstNotNullAsync();
+
+                        answer = visitQuestionAnswer.Answer;
+
+                        break;
+
+                    case CriterionType.SelfDefine:
+                    case CriterionType.mRECISTMesothelioma:
+                    case CriterionType.RECIL:
+                    case CriterionType.RECIST1Point0:
+                    case CriterionType.WHO:
+                    case CriterionType.PERCIST:
+                    case CriterionType.Forrest:
+
+                    case CriterionType.RANO_BM:
+                    case CriterionType.RANO:
+                    case CriterionType.IWCLL2018:
+                    case CriterionType.Cheson2007:
+                    case CriterionType.IMWG2016:
+                    default:
+
+                        //---该标准任务还未定义PD获取逻辑，联系业务和后台开发协商后补充
+                        throw new BusinessValidationFailedException(_localizer["TrialEmailN_PDLogicNotDefined"]);
+                }
+
+
+
+            }
+            else if (readingCategory == ReadingCategory.Global)
+            {
+                switch (criterionType)
+                {
+
+                    case CriterionType.RECIST1Point1:
+                    case CriterionType.RECIST1Pointt1_MB:
+                    case CriterionType.IRECIST1Point1:
+                    case CriterionType.mRECISTHCC:
+
+                        readingGlobalTaskInfo = await _readingGlobalTaskInfoRepository.Where(t => t.GlobalTaskId == visitTaskId && t.TrialReadingQuestion.QuestionType == QuestionType.Tumor).OrderByDescending(c => c.VisitTask.VisitTaskNum).FirstNotNullAsync();
+
+                        answer = readingGlobalTaskInfo.Answer;
+                        if (string.IsNullOrEmpty(readingGlobalTaskInfo.Answer))
+                        {
+                            answer = await _readingTaskQuestionAnswerRepository.Where(t => readingGlobalTaskInfo.TaskId == t.VisitTaskId && t.ReadingQuestionTrial.QuestionType == QuestionType.Tumor)
+                         .Select(t => t.Answer).FirstOrDefaultAsync();
+                        }
+
+                        break;
+
+                    case CriterionType.Lugano2014:
+
+                        readingGlobalTaskInfo = await _readingGlobalTaskInfoRepository.Where(t => t.GlobalTaskId == visitTaskId && t.TrialReadingQuestion.QuestionType == QuestionType.ImgOncology).OrderByDescending(c => c.VisitTask.VisitTaskNum).FirstNotNullAsync();
+
+                        answer = readingGlobalTaskInfo.Answer;
+                        if (string.IsNullOrEmpty(readingGlobalTaskInfo.Answer))
+                        {
+                            answer = await _readingTaskQuestionAnswerRepository.Where(t => readingGlobalTaskInfo.TaskId == t.VisitTaskId && t.ReadingQuestionTrial.QuestionType == QuestionType.ImgOncology)
+                         .Select(t => t.Answer).FirstOrDefaultAsync();
+                        }
+
+                        break;
+                    case CriterionType.Lugano2014WithoutPET:
+
+                        readingGlobalTaskInfo = await _readingGlobalTaskInfoRepository.Where(t => t.GlobalTaskId == visitTaskId && t.TrialReadingQuestion.QuestionType == QuestionType.CTandMRI).OrderByDescending(c => c.VisitTask.VisitTaskNum).FirstNotNullAsync();
+
+                        answer = readingGlobalTaskInfo.Answer;
+                        if (string.IsNullOrEmpty(readingGlobalTaskInfo.Answer))
+                        {
+                            answer = await _readingTaskQuestionAnswerRepository.Where(t => readingGlobalTaskInfo.TaskId == t.VisitTaskId && t.ReadingQuestionTrial.QuestionType == QuestionType.CTandMRI)
+                         .Select(t => t.Answer).FirstOrDefaultAsync();
+                        }
+
+                        break;
+
+                    case CriterionType.PCWG3:
+                        var questionAnsewer = await _readingGlobalTaskInfoRepository.Where(t => t.TaskId == visitTaskId && t.TrialReadingQuestion.QuestionType == QuestionType.SiteVisitForTumorEvaluation).FirstOrDefaultAsync();
+                        if (questionAnsewer != null && questionAnsewer.Answer.IsNotNullOrEmpty())
+                        {
+                            answer = questionAnsewer.Answer;
+                        }
+                        else
+                        {
+                            var visittaskList = await _visitTaskRepository.Where(t => t.Id == visitTaskId).Select(x => x.RelatedVisitTaskIdList).FirstOrDefaultAsync();
+
+                            var task = await _visitTaskRepository.Where(x => visittaskList.Contains(x.Id) && x.ReadingCategory == ReadingCategory.Visit).OrderByDescending(x => x.VisitTaskNum).FirstOrDefaultAsync();
+                            if (task != null)
+                            {
+                                answer = await _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == task.Id && t.ReadingQuestionTrial.QuestionType == QuestionType.SiteVisitForTumorEvaluation)
+                                    .Select(t => t.Answer).FirstOrDefaultAsync();
+                            }
+                        }
+
+
+
+                        break;
+
+
+
+                    case CriterionType.RANO_BM:
+                        break;
+                    case CriterionType.RANO:
+                        break;
+                    case CriterionType.IWCLL2018:
+                        break;
+                    case CriterionType.Cheson2007:
+                        break;
+                    case CriterionType.IMWG2016:
+                        break;
+
+                    case CriterionType.mRECISTMesothelioma:
+                        break;
+                    case CriterionType.RECIL:
+                        break;
+                    case CriterionType.RECIST1Point0:
+                        break;
+                    case CriterionType.WHO:
+                        break;
+                    case CriterionType.PERCIST:
+                        break;
+                    case CriterionType.Forrest:
+                        break;
+
+                    case CriterionType.IVUS:
+                        break;
+                    case CriterionType.OCT:
+                        break;
+                    case CriterionType.MRIPDFF:
+                        break;
+                    case CriterionType.NoCriterion:
+                        break;
+                    case CriterionType.SelfDefine:
+                        break;
+                    default:
+                        break;
+                }
+
+            }
+            else
+            {
+                //---不应有 除访视、裁判、全局其他类型的任务进行发送邮件，请核查业务逻辑
+                throw new BusinessValidationFailedException(_localizer["TrialEmailN_InvalidTaskTypeForEmailSending"]);
+            }
+
+
             switch (criterionType)
             {
 
-
                 case CriterionType.RECIST1Point1:
+                case CriterionType.RECIST1Pointt1_MB:
+                case CriterionType.mRECISTHCC:
 
-                    if (readingCategory == ReadingCategory.Visit)
-                    {
-
-                        visitQuestionAnswer = await _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == visitTaskId && t.ReadingQuestionTrial.QuestionType == QuestionType.Tumor).FirstNotNullAsync();
-
-
-                        answer = visitQuestionAnswer.Answer;
-                    }
-                    else if (readingCategory == ReadingCategory.Global)
-                    {
-                        var questionAnsewer = await _readingGlobalTaskInfoRepository.Where(t => t.GlobalTaskId == visitTaskId && t.TrialReadingQuestion.QuestionType == QuestionType.Tumor).OrderByDescending(c => c.VisitTask.VisitTaskNum).FirstNotNullAsync();
-
-
-                        answer = questionAnsewer.Answer;
-                        if (string.IsNullOrEmpty(questionAnsewer.Answer))
-                        {
-                            answer = await _readingTaskQuestionAnswerRepository.Where(t => questionAnsewer.TaskId == t.VisitTaskId && t.ReadingQuestionTrial.QuestionType == QuestionType.Tumor)
-                         .Select(t => t.Answer).FirstOrDefaultAsync();
-                        }
-
-                    }
-                    //else if (readingCategory == ReadingCategory.Judge)
-                    //{
-                    //    var judgeResultTaskId = await _visitTaskRepository.Where(t => t.Id == visitTaskId).Select(t => t.JudgeResultTaskId).FirstNotNullAsync();
-
-                    //    var questionAnsewer = await _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == judgeResultTaskId && t.ReadingQuestionTrial.QuestionType == QuestionType.Tumor).FirstNotNullAsync();
-
-
-                    //    answer = questionAnsewer.Answer;
-                    //}
-                    else
-                    {
-                        //---不应有 除访视、裁判、全局其他类型的任务进行发送邮件，请核查业务逻辑
-                        throw new BusinessValidationFailedException(_localizer["TrialEmailN_InvalidTaskTypeForEmailSending"]);
-                    }
 
                     if (answer == OverallAssessment.PD.GetEnumInt())
                     {
-                        answer = "是";
+                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
                     }
                     else
                     {
-                        answer = "否";
+                        answer = _userInfo.IsEn_Us ? "No" : "否";
+                    }
+
+                    break;
+                case CriterionType.IRECIST1Point1:
+
+                    if (answer == OverallAssessment.iCPD.GetEnumInt())
+                    {
+                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
+                    }
+                    else
+                    {
+                        answer = _userInfo.IsEn_Us ? "No" : "否";
+                    }
+
+                    break;
+                case CriterionType.Lugano2014WithoutPET:
+
+                    if (answer == CTMRIOverallAssessment.PD.GetEnumInt())
+                    {
+                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
+                    }
+                    else
+                    {
+                        answer = _userInfo.IsEn_Us ? "No" : "否";
+                    }
+
+                    break;
+                case CriterionType.Lugano2014:
+
+                    if (answer == ImagingOverallAssessment_Lugano.PMDPD.GetEnumInt())
+                    {
+                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
+                    }
+                    else
+                    {
+                        answer = _userInfo.IsEn_Us ? "No" : "否";
                     }
 
                     break;
 
+
+
                 case CriterionType.PCWG3:
-                    if (readingCategory == ReadingCategory.Visit)
-                    {
-
-                        visitQuestionAnswer = await _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == visitTaskId && t.ReadingQuestionTrial.QuestionType == QuestionType.SiteVisitForTumorEvaluation).FirstNotNullAsync();
-
-
-                        answer = visitQuestionAnswer.Answer;
-                    }
-                    else if (readingCategory == ReadingCategory.Global)
-                    {
-                        var questionAnsewer = await _readingGlobalTaskInfoRepository.Where(t => t.TaskId == visitTaskId && t.TrialReadingQuestion.QuestionType == QuestionType.SiteVisitForTumorEvaluation).FirstNotNullAsync();
-
-                        answer = questionAnsewer.Answer;
-                    }
-                    //else if (readingCategory == ReadingCategory.Judge)
-                    //{
-                    //    //var judgeResultTaskId = await _visitTaskRepository.Where(t => t.Id == visitTaskId).Select(t => t.JudgeResultTaskId).FirstNotNullAsync();
-
-                    //    var questionAnsewer = await _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == visitTaskId && t.ReadingQuestionTrial.QuestionType == QuestionType.SiteVisitForTumorEvaluation).FirstNotNullAsync();
-
-                    //    answer = questionAnsewer.Answer;
-                    //}
-                    else
-                    {
-                        //---不应有 除访视、裁判、全局其他类型的任务进行发送邮件，请核查业务逻辑
-                        throw new BusinessValidationFailedException(_localizer["TrialEmailN_InvalidTaskTypeForEmailSending"]);
-                    }
 
                     if (answer == VisitTumorEvaluation.PD.GetEnumInt())
                     {
-                        answer = "是";
-                    }
-                    if (answer == VisitTumorEvaluation.ND.GetEnumInt())
-                    {
-                        answer = "ND";
-                    }
-                    if (answer == VisitTumorEvaluation.NE.GetEnumInt())
-                    {
-                        answer = "NE";
+                        answer = _userInfo.IsEn_Us ? "Yes" : "是";
                     }
                     else
                     {
-                        answer = "否";
+                        answer = _userInfo.IsEn_Us ? "No" : "否";
                     }
                     break;
-                case CriterionType.SelfDefine:
-                case CriterionType.mRECISTMesothelioma:
-                case CriterionType.RECIL:
-                case CriterionType.RECIST1Point0:
-                case CriterionType.WHO:
-                case CriterionType.PERCIST:
-                case CriterionType.Forrest:
-                case CriterionType.Lugano2014:
-                case CriterionType.IRECIST1Point1:
+
+
                 case CriterionType.RANO_BM:
+                    break;
                 case CriterionType.RANO:
+                    break;
                 case CriterionType.IWCLL2018:
-                case CriterionType.mRECISTHCC:
+                    break;
+
                 case CriterionType.Cheson2007:
+                    break;
                 case CriterionType.IMWG2016:
+                    break;
+
+                case CriterionType.mRECISTMesothelioma:
+                    break;
+                case CriterionType.RECIL:
+                    break;
+                case CriterionType.RECIST1Point0:
+                    break;
+                case CriterionType.WHO:
+                    break;
+                case CriterionType.PERCIST:
+                    break;
+                case CriterionType.Forrest:
+                    break;
+
+                case CriterionType.IVUS:
+                    break;
+                case CriterionType.OCT:
+                    break;
+                case CriterionType.MRIPDFF:
+                    break;
+                case CriterionType.NoCriterion:
+                    break;
+                case CriterionType.SelfDefine:
+                    break;
                 default:
-
-                    //---该标准任务还未定义PD获取逻辑，联系业务和后台开发协商后补充
-                    throw new BusinessValidationFailedException(_localizer["TrialEmailN_PDLogicNotDefined"]);
+                    break;
             }
 
-
-
             return answer;
 
 
@@ -1333,7 +1618,10 @@ namespace IRaCIS.Core.Application.Service
                 item.IsAutoSend = true;
                 item.IsEnable = true;
 
-                item.TrialReadingCriterionId = list.FirstOrDefault(t => t.CriterionType == item.CriterionTypeEnum)?.TrialReadingCriterionId;
+                //item.TrialReadingCriterionId = list.FirstOrDefault(t => t.CriterionType == item.CriterionTypeEnum)?.TrialReadingCriterionId;
+
+                item.CriterionTypeList = item.CriterionTypeList.Where(t => list.Any(c => c.CriterionType == t)).ToList();
+
 
                 item.TrialEmailNoticeUserList.AddRange(batchAddList.Where(t => t.Id == item.SysEmailNoticeConfigId)
                     .SelectMany(t => t.ToUserTypeList).Select(t => new TrialEmailNoticeUser() { EmailUserType = EmailUserType.To, UserType = t }));
@@ -1349,16 +1637,25 @@ namespace IRaCIS.Core.Application.Service
             await _trialEmailNoticeConfigRepository.SaveChangesAsync();
 
             //处理定时任务
-            var taskInfoList = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId== trialId && t.EmailCron != string.Empty && t.IsAutoSend)
-             .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
+            var taskInfoList = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId == trialId && t.EmailCron != string.Empty)
+             .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId, t.IsEnable, t.IsAutoSend })
              .ToListAsync();
 
             foreach (var task in taskInfoList)
             {
+
                 //利用主键作为任务Id
                 var jobId = $"{task.TrialId}({task.TrialCode})_({task.BusinessScenarioEnum})";
 
-                HangfireJobHelper.AddOrUpdateTrialCronJob(jobId, trialId, task.BusinessScenarioEnum, task.EmailCron);
+                if (task.IsEnable && task.IsAutoSend)
+                {
+                    HangfireJobHelper.AddOrUpdateTrialCronJob(jobId, trialId, task.BusinessScenarioEnum, task.EmailCron);
+
+                }
+                else
+                {
+                    HangfireJobHelper.RemoveCronJob(jobId);
+                }
             }
 
             return ResponseOutput.Ok();
@@ -1376,9 +1673,9 @@ namespace IRaCIS.Core.Application.Service
             var trialConfig = _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new { t.IsEnrollementQualificationConfirm, t.IsPDProgressView }).First();
 
             var trialEmailNoticeConfigQueryable = _trialEmailNoticeConfigRepository.Where(t => t.TrialId == inQuery.TrialId)
-              .WhereIf(inQuery.IsDistinguishCriteria == false, t => t.TrialReadingCriterionId == null)
-              .WhereIf(inQuery.IsDistinguishCriteria == true, t => t.CriterionTypeEnum != null)
-              .WhereIf(inQuery.TrialReadingCriterionId != null, t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
+              .WhereIf(inQuery.IsDistinguishCriteria == false, t => t.IsDistinguishCriteria == false)
+              .WhereIf(inQuery.IsDistinguishCriteria == true, t => t.IsDistinguishCriteria == true)
+              .WhereIf(inQuery.CriterionTypeEnum != null, t => t.CriterionTypeList.Any(c => c == inQuery.CriterionTypeEnum))
               .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
               .WhereIf(inQuery.EmailUrgentEnum != null, t => t.EmailUrgentEnum == inQuery.EmailUrgentEnum)
               .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable)
@@ -1466,22 +1763,22 @@ namespace IRaCIS.Core.Application.Service
 
                 await _trialEmailNoticeConfigRepository.SaveChangesAsync();
 
-                var cronInfo = await _trialEmailNoticeConfigRepository.Where(t => t.Id == addOrEditTrialEmailNoticeConfig.Id)
-            .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
-            .FirstAsync();
+                //    var cronInfo = await _trialEmailNoticeConfigRepository.Where(t => t.Id == addOrEditTrialEmailNoticeConfig.Id)
+                //.Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
+                //.FirstAsync();
 
-                var jobId = $"{cronInfo.TrialId}({cronInfo.TrialCode})_({cronInfo.BusinessScenarioEnum})";
+                //    var jobId = $"{cronInfo.TrialId}({cronInfo.TrialCode})_({cronInfo.BusinessScenarioEnum})";
 
 
-                if (addOrEditTrialEmailNoticeConfig.IsAutoSend)
-                {
-                    HangfireJobHelper.AddOrUpdateTrialCronJob(jobId, addOrEditTrialEmailNoticeConfig.TrialId, addOrEditTrialEmailNoticeConfig.BusinessScenarioEnum, addOrEditTrialEmailNoticeConfig.EmailCron);
+                //    if (addOrEditTrialEmailNoticeConfig.IsAutoSend)
+                //    {
+                //        HangfireJobHelper.AddOrUpdateTrialCronJob(jobId, addOrEditTrialEmailNoticeConfig.TrialId, addOrEditTrialEmailNoticeConfig.BusinessScenarioEnum, addOrEditTrialEmailNoticeConfig.EmailCron);
 
-                }
-                else
-                {
-                    HangfireJobHelper.RemoveCronJob(jobId);
-                }
+                //    }
+                //    else
+                //    {
+                //        HangfireJobHelper.RemoveCronJob(jobId);
+                //    }
 
                 return ResponseOutput.Ok();
             }

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

@@ -0,0 +1,94 @@
+
+//--------------------------------------------------------------------
+//     此代码由liquid模板自动生成  byzhouhang 20240909
+//     生成时间 2025-06-09 02:09:09Z 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using IRaCIS.Core.Domain.Models;
+using Microsoft.AspNetCore.Mvc;
+using IRaCIS.Core.Application.Interfaces;
+using IRaCIS.Core.Infrastructure.Extention;
+using System.Threading.Tasks;
+using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Core.Application.Service.DTO;
+using IRaCIS.Core.Application.MassTransit.Command;
+namespace IRaCIS.Core.Application.Service;
+
+/// <summary>
+/// 项目历史记录文件服务
+/// </summary>
+[ApiExplorerSettings(GroupName = "FileRecord")]
+public class TrialHistoryRecordFileService(IRepository<TrialHistoryRecordFile> _trialHistoryRecordFileRepository,
+                                  IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer): BaseService, ITrialHistoryRecordFileService
+{
+
+    /// <summary>
+    /// 获取稽查记录文件列表
+    /// </summary>
+    /// <param name="inQuery"></param>
+    /// <returns></returns>
+    [HttpPost]
+	public async Task<PageOutput<TrialHistoryRecordFileView>>  GetTrialHistoryRecordFileList(TrialHistoryRecordFileQuery inQuery)
+	{
+			
+		    var trialHistoryRecordFileQueryable =_trialHistoryRecordFileRepository
+			.WhereIf(inQuery.TrialRecordId!=null,x=>x.TrialRecordId==inQuery.TrialRecordId)
+            .WhereIf(inQuery.TrialFileTypeId != null, x => x.TrialFileTypeId == inQuery.TrialFileTypeId)
+             .WhereIf(inQuery.FileName.IsNotNullOrEmpty(), x => x.FileName.Contains(x.FileName))
+                                        .ProjectTo<TrialHistoryRecordFileView>(_mapper.ConfigurationProvider);
+
+            var pageList= await trialHistoryRecordFileQueryable.ToPagedListAsync(inQuery);
+
+        return pageList;
+	}
+
+    /// <summary>
+    /// 批量新增稽查记录文件
+    /// </summary>
+    /// <param name="inDto"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public async Task<IResponseOutput> BatchAddTrialHistoryRecordFile(List<TrialHistoryRecordFileAddOrEdit> inDto)
+    {
+        List<TrialHistoryRecordFile> entities = _mapper.Map<List<TrialHistoryRecordFile>>(inDto);
+        await _trialHistoryRecordFileRepository.AddRangeAsync(entities);
+
+        await _trialHistoryRecordFileRepository.SaveChangesAsync();
+        return ResponseOutput.Ok(true);
+    }
+
+    /// <summary>
+    /// 新增或修改稽查记录文件
+    /// </summary>
+    /// <param name="addOrEditTrialHistoryRecordFile"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public async  Task<IResponseOutput> AddOrUpdateTrialHistoryRecordFile(TrialHistoryRecordFileAddOrEdit addOrEditTrialHistoryRecordFile)
+	{
+		    //  在此处拷贝automapper 映射
+			  
+         
+
+
+			var entity = await _trialHistoryRecordFileRepository.InsertOrUpdateAsync(addOrEditTrialHistoryRecordFile, true);
+
+        return ResponseOutput.Ok(entity.Id.ToString());
+		
+	}
+
+    /// <summary>
+    /// 删除稽查记录文件
+    /// </summary>
+    /// <param name="trialHistoryRecordFileId"></param>
+    /// <returns></returns>
+	[HttpDelete("{trialHistoryRecordFileId:guid}")]
+    public async Task<IResponseOutput> DeleteTrialHistoryRecordFile(Guid trialHistoryRecordFileId)
+	{
+			var success = await _trialHistoryRecordFileRepository.DeleteFromQueryAsync(t => t.Id == trialHistoryRecordFileId,true);
+            return ResponseOutput.Ok();
+	}
+      
+}
+
+
+

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

@@ -2,6 +2,7 @@
 using AutoMapper.EquivalencyExpression;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Service.DTO;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Infrastructure.Extention;
 
@@ -16,6 +17,8 @@ namespace IRaCIS.Core.Application.Service
             var isEn_Us = false;
 
             //  在此处拷贝automapper 映射
+            CreateMap<TrialDocumentAttachment, TrialDocumentAttachmentView>();
+            CreateMap<TrialDocumentAttachment, TrialDocumentAttachmentAddOrEdit>().ReverseMap();
 
             CreateMap<SystemDocumentAttachment, SystemDocumentAttachmentView>();
             CreateMap<SystemDocumentAttachment, SystemDocumentAttachmentAddOrEdit>().ReverseMap();
@@ -26,7 +29,8 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<AuditDocument, AuditDocumentUpdateDto>();
             CreateMap<AuditDocument, HistoricalVersionDto>();
             CreateMap<AuditDocumentUpdateDto, AuditDocumentAddOrEdit>();
-            CreateMap<AuditDocument, AuditDocumentData>();
+            CreateMap<AuditDocument, AuditDocumentData>()
+                .ForMember(d => d.HistoricalVersionsCount, u => u.MapFrom(s => s.AuditDocumentOldVersionList.Count()));
             CreateMap<AuditDocument, AuditDocumentAddOrEdit>().ReverseMap();
             CreateMap<SystemDocument, SystemDocumentView>()
                   .ForMember(d => d.AttachmentCount, u => u.MapFrom(s => s.SystemDocumentAttachmentList.Count()))
@@ -40,6 +44,7 @@ namespace IRaCIS.Core.Application.Service
                .ForMember(dest => dest.CreateUserRole, opt => opt.Ignore());
 
             CreateMap<TrialDocument, TrialDocumentView>()
+                    .ForMember(d => d.AttachmentCount, u => u.MapFrom(s => s.TrialDocumentAttachmentList.Count()))
                 .ForMember(d => d.FileType, u => u.MapFrom(s => isEn_Us ? s.FileType.Value : s.FileType.ValueCN))
                 .ForMember(d => d.IsSomeUserSigned, u => u.MapFrom(s => s.TrialDocConfirmedUserList.Any(t => t.ConfirmTime != null)))
                 .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path));
@@ -77,7 +82,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<BatchAddTrialEmailNoticeConfig, TrialEmailNoticeConfig>();
 
-            CreateMap<TrialSelectEmailNoticeConfigView, BatchAddTrialEmailNoticeConfig > ();
+            CreateMap<TrialSelectEmailNoticeConfigView, BatchAddTrialEmailNoticeConfig>();
 
 
             CreateMap<AddOrEditTrialDocument, TrialDocument>()
@@ -90,13 +95,14 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<AddOrEditSystemDocument, SystemDocument>().ForMember(d => d.NeedConfirmedUserTypeList, c => c.MapFrom(t => t.NeedConfirmedUserTypeIdList));
-            CreateMap<Guid, SystemDocNeedConfirmedUserType>().EqualityComparison((odto, o) => odto == o.NeedConfirmUserTypeId)
+            CreateMap<Guid, SystemDocNeedConfirmedUserType>()
+                .EqualityComparison((odto, o) => odto == o.NeedConfirmUserTypeId)
                .ForMember(d => d.NeedConfirmUserTypeId, c => c.MapFrom(t => t))
                .ForMember(d => d.SystemDocumentId, c => c.Ignore());
 
 
             CreateMap<TrialEmailNoticeConfig, TrialEmailNoticeConfigView>()
-
+                .ForMember(d => d.SysCriterionTypeList, c => c.MapFrom(t => t.SysEmailNoticeConfig.CriterionTypeList))
                 .ForMember(d => d.TrialCriterionName, c => c.MapFrom(t => t.TrialReadingCriterion.CriterionName))
                  .ForMember(d => d.TrialEmailNoticeUserList, c => c.MapFrom(t => t.TrialEmailNoticeUserList));
 
@@ -121,7 +127,8 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<TrialFileType, TrialFileTypeAddOrEdit>().ReverseMap();
 
-            CreateMap<TrialFinalRecord, TrialFinalRecordView>();
+            CreateMap<TrialFinalRecord, TrialFinalRecordView>()
+                  .ForMember(d => d.HistoryCount, c => c.MapFrom(t => t.TrialHistoryRecordFileList.Count));
             CreateMap<TrialFinalRecordAddOrEdit, TrialFinalRecord>();
             //.ForMember(d => d.HistoryFileRecord.TrialFileTypeId, c => c.MapFrom(t => t.TrialFileTypeId))
             //.ForMember(d => d.SignFileRecord.TrialFileTypeId, c => c.MapFrom(t => t.TrialFileTypeId))
@@ -129,14 +136,37 @@ namespace IRaCIS.Core.Application.Service
             //.ForMember(d => d.PDFFileRecord.TrialFileTypeId, c => c.MapFrom(t => t.TrialFileTypeId));
 
             CreateMap<TrialNormalRecord, TrialNormalRecordView>()
+                .ForMember(d => d.HistoryCount, c => c.MapFrom(t => t.TrialHistoryRecordFileList.Count))
                   .ForMember(d => d.FileName, c => c.MapFrom(t => t.TrialFileRecord.FileName));
             CreateMap<TrialNormalRecord, TrialNormalRecordAddOrEdit>().ReverseMap();
 
             CreateMap<TrialTrianingRecord, TrialTrianingRecordView>()
+                .ForMember(d => d.HistoryCount, c => c.MapFrom(t => t.TrialHistoryRecordFileList.Count))
             .ForMember(d => d.FileName, c => c.MapFrom(t => t.TrialFileRecord.FileName));
             CreateMap<TrialTrianingRecord, TrialTrianingRecordAddOrEdit>().ReverseMap();
 
 
+            CreateMap<TrialHistoryRecordFile, TrialHistoryRecordFileView>();
+            CreateMap<TrialHistoryRecordFile, TrialHistoryRecordFileAddOrEdit>().ReverseMap();
+
+
+
+            CreateMap<AuditRecord, AuditRecordView>()
+                 .ForMember(d => d.IdentityUserList, c => c.MapFrom(t => t.AuditRecordIdentityUserList));
+
+            CreateMap<AuditRecordAddOrEdit, AuditRecord>()
+                /* .ForMember(d => d.AuditRecordIdentityUserList, c => c.MapFrom(t => t.IdnetityUserIdList))*/;
+
+            CreateMap<Guid, AuditRecordIdentityUser>()
+                 .EqualityComparison((odto, o) => odto == o.IdentityUserId)
+               .ForMember(d => d.AuditRecordId, c => c.Ignore())
+                .ForMember(d => d.IdentityUserId, c => c.MapFrom(t => t));
+
+
+            CreateMap<AuditRecordIdentityUser, AuditIdentiUserInfo>()
+                 .ForMember(d => d.Id, c => c.MapFrom(t => t.IdentityUser.Id))
+                 .ForMember(d => d.UserName, c => c.MapFrom(t => t.IdentityUser.UserName))
+                 .ForMember(d => d.FullName, c => c.MapFrom(t => t.IdentityUser.FullName));
 
         }
     }

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

@@ -50,6 +50,10 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
         public string? WindowWidth => InstanceInfoList.FirstOrDefault()?.WindowWidth;
 
         public string ImageResizePath { get; set; }
+
+        public string VisitName { get; set; }
+
+        public string SubjectCode { get; set; }
     }
 
     public class StudyInstanceInfo
@@ -66,6 +70,12 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
         public Guid? InstanceId { get; set; }
 
         public int? NumberOfFrames { get; set; }
+
+        public DateTime CreateTime { get; set; }
+
+        public int? QuestionSort { get; set; }
+
+        public int? RowSort { get; set; }
     }
     public class InstanceBasicInfo
     {
@@ -98,6 +108,8 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
         public string WindowCenter { get; set; }
         [JsonIgnore]
         public string WindowWidth { get; set; }
+
+        public DateTime? RowDate { get; set; }
     }
 
     public class DicomSeriesWithLabelDTO : DicomSeriesDTO

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

@@ -1,4 +1,5 @@
 using IRaCIS.Core.Domain.Share;
+using Newtonsoft.Json;
 
 namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
 {
@@ -27,6 +28,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
 
         public List<StudyBasicInfo> UploadStudyList { get; set; }
 
+        [JsonIgnore]
+        public List<StudyBasicInfo> OriginalTaskStudyList { get; set; }
+
     }
 
 
@@ -102,6 +106,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
 
         public string BodyPartForEdit { get; set; }
 
+        public string BodyPartForEditOther { get; set; }
+
         public DateTime? StudyTime { get; set; }
 
         public string Modalities { get; set; }
@@ -114,6 +120,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
         public int ReadingSeriesCount { get; set; }
 
         public int ReadingInstanceCount { get; set; }
+
+        public Guid? SubjectVisitId { get; set; }
     }
 
     public class NoneDicomStudyBasicInfo
@@ -126,6 +134,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
 
         public string BodyPart { get; set; }
 
+        public string BodyPartForEditOther { get; set; }
+
         public string Modality { get; set; }
 
         public DateTime ImageDate { get; set; }
@@ -136,5 +146,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
         public int ReadingFileCount { get; set; }
 
     }
+
+    public class ImageMarkNoneDicomStudyBasicInfo: NoneDicomStudyBasicInfo
+    {
+        public Guid SubjectVisitId { get; set; }
+    }
 }
 

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

@@ -1,4 +1,5 @@
-using IRaCIS.Core.Application.Service.ImageAndDoc.DTO;
+using FellowOakDicom;
+using IRaCIS.Core.Application.Service.ImageAndDoc.DTO;
 using IRaCIS.Core.Domain.Share;
 using Newtonsoft.Json;
 using System.ComponentModel.DataAnnotations;
@@ -187,6 +188,7 @@ namespace IRaCIS.Core.Application.Contracts
         public Guid SubjectVisitId { get; set; }
 
         public int FileCount { get; set; }
+
     }
 
     public class PreArchiveDicomStudyCommand
@@ -236,6 +238,9 @@ namespace IRaCIS.Core.Application.Contracts
 
         public Guid? VisitTaskId { get; set; }
 
+
+        public bool? IsImageSegmentLabel { get; set; }
+
     }
 
     public class TaskStudyArchiveConfirmResult
@@ -264,8 +269,9 @@ namespace IRaCIS.Core.Application.Contracts
 
         public AddOrUpdateStudyDto Study { get; set; }
 
-        [NotDefault]
-        public Guid VisitTaskId { get; set; }
+        public Guid? VisitTaskId { get; set; }
+
+        public bool? IsImageSegmentLabel { get; set; }
     }
 
     public class NewArchiveStudyCommand
@@ -323,9 +329,14 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string BodyPartExamined { get; set; } = string.Empty;
 
+        public string DicomStudyDate { get; set; }
+
+        public string DicomStudyTime { get; set; }
+
         public List<AddOrUpdateSeriesDto> SeriesList { get; set; }
 
 
+
     }
 
     public class AddOrUpdateSeriesDto
@@ -351,6 +362,12 @@ namespace IRaCIS.Core.Application.Contracts
         public string TriggerTime { get; set; } = string.Empty;
 
         public string ImageResizePath { get; set; } = string.Empty;
+
+        public string DicomSeriesDate { get; set; }
+
+        public string DicomSeriesTime { get; set; }
+
+
         public List<AddInstanceDto> InstanceList { get; set; }
 
         public Guid? VisitTaskId { get; set; }
@@ -385,6 +402,17 @@ namespace IRaCIS.Core.Application.Contracts
         public string HtmlPath { get; set; } = string.Empty;
 
         public long FileSize { get; set; }
+
+        public string SOPClassUID { get; set; }
+
+        public string MediaStorageSOPClassUID { get; set; }
+
+        public string TransferSytaxUID { get; set; }
+
+        public string MediaStorageSOPInstanceUID { get; set; }
+
+        public bool IsEncapsulated => DicomTransferSyntax.Lookup(DicomUID.Parse(TransferSytaxUID)).IsEncapsulated;
+
     }
 
     public class CRCUploadTaskQuery
@@ -417,12 +445,17 @@ namespace IRaCIS.Core.Application.Contracts
         public string? SubjectCode { get; set; }
 
         public Guid? VisitTaskId { get; set; }
+
+        public bool? IsImageSegmentLabel { get; set; }
+
+        public Guid? SubjectVisitId { get; set; }
     }
 
     public class IRTaskUploadedDicomStudyQuery
     {
-        [NotDefault]
-        public Guid VisitTaskId { get; set; }
+        public Guid? VisitTaskId { get; set; }
+
+        public Guid? SubjectVisitId { get; set; }
     }
 
     public class IRUploadTaskDicomStudyDto : DicomStudyBasicInfo
@@ -496,13 +529,81 @@ namespace IRaCIS.Core.Application.Contracts
         public string TaskBlindName { get; set; }
 
         public string TaskName { get; set; }
+
+        public string VisitName { get; set; }
         public Guid? SourceSubjectVisitId { get; set; }
 
         public ReadingTaskState ReadingTaskState { get; set; }
 
     }
 
+    #region 下载重新生成名字
+    public class ImageDownloadDto
+    {
+        public Guid TrialId { get; set; }
+        public Guid SubjectId { get; set; }
+        public string SubjectCode { get; set; }
+        public string TrialSiteCode { get; set; }
+        public string VisitName { get; set; }
 
+        public string TaskBlindName { get; set; }
+
+        
+        public Guid VisitId { get; set; }
+
+        public List<DownloadDicomStudyDto> StudyList { get; set; }
+
+        [JsonIgnore]
+        public List<DownloadDicomStudyDto> TaskStudyList { get; set; }
+
+        public List<DownloadNoneDicomStudyDto> NoneDicomStudyList { get; set; }
+    }
+
+    public class DownloadDicomStudyDto
+    {
+        public string PatientId { get; set; }
+        public DateTime? StudyTime { get; set; }
+        public string StudyCode { get; set; }
+        public string StudyInstanceUid { get; set; }
+        public string StudyDIRPath { get; set; }
+
+        public List<DownloadDicomSeriesDto> SeriesList { get; set; } 
+    }
+
+    public class DownloadDicomSeriesDto
+    {
+        public string Modality { get; set; }
+
+        public List<DownloadDicomInstanceDto> InstanceList { get; set; } 
+    }
+
+    public class DownloadDicomInstanceDto
+    {
+        public bool IsEncapsulated { get; set; }
+        public Guid InstanceId { get; set; }
+        public string FileName { get; set; }
+        public string Path { get; set; }
+        public long? FileSize { get; set; }
+    }
+
+    public class DownloadNoneDicomStudyDto
+    {
+        public string Modality { get; set; }
+        public string StudyCode { get; set; }
+        public DateTime? ImageDate { get; set; }
+
+        public List<DownloadNoneDicomFileDto> FileList { get; set; } = new();
+    }
+
+    public class DownloadNoneDicomFileDto
+    {
+        public string FileName { get; set; }
+        public string Path { get; set; }
+        public string FileType { get; set; }
+        public long? FileSize { get; set; }
+    }
+
+    #endregion
 
     public class CRCUploadedStudyQuqry
     {
@@ -524,6 +625,8 @@ namespace IRaCIS.Core.Application.Contracts
         public string? SubjectCode { get; set; }
 
         public Guid? VisitTaskId { get; set; }
+
+        public bool? IsImageSegmentLabel { get; set; }
     }
 
 
@@ -544,8 +647,183 @@ namespace IRaCIS.Core.Application.Contracts
 
         public List<Guid> NoneDicomStudyIdList { get; set; }
 
+        public bool? IsImageSegmentLabel { get; set; }
+
     }
 
+    public class TrialKeyImageExportDTO
+    {
+        public Guid Id { get; set; }
+        public string ResearchProgramNo { get; set; }
+        public string CriterionName { get; set; }
+        public ArbitrationRule ArbitrationRule { get; set; }
+
+        public bool IsGlobalReading { get; set; }
+
+        public List<decimal> SubjectCriterionReadingPeriodVisitNumList { get; set; }
+
+        public string TrialSiteCode { get; set; }
+
+        public string VisitName { get; set; }
+
+        public Decimal VisitTaskNum { get; set; }
+
+        public string SubjectCode { get; set; }
+
+        public Arm ArmEnum { get; set; }
+
+        public Guid? JudgeResultTaskId { get; set; }
+
+        public bool? IsTrigerJudge { get; set; }
+        public bool? IsJudgeSelect { get; set; }
+
+        public ReadingCategory ReadingCategory { get; set; }
+
+        public List<TrialKeyPicturePath> ReadingNoneDicomMarkPathList { get; set; }
+        public List<TrialKeyPicturePath> QuestionMarkPictureList { get; set; }
+
+        public List<TrialKeyPicturePath> TableQuestionRowPictureList { get; set; }
+    }
+    public class TrialKeyPicturePath
+    {
+        public string PicturePath { get; set; }
+
+        public string OtherPicturePath { get; set; }
+    }
+    public class TrialExportImageCommand
+    {
+        [NotDefault]
+        public Guid TrialId { get; set; }
+
+        public List<Guid> SubjectVisitIdList { get; set; }
+
+
+        public bool IsKeyImage { get; set; }
+
+        // true 导出阅片，null 就是所有影像
+        public bool? IsExportReading { get; set; }
+    }
+
+
+    public class TrialVisitImageQuery : PageInput
+    {
+        [NotDefault]
+        public Guid TrialId { get; set; }
+
+
+        public Guid? TrialSiteId { get; set; }
+
+        public string? SubjectCode { get; set; }
+
+        public DateTime? BeginScanDate { get; set; }
+        public DateTime? EndScanDate { get; set; }
+    }
+    public class TrialVisitImageStatView
+    {
+        public Guid TrialId { get; set; }
+
+        public Guid SubjectVisitId { get; set; }
+
+        public Guid TrialSiteId { get; set; }
+
+        public string TrialSiteCode { get; set; }
+
+        public string SubjectCode { get; set; }
+
+        public string VisitName { get; set; }
+
+        public decimal VisitNum { get; set; }
+
+        public DateTime? EarliestScanDate { get; set; }
+        public DateTime? LatestScanDate { get; set; }
+
+
+
+        public int TotalStudyCount { get; set; }
+
+        public int TotalImageCount { get; set; }
+
+        public long? TotalImageSize { get; set; }
+
+        public long? TotalReadingImageSize { get; set; }
+
+        public string TotalImageSizeStr => TotalImageSize.HasValue
+        ? $"{TotalImageSize.Value / 1024d / 1024d:F3} MB"
+        : "0.000 MB";
+
+        public string TotalReadingImageSizeStr => TotalReadingImageSize.HasValue
+       ? $"{TotalReadingImageSize.Value / 1024d / 1024d:F3} MB"
+       : "0.000 MB";
+
+        public string ImageTypeStr => $"{(IsHaveDicom ? "DICOM" : "")}{(IsHaveNoneDicom&&IsHaveDicom?" , ":"")}{(IsHaveNoneDicom ? "Non-DICOM" : "")}";
+
+        public bool IsHaveDicom { get; set; }
+
+        public bool IsHaveNoneDicom { get; set; }
+
+        #region 废弃，为了字段排序
+        //public int TotalStudyCount => DicomStudyCount + NoneDicomStudyCount;
+
+        //public int TotalImageCount => DicomImageCount + NoneDicomImageCount;
+
+        //public long? TotalImageSize => DicomImageSize + NoneDicomImageSize;
+
+        //public int DicomStudyCount { get; set; }
+        //public int DicomImageCount { get; set; }
+        //public long? DicomImageSize { get; set; }
+
+
+        //public int NoneDicomStudyCount { get; set; }
+        //public int NoneDicomImageCount { get; set; }
+        //public long? NoneDicomImageSize { get; set; }
+
+        #endregion
+
+
+    }
+
+
+    public class TrialImageStatInfo
+    {
+        public int SubjectCount { get; set; }
+
+        public int SubjectVisitCount { get; set; }
+
+        public long? TotalImageSize { get; set; }
+
+
+        public string TotalImageSizeStr => TotalImageSize.HasValue
+            ? $"{TotalImageSize.Value / 1024d / 1024d:F3} MB"
+            : "0.000 MB";
+
+
+        public string SubjectImageAVGSizeStr => TotalImageSize.HasValue
+        ? $"{TotalImageSize.Value / SubjectCount / 1024d / 1024d:F3} MB"
+        : "0.000 MB";
+
+
+        public string SubjectVisitImageAVGSizeStr => TotalImageSize.HasValue
+        ? $"{TotalImageSize.Value / SubjectVisitCount / 1024d / 1024d:F3} MB"
+        : "0.000 MB";
+
+        public long? TotalReadingImageSize { get; set; }
+
+
+        public string TotalReadingImageSizeStr => TotalReadingImageSize.HasValue
+          ? $"{TotalReadingImageSize.Value / 1024d / 1024d:F3} MB"
+          : "0.000 MB";
+
+
+        public string SubjectReadingImageAVGSizeStr => TotalReadingImageSize.HasValue
+        ? $"{TotalReadingImageSize.Value / SubjectCount / 1024d / 1024d:F3} MB"
+        : "0.000 MB";
+
+
+        public string SubjectVisitReadingImageAVGSizeStr => TotalReadingImageSize.HasValue
+        ? $"{TotalReadingImageSize.Value / SubjectVisitCount / 1024d / 1024d:F3} MB"
+        : "0.000 MB";
+
+    }
     public class TrialImageDownloadView
     {
         public Guid TrialId { get; set; }
@@ -620,4 +898,88 @@ namespace IRaCIS.Core.Application.Contracts
 
         public Guid TaskId { get; set; }
     }
+
+
+    public class SubjectVisitMarkQuery:PageInput
+    {
+        public Guid TrialId { get; set; }
+
+        public Guid? SubjectId { get; set; }
+
+        public Guid? TrialReadingCriterionId { get; set; }
+
+        public string? SubjectCode { get; set; }
+
+        public bool? IsUrgent { get; set; }
+
+
+    }
+
+    public class SubjectVisitMarkDTO
+    {
+        public Guid TrialId { get; set; }
+
+        public Guid SubjectId { get; set; }
+
+        public bool IsUrgent { get; set; }
+
+
+        public string SubjectCode { get; set; }
+
+        public int? VisitCount { get; set; }
+
+
+        public int? MarkVisitCount { get; set; }
+
+
+        public int? DicomStudyCount { get; set; }
+
+        public int? MarkDicomStudyCount { get; set; }
+
+        public int? NoneDicomStudyCount { get; set; }
+
+        public int? MarkNoneDicomStudyCount { get; set; }
+    }
+
+    public class SubjectVisitMarkStudyDto
+    {
+        public bool IsDicom => DicomStudyList.Count() > 0;
+
+        public Guid VisitTaskId { get; set; }
+
+        public Guid SubjectId { get; set; }
+
+        public string SubjectCode { get; set; }
+
+        public string VisitName { get; set; }
+
+        public Guid SourceSubjectVisitId { get; set; }
+
+
+        public List<DicomStudyBasicInfo> DicomStudyList { get; set; } = new List<DicomStudyBasicInfo>();
+
+        public List<NoneDicomStudyBasicInfo> NoneDicomStudyList { get; set; }
+    }
+
+
+    public class SubjectVisitMarkUploadDto
+    {
+        public Guid SubjectVisitId { get; set; }
+        public Guid TrialSiteId { get; set; }
+
+        public Guid SubejctId { get; set; }
+
+        public string SubjectCode { get; set; }
+
+        public string VisitName { get; set; }
+
+        public Guid? SourceSubjectVisitId => SubjectVisitId;
+
+        //防止前端null 故意返回
+        public Guid VisitTaskId { get; set; }
+
+        public List<StudyBasicInfo> OrginalStudyList { get; set; }
+
+        public List<StudyBasicInfo> UploadStudyList { get; set; }
+    }
 }

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

@@ -9,7 +9,7 @@ namespace IRaCIS.Core.Application.Services
 {
     [ApiExplorerSettings(GroupName = "Image")]
     [AllowAnonymous]
-    public class InstanceService(IRepository<DicomInstance> _instanceRepository, 
+    public class InstanceService(IRepository<DicomInstance> _instanceRepository,
         IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService, IInstanceService
     {
 
@@ -29,7 +29,14 @@ namespace IRaCIS.Core.Application.Services
                 .OrderBy(s => s.InstanceNumber).ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
                 .ProjectTo<DicomInstanceDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
-            var seriesInfo = await _instanceRepository.Where(s => s.SeriesId == seriesId).Select(t => new { t.DicomSerie.ImageResizePath,t.DicomSerie.IsDeleted,t.DicomSerie.IsReading }).FirstOrDefaultAsync();
+            var seriesInfo = await _instanceRepository.Where(s => s.SeriesId == seriesId).Select(t => new
+            {
+                t.DicomSerie.ImageResizePath,
+                t.DicomSerie.IsDeleted,
+                t.DicomSerie.IsReading,
+                SubjectCode = t.DicomSerie.SubjectVisit.Subject.Code,
+                t.DicomSerie.SubjectVisit.VisitName
+            }).FirstOrDefaultAsync();
 
             return ResponseOutput.Ok(list, seriesInfo);
         }