修改

疾病进展计算修改

.dockerignore

@@ -0,0 +1,30 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
+!**/.gitignore
+!.git/HEAD
+!.git/config
+!.git/packed-refs
+!.git/refs/heads/**

IRaCIS.Core.API/1Program.cs

@@ -1,112 +0,0 @@
-using System;
-using Autofac.Extensions.DependencyInjection;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Configuration;
-using Serilog;
-using MediatR;
-using IRaCIS.Core.Application.MediatR.Handlers;
-using System.Threading.Tasks;
-using MassTransit;
-using MassTransit.NewIdProviders;
-using System.IO;
-using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infra.EFCore;
-using IRaCIS.Core.Application.Helper;
-using System.Runtime.InteropServices;
-
-namespace IRaCIS.Core.API
-{
-    public class Program1
-    {
-        public readonly string environment;
-        public static async Task Main(string[] args)
-        {
-            try
-            {
-                //以配置文件为准，否则 从url中取环境值(服务以命令行传递参数启动，配置文件配置了就不需要传递环境参数)
-                var config = new ConfigurationBuilder()
-                            .AddEnvironmentVariables()
-                            .Build();
-
-                var enviromentName = config["ASPNETCORE_ENVIRONMENT"];
-
-                if (string.IsNullOrWhiteSpace(enviromentName))
-                {
-
-                    var index = Array.IndexOf(args, "--env");
-                    enviromentName = index > -1
-                        ? args[index + 1]
-                        : "Development";
-                }
-
-                //Dicom 浏览
-                //ImageManager.SetImplementation(WinFormsImageManager.Instance);
-
-                var host = CreateHostBuilder(args)
-                    .UseEnvironment(enviromentName) //命令行传入环境
-                    .ConfigureAppConfiguration((hostContext, config) =>
-                    {
-
-                        //Console.WriteLine(hostContext.HostingEnvironment.EnvironmentName);                
-                        config.AddJsonFile("appsettings.json", false, true)
-                                  .AddJsonFile($"appsettings.{enviromentName}.json", false, true);
-                    })
-                    .Build();
-
-                //// Serilog 
-                SerilogExtension.AddSerilogSetup(enviromentName, host.Services);
-
-                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");
-                }
-
-                NewId.SetProcessIdProvider(new CurrentProcessIdProvider());
-
-
-                host.Run();
-
-
-
-            }
-            catch (Exception e)
-            {
-
-                Log.Logger.Error(e.InnerException is null ? e.Message + e.StackTrace : e.InnerException?.Message + e.InnerException?.StackTrace);
-            }
-
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .UseWindowsService()
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.ConfigureKestrel((context, options) =>
-                     {
-                         //设置应用服务器Kestrel请求体最大为1GB // if don't set default value is: 30 MB
-                         options.Limits.MaxRequestBodySize = long.MaxValue;
-                         options.Limits.KeepAliveTimeout = TimeSpan.FromMinutes(30);
-                         options.Limits.RequestHeadersTimeout = TimeSpan.FromMinutes(20);
-
-                     });
-                    //webBuilder.UseSerilog();//在宿主机启动的时候配置serilog,与微软ILogger进行整合
-                    webBuilder.UseStartup<Startup>();
-                }).UseSerilog()
-                .UseServiceProviderFactory(new AutofacServiceProviderFactory());
-
-
-    }
-}

IRaCIS.Core.API/1Startup.cs

@@ -1,251 +0,0 @@
-using Autofac;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http.Features;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using System;
-using IRaCIS.Core.Application.Filter;
-using LogDashboard;
-using MediatR;
-using IRaCIS.Core.Application.MediatR.Handlers;
-using Microsoft.Extensions.Logging;
-using AspNetCoreRateLimit;
-using Microsoft.AspNetCore.HttpOverrides;
-using IRaCIS.Core.Infra.EFCore;
-using System.Globalization;
-using Microsoft.AspNetCore.Localization;
-using Localization;
-using Magicodes.ExporterAndImporter.Core.Filters;
-using IRaCIS.Core.Application.MediatR.CommandAndQueries;
-using IRaCIS.Core.Infra.EFCore.Common;
-using Invio.Extensions.Authentication.JwtBearer;
-using Microsoft.AspNetCore.SignalR;
-using IRaCIS.Core.Domain.Share;
-using Microsoft.AspNetCore.StaticFiles;
-using IRaCIS.Core.Application.Helper;
-using IRaCIS.Application.Services.BackGroundJob;
-
-namespace IRaCIS.Core.API
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
-            _configuration = configuration;
-        }
-        public ILogger<Startup> _logger { get; }
-
-        public IConfiguration _configuration { get; }
-
-        //// ConfigureContainer is where you can register things directly
-        //// with Autofac. This runs after ConfigureServices so the things
-        //// here will override registrations made in ConfigureServices.
-        //// Don't build the container; that gets done for you by the factory.
-        // for castle
-        public void ConfigureContainer(ContainerBuilder containerBuilder)
-        {
-            containerBuilder.RegisterModule<AutofacModuleSetup>();
-
-            #region  Test
-            //containerBuilder.RegisterType<ClinicalDataService>().PropertiesAutowired().InstancePerLifetimeScope();//注册仓储
-
-            //var container = containerBuilder.Build();
-
-            //// Now you can resolve services using Autofac. For example,
-            //// this line will execute the lambda expression registered
-            //// to the IConfigReader service.
-            //using (var scope = container.BeginLifetimeScope())
-            //{
-            //    var reader = scope.Resolve<BaseService>();
-
-            //    var test = scope.Resolve<ClinicalDataService>();
-            //    var test2 = scope.Resolve<IClinicalDataService>();
-
-            //    var test3 = scope.Resolve<IEFUnitOfWork<IRaCISDBContext>>();
-            //}
-            #endregion
-        }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            //健康检查
-            services.AddHealthChecks();
-            //本地化
-            services.AddJsonLocalization(options => options.ResourcesPath = "Resources");
-
-            // 异常、参数统一验证过滤器、Json序列化配置、字符串参数绑型统一Trim()
-            services.AddControllers(options =>
-            {
-                //options.Filters.Add<LogActionFilter>();
-                options.Filters.Add<ModelActionFilter>();
-                options.Filters.Add<ProjectExceptionFilter>();
-                options.Filters.Add<UnitOfWorkFilter>();
-
-                if (_configuration.GetSection("BasicSystemConfig").GetValue<bool>("OpenLoginLimit"))
-                {
-                    options.Filters.Add<LimitUserRequestAuthorization>();
-                }
-
-
-            })
-                .AddNewtonsoftJsonSetup(); // NewtonsoftJson 序列化  处理
-
-            services.AddOptions().Configure<SystemEmailSendConfig>( _configuration.GetSection("SystemEmailSendConfig"));
-            services.AddOptions().Configure<ServiceVerifyConfigOption>(_configuration.GetSection("BasicSystemConfig"));
-            services.AddOptions().Configure<AliyunOSSOptions>(_configuration.GetSection("AliyunOSS"));
-            services.AddOptions().Configure<ObjectStoreServiceOptions>(_configuration.GetSection("ObjectStoreService"));
-
-
-            //动态WebApi + UnifiedApiResultFilter  省掉控制器代码
-            services.AddDynamicWebApiSetup();
-            //AutoMapper
-            services.AddAutoMapperSetup();
-            //EF ORM  QueryWithNoLock
-            services.AddEFSetup(_configuration);
-            //Http 响应压缩
-            services.AddResponseCompressionSetup();
-            //Swagger Api 文档
-            services.AddSwaggerSetup();
-            //JWT Token 验证
-            services.AddJWTAuthSetup(_configuration);
-
-
-            // MediatR 进程内消息 事件解耦  从程序集中 注册命令和handler对应关系
-            services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblyContaining<ConsistencyVerificationHandler>());
-            // EasyCaching 缓存
-            services.AddEasyCachingSetup(_configuration);
-
-            //services.AddDistributedMemoryCache();
-
-            // hangfire  定时任务框架  有界面，更友好~
-            services.AddhangfireSetup(_configuration);
-
-
-            // 保护上传文件
-            //services.AddStaticFileAuthorizationSetup();
-
-
-            ////HttpReports 暂时废弃
-            //services.AddHttpReports().AddHttpTransport();
-            //Serilog 日志可视化 LogDashboard日志
-            services.AddLogDashboardSetup();
-            //上传限制 配置
-            services.Configure<FormOptions>(options =>
-            {
-                options.MultipartBodyLengthLimit = int.MaxValue;
-                options.ValueCountLimit = int.MaxValue;
-                options.ValueLengthLimit = int.MaxValue;
-            });
-            //IP 限流 可设置白名单 或者黑名单
-            //services.AddIpPolicyRateLimitSetup(_configuration);
-            // 用户类型 策略授权
-            //services.AddAuthorizationPolicySetup(_configuration);
-
-            services.AddJsonConfigSetup(_configuration);
-            //转发头设置  获取真实IP 
-            services.Configure<ForwardedHeadersOptions>(options =>
-            {
-                options.ForwardedHeaders =
-                    ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
-            });
-            //Dicom影像渲染图片  跨平台
-            services.AddDicomSetup();
-
-            // 实时应用
-            services.AddSignalR();
-
-
-            services.AddSingleton<IUserIdProvider, IRaCISUserIdProvider>();
-
-            //services.AddSingleton<IImportResultFilter, ImportResultFilteTest>();
-
-            services.AddMemoryCache();
-
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public async void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-
-
-            //本地化
-            app.UseLocalization();
-
-            app.UseForwardedHeaders();
-
-            //响应压缩
-            app.UseResponseCompression();
-
-            //app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());
-
-            //不需要 token 访问的静态文件  wwwroot css, JavaScript, and images don't require authentication.
-            app.UseStaticFiles();
-
-            app.UseMiddleware<MultiDiskStaticFilesMiddleware>();
-
-            //LogDashboard
-            app.UseLogDashboard("/LogDashboard");
-
-            //hangfire
-            app.UseHangfireConfig(env);
-
-
-
-            ////限流 中间件
-            //app.UseIpRateLimiting();
-
-
-
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-            else
-            {
-                //app.UseHsts();
-            }
-            Console.WriteLine("当前环境： " + env.EnvironmentName);
-
-
-            // 特殊异常处理 比如 404 
-            app.UseStatusCodePagesWithReExecute("/Error/{0}");
-
-            SwaggerSetup.Configure(app, env);
-            
-
-
-            ////serilog 记录请求的用户信息
-            app.UseSerilogConfig(env);
-
-            app.UseRouting();
-
-            app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());
-
-            //app.UseIRacisHostStaticFileStore(env);
-
-
-
-
-            app.UseAuthentication();
-            app.UseAuthorization();
-
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-
-                endpoints.MapHub<UploadHub>("/UploadHub");
-
-                endpoints.MapHealthChecks("/health");
-            });
-
-            var hangfireJobService = app.ApplicationServices.GetRequiredService<IIRaCISHangfireJob>();
-
-            await hangfireJobService.InitHangfireJobTaskAsync();
-
-        }
-    }
-}

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -28,6 +28,8 @@ using Aliyun.Acs.Core.Auth.Sts;
 using Aliyun.Acs.Core;
 using IRaCIS.Core.Application.Helper;
 using Microsoft.Extensions.Options;
+using IRaCIS.Core.Application.Contracts;
+using LoginReturnDTO = IRaCIS.Application.Contracts.LoginReturnDTO;
 
 namespace IRaCIS.Api.Controllers
 {
@@ -54,6 +56,7 @@ namespace IRaCIS.Api.Controllers
        
         public  async Task<IResponseOutput<DoctorDetailDTO>> GetDoctorDetail([FromServices] IAttachmentService attachmentService, [FromServices] IDoctorService _doctorService,
             [FromServices] IEducationService _educationService, [FromServices] ITrialExperienceService _trialExperienceService,
+
             [FromServices] IResearchPublicationService _researchPublicationService, [FromServices] IVacationService _vacationService, Guid doctorId)
         {
             var education = await _educationService.GetEducation(doctorId);
@@ -94,7 +97,10 @@ namespace IRaCIS.Api.Controllers
         [HttpPost, Route("user/login")]
         [AllowAnonymous]
         public  async Task<IResponseOutput<LoginReturnDTO>>  Login(UserLoginDTO loginUser, [FromServices] IEasyCachingProvider provider, [FromServices] IUserService _userService,
-            [FromServices] ITokenService _tokenService, [FromServices] IConfiguration configuration)
+            [FromServices] ITokenService _tokenService,
+
+			 [FromServices] IReadingImageTaskService readingImageTaskService,
+			[FromServices] IConfiguration configuration)
         {
 
 
@@ -180,7 +186,8 @@ namespace IRaCIS.Api.Controllers
 
             var userId = returnModel.Data.BasicInfo.Id.ToString();
             //provider.Set(userId, userId, TimeSpan.FromMinutes(AppSettings.LoginExpiredTimeSpan));
-
+            // 验证阅片休息时间
+            await readingImageTaskService.ResetReadingRestTime(returnModel.Data.BasicInfo.Id);
 			await provider.SetAsync(userId.ToString(), returnModel.Data.JWTStr, TimeSpan.FromDays(7));
             return returnModel;
         }
@@ -216,7 +223,7 @@ namespace IRaCIS.Api.Controllers
 
                 var ossOptions = serviceOption.AliyunOSS;
 
-                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO ,AliyunOSS= serviceOption.AliyunOSS });
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO ,AliyunOSS= serviceOption.AliyunOSS,AWS=serviceOption.AWS });
 
                 #region 临时token 屏蔽
                 //IClientProfile profile = DefaultProfile.GetProfile(ossOptions.RegionId, ossOptions.AccessKeyId, ossOptions.AccessKeySecret);
@@ -259,11 +266,11 @@ namespace IRaCIS.Api.Controllers
             }
             else if(Enum.TryParse<ObjectStoreUse>(serviceOption.ObjectStoreUse, out var parsedValue) && parsedValue == ObjectStoreUse.MinIO)
             {
-                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse=serviceOption.ObjectStoreUse,MinIO=serviceOption.MinIO});
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse=serviceOption.ObjectStoreUse,MinIO=serviceOption.MinIO, AWS = serviceOption.AWS });
             }
             else
             {
-                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO });
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO, AWS = serviceOption.AWS });
             }
                    
         }

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -419,6 +419,23 @@ namespace IRaCIS.Core.API.Controllers
         }
 
 
+		/// <summary>
+		/// 重置并同步项目阅片标准
+		/// </summary>
+		/// <returns></returns>
+		[HttpPost, Route("Inspection/ReadingCriterion/ResetAndAsyncCriterion")]
+		[UnitOfWork]
+		[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+		public async Task<IResponseOutput> ResetAndAsyncCriterion(DataInspectionDto<ResetAndAsyncCriterionInDto> opt)
+		{
+			var singid = await _inspectionService.RecordSing(opt.SignInfo);
+			var result = await _trialConfigService.ResetAndAsyncCriterion(opt.Data);
+			await _inspectionService.CompletedSign(singid, result);
+			return result;
+		}
+
+
 
 		/// <summary>
 		/// CRC RequestToQC  批量提交

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -33,6 +33,7 @@ using Microsoft.AspNetCore.SignalR;
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 using MiniExcelLibs;
@@ -235,13 +236,17 @@ namespace IRaCIS.Core.API.Controllers
         public IUserInfo _userInfo { get; set; }
         private readonly IMediator _mediator;
 
+
+		public IStringLocalizer _localizer { get; set; }
+
+
 		private readonly IWebHostEnvironment _hostEnvironment;
 
         private readonly IRepository _repository;
 
         private readonly IEasyCachingProvider _provider;
         private readonly QCCommon _qCCommon;
-        public StudyController(IMapper mapper, IUserInfo userInfo, IWebHostEnvironment hostEnvironment, IMediator mediator, IEasyCachingProvider provider,
+        public StudyController(IMapper mapper, IStringLocalizer localizer, IUserInfo userInfo, IWebHostEnvironment hostEnvironment, IMediator mediator, IEasyCachingProvider provider,
              QCCommon qCCommon,
             IRepository repository)
         {
@@ -249,7 +254,7 @@ namespace IRaCIS.Core.API.Controllers
             _provider = provider;
             _hostEnvironment = hostEnvironment;
             _mediator = mediator;
-
+            _localizer = localizer;
 			_mapper = mapper;
             _userInfo = userInfo;
             _repository = repository;
@@ -313,7 +318,7 @@ namespace IRaCIS.Core.API.Controllers
                 string.IsNullOrEmpty(mediaTypeHeader.Boundary.Value))
             {
                 //---不支持的MediaType
-                return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_UnsupportedMedia"));
+                return ResponseOutput.NotOk(_localizer["UploadDownLoad_UnsupportedMedia"]);
             }
 
             var archiveStudyCommand = new ArchiveStudyCommand() { AbandonStudyId = abandonStudyId, StudyInstanceUid = studyInstanceUid, SubjectVisitId = subjectVisitId };
@@ -407,7 +412,7 @@ namespace IRaCIS.Core.API.Controllers
                 _provider.Remove($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}");
 
                 //---请求异常,请重试！
-                throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_RequestError"));
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_RequestError"]);
             }
 
             studyMonitor.FileSize = (decimal)HttpContext.Request.ContentLength;
@@ -559,14 +564,14 @@ namespace IRaCIS.Core.API.Controllers
                 if (!fileName.EndsWith(".xlsx") && !fileName.EndsWith(".csv") && !fileName.EndsWith(".xls"))
                 {
                     //---支持.xlsx、.xls、.csv格式的文件上传。
-                    throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_SupportedFormats"));
+                    throw new BusinessValidationFailedException(_localizer["UploadDownLoad_SupportedFormats"]);
                 }
 
                 fileStream.CopyTo(templateFileStream);
                 templateFileStream.Seek(0, SeekOrigin.Begin);
 
 
-                var ossRelativePath = oSSService.UploadToOSS(fileStream, "InspectionUpload/Check", realFileName);
+                var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, "InspectionUpload/Check", realFileName);
 
                 await _repository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId });
 
@@ -580,7 +585,6 @@ namespace IRaCIS.Core.API.Controllers
             var etcCheckList = new List<CheckViewModel>();
 
 
-
             #region MiniExcel  需要自己验证数据格式规范
 
             //if (fileName.EndsWith(".csv"))
@@ -609,7 +613,7 @@ namespace IRaCIS.Core.API.Controllers
 
                 //if (import.RowErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.RowErrors));
 
-                if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.TemplateErrors));
+                if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(_localizer["UploadDownLoad_TemplateErrors"]);
 
                 etcCheckList = import.Data.ToList();
             }
@@ -697,7 +701,7 @@ namespace IRaCIS.Core.API.Controllers
             if (etcCheckList == null || etcCheckList.Count == 0)
             {
                 //---请保证上传数据符合模板文件中的样式，且存在有效数据。
-                return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_InvalidData"));
+                return ResponseOutput.NotOk(_localizer["UploadDownLoad_InvalidData"]);
             }
             else
             {
@@ -718,7 +722,7 @@ namespace IRaCIS.Core.API.Controllers
                 if (etcCheckList.Count == 0)
                 {
                     //---请保证上传数据符合模板文件中的样式，且存在有效数据。
-                    return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_InvalidData"));
+                    return ResponseOutput.NotOk(_localizer["UploadDownLoad_InvalidData"]);
                 }
 
             }
@@ -962,12 +966,13 @@ namespace IRaCIS.Core.API.Controllers
         public IMapper _mapper { get; set; }
         public IUserInfo _userInfo { get; set; }
         private readonly IMediator _mediator;
-
+		public IStringLocalizer _localizer { get; set; }
 		private readonly IWebHostEnvironment _hostEnvironment;
 
-        public UploadDownLoadController(IMapper mapper, IUserInfo userInfo, IMediator mediator, IWebHostEnvironment hostEnvironment)
+        public UploadDownLoadController(IMapper mapper, IUserInfo userInfo, IStringLocalizer localizer, IMediator mediator, IWebHostEnvironment hostEnvironment)
         {
             _hostEnvironment = hostEnvironment;
+            _localizer = localizer;
 			_mediator = mediator;
             _mapper = mapper;
             _userInfo = userInfo;
@@ -994,10 +999,10 @@ namespace IRaCIS.Core.API.Controllers
                 if (!realFileName.EndsWith(".xlsx", StringComparison.OrdinalIgnoreCase))
                 {
                     //	 请用提供格式的模板excel上传需要处理的数据
-                    throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_TemplateUploadData"));
+                    throw new BusinessValidationFailedException(_localizer["UploadDownLoad_TemplateUploadData"]);
                 }
 
-                var ossRelativePath = oSSService.UploadToOSS(fileStream, "InspectionUpload/SiteSurvey", realFileName);
+                var ossRelativePath = await oSSService.UploadToOSSAsync(fileStream, "InspectionUpload/SiteSurvey", realFileName);
 
                 await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId });
 
@@ -1015,7 +1020,7 @@ namespace IRaCIS.Core.API.Controllers
             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中 每一行的 中心编号，姓名，邮箱，用户类型数据记录完整再进行上传
-                throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_EnsureCompleteData"));
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_EnsureCompleteData"]);
             }
 
             var siteCodeList = excelList.Select(t => t.TrialSiteCode.Trim().ToUpper()).Distinct().ToList();
@@ -1023,31 +1028,31 @@ namespace IRaCIS.Core.API.Controllers
             if (_trialSiteRepository.Where(t => t.TrialId == trialId && siteCodeList.Contains(t.TrialSiteCode.ToUpper())).Count() != siteCodeList.Count)
             {
                 //在项目中未找到该Excel中部分或全部中心
-                throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_InvalidCenters"));
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidCenters"]);
             }
 
             if (excelList.GroupBy(t => new { t.TrialSiteCode, t.UserTypeStr, t.Email }).Any(g => g.Count() > 1))
             {
                 //	同一邮箱，同一用户类型，只能生成一个账户,请核查Excel数据
 
-                throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_CheckDuplicateAccounts"));
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_CheckDuplicateAccounts"]);
             }
 
             if (excelList.Any(t => !t.Email.Contains("@")))
             {
                 //有邮箱不符合邮箱格式,请核查Excel数据
-                throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_InvalidEmail"));
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidEmail"]);
             }
             var generateUserTypeList = new List<string>() { "CRC", "CRA" };
 
             if (excelList.Any(t => !generateUserTypeList.Contains(t.UserTypeStr.ToUpper())))
             {
                 //用户类型仅能为 CRC,SR,CRA 请核查Excel数据
-                throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_InvalidUserType"));
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidUserType"]);
             }
             if (excelList.Count == 0)
             {
-                throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_NoValiddata"));
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_NoValiddata"]);
             }
             //处理好 用户类型  和用户类型枚举
             var sysUserTypeList = _usertypeRepository.Where(t => t.UserTypeEnum == UserTypeEnum.CRA || t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Select(t => new { UserTypeId = t.Id, t.UserTypeEnum }).ToList();

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <SignAssembly>false</SignAssembly>
     <UserSecretsId>354572d4-9e15-4099-807c-63a2d29ff9f2</UserSecretsId>
     <LangVersion>default</LangVersion>
@@ -63,23 +63,23 @@
   <ItemGroup>
     <PackageReference Include="aliyun-net-sdk-sts" Version="3.1.2" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
 	<PackageReference Include="EasyCaching.Interceptor.Castle" Version="1.9.2" />
 	<PackageReference Include="EasyCaching.Serialization.MessagePack" Version="1.9.2">
 	  <TreatAsUsed>true</TreatAsUsed>
 	</PackageReference>
-	  <PackageReference Include="Hangfire.AspNetCore" Version="1.8.6" />
+	  <PackageReference Include="Hangfire.AspNetCore" Version="1.8.11" />
 	  <PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
-	  <PackageReference Include="Hangfire.SqlServer" Version="1.8.6" />
+	  <PackageReference Include="Hangfire.SqlServer" Version="1.8.11" />
     <PackageReference Include="Invio.Extensions.Authentication.JwtBearer" Version="2.0.1" />
     <PackageReference Include="LogDashboard" Version="1.4.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.3" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
     <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.3" />
-    <PackageReference Include="Serilog.Sinks.Email" Version="2.4.0" />
+    <PackageReference Include="Serilog.Sinks.Email" Version="3.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
   </ItemGroup>

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

@@ -4,6 +4,34 @@
         <name>IRaCIS.Core.API</name>
     </assembly>
     <members>
+        <member name="M:EasyCaching.Demo.Interceptors.Controllers.ErrorController.Error(System.Int32)">
+            <summary>
+            主要处理 前端404等错误  全局业务异常已统一处理了，非业务错误会来到这里
+            </summary>
+            <param name="code"></param>
+            <returns></returns>
+        </member>
+        <member name="T:IRaCIS.Api.Controllers.ExtraController">
+            <summary>
+            医生基本信息 、工作信息  专业信息、审核状态
+            </summary>
+        </member>
+        <member name="M:IRaCIS.Api.Controllers.ExtraController.GetDoctorDetail(IRaCIS.Application.Interfaces.IAttachmentService,IRaCIS.Application.Interfaces.IDoctorService,IRaCIS.Application.Interfaces.IEducationService,IRaCIS.Application.Interfaces.ITrialExperienceService,IRaCIS.Application.Interfaces.IResearchPublicationService,IRaCIS.Application.Interfaces.IVacationService,System.Guid)">
+            <summary>
+             获取医生详情 
+            </summary>
+            <param name="attachmentService"></param>
+            <param name="_doctorService"></param>
+            <param name="_educationService"></param>
+            <param name="_trialExperienceService"></param>
+            <param name="_researchPublicationService"></param>
+            <param name="_vacationService"></param>
+            <param name="doctorId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Api.Controllers.ExtraController.Login(IRaCIS.Application.Contracts.UserLoginDTO,EasyCaching.Core.IEasyCachingProvider,IRaCIS.Application.Services.IUserService,IRaCIS.Core.Application.Auth.ITokenService,IRaCIS.Core.Application.Contracts.IReadingImageTaskService,Microsoft.Extensions.Configuration.IConfiguration)">
+            <summary>  系统用户登录接口[New] </summary>
+        </member>
         <member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateTrialInspection(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Application.Contracts.TrialCommand})">
             <summary> 添加实验项目-返回新增Id[AUTH]</summary>
             <returns>新记录Id</returns>
@@ -180,6 +208,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.ResetAndAsyncCriterion(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.ResetAndAsyncCriterionInDto})">
+            <summary>
+            重置并同步项目阅片标准
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.API.Controllers.InspectionController.CRCRequestToQC(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.CRCRequestToQCCommand})">
             <summary>
             CRC RequestToQC  批量提交
@@ -337,6 +371,11 @@
             IPLimit限流 启动服务
             </summary>
         </member>
+        <member name="T:IRaCIS.Core.API.JSONTimeZoneConverter">
+            <summary>
+            序列化，反序列化的时候，处理时间 时区转换
+            </summary>
+        </member>
         <member name="M:IRaCIS.Core.API.NullToEmptyStringResolver.CreateProperties(System.Type,Newtonsoft.Json.MemberSerialization)">
             <summary>
             创建属性
@@ -345,27 +384,6 @@
             <param name="memberSerialization">序列化成员</param>
             <returns></returns>
         </member>
-        <member name="T:IRaCIS.Api.Controllers.ExtraController">
-            <summary>
-            医生基本信息 、工作信息  专业信息、审核状态
-            </summary>
-        </member>
-        <member name="M:IRaCIS.Api.Controllers.ExtraController.GetDoctorDetail(IRaCIS.Application.Interfaces.IAttachmentService,IRaCIS.Application.Interfaces.IDoctorService,IRaCIS.Application.Interfaces.IEducationService,IRaCIS.Application.Interfaces.ITrialExperienceService,IRaCIS.Application.Interfaces.IResearchPublicationService,IRaCIS.Application.Interfaces.IVacationService,System.Guid)">
-            <summary>
-             获取医生详情 
-            </summary>
-            <param name="attachmentService"></param>
-            <param name="_doctorService"></param>
-            <param name="_educationService"></param>
-            <param name="_trialExperienceService"></param>
-            <param name="_researchPublicationService"></param>
-            <param name="_vacationService"></param>
-            <param name="doctorId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Api.Controllers.ExtraController.Login(IRaCIS.Application.Contracts.UserLoginDTO,EasyCaching.Core.IEasyCachingProvider,IRaCIS.Application.Services.IUserService,IRaCIS.Core.Application.Auth.ITokenService,Microsoft.Extensions.Configuration.IConfiguration)">
-            <summary>  系统用户登录接口[New] </summary>
-        </member>
         <member name="M:IRaCIS.WX.CoreApi.Auth.AuthMiddleware.Invoke(Microsoft.AspNetCore.Http.HttpContext)">
              <summary>
             为了前端 一段时间无操作，需要重新登陆
@@ -373,12 +391,10 @@
              <param name="httpContext"></param>
              <returns></returns>
         </member>
-        <member name="M:EasyCaching.Demo.Interceptors.Controllers.ErrorController.Error(System.Int32)">
+        <member name="T:TimeZoneAdjustmentMiddleware">
             <summary>
-            主要处理 前端404等错误  全局业务异常已统一处理了，非业务错误会来到这里
+            废弃，没用
             </summary>
-            <param name="code"></param>
-            <returns></returns>
         </member>
         <member name="T:ZhaoXi._001.NET5Demo.Practice.WebApi.Utility.Jwt.CustomHSJWTService">
             <summary>

IRaCIS.Core.API/Middleware/TimeZoneAdjustmentMiddleware.cs

@@ -0,0 +1,118 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+
+/// <summary>
+/// 废弃，没用
+/// </summary>
+public class TimeZoneAdjustmentMiddleware
+{
+    private readonly RequestDelegate _next;
+
+    public TimeZoneAdjustmentMiddleware(RequestDelegate next)
+    {
+        _next = next;
+    }
+
+    public async Task Invoke(HttpContext context)
+    {
+        if (string.IsNullOrEmpty(context.Request.ContentType))
+        {
+            // 请求没有内容体，可能是一个没有请求体的请求，比如 GET 请求
+            await _next(context);
+            return;
+        }
+        
+
+        var timeZoneId = "Asia/Shanghai"; // 客户端默认时区
+
+        var timeZoneIdHeaderValue = context.Request.Headers["TimeZoneId"];
+
+        if (!string.IsNullOrEmpty(timeZoneIdHeaderValue))
+        {
+            timeZoneId = timeZoneIdHeaderValue;
+        }
+
+        var timeZone = TimeZoneInfo.FindSystemTimeZoneById(timeZoneId);
+
+
+
+        // 处理 JSON 请求体中的时间字段
+        if (context.Request.ContentType.StartsWith("application/json"))
+        {
+            var requestBody = await new StreamReader(context.Request.Body).ReadToEndAsync();
+
+            // 使用 JSON.NET 或 System.Text.Json 解析 JSON 请求体
+            // 假设请求体中有一个名为 "dateTime" 的时间字段
+            dynamic jsonData = JsonConvert.DeserializeObject(requestBody);
+
+            if (jsonData.dateTime != null)
+            {
+                if (DateTime.TryParse((string)jsonData.dateTime, out DateTime dateTime))
+                {
+                    // 将 JSON 请求体中的时间字段转换为服务器时区的时间
+                    var serverTime = TimeZoneInfo.ConvertTime(dateTime, timeZone);
+                    jsonData.dateTime = serverTime;
+                }
+            }
+
+            // 将修改后的 JSON 请求体重新写入请求流中
+            var jsonBytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(jsonData));
+            context.Request.Body = new MemoryStream(jsonBytes);
+            context.Request.ContentLength = jsonBytes.Length;
+        }
+
+
+        // 处理 URL 表单参数
+        var modifiedQuery = new Dictionary<string, StringValues>();
+
+        foreach (var key in context.Request.Query.Keys)
+        {
+            if (DateTime.TryParse(context.Request.Query[key], out DateTime dateTime))
+            {
+                // 将 URL 表单参数中的时间转换为服务器时区的时间
+                var serverTime = TimeZoneInfo.ConvertTime(dateTime, timeZone);
+                modifiedQuery[key] = new StringValues(serverTime.ToString());
+            }
+            else
+            {
+                modifiedQuery[key] = context.Request.Query[key];
+            }
+        }
+
+        context.Request.Query = new QueryCollection(modifiedQuery);
+
+        // 处理Form请求体中的参数
+        if (context.Request.HasFormContentType)
+        {
+            var modifiedForm = new Dictionary<string, StringValues>();
+
+            foreach (var key in context.Request.Form.Keys)
+            {
+                if (DateTime.TryParse(context.Request.Form[key], out DateTime dateTime))
+                {
+                    // 将请求体中的时间转换为服务器时区的时间
+                    var serverTime = TimeZoneInfo.ConvertTime(dateTime, timeZone);
+                    modifiedForm[key] = new StringValues(serverTime.ToString());
+                }
+                else
+                {
+                    modifiedForm[key] = context.Request.Form[key];
+                }
+            }
+
+            var newFormCollection = new FormCollection(modifiedForm);
+
+            // 将新的表单集合设置回请求对象
+            context.Request.Form = newFormCollection;
+        }
+
+        await _next(context);
+    }
+
+}

IRaCIS.Core.API/Progranm.cs

@@ -25,7 +25,8 @@ using Microsoft.AspNetCore.HttpOverrides;
 using IRaCIS.Application.Services.BackGroundJob;
 using LogDashboard;
 using OfficeOpenXml.Utils;
-
+using FellowOakDicom.Network;
+using IRaCIS.Core.Application.Service.ImageAndDoc;
 
 
 #region 获取环境变量
@@ -74,16 +75,10 @@ if (urlsIndex > -1)
 
 NewId.SetProcessIdProvider(new CurrentProcessIdProvider());
 
-
+builder.Configuration.AddJsonFile("appsettings.json", false, true)
+                     .AddJsonFile($"appsettings.{enviromentName}.json", false, true);
 
 builder.Host
-            .ConfigureAppConfiguration((hostContext, config) =>
-            {
-
-                //Console.WriteLine(hostContext.HostingEnvironment.EnvironmentName);                
-                config.AddJsonFile("appsettings.json", false, true)
-                          .AddJsonFile($"appsettings.{enviromentName}.json", false, true);
-            })
             .UseServiceProviderFactory(new AutofacServiceProviderFactory())
             .ConfigureContainer<ContainerBuilder>(containerBuilder =>
             {
@@ -115,7 +110,7 @@ builder.Services.AddControllers(options =>
     }
 
 })
-    .AddNewtonsoftJsonSetup(); // NewtonsoftJson 序列化  处理
+    .AddNewtonsoftJsonSetup(builder.Services); // NewtonsoftJson 序列化  处理
 
 builder.Services.AddOptions().Configure<SystemEmailSendConfig>(_configuration.GetSection("SystemEmailSendConfig"));
 builder.Services.AddOptions().Configure<ServiceVerifyConfigOption>(_configuration.GetSection("BasicSystemConfig"));
@@ -247,15 +242,11 @@ app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());
 app.UseAuthentication();
 app.UseAuthorization();
 
+app.MapControllers();
 
-app.UseEndpoints(endpoints =>
+app.MapHub<UploadHub>("/UploadHub");
-{
+app.MapHealthChecks("/health");
-    endpoints.MapControllers();
 
-    endpoints.MapHub<UploadHub>("/UploadHub");
-
-    endpoints.MapHealthChecks("/health");
-});
 
 // Serilog 
 SerilogExtension.AddSerilogSetup(enviromentName, app.Services);
@@ -266,6 +257,7 @@ var hangfireJobService = app.Services.GetRequiredService<IIRaCISHangfireJob>();
 await hangfireJobService.InitHangfireJobTaskAsync();
 
 
+
 #endregion
 
 try
@@ -301,6 +293,11 @@ try
     //Log.Logger.Warning($"ContentRootPath——GetParent：{Directory.GetParent(env.ContentRootPath).Parent.FullName}");
     //Log.Logger.Warning($"ContentRootPath——xx：{Path.GetDirectoryName(Path.GetDirectoryName(env.ContentRootPath))}");
 
+
+
+
+    var server = DicomServerFactory.Create<CStoreSCPService>(11112,userState: app.Services);
+
     app.Run();
 
 }

IRaCIS.Core.API/Properties/launchSettings.json

@@ -52,7 +52,15 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Prod_IRC"
       },
-      "applicationUrl": "http://localhost:6300"
+      "applicationUrl": "http://localhost:6100"
+    },
+    "IRaCIS.US_IRC": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "US_IRC"
+      },
+      "applicationUrl": "http://localhost:6100"
     }
 
   }

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

@@ -19,7 +19,7 @@ namespace IRaCIS.Core.API
             app.UseSerilogRequestLogging(opts
               =>
             {
-                opts.MessageTemplate = "{TokenUserRealName} {TokenUserType}  {ClientIp} {RequestIP}  {Host} {Protocol} {RequestMethod} {RequestPath} {RequestBody} responded {StatusCode} in {Elapsed:0.0000} ms";
+                opts.MessageTemplate = "{TokenUserRealName} {TokenUserTypeShortName}  {ClientIp} {LocalIP} {Host} {Protocol} {RequestMethod} {RequestPath} {RequestBody} responded {StatusCode} in {Elapsed:0.0000} ms";
                 opts.EnrichDiagnosticContext = SerilogHelper.EnrichFromRequest;
             });
 

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

@@ -1,4 +1,5 @@
-using IRaCIS.Core.Infrastructure.Extention;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Http;
 using Serilog;
 using System;
@@ -20,7 +21,7 @@ namespace IRaCIS.Core.API
             diagnosticContext.Set("Host", request.Host);
 
             //这种获取的Ip不准 配置服务才行
-            diagnosticContext.Set("RequestIP", httpContext.Connection.RemoteIpAddress.ToString());
+            //diagnosticContext.Set("RequestIP", httpContext.Connection.RemoteIpAddress.ToString());
 
             //这种方式可以，但是serilog提供了 就不用了
             //diagnosticContext.Set("TestIP", httpContext.GetUserIp());
@@ -41,9 +42,9 @@ namespace IRaCIS.Core.API
             // Set the content-type of the Response at this point
             diagnosticContext.Set("ContentType", httpContext.Response.ContentType);
 
-            diagnosticContext.Set("TokenUserRealName", httpContext?.User?.FindFirst("realName")?.Value);
+            diagnosticContext.Set("TokenUserRealName", httpContext?.User?.FindFirst(JwtIRaCISClaimType.RealName)?.Value);
 
-            diagnosticContext.Set("TokenUserType", httpContext?.User?.FindFirst("userTypeEnumName")?.Value);
+            diagnosticContext.Set("TokenUserTypeShortName", httpContext?.User?.FindFirst(JwtIRaCISClaimType.UserTypeShortName)?.Value);
 
             // Retrieve the IEndpointFeature selected for the request
             var endpoint = httpContext.GetEndpoint();

IRaCIS.Core.API/_ServiceExtensions/Authorization/ApiResponseHandler.cs

@@ -16,7 +16,7 @@ namespace IRaCIS.Core.API
         public IStringLocalizer _localizer;
 		public ApiResponseHandler(IOptionsMonitor<AuthenticationSchemeOptions> options,
 			IStringLocalizer localizer,
-			ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock)
+			ILoggerFactory logger, UrlEncoder encoder) : base(options, logger, encoder)
         {
             _localizer = localizer;
 

IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs

@@ -49,6 +49,9 @@ namespace IRaCIS.Core.API
                     triggerOptions.AddTrigger<TableQuestionRowTrigger>();
                     //triggerOptions.AddTrigger<AddlTrialUserTrigger>();
                     triggerOptions.AddTrigger<VisitTaskIsFrontTaskNeedSignButNotSignTrigger>();
+                    triggerOptions.AddTrigger<VisitTaskIbeforeTrigger>();
+                    
+
 
 
 

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

@@ -1,46 +0,0 @@
-using IRaCIS.Core.Domain.Share;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using System;
-
-namespace IRaCIS.Core.API
-{
-    public class JSONCustomDateConverter : DateTimeConverterBase
-    {
-        private TimeZoneInfo _timeZoneInfo;
-        private string _dateFormat;
-
-        private IUserInfo _userInfo;
-        public JSONCustomDateConverter(string dateFormat, TimeZoneInfo timeZoneInfo, IUserInfo userInfo)
-        {
-            _dateFormat = dateFormat;
-            _timeZoneInfo = timeZoneInfo;
-
-            _userInfo = userInfo;
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var timeZoneId = _userInfo.TimeZoneId;
-
-            var needConvertUtcDateTime = Convert.ToDateTime(value);
-
-
-            var tz = TimeZoneInfo.FindSystemTimeZoneById(timeZoneId);
-
-
-            var dateTimeOffset = new DateTimeOffset(needConvertUtcDateTime);
-
-            var time = TimeZoneInfo.ConvertTimeFromUtc(needConvertUtcDateTime, tz).ToString(_dateFormat);
-
-            writer.WriteValue(time);
-            writer.Flush();
-        }
-
-    }
-}

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

@@ -0,0 +1,103 @@
+using IRaCIS.Core.Domain.Share;
+using Microsoft.AspNetCore.Http;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using StackExchange.Redis;
+using System;
+using System.Globalization;
+
+namespace IRaCIS.Core.API
+{
+    /// <summary>
+    /// 序列化，反序列化的时候，处理时间 时区转换
+    /// </summary>
+    public class JSONTimeZoneConverter : DateTimeConverterBase
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        private readonly TimeZoneInfo _clientTimeZone;
+        public JSONTimeZoneConverter(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+
+            //默认是UTC
+            //var timeZoneId = "Etc/UTC";
+            var timeZoneId = "Asia/Shanghai";
+
+            var timeZoneIdHeader = _httpContextAccessor?.HttpContext?.Request?.Headers["TimeZoneId"];
+
+            if (timeZoneIdHeader is not null && !string.IsNullOrEmpty(timeZoneIdHeader.Value))
+            {
+                timeZoneId = timeZoneIdHeader.Value;
+            }
+
+            _clientTimeZone = TimeZoneInfo.FindSystemTimeZoneById(timeZoneId);
+
+        }
+
+        public override bool CanConvert(Type objectType)
+        {
+            // 仅支持 DateTime 类型的转换
+            return objectType == typeof(DateTime)|| objectType == typeof(DateTime?);
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            if (reader.Value == null)
+            {
+                return null;
+            }
+
+            DateTime dateTime;
+
+            if (reader.ValueType == typeof(DateTime) || reader.ValueType == typeof(DateTime?))
+            {
+                DateTime? nullableDateTime = reader.Value as DateTime?;
+
+
+                if (nullableDateTime != null && nullableDateTime.HasValue)
+                {
+                    dateTime = nullableDateTime.Value;
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            else
+            {
+                if (DateTime.TryParse((string)reader.Value, out dateTime) == false)
+                {
+                    return null;
+                }
+            }
+            
+          
+
+            // 将客户端时间转换为服务器时区的时间
+            var serverZoneTime = TimeZoneInfo.ConvertTime(dateTime, _clientTimeZone, TimeZoneInfo.Local);
+
+            return serverZoneTime;
+
+           
+                      
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {                  
+            DateTime? nullableDateTime = value as DateTime?;
+
+            if (nullableDateTime != null && nullableDateTime.HasValue)
+            {
+                //第一个参数默认使用系统本地时区 也就是应用服务器的时区
+                DateTime clientZoneTime = TimeZoneInfo.ConvertTime(nullableDateTime.Value, _clientTimeZone);
+                writer.WriteValue(clientZoneTime);
+            }
+            else
+            {
+                writer.WriteNull();
+            }            
+        }
+
+    }
+}

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

@@ -1,4 +1,6 @@
 
+using IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson;
+using IRaCIS.Core.Application.Helper;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -8,8 +10,12 @@ namespace IRaCIS.Core.API
 {
     public static class NewtonsoftJsonSetup
     {
-        public static void AddNewtonsoftJsonSetup(this IMvcBuilder builder)
+        public static void AddNewtonsoftJsonSetup(this IMvcBuilder builder, IServiceCollection services)
         {
+            services.AddHttpContextAccessor();
+            services.AddScoped<JSONTimeZoneConverter>();
+            services.AddScoped<CustomStringConverter>();
+            services.AddScoped<IOSSService,OSSService>();
 
             builder.AddNewtonsoftJson(options =>
              {
@@ -23,8 +29,15 @@ namespace IRaCIS.Core.API
                                                                                                 // 设置时间格式
                  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>());
+
+                 //options.SerializerSettings.Converters.Add(services.BuildServiceProvider().GetService<CustomStringConverter>());
+
+
                  //IsoDateTimeConverter
                  //options.SerializerSettings.NullValueHandling = NullValueHandling.Ignore;
 

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

@@ -0,0 +1,65 @@
+using IRaCIS.Core.Application.Helper;
+using Microsoft.AspNetCore.Http;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Serialization;
+using System;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
+{
+    public class CustomStringConverter : JsonConverter<string>
+    {
+        //private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IOSSService _oSSService;
+
+        // 构造函数
+        public CustomStringConverter(/*IHttpContextAccessor httpContextAccessor*/ IOSSService oSSService)
+        {
+            //_httpContextAccessor = httpContextAccessor;
+            _oSSService = oSSService;
+        }
+
+        public override string ReadJson(JsonReader reader, Type objectType, string existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            if (reader.TokenType == JsonToken.String)
+            {
+                return (string)reader.Value;
+            }
+
+            return null;
+        }
+
+        public override void WriteJson(JsonWriter writer, string value, JsonSerializer serializer)
+        {
+            if (value != null)
+            {
+                // 在这里对字符串进行处理，例如转换大小写、去除空格等
+                // 这里只是一个示例，您可以根据实际需求进行更改
+
+                // 获取当前正在序列化的属性名
+                string propertyName = writer.Path.Split('.').Last();
+
+                Regex guidRegex = new Regex(@"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
+
+                if (propertyName.IndexOf("Path") > -1 && value.IndexOf('.')>-1 && guidRegex.IsMatch(value))
+                {
+                    var tt= _oSSService.GetSignedUrl(value);
+                    writer.WriteValue(tt);
+                }
+                else
+                {
+                    // 将处理后的字符串写入到 JsonWriter 中
+                    writer.WriteValue(value);
+                }
+               
+            }
+            else
+            {
+                writer.WriteNull();
+            }
+        }
+                                                       
+    }
+}

IRaCIS.Core.API/_ServiceExtensions/Serilog/SerilogSetup.cs

@@ -21,29 +21,31 @@ namespace IRaCIS.Core.API
                    .MinimumLevel.Override("Hangfire", LogEventLevel.Warning)
                    .MinimumLevel.Override("System.Net.Http.HttpClient.HttpReports", LogEventLevel.Warning)                  
                    .Enrich.WithClientIp()
-
                    .Enrich.FromLogContext()
+                   .Filter.ByExcluding(logEvent =>logEvent.Properties.ContainsKey("RequestPath") && logEvent.Properties["RequestPath"].ToString().Contains("/health"))
 
                    //控制台 方便调试 问题   我们显示记录日志 时 获取上下文的ip 和用户名 用户类型
                    .WriteTo.Console(restrictedToMinimumLevel: LogEventLevel.Warning,
-                outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3} ] {LocalIP} {ClientIp}  {TokenUserRealName} {TokenUserType} {Message:lj} {Properties:j}{NewLine} {Exception}")
+                                    outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {SourceContext:l} || {Message} || {Exception} ||end {NewLine}")
+
                    .WriteTo.File($"{AppContext.BaseDirectory}Serilogs/.log", rollingInterval: RollingInterval.Day,
-                                    outputTemplate: "{Timestamp:HH:mm:ss} || {Level} || {SourceContext:l} ||  {Message} ||{Exception}  ||end {NewLine}");
+                                    outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {SourceContext:l} || {Message} || {Exception} ||end {NewLine}");
+
             //.WriteTo.MSSqlServer("Data Source=DESKTOP-4TU9A6M;Initial Catalog=CoreFrame;User ID=sa;Password=123456", "logs", autoCreateSqlTable: true, restrictedToMinimumLevel: LogEventLevel.Information)//从左至右四个参数分别是数据库连接字符串、表名、如果表不存在是否创建、最低等级。Serilog会默认创建一些列。                
 
-            if (environment == "Production")
+            //if (environment == "Production")
-            {
+            //{
-                config.WriteTo.Email(new EmailConnectionInfo()
+            //    config.WriteTo.Email(new EmailConnectionInfo()
-                {
+            //    {
-                    EmailSubject = "系统警告,请速速查看!",//邮件标题
+            //        EmailSubject = "系统警告,请速速查看!",//邮件标题
-                    FromEmail = "test@extimaging.com",//发件人邮箱
+            //        FromEmail = "test@extimaging.com",//发件人邮箱
-                    MailServer = "smtp.qiye.aliyun.com",//smtp服务器地址
+            //        MailServer = "smtp.qiye.aliyun.com",//smtp服务器地址
-                    NetworkCredentials = new NetworkCredential("test@extimaging.com", "SHzyyl2021"),//两个参数分别是发件人邮箱与客户端授权码
+            //        NetworkCredentials = new NetworkCredential("test@extimaging.com", "SHzyyl2021"),//两个参数分别是发件人邮箱与客户端授权码
-                    Port = 465,//端口号
+            //        Port = 465,//端口号
-                    ToEmail = "872297557@qq.com"//收件人
+            //        ToEmail = "872297557@qq.com"//收件人
-                }, restrictedToMinimumLevel: LogEventLevel.Error,
+            //    }, restrictedToMinimumLevel: LogEventLevel.Error,
-                outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff}  [ {Level} {ClientIp} {ClientAgent}  {TokenUserRealName} {TokenUserType} ] || [path: {RequestPath}  arguments: {RequestBody}] {SourceContext:l}  || {Message} || {Exception} ||end {NewLine})");
+            //    outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff}  [ {Level} {ClientIp} {ClientAgent}  {TokenUserRealName} {TokenUserType} ] || [path: {RequestPath}  arguments: {RequestBody}] {SourceContext:l}  || {Message} || {Exception} ||end {NewLine})");
-            }
+            //}
 
             //扩展方法 获取上下文的ip 用户名 用户类型
             Log.Logger = config.Enrich.WithHttpContextInfo(serviceProvider).CreateLogger();

IRaCIS.Core.API/appsettings.Event_IRC.json

@@ -41,7 +41,8 @@
     "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
 
-    "LoginFailLockMinutes": 30
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 60
 
   },
   "SystemEmailSendConfig": {

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -7,8 +7,10 @@
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=101.132.193.237,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
+   // "RemoteNew": "Server=47.117.165.18,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
-    "Hangfire": "Server=101.132.193.237,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
+   // "Hangfire": "Server=47.117.165.18,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",
@@ -40,7 +42,8 @@
     "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
 
-    "LoginFailLockMinutes": 30
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 60
   },
 
   "SystemEmailSendConfig": {
@@ -49,8 +52,10 @@
     "FromEmail": "IRC@extimaging.com",
     "FromName": "IRC",
     "AuthorizationCode": "ExtImg@2022",
-    "SiteUrl": "http://irc.extimaging.com/login"
+    "SiteUrl": "http://irc.extimaging.com/login",
+    "CompanyName": "Extensive Imaging",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Extensive Imaging",
+    "CompanyShortNameCN": "展影医疗"
   }
-
-
 }

IRaCIS.Core.API/appsettings.Test_IRC.json

@@ -18,7 +18,7 @@
 
     "AliyunOSS": {
       "regionId": "cn-shanghai",
-      "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
+      "endPoint": "https://oss-cn-shanghai.aliyuncs.com",
       "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
       "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
       "bucketName": "zy-irc-test-store",
@@ -28,12 +28,22 @@
     },
 
     "MinIO": {
-      "endpoint": "http://192.168.3.68",
+      "endPoint": "192.168.3.68",
       "port": "8001",
       "useSSL": false,
       "accessKey": "IDFkwEpWej0b4DtiuThL",
       "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
-      "bucketName": "test"
+      "bucketName": "test",
+      "viewEndpoint": "http://192.168.3.68:8001/test/"
+    },
+
+    "AWS": {
+      "endPoint": "s3.us-east-1.amazonaws.com",
+      "useSSL": true,
+      "accessKey": "AKIAZQ3DRSOHFPJJ6FEU",
+      "secretKey": "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",
+      "bucketName": "ei-irc-test-store",
+      "viewEndpoint": "https://ei-irc-test-store.s3.amazonaws.com/"
     }
   },
 
@@ -49,7 +59,8 @@
 
     "LoginMaxFailCount": 5,
 
-    "LoginFailLockMinutes": 1
+    "LoginFailLockMinutes": 1,
+    "AutoLoginOutMinutes": 10
   },
 
   "SystemEmailSendConfig": {
@@ -59,7 +70,12 @@
     "FromName": "Test_IRC",
     "AuthorizationCode": "SHzyyl2021",
 
-    "SiteUrl": "http://irc.test.extimaging.com/login"
+    "SiteUrl": "http://irc.test.extimaging.com/login",
+
+    "CompanyName": "Extensive Imaging",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Extensive Imaging",
+    "CompanyShortNameCN": "展影医疗"
   }
 
 }

IRaCIS.Core.API/appsettings.USDemo.json

@@ -1,37 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "ConnectionStrings": {
-    "RemoteNew": "Server=47.90.161.85,1433\\MSSQLSERVER;Database=IRaCIS_Demo_US;User ID=sa;Password=zhanying2021;TrustServerCertificate=true",
-    "Hangfire": "Server=47.90.161.85,1433\\MSSQLSERVER;Database=Hangfire.IRaCIS_Demo_US;User ID=sa;Password=zhanying2021;TrustServerCertificate=true"
-
-  },
-  "BasicSystemConfig": {
-
-    "OpenUserComplexPassword": false,
-
-    "OpenSignDocumentBeforeWork": false,
-
-    "OpenTrialRelationDelete": true,
-
-    "OpenLoginLimit": false,
-
-    "LoginMaxFailCount": 5,
-
-    "LoginFailLockMinutes": 30
-  },
-
-  "SystemEmailSendConfig": {
-    "Port": 465,
-    "Host": "smtp.qiye.aliyun.com",
-    "FromEmail": "test@extimaging.com",
-    "FromName": "Test_IRC",
-    "AuthorizationCode": "SHzyyl2021"
-  }
-
-}

IRaCIS.Core.API/appsettings.US_IRC.json

@@ -0,0 +1,79 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ConnectionStrings": {
+    "RemoteNew": "Server=us-mssql-service,1433;Database=Prod_US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=us-mssql-service,1433;Database=Prod_US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+
+    //"RemoteNew": "Server=44.218.11.19,1435;Database=Prod_US_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    //"Hangfire": "Server=44.218.11.19,1435;Database=Prod_US_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+  },
+
+  "ObjectStoreService": {
+
+    "ObjectStoreUse": "AWS",
+
+    "AliyunOSS": {
+      "regionId": "cn-shanghai",
+      "endPoint": "https://oss-cn-shanghai.aliyuncs.com",
+      "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
+      "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
+      "bucketName": "zy-irc-test-store",
+      "roleArn": "acs:ram::1899121822495495:role/oss-upload",
+      "viewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
+      "region": "oss-cn-shanghai"
+    },
+
+    "MinIO": {
+      "endPoint": "192.168.3.68",
+      "port": "8001",
+      "useSSL": false,
+      "accessKey": "IDFkwEpWej0b4DtiuThL",
+      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
+      "bucketName": "test",
+      "viewEndpoint": "http://192.168.3.68:8001/test/"
+    },
+
+    "AWS": {
+      "endPoint": "s3.us-east-1.amazonaws.com",
+      "useSSL": true,
+      "accessKey": "AKIAZQ3DRSOHFPJJ6FEU",
+      "secretKey": "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",
+      "bucketName": "ei-irc-test-store",
+      "viewEndpoint": "https://ei-irc-test-store.s3.amazonaws.com/"
+    }
+  },
+  "BasicSystemConfig": {
+
+    "OpenUserComplexPassword": false,
+
+    "OpenSignDocumentBeforeWork": false,
+
+    "OpenTrialRelationDelete": true,
+
+    "OpenLoginLimit": false,
+
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 60
+  },
+
+  "SystemEmailSendConfig": {
+    "Port": 465,
+    "Host": "smtp.qiye.aliyun.com",
+    "FromEmail": "test@extimaging.com",
+    "FromName": "Test_IRC",
+    "AuthorizationCode": "SHzyyl2021",
+    "CompanyName": "Elevate Imaging",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Elevate Imaging",
+    "CompanyShortNameCN": "展影医疗"
+  }
+
+}

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -44,7 +44,8 @@
     "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
 
-    "LoginFailLockMinutes": 30
+    "LoginFailLockMinutes": 30,
+    "AutoLoginOutMinutes": 60
 
   },
   "SystemEmailSendConfig": {
@@ -53,7 +54,11 @@
     "FromEmail": "uat@extimaging.com",
     "FromName": "UAT_IRC",
     "AuthorizationCode": "SHzyyl2021",
-    "SiteUrl": "http://irc.uat.extimaging.com/login"
+    "SiteUrl": "http://irc.uat.extimaging.com/login",
+    "CompanyName": "Extensive Imaging",
+    "CompanyNameCN": "上海展影医疗科技有限公司",
+    "CompanyShortName": "Extensive Imaging",
+    "CompanyShortNameCN": "展影医疗"
   }
 
 

IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser.html

@@ -11,7 +11,7 @@
                 尊敬的 {0} ,您好：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                展影医疗为您添加了账户，账户信息如下:
+                {company abbreviation}为您添加了账户，账户信息如下:
             </div>
             <span style="color: #00D1B2"></span>
             <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>              
@@ -23,7 +23,7 @@
                 </div>
                 <div>
                     首次登陆前，请通过该链接修改您的账户信息：
-                    <a href='{3}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                    <a href='{3}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
                         初始化账号信息
                     </a>
                 </div>
@@ -31,8 +31,8 @@
 
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>祝您顺利！/Best Regards</div>
+                <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/AdminAddUser_US.html

@@ -11,28 +11,28 @@
                 Dear  {0} ,
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Extimaging has added an account for you. The account information is as follows:
+                {company abbreviation} has created an account for you. The account information is as follows:
             </div>
             <span style="color: #00D1B2"></span>
             <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>              
                 <div>
-                    User name: {1}
+                    User ID: {1}
                 </div>
                 <div>
                     Role: {2}
                 </div>
                 <div>
-                    Before logging in for the first time, please modify your account information by this link：
+                    Before logging in for the first time, please modify the account information through this link：
-                    <a href='{3}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                    <a href='{3}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
-                        Initialize the account information
+                    Initialize account information
                     </a>
                 </div>
             </div>
 
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>Best Regards</div>
+                <div>Best regards,</div>
-                <div style="font-size: 14px;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/AdminResetUser.html

@@ -11,7 +11,7 @@
                 尊敬的 {0} ,您好：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                展影医疗将您的账户密码已重置，账户信息如下:
+                {company abbreviation}将您的账户密码已重置，账户信息如下:
             </div>
             <span style="color: #00D1B2"></span>
             <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
@@ -28,8 +28,8 @@
 
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>祝您顺利！/Best Regards</div>
+                <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/AdminResetUser_US.html

@@ -11,12 +11,12 @@
                 Dear {0} ,
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Extimaging has reset your account password, and the account information is as follows:
+                {company abbreviation} has reset your account password, and the account information is as follows:
             </div>
             <span style="color: #00D1B2"></span>
             <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
                 <div>
-                    User name: {1}
+                    User ID: {1}
                 </div>
                 <div>
                     Role: {2}
@@ -28,8 +28,8 @@
 
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>Best Regards</div>
+                <div>Best regards,</div>
-                <div style="font-size: 14px;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/SubjectEnrollConfirmOrPDProgress.html

@@ -18,8 +18,8 @@
             </div>
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>祝您顺利！/Best Regards</div>
+                <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/SubjectEnrollConfirmOrPDProgress_US.html

@@ -11,15 +11,15 @@
                 Dear：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Thank you for using Extensive Imaging Cloud System.
+                Thank you for using {company abbreviation} Cloud System.
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 {0}。
             </div>
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>Best Regards</div>
+                <div>Best regards,</div>
-                <div style="font-size: 14px;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin.html

@@ -11,7 +11,7 @@
                 尊敬的 {0} ,您好：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目阅片相关工作。
+                {company abbreviation}作为 [{1}   (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目阅片相关工作。
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 该项目采用电子化工作流，系统及您的账号信息如下：
@@ -35,15 +35,15 @@
                 </div>
                 <div>
                     系统登录地址:
-                    <a href='{6}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                    <a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
                         点击跳转
                     </a>
                 </div>
             </div>
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>祝您顺利！/Best Regards</div>
+                <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html

@@ -11,10 +11,10 @@
                 Dear {0},
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
-                As the service provider of {1} trial（Protocol ID is {2}）, Extensive Imaging invites you to participate in the independent assessment work of this trial.
+                {company abbreviation} invites you to participate in the IRC work of a trial ({1} , {2}).
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                This project adopts electronic workflow. The system and your account information are as follows：
+                Your account information is as follows：
             </div>
             <span style="color: #00D1B2"></span>
             <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
@@ -25,23 +25,26 @@
                     Protocol ID: {2}
                 </div>
                 <div>
-                    Study name: {1}
+                    Study Name: {1}
                 </div>
                 <div>
-                    User name: {4}
+                    User ID: {4}
                 </div>
                 <div>
                     Role: {5}
                 </div>
                 <div>
-                    Login URL: {6}
+                    Login URL: 
+					<a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                        Click to login
+                    </a>
                 </div>
             </div>
 
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>Best Regards</div>
+                <div>Best regards,</div>
-                <div style="font-size: 14px;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin.html

@@ -11,7 +11,7 @@
                 尊敬的 {0} ,您好：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作，欢迎您提供指导和建议，非常感谢！
+                {company abbreviation}作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作，欢迎您提供指导和建议，非常感谢！
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 该项目采用电子化工作流，系统及您的账号信息如下：
@@ -35,7 +35,7 @@
                 </div>
                 <div>
                     首次登陆前，请通过该链接修改您的账户信息：
-                    <a href='{6}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                    <a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
                         初始化账号信息
                     </a>
                 </div>
@@ -43,8 +43,8 @@
 
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>祝您顺利！/Best Regards</div>
+                <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html

@@ -11,10 +11,10 @@
                 Dear {0},
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Hello, as the IRC supplier of [ {1} (Protocol ID is {2}) ] project，Extiming sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome.
+                {company abbreviation} invites you to participate in the IRC work of a trial ({1}, {2}).
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                This project adopts electronic workflow. The system and your account information are as follows：
+                Your account information is  as follows：
             </div>
             <span style="color: #00D1B2"></span>
             <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
@@ -25,26 +25,26 @@
                     Protocol ID: {2}
                 </div>
                 <div>
-                    Study name: {1}
+                    Study Name: {1}
                 </div>
                 <div>
-                    User name: {4}
+                    User ID: {4}
                 </div>
                 <div>
                     Role: {5}
                 </div>
                 <div>
-                    Before logging in for the first time, please modify your account information by this link：
+                    Before logging in for the first time, please modify the account information through this link：
-                    <a href='{6}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                    <a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
-                        Initialize the account information
+                     Initialize account information
                     </a>
                 </div>
             </div>
 
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>Best Regards</div>
+                <div>Best regards,</div>
-                <div style="font-size: 14px;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject.html

@@ -11,7 +11,7 @@
                 尊敬的 {0} ,您好：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                您好, 您填写的中心调研表被驳回，详细信息如下：
+                您填写的中心调研表被驳回，详细信息如下：
             </div>
             <span style="color: #00D1B2"></span>
             <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
@@ -40,8 +40,8 @@
             </a>
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>祝您顺利！/Best Regards</div>
+                <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject_US.html

@@ -11,7 +11,7 @@
                 Dear  {0} ,
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Hello, the center survey form you filled in has been rejected. The details are as follows：
+                The site survey form you filled in has been rejected. The details are as follows：
             </div>
             <span style="color: #00D1B2"></span>
             <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
@@ -22,7 +22,7 @@
                     Protocol ID: {2}
                 </div>
                 <div>
-                    Study name: {3}
+                    Study Name: {3}
                 </div>
                 <div>
                     Site ID: {4}
@@ -40,8 +40,8 @@
             </a>
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>Best Regards</div>
+                <div>Best regards,</div>
-                <div style="font-size: 14px;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin.html

@@ -11,7 +11,7 @@
                 尊敬的 {0} ,您好：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目相关工作，欢迎您提供指导和建议，非常感谢！
+                {company abbreviation}作为 [{1}   (试验方案号：{2 })] 项目的供应商，诚邀您参加该项目相关工作，欢迎您提供指导和建议，非常感谢！
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 该项目采用电子化工作流，系统及您的账号信息如下：
@@ -35,7 +35,7 @@
                 </div>
                 <div>
                     系统登录地址:
-                    <a href='{6}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                    <a href='{6}' style='margin-left:5px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
                         点击跳转
                     </a>
                 </div>
@@ -43,8 +43,8 @@
 
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>祝您顺利！/Best Regards</div>
+                <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html

@@ -11,10 +11,10 @@
                 Dear {0},
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
-                As the service provider of {1} trial (Protocol ID is {2}), Extensive Imaging invites you to participate in related work of this trial.
+                {company abbreviation} invites you to participate in the IRC work of a trial ({1}, {2}).
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                This project adopts electronic workflow. The system and your account information are as follows：
+                Your account information is as follows：
             </div>
             <span style="color: #00D1B2"></span>
             <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
@@ -25,23 +25,26 @@
                     Protocol ID: {2}
                 </div>
                 <div>
-                    Study name: {1}
+                    Study Name: {1}
                 </div>
                 <div>
-                    User name: {4}
+                    User ID: {4}
                 </div>
                 <div>
                     Role: {5}
                 </div>
                 <div>
-                    Login URL: {6}
+                    Login URL: 
+					<a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                        Click to login
+                    </a>
                 </div>
             </div>
 
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>Best Regards</div>
+                <div>Best regards,</div>
-                <div style="font-size: 14px;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin.html

@@ -11,7 +11,7 @@
                 尊敬的 {0} ,您好：
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！
+                {company abbreviation}作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 该项目采用电子化工作流，系统及您的账号信息如下：
@@ -35,7 +35,7 @@
                 </div>
                 <div>
                     首次登陆前，请通过该链接修改您的账户信息：
-                    <a href='{6}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                    <a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
                         初始化账号信息
                     </a>
                 </div>
@@ -43,8 +43,8 @@
 
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>祝您顺利！/Best Regards</div>
+                <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html

@@ -11,10 +11,10 @@
                 Dear {0},
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Hello, as the IRC supplier of [ {1} (Protocol ID is {2}) ] project，Extiming sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome.
+                {company abbreviation} invites you to participate in the IRC work of a trial ({1}, {2}).
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                This project adopts electronic workflow. The system and your account information are as follows：
+                Your account information is as follows：
             </div>
             <span style="color: #00D1B2"></span>
             <div style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 14px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;'>
@@ -25,17 +25,17 @@
                     Protocol ID: {2}
                 </div>
                 <div>
-                    Study name: {1}
+                    Study Name: {1}
                 </div>
                 <div>
-                    User name: {4}
+                    User ID: {4}
                 </div>
                 <div>
                     Role: {5}
                 </div>
                 <div>
-                    Before logging in for the first time, please modify your account information by this link：
+                    Before logging in for the first time, please modify the account information through this link：
-                    <a href='{6}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                    <a href='{6}' style='margin-left:1px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
                      Initialize the account information
                     </a>
                 </div>
@@ -43,8 +43,8 @@
 
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>Best Regards</div>
+                <div>Best regards,</div>
-                <div style="font-size: 14px;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html

@@ -8,7 +8,7 @@
     <div style='padding-left: 40px;background: #f6f6f6'>
         <div style='padding-top: 20px;'>
             <div style='line-height: 40px;font-size: 18px'>
-                Hello {0},
+               {0}您好,
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 感谢您使用展影云平台。
@@ -21,7 +21,7 @@
             </div>
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
                 <div>祝您顺利！</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html

@@ -8,21 +8,21 @@
     <div style='padding-left: 40px;background: #f6f6f6'>
         <div style='padding-top: 20px;'>
             <div style='line-height: 40px;font-size: 18px'>
-                Hello {0},
+                Dear {0},
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Thank you for using Extensive Imaging’s cloud system!
+                {1}
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                {1}, and the verification code is <span style="font-weight:bold">{2}</span>.
+                The verification code is <span style="font-weight:bold">{2}</span>.
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Please enter this verification code within 3 minutes for subsequent operations.
+                This code will expire in 3 minutes.
             </div>
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>Best Regards</div>
+                <div>Best regards,</div>
-                <div style="font-size: 14px;">Extensive Imaging</div>
+                <div style="font-size: 14px;">{company}</div>
             </div>
         </div>
     </div>

IRaCIS.Core.Application/BackGroundJob/IRaCISCHangfireJob.cs

@@ -8,6 +8,7 @@ using IRaCIS.Core.Infrastructure;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using SharpCompress.Common;
 
 namespace IRaCIS.Application.Services.BackGroundJob
 {
@@ -24,6 +25,8 @@ namespace IRaCIS.Application.Services.BackGroundJob
     {
         public static string JsonFileFolder = Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources);
 
+        public static FileSystemWatcher FileSystemWatcher_US { get; set; }
+        public static FileSystemWatcher FileSystemWatcher_CN { get; set; }
         private readonly IRepository<Trial> _trialRepository;
         private readonly IEasyCachingProvider _provider;
         private readonly ILogger<IRaCISCHangfireJob> _logger;
@@ -124,29 +127,43 @@ namespace IRaCIS.Application.Services.BackGroundJob
 
 
             //监测Json文件变更 实时刷新数据
-            WatchJsonFile(usJsonPath);
-            WatchJsonFile(cnJsonPath);
 
-        }
+            if (!File.Exists(usJsonPath)|| !File.Exists(cnJsonPath))
-
-        public void WatchJsonFile(string filePath)
-        {
-            if (!File.Exists(filePath))
             {
                 throw new BusinessValidationFailedException(StaticData.International("IRaCISCHangfireJob_FileNotFound"));
             }
 
-            FileSystemWatcher watcher = new FileSystemWatcher(Path.GetDirectoryName(filePath), Path.GetFileName(filePath));
+            FileSystemWatcher_US = new FileSystemWatcher
-            watcher.Changed += (sender, e) => LoadJsonFile(filePath);
+            {
-            watcher.EnableRaisingEvents = true;
+                Path = Path.GetDirectoryName(usJsonPath)!,
+                NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.Size,
+                Filter = Path.GetFileName(usJsonPath),
+                EnableRaisingEvents = true,
+
+            };
+            // 添加文件更改事件的处理程序
+            FileSystemWatcher_US.Changed += (sender, e) => LoadJsonFile(usJsonPath);
+
+
+            FileSystemWatcher_CN = new FileSystemWatcher
+            {
+                Path = Path.GetDirectoryName(cnJsonPath)!,
+                NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.Size,
+                Filter = Path.GetFileName(cnJsonPath),
+                EnableRaisingEvents = true,
+
+            };
+            FileSystemWatcher_CN.Changed += (sender, e) => LoadJsonFile(cnJsonPath);
 
         }
 
 
+
+
         private void LoadJsonFile(string filePath)
         {
-
+            Console.WriteLine("刷新json内存数据");
-            IConfigurationBuilder builder = new ConfigurationBuilder().AddJsonFile(filePath);
+            IConfigurationBuilder builder = new ConfigurationBuilder().AddJsonFile(filePath,false,true);
 
             IConfigurationRoot enConfiguration = builder.Build();
 

IRaCIS.Core.Application/BusinessFilter/LimitUserRequestAuthorization.cs

@@ -35,6 +35,8 @@ public class LimitUserRequestAuthorization : IAsyncAuthorizationFilter
 
     public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
     {
+        var minutes = _verifyConfig.CurrentValue.AutoLoginOutMinutes;
+
         if (_verifyConfig.CurrentValue.OpenLoginLimit)
         {
             if (context.ActionDescriptor.EndpointMetadata.Any(item => item is IAllowAnonymous))
@@ -58,22 +60,44 @@ public class LimitUserRequestAuthorization : IAsyncAuthorizationFilter
                     context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["LimitUser_AuthTokenMissing"]));
                 }
 
+
+
                 //2、在这里取缓存  进行比较  看是否有其他人进行了登陆，如果其他人登陆了，就把之前用户挤掉
                 var cacheUserToken = (await _provider.GetAsync<string>(_userInfo.Id.ToString())).Value;
 
+
+
                 //缓存中没有取到Token
                 if (string.IsNullOrWhiteSpace(cacheUserToken))
                 {
+                    cacheUserToken = _userInfo.UserToken;
+
                     //设置当前用户最新Token
                     await _provider.SetAsync(_userInfo.Id.ToString(), _userInfo.UserToken, TimeSpan.FromDays(7));
 
-                    cacheUserToken = _userInfo.UserToken;
+                    //重启应用程序，所有人续期，不一下子踢出所有人
+                    await _provider.SetAsync($"{_userInfo.Id.ToString()}_Online", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));
 
                 }
                 //是同一个人  
                 else if (cacheUserToken == _userInfo.UserToken)
                 {
 
+                    var cacheTime = (await _provider.GetAsync<string>($"{_userInfo.Id.ToString()}_Online")).Value;
+
+                    //过期了 需要自动退出
+                    if (string.IsNullOrEmpty(cacheTime))
+                    {
+                        context.HttpContext.Response.ContentType = "application/json";
+                        context.HttpContext.Response.StatusCode = StatusCodes.Status403Forbidden;
+                        context.Result = new JsonResult(ResponseOutput.NotOk("登录无操作超时自动退出", ApiResponseCodeEnum.AutoLoginOut));
+
+                    }
+                    else
+                    {
+                        await _provider.SetAsync($"{_userInfo.Id.ToString()}_Online", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(minutes));
+                    }
+
                 }
 
                 else

IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs

@@ -32,7 +32,9 @@ namespace IRaCIS.Core.Application.Filter
 
                 if (context.Exception.GetType() == typeof(BusinessValidationFailedException))
                 {
-                    context.Result = new JsonResult(ResponseOutput.NotOk(context.Exception.Message,ApiResponseCodeEnum.BusinessValidationFailed));
+                    var error = context.Exception as BusinessValidationFailedException;
+
+					context.Result = new JsonResult(ResponseOutput.NotOk(context.Exception.Message, error!.Code));
                 }
                 else if(context.Exception.GetType() == typeof(QueryBusinessObjectNotExistException))
                 {

IRaCIS.Core.Application/Helper/ExcelExportHelper.cs

@@ -342,7 +342,7 @@ public static class ExcelExportHelper
             IgnoreTemplateParameterMissing = true,
         };
 
-        await MiniExcel.SaveAsByTemplateAsync(memoryStream, tplPath, translateData, config);
+        await MiniExcel.SaveAsByTemplateAsync(memoryStream, templateStream.ToArray(), translateData, config);
 
         memoryStream.Seek(0, SeekOrigin.Begin);
 

IRaCIS.Core.Application/Helper/OSSService.cs

@@ -3,6 +3,8 @@ using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Infrastructure;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
+using Minio.DataModel.Args;
+using Minio;
 using NPOI.HPSF;
 using SharpCompress.Common;
 using System;
@@ -13,17 +15,24 @@ using System.Linq;
 using System.Security.AccessControl;
 using System.Text;
 using System.Threading.Tasks;
+using SkiaSharp;
 
 namespace IRaCIS.Core.Application.Helper
 {
-    public class MinIOOptions
+    public class MinIOOptions : AWSOptions
     {
-        public string endpoint { get; set; }
+        public int port { get; set; }
-        public string port { get; set; }
+
+    }
+
+    public class AWSOptions
+    {
+        public string endPoint { get; set; }
         public bool useSSL { get; set; }
         public string accessKey { get; set; }
         public string secretKey { get; set; }
         public string bucketName { get; set; }
+        public string viewEndpoint { get; set; }
     }
 
     public class AliyunOSSOptions
@@ -48,6 +57,8 @@ namespace IRaCIS.Core.Application.Helper
         public AliyunOSSOptions AliyunOSS { get; set; }
         public MinIOOptions MinIO { get; set; }
 
+        public AWSOptions AWS { get; set; }
+
     }
 
     public class ObjectStoreDTO
@@ -58,6 +69,8 @@ namespace IRaCIS.Core.Application.Helper
 
         public MinIOOptions MinIO { get; set; }
 
+        public AWSOptions AWS { get; set; }
+
     }
 
     public class AliyunOSSTempToken
@@ -81,39 +94,28 @@ namespace IRaCIS.Core.Application.Helper
         AWS = 2,
     }
 
-
-
-
-
-
     public interface IOSSService
     {
-        public string UploadToOSS(Stream fileStream, string oosFolderPath, string fileRealName);
+        public Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName);
-        public string UploadToOSS(string localFilePath, string oosFolderPath);
+        public Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath);
 
-        public void DownLoadFromOSS(string ossRelativePath, string localFilePath);
+        public Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath);
 
-        public AliyunOSSOptions _OSSConfig { get; set; }
+        public ObjectStoreServiceOptions ObjectStoreServiceOptions { get; set; }
+
+        public Task<string> GetSignedUrl(string ossRelativePath);
 
-        public OssClient _ossClient { get; set; }
     }
+
+
     public class OSSService : IOSSService
     {
-
+        public ObjectStoreServiceOptions ObjectStoreServiceOptions { get; set; }
-        public AliyunOSSOptions _OSSConfig { get; set; }
-
-        public OssClient _ossClient { get; set; }
-
 
 
         public OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options)
         {
-            var ossOptions = options.CurrentValue;
+            ObjectStoreServiceOptions = options.CurrentValue;
-
-            _OSSConfig = ossOptions.AliyunOSS;
-
-            _ossClient = new OssClient(_OSSConfig.endPoint, _OSSConfig.accessKeyId, _OSSConfig.accessKeySecret);
-
         }
 
         /// <summary>
@@ -123,14 +125,13 @@ namespace IRaCIS.Core.Application.Helper
         /// <param name="oosFolderPath"></param>
         /// <param name="fileRealName"></param>
         /// <returns></returns>
-        /// <exception cref="BusinessValidationFailedException"></exception>
+        public async Task<string> UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName)
-        public string UploadToOSS(Stream fileStream, string oosFolderPath,string fileRealName)
         {
 
-            var ossRelativePath = oosFolderPath + "/" + fileRealName;
 
-            try
+            var ossRelativePath = $"{oosFolderPath}/{Guid.NewGuid()}_{fileRealName}";
-            {
+            //var ossRelativePath = oosFolderPath + "/" + fileRealName;
+
             using (var memoryStream = new MemoryStream())
             {
                 fileStream.Seek(0, SeekOrigin.Begin);
@@ -139,19 +140,65 @@ namespace IRaCIS.Core.Application.Helper
 
                 memoryStream.Seek(0, SeekOrigin.Begin);
 
+
+                if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+                {
+                    var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+
+                    var _ossClient = new OssClient(aliConfig.endPoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+
+
+
                     // 上传文件
-                    var result = _ossClient.PutObject(_OSSConfig.bucketName, ossRelativePath, memoryStream);
+                    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.accessKey, minIOConfig.secretKey).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 minIOConfig = ObjectStoreServiceOptions.AWS;
+
+
+                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
+                        .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                        .Build();
+
+                    var putObjectArgs = new PutObjectArgs()
+                           .WithBucket(minIOConfig.bucketName)
+                           .WithObject(ossRelativePath)
+                           .WithStreamData(memoryStream)
+                           .WithObjectSize(memoryStream.Length);
+
+                    await minioClient.PutObjectAsync(putObjectArgs);
+                }
+                else
+                {
+                    throw new BusinessValidationFailedException("未定义的存储介质类型");
+                }
             }
 
 
             return "/" + ossRelativePath;
-            }
-            catch (Exception ex)
-            {
-                throw new BusinessValidationFailedException("oss上传失败" + ex.Message);
 
         }
-        }
+
+
 
         /// <summary>
         /// oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
@@ -160,32 +207,81 @@ namespace IRaCIS.Core.Application.Helper
         /// <param name="oosFolderPath"></param>
         /// <returns></returns>
         /// <exception cref="BusinessValidationFailedException"></exception>
-        public string UploadToOSS(string localFilePath, string oosFolderPath)
+        public async Task<string> UploadToOSSAsync(string localFilePath, string oosFolderPath)
         {
             var localFileName = Path.GetFileName(localFilePath);
 
-            var ossRelativePath = oosFolderPath + "/" + localFileName;
+            var ossRelativePath = $"{oosFolderPath}/{Guid.NewGuid()}_{localFileName}";
+
+            //var ossRelativePath = oosFolderPath + "/" + localFileName;
 
 
-            try
+            if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
             {
+                var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+
+                var _ossClient = new OssClient(aliConfig.endPoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+
                 // 上传文件
-                var result = _ossClient.PutObject(_OSSConfig.bucketName, ossRelativePath, localFilePath);
+                var result = _ossClient.PutObject(aliConfig.bucketName, ossRelativePath, localFilePath);
 
-                return ossRelativePath;
             }
-            catch (Exception ex)
+            else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
             {
-                throw new BusinessValidationFailedException("oss上传失败" + ex.Message);
+                var minIOConfig = ObjectStoreServiceOptions.MinIO;
 
-            }
-        }
 
-        public void DownLoadFromOSS(string ossRelativePath, string localFilePath)
+                var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}:{minIOConfig.port}")
+                    .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).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 minIOConfig = ObjectStoreServiceOptions.AWS;
+
+
+                var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
+                    .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                    .Build();
+
+                var putObjectArgs = new PutObjectArgs()
+                       .WithBucket(minIOConfig.bucketName)
+                       .WithObject(ossRelativePath)
+                       .WithFileName(localFilePath);
+
+                await minioClient.PutObjectAsync(putObjectArgs);
+            }
+            else
+            {
+                throw new BusinessValidationFailedException("未定义的存储介质类型");
+            }
+            return "/" + ossRelativePath;
+
+        }
+
+        public async Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath)
+        {
+
+            ossRelativePath = ossRelativePath.TrimStart('/');
             try
             {
-                var result = _ossClient.GetObject(_OSSConfig.bucketName, ossRelativePath);
+
+
+                if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+                {
+                    var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+
+                    var _ossClient = new OssClient(aliConfig.endPoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+
+                    // 上传文件
+                    var result = _ossClient.GetObject(aliConfig.bucketName, ossRelativePath);
 
                     // 将下载的文件流保存到本地文件
                     using (var fs = File.OpenWrite(localFilePath))
@@ -193,6 +289,43 @@ namespace IRaCIS.Core.Application.Helper
                         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.accessKey, minIOConfig.secretKey).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 minIOConfig = ObjectStoreServiceOptions.AWS;
+
+                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
+                        .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                        .Build();
+
+                    var getObjectArgs = new GetObjectArgs()
+                    .WithBucket(minIOConfig.bucketName)
+                    .WithObject(ossRelativePath)
+                    .WithFile(localFilePath);
+
+                    await minioClient.GetObjectAsync(getObjectArgs);
+                }
+                else
+                {
+                    throw new BusinessValidationFailedException("未定义的存储介质类型");
+                }
             }
             catch (Exception ex)
             {
@@ -201,11 +334,86 @@ namespace IRaCIS.Core.Application.Helper
             }
 
 
+
+
+
         }
 
+        public async Task<string>  GetSignedUrl(string ossRelativePath)
+        {
+            ossRelativePath = ossRelativePath.TrimStart('/');
+            try
+            {
 
 
+                if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+                {
+                    var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
 
+                    var _ossClient = new OssClient(aliConfig.endPoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+
+                    // 生成签名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.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                        .Build();
+
+                    //var reqParams = new Dictionary<string, string>(StringComparer.Ordinal)
+                    //                {
+                    //                    { "response-content-type", "application/json" }
+                    //                };
+
+                    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 minIOConfig = ObjectStoreServiceOptions.AWS;
+
+                    var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}")
+                        .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                        .Build();
+
+                    return string.Empty;
+                }
+                else
+                {
+                    throw new BusinessValidationFailedException("未定义的存储介质类型");
+                }
+            }
+            catch (Exception ex)
+            {
+
+                throw new BusinessValidationFailedException("oss授权url失败!" + ex.Message);
+            }
+
+        }
     }
 
 

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<LangVersion>default</LangVersion>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
@@ -64,8 +64,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />	
-		<PackageReference Include="FreeSpire.Doc" Version="11.6.0" />
+		<PackageReference Include="FreeSpire.Doc" Version="12.2.0" />
-		<PackageReference Include="Hangfire.Core" Version="1.8.6" />
+		<PackageReference Include="Hangfire.Core" Version="1.8.11" />
 		<PackageReference Include="BeetleX.BNR" Version="1.0.1" />
 		<PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
 		<PackageReference Include="EasyCaching.Redis" Version="1.9.2" />
@@ -74,31 +74,31 @@
 		<PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" />
 		<PackageReference Include="DistributedLock.Redis" Version="1.0.2" />
 		<PackageReference Include="DistributedLock.SqlServer" Version="1.0.3" />
-		<PackageReference Include="fo-dicom" Version="5.1.1" />
+		<PackageReference Include="fo-dicom" Version="5.1.2" />
-		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.0" />
+		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.2" />
-		<PackageReference Include="fo-dicom.Codecs" Version="5.11.0" />
+		<PackageReference Include="fo-dicom.Codecs" Version="5.12.0" />
-		<PackageReference Include="Magicodes.IE.Core" Version="2.7.4.5" />
+		<PackageReference Include="Magicodes.IE.Core" Version="2.7.5.1" />
-		<PackageReference Include="Magicodes.IE.Csv" Version="2.7.4.5">
+		<PackageReference Include="Magicodes.IE.Csv" Version="2.7.5.1">
 		  <TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
-		<PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.5">
+		<PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.1">
 		  <TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
-		<PackageReference Include="Magicodes.IE.Excel.AspNetCore" Version="2.7.4.5" />
+		<PackageReference Include="Magicodes.IE.Excel.AspNetCore" Version="2.7.5.1" />
-		<PackageReference Include="MailKit" Version="4.3.0" />
+		<PackageReference Include="MailKit" Version="4.4.0" />
 		<PackageReference Include="MediatR" Version="12.2.0" />
-		<PackageReference Include="MimeKit" Version="4.3.0" />
+		<PackageReference Include="MimeKit" Version="4.4.0" />
-		<PackageReference Include="MiniExcel" Version="1.31.2" />
+		<PackageReference Include="MiniExcel" Version="1.31.3" />
-		<PackageReference Include="Minio" Version="6.0.1" />
+		<PackageReference Include="Minio" Version="6.0.2" />
-		<PackageReference Include="MiniWord" Version="0.7.0" />
+		<PackageReference Include="MiniWord" Version="0.8.0" />
-		<PackageReference Include="My.Extensions.Localization.Json" Version="3.0.0">
+		<PackageReference Include="My.Extensions.Localization.Json" Version="3.2.0">
 		  <TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
 		<PackageReference Include="NPOI" Version="2.6.2" />
 		<PackageReference Include="Panda.DynamicWebApi" Version="1.2.1" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.0" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
-		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.12" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.1" />
-		<PackageReference Include="WinSCP" Version="6.1.2" />
+		<PackageReference Include="WinSCP" Version="6.3.2" />
 	</ItemGroup>
 
 	<ItemGroup>

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

@@ -84,7 +84,7 @@
             <param name="type"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Helper.OSSService.UploadToOSS(System.IO.Stream,System.String,System.String)">
+        <member name="M:IRaCIS.Core.Application.Helper.OSSService.UploadToOSSAsync(System.IO.Stream,System.String,System.String)">
             <summary>
              oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
             </summary>
@@ -92,9 +92,8 @@
             <param name="oosFolderPath"></param>
             <param name="fileRealName"></param>
             <returns></returns>
-            <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
         </member>
-        <member name="M:IRaCIS.Core.Application.Helper.OSSService.UploadToOSS(System.String,System.String)">
+        <member name="M:IRaCIS.Core.Application.Helper.OSSService.UploadToOSSAsync(System.String,System.String)">
             <summary>
             oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
             </summary>
@@ -155,12 +154,11 @@
             <param name="inQuery"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.ConfirmGenerateSelfConsistentTask(IRaCIS.Core.Application.ViewModel.ConsistentConfirmGenerateCommand,IRaCIS.Core.Application.Service.IVisitTaskHelpeService)">
+        <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.ConfirmGenerateSelfConsistentTask(IRaCIS.Core.Application.ViewModel.ConsistentConfirmGenerateCommand)">
             <summary>
             确认生成自身一致性分析任务
             </summary>
             <param name="inCommand"></param>
-            <param name="_visitTaskCommonService"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetGroupConsistentRuleSubjectList(IRaCIS.Core.Application.ViewModel.GroupConsistentQuery)">
@@ -170,12 +168,11 @@
             <param name="inQuery"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.ConfirmGenerateGroupConsistentTask(IRaCIS.Core.Application.ViewModel.GroupConsistentConfirmGenrateCommand,IRaCIS.Core.Application.Service.IVisitTaskHelpeService)">
+        <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.ConfirmGenerateGroupConsistentTask(IRaCIS.Core.Application.ViewModel.GroupConsistentConfirmGenrateCommand)">
             <summary>
             确认生成组间一致性分析任务
             </summary>
             <param name="inCommand"></param>
-            <param name="_visitTaskCommonService"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetIQueryableDoctorSelfConsistentSubjectView(IRaCIS.Core.Domain.Models.TaskConsistentRule,System.Guid,System.Collections.Generic.List{System.Guid})">
@@ -187,6 +184,14 @@
             <param name="subejctIdList"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetGroupConsistentQueryAsync(IRaCIS.Core.Domain.Models.TaskConsistentRule,System.Collections.Generic.List{System.Guid})">
+            <summary>
+            组间一致性分析 满足条件的subject 筛选
+            </summary>
+            <param name="filterObj"></param>
+            <param name="subejctIdList"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetSelfConsistentDoctorStatList(IRaCIS.Core.Application.ViewModel.TaskConsistentRuleQuery)">
             <summary>
             自身一致性分配 配置+  统计已经生成数量统计表
@@ -194,6 +199,28 @@
             <param name="inQuery"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetSelfConsistentRuleMatchSubjectIdListAsync(IRaCIS.Core.Application.ViewModel.SelfConsistentSimpleQuery)">
+            <summary>
+            获取自身一致性分析 符合条件的subject 数组
+            </summary>
+            <param name="inQuery"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetGroupConsistentRuleMatchSubjectIdListAsync(IRaCIS.Core.Application.ViewModel.GroupConsistentSimpleQuery)">
+            <summary>
+            获取组件一致性分析符合条件的subject 数组
+            </summary>
+            <param name="inQuery"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetRandomSubjectIdList(System.Collections.Generic.List{System.Guid},System.Int32)">
+            <summary>
+            随机算法，选择指定数量的 subject  
+            </summary>
+            <param name="matchSubjectIdList"></param>
+            <param name="countToSelect"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.TaskMedicalReviewRuleService">
             <summary>
             医学审核生成规则   废弃
@@ -684,6 +711,32 @@
             InternationalizationService
             </summary>	
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.InternationalizationService.GetFrontInternationalizationList">
+            <summary>
+            前端国际化内容接口
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.InternationalizationService.BatchAddOrUpdateFrontInternationalization(System.Collections.Generic.List{IRaCIS.Core.Application.ViewModel.BatchInternationalizationDto})">
+            <summary>
+            前端批量提交，后端判断不存在就添加，存在就更新
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.InternationalizationService.BatchAddInternationalization(IRaCIS.Core.Application.ViewModel.BatchAddInternationalization)">
+            <summary>
+            后端之前批量添加接口
+            </summary>
+            <param name="batchAdd"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.InternationalizationService.AddOrUpdateInternationalization(IRaCIS.Core.Application.ViewModel.InternationalizationAddOrEdit)">
+            <summary>
+            前后端添加的时候，区分了，前端判断重复多了多了一个路由  路由+标识唯一
+            </summary>
+            <param name="addOrEditInternationalization"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.PublishLogService">
             <summary>
             PublishLogService
@@ -794,6 +847,18 @@
             <param name="batchAddList"></param>
             <returns></returns>
         </member>
+        <member name="T:IRaCIS.Core.Application.Service.ImageAndDoc.CStoreSCPService">
+            <summary>
+            后台托管服务的方式运行
+            </summary>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.StudyService.AddOrUpdateArchiveStudy(IRaCIS.Core.Application.Contracts.NewArchiveStudyCommand)">
+            <summary>
+            上传临床数据
+            </summary>
+            <param name="incommand"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.StudyService.Preview(System.Guid)">
             <summary> 指定资源Id，渲染Dicom检查的Jpeg预览图像  </summary>
             <param name="studyId"> Dicom检查的Id </param>
@@ -997,6 +1062,11 @@
             阅读片人
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.GetDataInspectionDto.RoleName">
+            <summary>
+            角色
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.GetDataInspectionDto.IsSign">
             <summary>
             是否有签名
@@ -1254,6 +1324,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.ReadingCalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.ReadingCalculateService.AddTaskLesionAnswerFromLastTask(IRaCIS.Core.Application.ViewModel.AddTaskLesionAnswerFromLastTaskInDto)">
             <summary>
             将上一次的访视病灶添加到这一次
@@ -1280,6 +1357,27 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.Interface.ILuganoCalculateService.CalculateTargetLesionStatus(IRaCIS.Core.Application.ViewModel.CalculateTargetLesionStatusInDto)">
+            <summary>
+            计算靶病灶状态
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.Interface.ILuganoCalculateService.CalculateMergeTargetLesionStatus(IRaCIS.Core.Application.ViewModel.CalculateTargetLesionStatusInDto)">
+            <summary>
+            计算靶病灶融合后状态
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="F:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.sODData">
             <summary>
             获取Sod的值
@@ -1653,6 +1751,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="F:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.sODData">
             <summary>
             获取Sod的值
@@ -1663,6 +1768,11 @@
             基线任务Id
             </summary>
         </member>
+        <member name="F:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.isUnableFuse">
+            <summary>
+            影像是否无法融合
+            </summary>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetDeleteLesionStatrIndex(IRaCIS.Core.Application.Service.Reading.Dto.DeleteReadingRowAnswerInDto)">
             <summary>
             删除病灶获取起始病灶序号（RECIST1Point1 固定是1）
@@ -1676,6 +1786,20 @@
             <param name="indto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetIsSuvMaxLesion(IRaCIS.Core.Application.Service.Reading.Dto.GetIsSuvMaxLesionInDto)">
+            <summary>
+            获取是否是最大suvmax 病灶
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetCanChooseNotMerge(IRaCIS.Core.Application.Service.Reading.Dto.GetCanChooseNotMergeInDto)">
+            <summary>
+            获取是否可选择不能融合影像
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.TestCalculate(System.Guid,IRaCIS.Core.Domain.Share.QuestionType)">
             <summary>
             测试计算
@@ -1713,6 +1837,13 @@
             <param name="calculateType"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.ImageQualityIsUnableFuse(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
+            <summary>
+            获取影像是否无法融合
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetReportTumor(System.Guid)">
             <summary>
             获取报告整体整体评估
@@ -1734,6 +1865,26 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.CalculateMergeTargetLesionStatus(IRaCIS.Core.Application.ViewModel.CalculateTargetLesionStatusInDto)">
+            <summary>
+            计算融合靶病灶的状态
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.CalculateTargetLesionStatus(IRaCIS.Core.Application.ViewModel.CalculateTargetLesionStatusInDto)">
+            <summary>
+            计算分裂靶病灶状态
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetSplitPPdSum(IRaCIS.Core.Application.ViewModel.GetSplitPPdInDto)">
+            <summary>
+            获取分裂病灶的PPd之和 不包括当前的主病灶
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.AddTaskLesionAnswerFromLastTask(IRaCIS.Core.Application.ViewModel.AddTaskLesionAnswerFromLastTaskInDto)">
             <summary>
             将上一次的访视病灶添加到这一次
@@ -1901,6 +2052,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetSpleenLength(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
+            <summary>
+            获取脾脏垂直径
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.CompareBaselineSPD(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
             <summary>
             与基线相比SPD变化的百分比
@@ -1938,6 +2096,26 @@
             <param name="spleenLength"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetLowSpleenLength(IRaCIS.Core.Domain.Models.VisitTask)">
+            <summary>
+            获取最低垂直径
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetSplenicVerify(System.Guid)">
+            <summary>
+            获取脾脏验证
+            </summary>
+            <param name="visitTaskId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetSplenicStatus(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
+            <summary>
+            获取脾脏状态
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetSplenicEvaluation(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
             <summary>
             获取脾脏评估
@@ -1952,6 +2130,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetPET5PSRemark(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
+            <summary>
+            获取PET5PS评分备注
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetUptakeChange(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
             <summary>
             与基线相比摄取值变化
@@ -1973,6 +2158,15 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.CalculationFDGPETOverallAssessment(System.String,System.String,System.String)">
+            <summary>
+            计算FDG-PET总体评估结果【测试】
+            </summary>
+            <param name="pET5PS">PET5PS评分</param>
+            <param name="uptakeChange"> 与基线相比摄取值变化</param>
+            <param name="evidenceFocalFDG">骨髓中是否存在局灶性 FDG亲和病灶的证据</param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetEvidenceFocalFDG(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
             <summary>
             骨髓中是否存在局灶性 FDG亲和病灶的证据
@@ -2015,6 +2209,15 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.CalculationGetImgOncology(System.String,System.String,System.String)">
+            <summary>
+            计算整体肿瘤评估 【测试】
+            </summary>
+            <param name="cTandMRIData"> CT/MRI总体评估</param>
+            <param name="fDGPETData"> FDG-PET总体评估</param>
+            <param name="lastFDGPETData">上一次 FDG-PET总体评估</param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetBaseLineSpleenLength(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
             <summary>
             获取基线脾脏长度
@@ -2057,6 +2260,17 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.CalculationCTMRIEvaluation(System.String,System.String,System.String,System.String,System.String)">
+            <summary>
+            计算CTMRI 总体评估 【测试】
+            </summary>
+            <param name="targetEvaluation">靶病灶评估</param>
+            <param name="noTargetEvaluation">非靶病灶评估</param>
+            <param name="existsNewTarget">存在新病灶</param>
+            <param name="liverEvaluation">肝脏评估</param>
+            <param name="spleenEvaluation">脾脏评估</param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.ReserveDecimal(System.Decimal,System.Int32)">
             <summary>
             保留小数
@@ -2065,6 +2279,13 @@
             <param name="digitPlaces"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.PCWG3CalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.PCWG3CalculateService.GetDeleteLesionStatrIndex(IRaCIS.Core.Application.Service.Reading.Dto.DeleteReadingRowAnswerInDto)">
             <summary>
             删除病灶获取起始病灶序号
@@ -2164,6 +2385,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1CalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="F:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1CalculateService.sODData">
             <summary>
             获取Sod的值
@@ -2408,6 +2636,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1_BMCalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="F:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1_BMCalculateService.sODData">
             <summary>
             获取Sod的值
@@ -2712,6 +2947,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.SelfDefineCalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.SelfDefineCalculateService.GetDeleteLesionStatrIndex(IRaCIS.Core.Application.Service.Reading.Dto.DeleteReadingRowAnswerInDto)">
             <summary>
             删除病灶获取起始病灶序号
@@ -2796,6 +3038,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ICriterionCalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.IGeneralCalculateService.GetReadingCalculateDto(System.Guid)">
             <summary>
             获取ReadingCalculateDto
@@ -2868,6 +3117,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.IReadingCalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.SubjectCriteriaEvaluationService">
             <summary>
             SubjectCriteriaEvaluationService
@@ -2951,9 +3207,23 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ClinicalAnswerService.DeleteStudyClinical(IRaCIS.Core.Application.Service.Reading.Dto.DeleteStudyClinicalInDto)">
+            <summary>
+            删除检查级别临床数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ClinicalAnswerService.AddStudyClinical(IRaCIS.Core.Application.Service.Reading.Dto.AddStudyClinicalInDto)">
+            <summary>
+             添加检查级别临床数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ClinicalAnswerService.AutoAddCRCClinical(IRaCIS.Core.Application.Service.Reading.Dto.AutoAddClinicalInDto)">
             <summary>
-            自动添加CRC临床数据
+            自动添加CRC临床数据 (不包括检查级别)
             </summary>
             <param name="inDto"></param>
             <returns></returns>
@@ -4382,6 +4652,11 @@
             上传方式
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataOutDto.ClinicalDataLevel">
+            <summary>
+            临床级别
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataOutDto.UploadRole">
             <summary>
             上传角色
@@ -4797,11 +5072,81 @@
             序号标记
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionAnswerInfo.QuestionMark">
+            <summary>
+            问题标识
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionAnswerInfo.QuestionId">
+            <summary>
+            问题Id
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionAnswerInfo.TableQuestionId">
+            <summary>
+            表格问题Id
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionAnswerInfo.VisitTaskId">
+            <summary>
+            任务Id
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionAnswerInfo.TrialId">
+            <summary>
+            项目Id
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionAnswerInfo.RowIndex">
+            <summary>
+            行号
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionAnswerInfo.Answer">
+            <summary>
+            答案
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionAnswerInfo.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionAnswerInfo.CreateUserId">
+            <summary>
+            创建人
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionAnswerInfo.RowId">
+            <summary>
+            RowId
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.MergeLesionInDto.MergeMainRowId">
+            <summary>
+            融合的主病灶
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.MergeLesionInDto.MergeRowIdList">
+            <summary>
+            融合的病灶
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCustomTagInDto.VisitTaskId">
             <summary>
             任务Id
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetPreviousOtherPicturePathInDto.QuestionType">
+            <summary>
+            问题类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto.VisitTaskId">
+            <summary>
+            任务Id
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingCustomTagDto.VisitTaskId">
             <summary>
             任务Id
@@ -4857,6 +5202,11 @@
             问题分类
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.CreateTime">
+            <summary>
+            CreateTime
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.QuestionId">
             <summary>
             第一层的Question
@@ -4927,11 +5277,6 @@
             MeasureData
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.CreateTime">
-            <summary>
-            CreateTime
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.IsCurrentTaskAdd">
             <summary>
             是否是当前任务添加
@@ -5227,6 +5572,11 @@
             是否显示详情
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetOncologyReadingInfoOutDto.ReadingCategory">
+            <summary>
+            任务类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetRelatedVisitTaskOutDto.IsConvertedTask">
             <summary>
             是否是转变的任务(转为IRECIST)
@@ -5237,6 +5587,21 @@
             是否是第一次转化的任务
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetRelatedVisitTaskOutDto.PTSeriesId">
+            <summary>
+            融合的PTSeriesId
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetRelatedVisitTaskOutDto.CTSeriesId">
+            <summary>
+            融合的CTSeriesId
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetRelatedVisitTaskOutDto.OtherStudyId">
+            <summary>
+            StudyId
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetGlobalReadingInfoInDto.UsingOriginalData">
             <summary>
             当新答案为空的时候 是否是有原数据
@@ -5447,6 +5812,16 @@
             StudyId
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SubmitTableQuestionInDto.PTSeriesId">
+            <summary>
+            融合的PTSeriesId
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SubmitTableQuestionInDto.CTSeriesId">
+            <summary>
+            融合的CTSeriesId
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.Reading.Dto.SubmitVisitTaskQuestionsInDto">
             <summary>
             
@@ -5577,6 +5952,11 @@
             问题标识
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetSystemReadingQuestionOutDto.GroupId">
+            <summary>
+            分组ID
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetSystemReadingQuestionOutDto.ReadingQuestionCriterionSystemId">
             <summary>
             系统标准Id
@@ -6652,6 +7032,11 @@
             限制编辑
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.LimitShow">
+            <summary>
+            限制显示
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.MaxAnswerLength">
             <summary>
             最大答案长度
@@ -6740,6 +7125,11 @@
             限制编辑
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.LimitShow">
+            <summary>
+            限制显示
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.MaxAnswerLength">
             <summary>
             最大答案长度
@@ -7103,6 +7493,11 @@
             限制编辑
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.LimitShow">
+            <summary>
+            限制显示
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.MaxAnswerLength">
             <summary>
             最大答案长度
@@ -7163,6 +7558,11 @@
             限制编辑
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.LimitShow">
+            <summary>
+            限制显示
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.MaxAnswerLength">
             <summary>
             最大答案长度
@@ -7508,6 +7908,11 @@
             限制编辑
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.LimitShow">
+            <summary>
+            限制显示
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.MaxAnswerLength">
             <summary>
             最大答案长度
@@ -7853,6 +8258,11 @@
             限制编辑
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.LimitShow">
+            <summary>
+            限制显示
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.MaxAnswerLength">
             <summary>
             最大答案长度
@@ -7983,6 +8393,11 @@
             排序
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionTrialView.CriterionType">
+            <summary>
+            标准类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionTrialView.IsSystemData">
             <summary>
             是否是系统数据
@@ -8278,6 +8693,21 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingMedicineQuestionService.AddDefaultQuestions(IRaCIS.Core.Application.ViewModel.AddDefaultQuestionsInDto)">
+            <summary>
+            一键添加默认医学审核问题
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingMedicineQuestionService.VerifyIsCanConfirm(IRaCIS.Core.Application.ViewModel.VerifyIsCanConfirmInDto)">
+            <summary>
+            验证医学审核问题是否可确认
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+            <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingMedicineQuestionService.AddTrialDataFromSystem(IRaCIS.Core.Application.ViewModel.AddTrialDataFromSystemInDto)">
             <summary>
             从系统里面选择问题添加到项目里面
@@ -8797,7 +9227,7 @@
         </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.TaskMedicalReviewQuery.Id">
             <summary>
-            传了Id 就不查询这条数据
+            传了Id 
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.VisitTaskViewBasic.TaskUrgentType">
@@ -11171,6 +11601,14 @@
             Financial---项目收入价格验证
             </summary>
         </member>
+        <member name="M:IRaCIS.Core.Application.Services.DicomArchiveService.ArchiveDicomFileAsync(FellowOakDicom.DicomDataset)">
+            <summary>
+            单个文件接收 归档
+            </summary>
+            <param name="dataset"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
         <member name="M:IRaCIS.Core.Application.Services.InstanceService.List(System.Guid)">
             <summary> 指定资源Id，获取Dicom序列所属的实例信息列表 </summary>
             <param name="seriesId"> Dicom序列的Id </param>
@@ -11236,6 +11674,20 @@
             <param name="isReading"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Services.SubjectVisitService.GetDicomSeriesInfo(IRaCIS.Core.Application.Contracts.GetDicomSeriesInfoInDto)">
+            <summary>
+            获取Series信息
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Services.SubjectVisitService.GetPTAndCtSeries(IRaCIS.Core.Application.Contracts.GetPTAndCtSeriesInDto)">
+            <summary>
+            获取PTAndCtSeries
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Services.SubjectVisitService.GetReadingVisitStudyList(IRaCIS.Core.Application.Contracts.GetReadingVisitStudyListIndto)">
             <summary>
             获取访视下的Dicom 检查信息   分所有的， 阅片的 不阅片   isReading : 0 查询所有 1 查询仅仅阅片的
@@ -11586,12 +12038,6 @@
             映射配置
             </summary>
         </member>
-        <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetBasicStat">
-            <summary>
-            个人面板 统计值
-            </summary>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetSiteSurveyApprovalList(IRaCIS.Core.Application.Contracts.TrialSiteSurveyStatQuery)">
             <summary>
             中心调研    每个项目 需要处理的审批统计
@@ -11794,9 +12240,16 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.TrialConfigService.ResetAndAsyncCriterion(IRaCIS.Core.Application.Service.Reading.Dto.ResetAndAsyncCriterionInDto)">
+            <summary>
+            重置并同步标准
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.TrialConfigService.AsyncTrialCriterionDictionary(IRaCIS.Core.Application.Contracts.AsyncTrialCriterionDictionaryInDto)">
             <summary>
-            同步项目标准字典信息
+            同步项目标准所有信息
             </summary>
             <param name="inDto"></param>
             <returns></returns>
@@ -11905,6 +12358,14 @@
             <param name="trialConfig"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.TrialConfigService.ConfigTrialProcessInfoVerification(IRaCIS.Core.Application.Contracts.ConfigTrialProcessInfoVerificationInDto)">
+            <summary>
+            配置流程验证
+            </summary>
+            <param name="trialConfig"></param>
+            <returns></returns>
+            <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
+        </member>
         <member name="M:IRaCIS.Core.Application.TrialConfigService.ConfigTrialProcessInfo(IRaCIS.Core.Application.Contracts.TrialProcessConfig)">
             <summary>
             配置流程
@@ -12007,6 +12468,27 @@
               因为可能先一致性核查通过，生成其他标准的任务了，新签名的标准也需要产生任务
             </summary>
         </member>
+        <member name="M:IRaCIS.Core.Application.Triggers.VisitTaskIbeforeTrigger.AfterSave(EntityFrameworkCore.Triggered.ITriggerContext{IRaCIS.Core.Domain.Models.VisitTask},System.Threading.CancellationToken)">
+            <summary>
+            因为维护状态先后顺序导致  裁判任务关联的 任务上的JudgeVisitTaskId==nulll  在这里需要重新设置下
+            
+            比如： 申请裁判任务重阅，事务里面本来设置了任务上的裁判id,但是因为下面的逻辑，导致设置的值又被清理了，只能重新设置下  
+            </summary>
+            <param name="context"></param>
+            <param name="cancellationToken"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Triggers.VisitTaskIbeforeTrigger.BeforeSave(EntityFrameworkCore.Triggered.ITriggerContext{IRaCIS.Core.Domain.Models.VisitTask},System.Threading.CancellationToken)">
+            <summary>
+            比如  两个任务产生了裁判，然后其中一个人申请了重阅，影响了裁判，需要清理之前任务的上裁判id
+            
+            
+            因为申请重阅，退回，里面分有序，无序，情况太多，所以不在那块逻辑修改，不然得加多个地方处理，在这里统一处理
+            </summary>
+            <param name="context"></param>
+            <param name="cancellationToken"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.Application.Triggers.VisitTaskIsFrontTaskNeedSignButNotSignTrigger">
             <summary>
              维护 IsFrontTaskNeedSignButNotSign 字段   另外附加评估结果
@@ -12799,6 +13281,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.GetStudyClinicalData(IRaCIS.Core.Application.Service.Reading.Dto.GetStudyClinicalDataInDto)">
+            <summary>
+            获取检查类型临床数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingClinicalDataService.GetCRCClinicalData(IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataInDto)">
             <summary>
             获取CRC上传的文件
@@ -13106,6 +13595,20 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetPreviousOtherPicturePath(IRaCIS.Core.Application.Service.Reading.Dto.GetPreviousOtherPicturePathInDto)">
+            <summary>
+            获取既往病灶的OtherPicture
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SubmitCustomTag(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCustomTagDto)">
             <summary>
             提交自定义标记
@@ -13289,16 +13792,23 @@
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SplitLesion(IRaCIS.Core.Application.Service.Reading.Dto.SplitLesionInDto)">
             <summary>
-            拆分病灶
+            拆分病灶 分裂病灶
             </summary>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.MergeLesion(IRaCIS.Core.Application.Service.Reading.Dto.MergeLesionInDto)">
             <summary>
-            合并病灶
+            合并病灶 融合
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetCanMergeLesion(IRaCIS.Core.Application.Service.Reading.Dto.GetCanMergeLesionInDto)">
+            <summary>
+            获取可合并的病灶
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SaveImageQuality(IRaCIS.Core.Application.Service.Reading.Dto.ChangeDicomReadingQuestionAnswerInDto)">
             <summary>
             保存影像质量
@@ -13306,6 +13816,14 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SaveTaskQuestion(IRaCIS.Core.Application.Service.Reading.Dto.ChangeDicomReadingQuestionAnswerInDto,System.String)">
+            <summary>
+            保存任务问题 带动态稽查参数
+            </summary>
+            <param name="inDto"></param>
+            <param name="param">请求类型</param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.ChangeDicomReadingQuestionAnswer(IRaCIS.Core.Application.Service.Reading.Dto.ChangeDicomReadingQuestionAnswerInDto)">
             <summary>
             修改肿瘤学评估结果
@@ -13322,7 +13840,7 @@
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SubmitTableQuestion(IRaCIS.Core.Application.Service.Reading.Dto.SubmitTableQuestionInDto)">
             <summary>
-            提交表格问题答案  提交病灶
+            提交表格问题答案  提交病灶 保存病灶
             </summary>
             <param name="inDto"></param>
             <returns></returns>
@@ -13362,6 +13880,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.ResetReadingRestTime(System.Nullable{System.Guid})">
+            <summary>
+            重置阅片时间 登录和解锁调用
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SubmitTaskChangeState(System.Guid)">
             <summary>
             签名提交任务修改状态
@@ -13901,18 +14425,18 @@
             <param name="outEnrollTime"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Application.Services.TestService.OldLocalImageResizeJpg(IRaCIS.Core.Application.Helper.IOSSService,IRaCIS.Core.Infra.EFCore.IRepository,Microsoft.AspNetCore.Hosting.IWebHostEnvironment)">
-            <summary>
-            维护OSS 影像数据
-            </summary>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Application.Services.TestService.ModifyClinicalDataTable">
             <summary>
             维护临床数据  --一定要在同步表前同步数据才行
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.TestService.OldLocalImageResizeJpg(IRaCIS.Core.Application.Helper.IOSSService,IRaCIS.Core.Infra.EFCore.IRepository,Microsoft.AspNetCore.Hosting.IWebHostEnvironment)">
+            <summary>
+            维护OSS 影像数据
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Application.Contracts.DoctorSearchDTO">
             <summary>
             Reviewer 列表查询参数

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

@@ -24,7 +24,9 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public int? GeneratedSubjectCount { get; set; }
 
+        public int? MatchSubejctCount { get; set; }
 
+        public int? CanGeneratedSubejctCount => MatchSubejctCount - GeneratedSubjectCount;
 
     }
 
@@ -34,6 +36,13 @@ namespace IRaCIS.Core.Application.ViewModel
 
     }
 
+    public class SubjectGeneratedTask
+    {
+        public Guid SubjectId { get; set; }
+
+        public bool IsHaveGeneratedTask { get; set; }
+    }
+
     public class ConsistentQuery : PageInput
     {
         [NotDefault]
@@ -46,6 +55,15 @@ namespace IRaCIS.Core.Application.ViewModel
 
     }
 
+    public class GroupConsistentSimpleQuery
+    {
+        [NotDefault]
+        public Guid TrialId { get; set; }
+
+        [NotDefault]
+
+        public Guid TrialReadingCriterionId { get; set; }
+    }
     public class GroupConsistentQuery : PageInput
     {
         [NotDefault]
@@ -56,13 +74,21 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid TrialReadingCriterionId { get; set; }
     }
 
-    public class ConsistentConfirmGenerateCommand
+    public class SelfConsistentSimpleQuery
     {
+        [NotDefault]
         public Guid TaskConsistentRuleId { get; set; }
         [NotDefault]
         public Guid DoctorUserId { get; set; }
+    }
+
+    public class ConsistentConfirmGenerateCommand: SelfConsistentSimpleQuery
+    {
+
 
         public List<Guid> SubejctIdList { get; set; }
+
+        public bool IsAutoAllocateGenerateTask { get; set; }
     }
 
 
@@ -70,7 +96,13 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         [NotDefault]
         public Guid TrialId { get; set; }
+
+        [NotDefault]
+
+        public Guid TrialReadingCriterionId { get; set; }
         public List<Guid> SubejctIdList { get; set; }
+
+        public bool IsAutoAllocateGenerateTask { get; set; }
     }
 
     public class DoctorSelfConsistentSubjectView: ConsistentCommonView
@@ -105,6 +137,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public List<VisitTaskGroupSimpleDTO> SubjectTaskVisitList => VisitTaskList.GroupBy(t => new { t.SubjectId, t.VisitTaskNum }).Where(g => g.Count() == 2).Select(g => g.First()).OrderBy(t=>t.VisitTaskNum).ToList();
 
         public List<VisitTaskGroupSimpleDTO> VisitTaskList { get; set; } = new List<VisitTaskGroupSimpleDTO>();
+
+        public List<UserSimpleInfo> DoctorUserList { get; set; }=new List<UserSimpleInfo>();
     }
 
     public class VisitTaskGroupSimpleDTO
@@ -287,6 +321,17 @@ namespace IRaCIS.Core.Application.ViewModel
 
 
     }
+    public class UpdateTrialSiteCodeCommand
+    {
+        public Guid TrialId { get; set; }
+
+        public string VirtualSiteCode { get; set; }
+    }
+
+    public class UpdateTrialSiteCodeCommandView: UpdateTrialSiteCodeCommand
+    {
+        public DateTime Creatime { get; set; }
+    }
 
     ///<summary> TaskConsistentRuleAddOrEdit  列表查询参数模型</summary>
     public class TaskConsistentRuleAddOrEdit

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

@@ -71,7 +71,7 @@ namespace IRaCIS.Core.Application.ViewModel
             {
                 if (!ReadingDurationTimeSpan.HasValue)
                     return "";
-                else return string.Format("{0}d {1}h {2}min", (SignTime - FirstReadingTime)?.Days, (SignTime - FirstReadingTime)?.Hours, (SignTime - FirstReadingTime)?.Minutes)
+                else return string.Format("{0}h:{1}m:{2}s",  (SignTime - FirstReadingTime)?.Hours, (SignTime - FirstReadingTime)?.Minutes, (SignTime - FirstReadingTime)?.Seconds)
                          /*string.Format("{0}分钟", (ReadingDurationTimeSpan)?.TotalMinutes)*/;
             }
         }
@@ -98,15 +98,23 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid? SiteId { get; set; }
 
         /// <summary>
-        /// 传了Id 就不查询这条数据
+        /// 传了Id 
         /// </summary>
         public Guid? Id { get; set; }
 
         public Guid? SubjectId { get; set; }
 
+		public Guid? MedicalManagerUserId { get; set; }
+
+		public DateTime? BeginSignTime { get; set; }
+		public AuditAdvice? AuditAdviceEnum { get; set; }
+
+		public DateTime? EndSignTime { get; set; }
 
 		public bool IsGetBeRead { get; set; } = false;
 
+		public bool IsGetNextMedicalReviewTask { get; set; } = false;
+
 		public string SubjectCode { get; set; } = String.Empty;
 
         public string TrialSiteCode { get; set; } = String.Empty;
@@ -126,6 +134,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public ReadingTaskState? ReadingTaskState { get; set; }
 
         public Guid? TrialReadingCriterionId { get; set; }
+
+		public MedicalReviewDoctorUserIdea? DoctorUserIdeaEnum { get; set; }
 	}
 
 

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

@@ -299,11 +299,12 @@ namespace IRaCIS.Core.Application.ViewModel
             }
         }
 
+		public int UrgentCount { get; set; }
 
+		// public int UrgentCount => UnReadCanReadTaskList.Count(t => t.IsUrgent);
 
-        public int UrgentCount => UnReadCanReadTaskList.Count(t => t.IsUrgent);
+		public List<IRUnreadTaskView> UnReadCanReadTaskList { get; set; } = new List<IRUnreadTaskView>();
-
+		// public List<IRUnreadTaskView> UnReadCanReadTaskList => UnReadTaskList.Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)).ToList();
-        public List<IRUnreadTaskView> UnReadCanReadTaskList => UnReadTaskList.Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)).ToList();
 
 		public List<IRUnreadTaskView> UnReadTaskList { get; set; } = new List<IRUnreadTaskView>();
     }
@@ -369,6 +370,7 @@ namespace IRaCIS.Core.Application.ViewModel
         [NotDefault]
         public Guid TrialId { get; set; }
 
+
 		public Guid? SiteId { get; set; }
 
         public Guid? SubjectId { get; set; }
@@ -391,6 +393,10 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public DateTime? EndAllocateDate { get; set; }
 
+		public DateTime? BeginSignTime { get; set; }
+
+		public DateTime? EndSignTime { get; set; }
+
 		public Guid? RootReReadingTaskId { get; set; }
 
         public string? TaskCode { get; set; }
@@ -498,6 +504,9 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string SubjectCode { get; set; } = String.Empty;
 
+        public int? SubjectAllocateState { get; set; }
+
+        public List<Arm> ArmList { get; set; }=new List<Arm>() { };
 
         [NotDefault]
         public Guid TrialReadingCriterionId { get; set; }

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

@@ -16,6 +16,9 @@ using System.Linq;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
 using Medallion.Threading;
+using IRaCIS.Core.Infrastructure.Extention;
+using System;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -32,9 +35,16 @@ namespace IRaCIS.Core.Application.Service
         private readonly IRepository<Subject> _subjectRepository;
         private readonly IRepository<Enroll> _enrollRepository;
         private readonly IDistributedLockProvider _distributedLockProvider;
+        private readonly IRepository<Trial> _trialRepository;
+        private readonly IRepository<TrialSite> _trialSiteRepository;
+
+        private readonly IRepository<TrialVirtualSiteCodeUpdate> _trialVirtualSiteCodeUpdateRepository;
+
+        private readonly IVisitTaskHelpeService _visitTaskCommonService;
 
 
-        public TaskConsistentRuleService(IRepository<VisitTask> visitTaskRepository, IRepository<Enroll> enrollRepository, IRepository<TaskConsistentRule> taskConsistentRuleRepository, IRepository<SubjectUser> subjectUserRepository, IRepository<Subject> subjectRepository, IDistributedLockProvider distributedLockProvider)
+        public TaskConsistentRuleService(IRepository<VisitTask> visitTaskRepository, IRepository<Enroll> enrollRepository, IRepository<TaskConsistentRule> taskConsistentRuleRepository, IRepository<SubjectUser> subjectUserRepository, IRepository<Subject> subjectRepository, IDistributedLockProvider distributedLockProvider,
+            IRepository<Trial> trialRepository, IRepository<TrialSite> trialSiteRepository, IRepository<TrialVirtualSiteCodeUpdate> trialVirtualSiteCodeUpdateRepository, IVisitTaskHelpeService visitTaskCommonService)
         {
             _taskConsistentRuleRepository = taskConsistentRuleRepository;
             _visitTaskRepository = visitTaskRepository;
@@ -42,6 +52,14 @@ namespace IRaCIS.Core.Application.Service
             _subjectRepository = subjectRepository;
             _enrollRepository = enrollRepository;
             _distributedLockProvider = distributedLockProvider;
+
+            _trialRepository = trialRepository;
+
+            _trialSiteRepository = trialSiteRepository;
+
+            _trialVirtualSiteCodeUpdateRepository = trialVirtualSiteCodeUpdateRepository;
+
+            _visitTaskCommonService = visitTaskCommonService;
         }
 
         /// <summary>
@@ -54,7 +72,7 @@ namespace IRaCIS.Core.Application.Service
         {
 
 
-            await _visitTaskRepository.UpdatePartialFromQueryAsync(t => taskIdList.Contains(t.Id), u => new VisitTask() { TaskState = TaskState.NotEffect },true);
+            await _visitTaskRepository.UpdatePartialFromQueryAsync(t => taskIdList.Contains(t.Id), u => new VisitTask() { TaskState = TaskState.Adbandon }, true);
 
             await _visitTaskRepository.SaveChangesAsync();
 
@@ -69,7 +87,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="queryVisitTask"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<PageOutput<AnalysisTaskView>> GetAnalysisTaskList(VisitTaskQuery queryVisitTask)
+        public async Task<IResponseOutput<PageOutput<AnalysisTaskView>>> GetAnalysisTaskList(VisitTaskQuery queryVisitTask)
         {
             var visitTaskQueryable = _visitTaskRepository.Where(t => t.TrialId == queryVisitTask.TrialId)
                 .Where(t => t.IsAnalysisCreate)
@@ -97,8 +115,9 @@ namespace IRaCIS.Core.Application.Service
 
             var pageList = await visitTaskQueryable.ToPagedListAsync(queryVisitTask.PageIndex, queryVisitTask.PageSize, queryVisitTask.SortField, queryVisitTask.Asc, string.IsNullOrWhiteSpace(queryVisitTask.SortField), defalutSortArray);
 
-            //var trialTaskConfig = _repository.Where<Trial>(t => t.Id == queryVisitTask.TrialId).ProjectTo<TrialTaskConfigView>(_mapper.ConfigurationProvider).FirstOrDefault();
+            var trialTaskConfig = _repository.Where<Trial>(t => t.Id == queryVisitTask.TrialId).Select(t => new { IsHaveDoubleReadCriterion=t.ReadingQuestionCriterionTrialList.Any(t=>t.IsSigned && t.IsConfirm && t.ReadingType==ReadingMethod.Double),  t.VitrualSiteCode }).FirstOrDefault();
-            return pageList;
+
+            return ResponseOutput.Ok(pageList, trialTaskConfig);
         }
 
 
@@ -123,13 +142,12 @@ namespace IRaCIS.Core.Application.Service
         /// 确认生成自身一致性分析任务
         /// </summary>
         /// <param name="inCommand"></param>
-        /// <param name="_visitTaskCommonService"></param>
         /// <returns></returns>
         [HttpPost]
         [UnitOfWork]
         //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
 
-        public async Task<IResponseOutput> ConfirmGenerateSelfConsistentTask(ConsistentConfirmGenerateCommand inCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService)
+        public async Task<IResponseOutput> ConfirmGenerateSelfConsistentTask(ConsistentConfirmGenerateCommand inCommand)
         {
 
 
@@ -137,6 +155,25 @@ namespace IRaCIS.Core.Application.Service
             var doctorUserId = inCommand.DoctorUserId;
             var trialReadingCriterionId = filterObj.TrialReadingCriterionId;
 
+            //随机分配
+            if (inCommand.IsAutoAllocateGenerateTask)
+            {
+                var subjectList = (await GetSelfConsistentRuleMatchSubjectIdListAsync(new SelfConsistentSimpleQuery() { TaskConsistentRuleId = inCommand.TaskConsistentRuleId, DoctorUserId = inCommand.DoctorUserId })).ToList();
+
+                if (subjectList.Any(t => t.IsHaveGeneratedTask))
+                {
+                    //已手动分配，不允许自动分配
+                    throw new BusinessValidationFailedException(_localizer["TaskConsistent_NotAllowedGenerate"]);
+                }
+
+                if (subjectList.Count<2 * filterObj.PlanSubjectCount)
+                {
+                    throw new BusinessValidationFailedException(_localizer["TaskConsistent_NotAllowedGenerate1"]);
+                }
+
+                inCommand.SubejctIdList = GetRandomSubjectIdList(subjectList.Select(t => t.SubjectId).ToList(), filterObj.PlanSubjectCount);
+            }
+
             var list = await GetIQueryableDoctorSelfConsistentSubjectView(filterObj, doctorUserId, inCommand.SubejctIdList).ToListAsync();
 
             //var (group, query) = GetIQueryableDoctorSelfConsistentRuleSubjectView(filterObj, inCommand.SubejctIdList);
@@ -155,9 +192,9 @@ namespace IRaCIS.Core.Application.Service
 
                     var blindSubjectCode = string.Empty;
 
-                    var subjectTask = _visitTaskRepository.Where(t => t.SubjectId == subject.SubjectId && t.TrialReadingCriterionId==trialReadingCriterionId && t.IsSelfAnalysis == true).OrderByDescending(t => t.BlindSubjectCode).FirstOrDefault();
+                    var subjectTask = _visitTaskRepository.Where(t => t.SubjectId == subject.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsSelfAnalysis == true).OrderByDescending(t => t.BlindSubjectCode).FirstOrDefault();
 
-                    if (subjectTask!=null &&  subjectTask.BlindSubjectCode != String.Empty)
+                    if (subjectTask != null && subjectTask.BlindSubjectCode != String.Empty)
                     {
                         blindSubjectCode = subjectTask.BlindSubjectCode;
                     }
@@ -165,7 +202,7 @@ namespace IRaCIS.Core.Application.Service
                     {
                         var maxCodeStr = _visitTaskRepository.Where(t => t.TrialId == subject.TrialId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsSelfAnalysis == true).OrderByDescending(t => t.BlindSubjectCode).Select(t => t.BlindSubjectCode).FirstOrDefault();
 
-                        if ( !string.IsNullOrEmpty(maxCodeStr))
+                        if (!string.IsNullOrEmpty(maxCodeStr))
                         {
                             int.TryParse(maxCodeStr.Substring(maxCodeStr.Length - filterObj.BlindSubjectNumberOfPlaces), out maxCodeInt);
 
@@ -190,7 +227,7 @@ namespace IRaCIS.Core.Application.Service
                     {
                         var lastTask = (subject.VisitTaskList.Take(filterObj.PlanVisitCount).Last()).Clone();
 
-                        var existGlobal = _visitTaskRepository.Where(t => t.SubjectId == lastTask.SubjectId &&t.TrialReadingCriterionId==trialReadingCriterionId && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Global && t.VisitTaskNum == lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global]).ProjectTo<VisitTaskSimpleDTO>(_mapper.ConfigurationProvider).FirstOrDefault();
+                        var existGlobal = _visitTaskRepository.Where(t => t.SubjectId == lastTask.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Global && t.VisitTaskNum == lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global]).ProjectTo<VisitTaskSimpleDTO>(_mapper.ConfigurationProvider).FirstOrDefault();
 
 
                         if (existGlobal == null)
@@ -203,7 +240,7 @@ namespace IRaCIS.Core.Application.Service
                                 ReadingCategory = ReadingCategory.Global,
                                 TaskName = lastTask.TaskName + "_Global",
                                 TaskBlindName = lastTask.TaskBlindName + "_Global",
-                                TrialReadingCriterionId=trialReadingCriterionId,
+                                TrialReadingCriterionId = trialReadingCriterionId,
                             };
                         }
 
@@ -245,16 +282,17 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inQuery"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<PageOutput<DoctorGroupConsistentSubjectView>> GetGroupConsistentRuleSubjectList(GroupConsistentQuery inQuery)
+        public async Task<IResponseOutput<PageOutput<DoctorGroupConsistentSubjectView>> > GetGroupConsistentRuleSubjectList(GroupConsistentQuery inQuery)
         {
             var trialId = inQuery.TrialId;
 
-            var filterObj = await _taskConsistentRuleRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.TrialReadingCriterionId==inQuery.TrialReadingCriterionId  &&  t.IsSelfAnalysis == false);
+            var filterObj = await _taskConsistentRuleRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.IsSelfAnalysis == false);
 
 
             if (filterObj == null)
             {
-                return new PageOutput<DoctorGroupConsistentSubjectView>();
+                object tt = null;
+                return ResponseOutput.Ok(new PageOutput<DoctorGroupConsistentSubjectView>(), new { Rule = tt, IsAllowAutoAllocate = false }) ;
             }
 
             var query = await GetGroupConsistentQueryAsync(filterObj);
@@ -262,7 +300,13 @@ namespace IRaCIS.Core.Application.Service
 
             var pagedList = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(DoctorSelfConsistentSubjectView.SubjectCode) : inQuery.SortField, inQuery.Asc);
 
-            return pagedList;
+            var rule = await _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId && t.IsSelfAnalysis == false && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId).ProjectTo<TaskConsistentRuleBasic>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
+
+            var list = await GetGroupConsistentRuleMatchSubjectIdListAsync(new GroupConsistentSimpleQuery() { TrialId = inQuery.TrialId, TrialReadingCriterionId = inQuery.TrialReadingCriterionId });
+
+            var isAllowAutoAllocate = !list.Any(t => t.IsHaveGeneratedTask) && list.Count() > 2*(rule?.PlanSubjectCount??0);
+
+            return ResponseOutput.Ok(pagedList, new {Rule=rule, IsAllowAutoAllocate = isAllowAutoAllocate }); 
         }
 
 
@@ -271,26 +315,46 @@ namespace IRaCIS.Core.Application.Service
         /// 确认生成组间一致性分析任务
         /// </summary>
         /// <param name="inCommand"></param>
-        /// <param name="_visitTaskCommonService"></param>
         /// <returns></returns>
         [HttpPost]
         [UnitOfWork]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
 
-        public async Task<IResponseOutput> ConfirmGenerateGroupConsistentTask(GroupConsistentConfirmGenrateCommand inCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService)
+        public async Task<IResponseOutput> ConfirmGenerateGroupConsistentTask(GroupConsistentConfirmGenrateCommand inCommand)
         {
             var trialId = inCommand.TrialId;
 
-            var filterObj = await _taskConsistentRuleRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.IsSelfAnalysis == false);
+            var filterObj = await _taskConsistentRuleRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.TrialReadingCriterionId == inCommand.TrialReadingCriterionId && t.IsSelfAnalysis == false);
 
             var trialReadingCriterionId = filterObj.TrialReadingCriterionId;
 
+            //随机分配
+            if (inCommand.IsAutoAllocateGenerateTask)
+            {
+                var subjectSelectList = (await GetGroupConsistentRuleMatchSubjectIdListAsync(new GroupConsistentSimpleQuery() { TrialId = inCommand.TrialId, TrialReadingCriterionId = inCommand.TrialReadingCriterionId })).ToList();
+
+                if (subjectSelectList.Any(t => t.IsHaveGeneratedTask))
+                {
+                    //已手动分配过，不允许自动分配
+                    throw new BusinessValidationFailedException(_localizer["TaskConsistent_NotAllowedGenerate"]);
+                }
+
+                if (subjectSelectList.Count< 2 * filterObj.PlanSubjectCount)
+                {
+                    throw new BusinessValidationFailedException(_localizer["TaskConsistent_NotAllowedGenerate1"]);
+                }
+
+                inCommand.SubejctIdList = GetRandomSubjectIdList(subjectSelectList.Select(t => t.SubjectId).ToList(), filterObj.PlanSubjectCount);
+            }
+
+
 
             var query = await GetGroupConsistentQueryAsync(filterObj, inCommand.SubejctIdList);
 
             var subjectList = query.ToList();
 
-            var doctorUserIdQuery = from enroll in _repository.Where<Enroll>(t => t.TrialId == trialId).Where(t => t.EnrollReadingCategoryList.Where(t=>t.TrialReadingCriterionId==trialReadingCriterionId).Any(c => c.ReadingCategory == ReadingCategory.Global || c.ReadingCategory == ReadingCategory.Visit))
+            var doctorUserIdQuery = from enroll in _repository.Where<Enroll>(t => t.TrialId == trialId).Where(t => t.EnrollReadingCategoryList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(c => c.ReadingCategory == ReadingCategory.Global || c.ReadingCategory == ReadingCategory.Visit))
+                                    .Where(t => t.EnrollReadingCriteriaList.Any(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.IsJoinAnalysis == true))
                                     join user in _repository.Where<User>() on enroll.DoctorId equals user.DoctorId
                                     select user.Id;
 
@@ -310,7 +374,7 @@ namespace IRaCIS.Core.Application.Service
 
                     var blindSubjectCode = string.Empty;
 
-                    var subjectTask = _visitTaskRepository.Where(t => t.SubjectId == subject.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsSelfAnalysis==false).OrderByDescending(t => t.BlindSubjectCode).FirstOrDefault();
+                    var subjectTask = _visitTaskRepository.Where(t => t.SubjectId == subject.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.IsSelfAnalysis == false).OrderByDescending(t => t.BlindSubjectCode).FirstOrDefault();
                     if (subjectTask != null && subjectTask.BlindSubjectCode != String.Empty)
                     {
                         blindSubjectCode = subjectTask.BlindSubjectCode;
@@ -371,8 +435,8 @@ namespace IRaCIS.Core.Application.Service
 
                                 TrialReadingCriterionId = task.TrialReadingCriterionId,
 
-                                BlindSubjectCode=blindSubjectCode,
+                                BlindSubjectCode = blindSubjectCode,
-                                BlindTrialSiteCode=filterObj.BlindTrialSiteCode
+                                BlindTrialSiteCode = filterObj.BlindTrialSiteCode
 
 
                             });
@@ -460,7 +524,7 @@ namespace IRaCIS.Core.Application.Service
 
             #region Subejct 维度
 
-            Expression<Func<VisitTask, bool>> comonTaskFilter = u => u.TrialId == trialId && u.IsAnalysisCreate == false && u.TaskState == TaskState.Effect && u.ReadingTaskState == ReadingTaskState.HaveSigned && u.TrialReadingCriterionId== trialReadingCriterionId &&
+            Expression<Func<VisitTask, bool>> comonTaskFilter = u => u.TrialId == trialId && u.IsAnalysisCreate == false && u.TaskState == TaskState.Effect && u.ReadingTaskState == ReadingTaskState.HaveSigned && u.TrialReadingCriterionId == trialReadingCriterionId &&
             u.SignTime!.Value.AddDays(filterObj.IntervalWeeks * 7) < DateTime.Now && (u.ReReadingApplyState == ReReadingApplyState.Default || u.ReReadingApplyState == ReReadingApplyState.Reject) && u.DoctorUserId == doctorUserId;
 
 
@@ -499,11 +563,11 @@ namespace IRaCIS.Core.Application.Service
                 TrialSiteCode = t.TrialSite.TrialSiteCode,
                 SubjectId = t.Id,
 
-                IsReReadingOrBackInfluenceAnalysis=t.IsReReadingOrBackInfluenceAnalysis,
+                IsReReadingOrBackInfluenceAnalysis = t.IsReReadingOrBackInfluenceAnalysis,
 
                 BlindSubjectCode = t.SubjectVisitTaskList.Where(t => t.IsAnalysisCreate && t.TrialReadingCriterionId == trialReadingCriterionId).OrderByDescending(t => t.BlindSubjectCode).Select(t => t.BlindSubjectCode).FirstOrDefault(),
 
-                IsHaveGeneratedTask = t.SubjectVisitTaskList.Any(c => c.DoctorUserId == doctorUserId && c.IsSelfAnalysis == true && c.TrialReadingCriterionId==trialReadingCriterionId),
+                IsHaveGeneratedTask = t.SubjectVisitTaskList.Any(c => c.DoctorUserId == doctorUserId && c.IsSelfAnalysis == true && c.TrialReadingCriterionId == trialReadingCriterionId),
 
 
                 ValidVisitCount = t.SubjectVisitTaskList.AsQueryable().Where(visitTaskFilter).Count(),
@@ -526,7 +590,7 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-                    TrialReadingCriterionId=c.TrialReadingCriterionId,
+                    TrialReadingCriterionId = c.TrialReadingCriterionId,
                     IsClinicalDataSign = c.IsClinicalDataSign,
                     IsNeedClinicalDataSign = c.IsNeedClinicalDataSign,
 
@@ -564,7 +628,12 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-
+        /// <summary>
+        /// 组间一致性分析 满足条件的subject 筛选
+        /// </summary>
+        /// <param name="filterObj"></param>
+        /// <param name="subejctIdList"></param>
+        /// <returns></returns>
         private async Task<IQueryable<DoctorGroupConsistentSubjectView>> GetGroupConsistentQueryAsync(TaskConsistentRule filterObj, List<Guid>? subejctIdList = null)
         {
 
@@ -622,8 +691,15 @@ namespace IRaCIS.Core.Application.Service
                 SubjectId = t.Id,
                 IsReReadingOrBackInfluenceAnalysis = t.IsReReadingOrBackInfluenceAnalysis,
 
-                IsHaveGeneratedTask = t.SubjectVisitTaskList.Any(c => c.IsSelfAnalysis == false && c.TrialReadingCriterionId==trialReadingCriterionId),
+                IsHaveGeneratedTask = t.SubjectVisitTaskList.Any(c => c.IsSelfAnalysis == false && c.TrialReadingCriterionId == trialReadingCriterionId),
 
+                DoctorUserList = t.SubjectDoctorList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.IsConfirmed).Select(t => new UserSimpleInfo()
+                {
+                    UserId = t.Id,
+                    FullName = t.DoctorUser.FullName,
+                    UserCode = t.DoctorUser.UserCode,
+                    UserName = t.DoctorUser.UserName
+                }).ToList(),
 
                 ValidVisitCount = t.SubjectVisitTaskList.AsQueryable().Where(visitTaskFilter).GroupBy(t => new { t.SubjectId, t.VisitTaskNum }).Where(g => g.Count() == 2).Count(),
 
@@ -663,7 +739,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<TaskConsistentRuleBasic?> GetConsistentRule(TaskConsistentRuleQuery inQuery)
         {
-            return await _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId && t.IsSelfAnalysis == inQuery.IsSelfAnalysis && t.TrialReadingCriterionId==inQuery.TrialReadingCriterionId).ProjectTo<TaskConsistentRuleBasic>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
+            return await _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId && t.IsSelfAnalysis == inQuery.IsSelfAnalysis && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId).ProjectTo<TaskConsistentRuleBasic>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
         }
 
         /// <summary>
@@ -672,13 +748,23 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inQuery"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<List<TaskConsistentRuleView>> GetSelfConsistentDoctorStatList(TaskConsistentRuleQuery inQuery)
+        public async Task<IResponseOutput<List<TaskConsistentRuleView>>> GetSelfConsistentDoctorStatList(TaskConsistentRuleQuery inQuery)
         {
+
+
             var trialId = inQuery.TrialId;
 
-            var taskConsistentRuleQueryable = from enroll in _repository.Where<Enroll>(t => t.TrialId == trialId && t.EnrollStatus==EnrollStatus.ConfirmIntoGroup)
+            Expression<Func<VisitTask, bool>> comonTaskFilter = u => u.TrialId == trialId && u.IsAnalysisCreate == false && u.TaskState == TaskState.Effect && u.ReadingTaskState == ReadingTaskState.HaveSigned && (u.ReReadingApplyState == ReReadingApplyState.Default || u.ReReadingApplyState == ReReadingApplyState.Reject);
-                                              join user in _repository.Where<User>() on enroll.DoctorId equals user.DoctorId
+
-                                              join taskConsistentRule in _repository.Where<TaskConsistentRule>(t => t.TrialId == trialId &&t.TrialReadingCriterionId==inQuery.TrialReadingCriterionId  && t.IsSelfAnalysis) on enroll.TrialId equals taskConsistentRule.TrialId
+            //&& u.TrialReadingCriterionId == trialReadingCriterionId &&u.SignTime!.Value.AddDays(filterObj.IntervalWeeks * 7) < DateTime.Now   && u.DoctorUserId == doctorUserId;
+
+            Expression<Func<VisitTask, bool>> visitTaskFilter = comonTaskFilter.And(t => t.ReadingCategory == ReadingCategory.Visit);
+
+
+            var taskConsistentRuleQueryable = from enroll in _repository.Where<Enroll>(t => t.TrialId == trialId && t.EnrollStatus == EnrollStatus.ConfirmIntoGroup
+                                              && t.EnrollReadingCriteriaList.Any(c => c.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && c.IsJoinAnalysis))
+                                              join user in _repository.Where<User>() on enroll.DoctorUserId equals user.Id
+                                              join taskConsistentRule in _repository.Where<TaskConsistentRule>(t => t.TrialId == trialId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.IsSelfAnalysis) on enroll.TrialId equals taskConsistentRule.TrialId
                                               select new TaskConsistentRuleView()
                                               {
                                                   Id = taskConsistentRule.Id,
@@ -697,7 +783,20 @@ namespace IRaCIS.Core.Application.Service
                                                   IsHaveReadingPeriod = taskConsistentRule.IsHaveReadingPeriod,
                                                   PlanVisitCount = taskConsistentRule.PlanVisitCount,
 
-                                                  GeneratedSubjectCount = taskConsistentRule.Trial.VisitTaskList.Where(t => t.IsAnalysisCreate && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.IsSelfAnalysis == true && t.DoctorUserId == user.Id).Select(t => t.SubjectId).Distinct().Count(),
+                                                  GeneratedSubjectCount = taskConsistentRule.TrialReadingCriterion.VisitTaskList.Where(t => t.IsAnalysisCreate && t.IsSelfAnalysis == true && t.DoctorUserId == user.Id).Select(t => t.SubjectId).Distinct().Count(),
+
+
+                                                  MatchSubejctCount = taskConsistentRule.Trial.SubjectList.AsQueryable()
+                                                  .Where(t => taskConsistentRule.IsHaveReadingPeriod == false ? t.SubjectVisitTaskList.AsQueryable()
+                                                  .Where(visitTaskFilter).Where(t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.SignTime!.Value.AddDays(taskConsistentRule.IntervalWeeks * 7) < DateTime.Now && t.DoctorUserId == user.Id)
+                                                  .Count() >= taskConsistentRule.PlanVisitCount :
+
+                                                    t.SubjectVisitTaskList.AsQueryable().Where(comonTaskFilter)
+                                                    .Where(t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.SignTime!.Value.AddDays(taskConsistentRule.IntervalWeeks * 7) < DateTime.Now && t.DoctorUserId == user.Id)
+                                                    .Where(t => t.ReadingCategory == ReadingCategory.Visit || t.ReadingCategory == ReadingCategory.Global).OrderBy(t => t.VisitTaskNum).Take(taskConsistentRule.PlanVisitCount + 1).Any(t => t.ReadingCategory == ReadingCategory.Global))
+                                                  .Count(),
+
+
 
                                                   AnalysisDoctorUser = new UserSimpleInfo()
                                                   {
@@ -724,10 +823,48 @@ namespace IRaCIS.Core.Application.Service
             //var taskConsistentRuleQueryable = _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId)
             // .ProjectTo<TaskConsistentRuleView>(_mapper.ConfigurationProvider);
 
-            return await taskConsistentRuleQueryable.ToListAsync();
+            var list= await taskConsistentRuleQueryable.ToListAsync();
+
+            var rule= await _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId && t.IsSelfAnalysis == true && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId).ProjectTo<TaskConsistentRuleBasic>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
+            return ResponseOutput.Ok(list, rule);
         }
 
+        [HttpPost]
+        [UnitOfWork]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        public async Task<IResponseOutput> UpdateTrialVirtualSiteCode(UpdateTrialSiteCodeCommand inCommand)
+        {
 
+            if (_trialSiteRepository.Where(t => t.TrialId == inCommand.TrialId, false, true).Any(t => t.TrialSiteCode == inCommand.VirtualSiteCode))
+            {
+                return ResponseOutput.NotOk(_localizer["TaskConsistent_SiteCodeExists"]);
+            }
+
+            var trial = await _trialRepository.FirstOrDefaultAsync(t => t.Id == inCommand.TrialId);
+
+            var oldCode = trial.VitrualSiteCode;
+
+            trial.VitrualSiteCode = inCommand.VirtualSiteCode;
+
+            await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == trial.Id, u => new VisitTask() { BlindTrialSiteCode = inCommand.VirtualSiteCode });
+
+            await _taskConsistentRuleRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == trial.Id, u => new TaskConsistentRule() { BlindTrialSiteCode = inCommand.VirtualSiteCode });
+
+
+            await _visitTaskRepository.ExecuteUpdateAsync(t => t.TrialId == trial.Id, s => s.SetProperty(e => e.BlindSubjectCode, u => u.BlindSubjectCode.Replace(oldCode, inCommand.VirtualSiteCode)));
+
+            await _trialVirtualSiteCodeUpdateRepository.AddAsync(new TrialVirtualSiteCodeUpdate() { VirturalSiteCode = inCommand.VirtualSiteCode, TrialId = inCommand.TrialId });
+
+            await _trialRepository.SaveChangesAsync();
+
+            return ResponseOutput.Ok();
+        }
+
+        public async Task<List<UpdateTrialSiteCodeCommandView>> GetUpdateVirtualSiteCodeList(Guid trialId)
+        {
+            var list = await _trialVirtualSiteCodeUpdateRepository.Where(t => t.TrialId == trialId).Select(t => new UpdateTrialSiteCodeCommandView() { TrialId = trialId, VirtualSiteCode = t.VirturalSiteCode, Creatime = t.CreateTime }).OrderByDescending(t=>t.Creatime).ToListAsync();
+            return list;
+        }
 
 
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
@@ -737,7 +874,7 @@ namespace IRaCIS.Core.Application.Service
 
             var verifyExp1 = new EntityVerifyExp<TaskConsistentRule>()
             {
-                VerifyExp = t => t.TrialId == addOrEditTaskConsistentRule.TrialId && t.IsSelfAnalysis == addOrEditTaskConsistentRule.IsSelfAnalysis && t.TrialReadingCriterionId==addOrEditTaskConsistentRule.TrialReadingCriterionId,
+                VerifyExp = t => t.TrialId == addOrEditTaskConsistentRule.TrialId && t.IsSelfAnalysis == addOrEditTaskConsistentRule.IsSelfAnalysis && t.TrialReadingCriterionId == addOrEditTaskConsistentRule.TrialReadingCriterionId,
                 //"已有该项目配置，不允许继续增加"
                 VerifyMsg = _localizer["TaskConsistent_TaskGenerated"]
             };
@@ -748,6 +885,22 @@ namespace IRaCIS.Core.Application.Service
                 return ResponseOutput.NotOk(_localizer["TaskConsistent_MedicalAuditTaskExists"]);
             }
 
+
+            if (_trialSiteRepository.Where(t => t.TrialId == addOrEditTaskConsistentRule.TrialId, false, true).Any(t => t.TrialSiteCode == addOrEditTaskConsistentRule.BlindTrialSiteCode))
+            {
+                return ResponseOutput.NotOk(_localizer["TaskConsistent_SiteCodeExists"]);
+            }
+
+            var trial = await _trialRepository.FirstOrDefaultAsync(t => t.Id == addOrEditTaskConsistentRule.TrialId);
+
+            if (string.IsNullOrEmpty(trial.VitrualSiteCode))
+            {
+                await _trialVirtualSiteCodeUpdateRepository.AddAsync(new TrialVirtualSiteCodeUpdate() { VirturalSiteCode = addOrEditTaskConsistentRule.BlindTrialSiteCode, TrialId = addOrEditTaskConsistentRule.TrialId });
+            }
+
+            trial.VitrualSiteCode = addOrEditTaskConsistentRule.BlindTrialSiteCode;
+
+
             var entity = await _taskConsistentRuleRepository.InsertOrUpdateAsync(addOrEditTaskConsistentRule, true, verifyExp1);
 
             return ResponseOutput.Ok(entity.Id.ToString());
@@ -762,7 +915,7 @@ namespace IRaCIS.Core.Application.Service
             var config = await _taskConsistentRuleRepository.FirstOrDefaultAsync(t => t.Id == taskConsistentRuleId);
 
 
-            if (await _visitTaskRepository.AnyAsync(t => t.IsAnalysisCreate && t.TrialId == config.TrialId && t.IsSelfAnalysis == config.IsSelfAnalysis && t.TrialReadingCriterionId==config.TrialReadingCriterionId))
+            if (await _visitTaskRepository.AnyAsync(t => t.IsAnalysisCreate && t.TrialId == config.TrialId && t.IsSelfAnalysis == config.IsSelfAnalysis && t.TrialReadingCriterionId == config.TrialReadingCriterionId))
             {
                 //"该标准已产生一致性分析任务，不允许删除"
                 throw new BusinessValidationFailedException(_localizer["TaskConsistent_SignedTaskCannotBeInvalidated"]);
@@ -775,8 +928,65 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
+        /// <summary>
+        /// 获取自身一致性分析 符合条件的subject 数组
+        /// </summary>
+        /// <param name="inQuery"></param>
+        /// <returns></returns>
+        public async Task<List<SubjectGeneratedTask>> GetSelfConsistentRuleMatchSubjectIdListAsync(SelfConsistentSimpleQuery inQuery)
+        {
+            var filterObj = await _taskConsistentRuleRepository.FirstOrDefaultAsync(t => t.Id == inQuery.TaskConsistentRuleId);
+
+            var subjectList = await GetIQueryableDoctorSelfConsistentSubjectView(filterObj, inQuery.DoctorUserId).Select(t => new SubjectGeneratedTask() { SubjectId = t.SubjectId, IsHaveGeneratedTask = t.IsHaveGeneratedTask }).ToListAsync();
+
+            return subjectList;
+        }
+
+        /// <summary>
+        /// 获取组件一致性分析符合条件的subject 数组
+        /// </summary>
+        /// <param name="inQuery"></param>
+        /// <returns></returns>
+        public async Task<List<SubjectGeneratedTask>> GetGroupConsistentRuleMatchSubjectIdListAsync(GroupConsistentSimpleQuery inQuery)
+        {
+            var filterObj = await _taskConsistentRuleRepository.FirstOrDefaultAsync(t => t.TrialId == inQuery.TrialId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.IsSelfAnalysis == false);
+
+            var subjectList = await (await GetGroupConsistentQueryAsync(filterObj)).Select(t => new SubjectGeneratedTask() { SubjectId = t.SubjectId, IsHaveGeneratedTask = t.IsHaveGeneratedTask }).ToListAsync();
+
+            return subjectList;
+        }
 
 
 
+        /// <summary>
+        /// 随机算法，选择指定数量的 subject  
+        /// </summary>
+        /// <param name="matchSubjectIdList"></param>
+        /// <param name="countToSelect"></param>
+        /// <returns></returns>
+        public List<Guid> GetRandomSubjectIdList(List<Guid> matchSubjectIdList, int countToSelect)
+        {
+
+            // 使用 Fisher-Yates 随机置换算法来选择指定数量的 GUID
+            Random random = new Random();
+
+            for (int i = 0; i < countToSelect; i++)
+            {
+                // 生成一个随机索引
+                int randomIndex = random.Next(i, matchSubjectIdList.Count);
+
+                // 将选中的元素与当前元素交换位置
+                Guid temp = matchSubjectIdList[randomIndex];
+                matchSubjectIdList[randomIndex] = matchSubjectIdList[i];
+                matchSubjectIdList[i] = temp;
+            }
+
+            return matchSubjectIdList.Take(countToSelect).ToList();
+
+            // 使用洗牌算法来随机选择指定数量的GUID
+            //Random random = new Random();
+            //return matchSubjectIdList.OrderBy(g => random.Next()).Take(countToSelect).ToList();
+        }
+
     }
 }

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

@@ -67,11 +67,11 @@ namespace IRaCIS.Core.Application.Service
         public async Task<IResponseOutput> DeleteTaskMedicalReviewRule(Guid taskMedicalReviewRuleId)
         {
 
-            if(await _taskMedicalReviewRuleRepository.Where(t=>t.Id== taskMedicalReviewRuleId).AnyAsync(t => t.TaskMedicalReviewList.Any()))
+            //if(await _taskMedicalReviewRuleRepository.Where(t=>t.Id== taskMedicalReviewRuleId).AnyAsync(t => t.TaskMedicalReviewList.Any()))
-            {
+            //{
-                //"已产生医学审核任务"
+            //    //"已产生医学审核任务"
-                return ResponseOutput.NotOk(_localizer["TaskMedicalRule_TaskStarted"]);
+            //    return ResponseOutput.NotOk(_localizer["TaskMedicalRule_TaskStarted"]);
-            }
+            //}
 
             var success = await _taskMedicalReviewRuleRepository.DeleteFromQueryAsync(t => t.Id == taskMedicalReviewRuleId,true);
 

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

@@ -11,6 +11,7 @@ using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Application.Filter;
+using Microsoft.Extensions.Logging;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -55,6 +56,7 @@ namespace IRaCIS.Core.Application.Service
 
             var taskMedicalReviewQueryable = _taskMedicalReviewRepository.Where(t => t.VisitTask.TrialId == inQuery.TrialId)
                              .WhereIf(inQuery.SiteId != null, t => t.VisitTask.Subject.SiteId == inQuery.SiteId)
+                             .WhereIf(inQuery.SubjectId != null, t => t.VisitTask.SubjectId == inQuery.SubjectId)
 							   .WhereIf(inQuery.SubjectId != null, t => t.VisitTask.SubjectId == inQuery.SubjectId)
 							 .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => t.VisitTask.Subject.Code.Contains(inQuery.SubjectCode))
                              .WhereIf(!string.IsNullOrEmpty(inQuery.TaskName), t => t.VisitTask.TaskName.Contains(inQuery.TaskName) || t.VisitTask.TaskBlindName.Contains(inQuery.TaskName))
@@ -64,11 +66,17 @@ namespace IRaCIS.Core.Application.Service
                              .WhereIf(inQuery.ReadingCategory != null, t => t.VisitTask.ReadingCategory == inQuery.ReadingCategory)
                              .WhereIf(inQuery.TaskState != null, t => t.VisitTask.TaskState == inQuery.TaskState)
                              .WhereIf(inQuery.AuditState != null, t => t.AuditState == inQuery.AuditState)
+								 .WhereIf(inQuery.MedicalManagerUserId != null, t => t.MedicalManagerUserId == inQuery.MedicalManagerUserId)
+                                 .WhereIf(inQuery.BeginSignTime != null, t => t.VisitTask.SignTime > inQuery.BeginSignTime)
+                                 .WhereIf(inQuery.EndSignTime != null, t => t.VisitTask.SignTime < inQuery.EndSignTime!.Value.AddDays(1))
+									 .WhereIf(inQuery.AuditAdviceEnum != null, t => t.AuditAdviceEnum == inQuery.AuditAdviceEnum)
 
+								 .WhereIf(inQuery.DoctorUserIdeaEnum != null, t => t.DoctorUserIdeaEnum == inQuery.DoctorUserIdeaEnum)
 							   .WhereIf(inQuery.TrialReadingCriterionId != null, t => t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
+							 .OrderBy(x => x.AuditState).ThenBy(x => x.VisitTask.SubjectId).ThenBy(x => x.VisitTask.ArmEnum).ThenBy(x => x.VisitTask.VisitTaskNum)
 							 .ProjectTo<TaskMedicalReviewView>(_mapper.ConfigurationProvider);
 
-            var pageList = await taskMedicalReviewQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TaskMedicalReviewView.Id) : inQuery.SortField, inQuery.Asc);
+            var pageList = await taskMedicalReviewQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, new string[] { });
 
             return pageList;
         }
@@ -136,46 +144,54 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<TaskMedicalReviewView> GetNextMedicalReviewTask(GetNextMedicalReviewTaskInDto inDto)
         {
-            var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.MedicalReviewId).Include(x=>x.VisitTask).FirstNotNullAsync();
+            var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.MedicalReviewId).Include(x => x.VisitTask).FirstNotNullAsync();
 
-            var subjectReview = (await GetMIMMedicalReviewTaskList(new TaskMedicalReviewQuery()
-            {
 
-                TrialId = medicalReview.TrialId,
-                IsGetBeRead = true,
-                Id=inDto.MedicalReviewId,
-                SubjectId= medicalReview.VisitTask.SubjectId,
-                TrialReadingCriterionId = medicalReview.VisitTask.TrialReadingCriterionId,
-                PageIndex=1,
-                PageSize=1,
-            })).Data;
-
-            if (subjectReview.CurrentPageData.Count == 1)
-            {
-                return subjectReview.CurrentPageData[0];
-            }
 
             var data = (await GetMIMMedicalReviewTaskList(new TaskMedicalReviewQuery()
             {
 
                 TrialId = medicalReview.TrialId,
-                IsGetBeRead = true,
                 Id = inDto.MedicalReviewId,
                 TrialReadingCriterionId = medicalReview.VisitTask.TrialReadingCriterionId,
+                IsGetNextMedicalReviewTask = true,
                 PageIndex = 1,
-                PageSize = 1,
+                PageSize = 99999,
             })).Data;
 
-            if (data.CurrentPageData.Count == 1)
+
+            if (data.CurrentPageData.Count > 0)
             {
-                return data.CurrentPageData[0];
+
+                var index = data.CurrentPageData.ToList().FindIndex(x => x.Id == inDto.MedicalReviewId);
+
+                var result = new TaskMedicalReviewView() { };
+
+                if (index+1 == data.CurrentPageData.Count()) // 最后一个
+                {
+					throw new BusinessValidationFailedException(_localizer["MedicalReview_Finish"]);
+				}
+                else if (index == -1 || data.CurrentPageData.Count == 1) // 第一个或者只有一个
+                {
+                    if (data.CurrentPageData[0].Id == inDto.MedicalReviewId)
+                    {
+						throw new BusinessValidationFailedException(_localizer["MedicalReview_Finish"]);
+					}
+                    result = data.CurrentPageData[0];
+                }
+                else
+                {
+                    result = data.CurrentPageData.Skip(index + 1).Take(1).First();
+
+                }
+                return result;
+
             }
             else
             {
 				throw new BusinessValidationFailedException(_localizer["MedicalReview_Finish"]);
 			}
 
-
         }
 
 
@@ -190,12 +206,23 @@ namespace IRaCIS.Core.Application.Service
         {
 
             var taskMedicalReviewQueryable = _taskMedicalReviewRepository.Where(t => t.VisitTask.TrialId == inQuery.TrialId && t.MedicalManagerUserId == _userInfo.Id&&t.VisitTask.TrialReadingCriterionId==inQuery.TrialReadingCriterionId)
+               
+                .WhereIf(inQuery.IsGetNextMedicalReviewTask,
+                x=>(
+				!x.IsInvalid&&  x.AuditState== MedicalReviewAuditState.Auditing & 
+               ( x.ReadingMedicalReviewDialogList.Count()!=0&&
+				x.ReadingMedicalReviewDialogList.Count()>0&&
+				x.ReadingMedicalReviewDialogList.OrderByDescending(x=>x.CreateTime).FirstOrDefault().UserTypeEnumInt==(int)UserTypeEnum.IndependentReviewer)
+                )  // 审核中最新回复为IR的 
+                || (!x.IsInvalid&& x.AuditState==MedicalReviewAuditState.WaitAudit)
+                ||x.Id == inQuery.Id   // 这里必须找传入id 因为要找到这条的索引 获取下一条
+				)
                 .WhereIf(inQuery.SubjectId != null, t => t.VisitTask.SubjectId == inQuery.SubjectId)
                              .WhereIf(inQuery.SiteId != null, t => t.VisitTask.Subject.SiteId == inQuery.SiteId)
                              .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => t.VisitTask.Subject.Code.Contains(inQuery.SubjectCode))
-                                  .WhereIf(inQuery.Id != null, t => t.Id != inQuery.Id)
                              .WhereIf(inQuery.IsUrgent != null, t => t.VisitTask.IsUrgent == inQuery.IsUrgent)
                               .WhereIf(inQuery.AuditState != null, t => t.AuditState == inQuery.AuditState)
+							   .WhereIf(inQuery.DoctorUserIdeaEnum != null, t => t.DoctorUserIdeaEnum == inQuery.DoctorUserIdeaEnum)
 							   .WhereIf(inQuery.TaskState != null, t => t.VisitTask.TaskState == inQuery.TaskState)
                              .WhereIf(inQuery.DoctorUserId != null, t => t.VisitTask.DoctorUserId == inQuery.DoctorUserId)
                              .WhereIf(inQuery.ReadingCategory != null, t => t.VisitTask.ReadingCategory == inQuery.ReadingCategory)
@@ -203,9 +230,11 @@ namespace IRaCIS.Core.Application.Service
                               .WhereIf(inQuery.IsInvalid != null, t => t.IsInvalid == inQuery.IsInvalid)
                              .WhereIf(inQuery.IsGetBeRead,x=>!x.IsInvalid&&x.AuditState!= MedicalReviewAuditState.HaveSigned)
                               .WhereIf(inQuery.TrialReadingCriterionId != null, t => t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
+						     .OrderBy(x=>x.VisitTask.SubjectId).ThenBy(x=>x.VisitTask.ArmEnum).ThenBy(x=>x.VisitTask.VisitTaskNum)
                              .ProjectTo<TaskMedicalReviewView>(_mapper.ConfigurationProvider);
                         
-            var pageList = await taskMedicalReviewQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TaskMedicalReviewView.Id) : inQuery.SortField, inQuery.Asc);
+
+            var pageList = await taskMedicalReviewQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize,new string[] {  } );
 
             return  ResponseOutput.Ok(pageList, new
             {

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

@@ -40,6 +40,7 @@ namespace IRaCIS.Core.Application.Service
         private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
         private readonly IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository;
         private readonly IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository;
+		private readonly IRepository<ReadingOncologyTaskInfo> _readingOncologyTaskInfoRepository;
 		private readonly IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository;
         private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
         private readonly IMapper _mapper;
@@ -60,6 +61,7 @@ namespace IRaCIS.Core.Application.Service
                 IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository,
                     IRepository<ReadingTableAnswerRowInfo> readingTableAnswerRowInfoRepository,
                        IRepository<ReadingTableQuestionAnswer> readingTableQuestionAnswerRepository,
+							  IRepository<ReadingOncologyTaskInfo> ReadingOncologyTaskInfoRepository,
 						   IRepository<ReadingTableQuestionTrial> readingTableQuestionTrialRepository,
                              IRepository<ReadingQuestionTrial> readingQuestionTrialRepository,
              IRepository<ReadingJudgeInfo> readingJudgeInfoRepository,
@@ -76,6 +78,7 @@ namespace IRaCIS.Core.Application.Service
             this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;
             this._readingTableAnswerRowInfoRepository = readingTableAnswerRowInfoRepository;
             this._readingTableQuestionAnswerRepository = readingTableQuestionAnswerRepository;
+			_readingOncologyTaskInfoRepository = ReadingOncologyTaskInfoRepository;
 			this._readingTableQuestionTrialRepository = readingTableQuestionTrialRepository;
             this._readingQuestionTrialRepository = readingQuestionTrialRepository;
             _provider = provider;
@@ -663,6 +666,7 @@ namespace IRaCIS.Core.Application.Service
                                     var isNeedClinicalDataSign = IsNeedClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionConfig.TrialReadingCriterionId, clinicalDataConfirmList);
                                     var isClinicalDataSign = IsClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionConfig.TrialReadingCriterionId, clinicalDataConfirmList, subjectVisit.Id, trialId);
 
+                                    var isFrontTaskNeedSignButNotSign = await _visitTaskRepository.AnyAsync(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.TaskState == TaskState.Effect && t.VisitTaskNum < subjectVisit.VisitNum && t.IsNeedClinicalDataSign == true && t.IsClinicalDataSign == false);
 
                                     if (visitNumList.IndexOf(subjectVisit.VisitNum) == 0)
                                     {
@@ -689,7 +693,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).ToList();
 
                                         VisitTask? task1 = null;
                                         VisitTask? task2 = null;
@@ -719,7 +723,8 @@ namespace IRaCIS.Core.Application.Service
 
                                                 TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
                                                 IsNeedClinicalDataSign = isNeedClinicalDataSign,
-                                                IsClinicalDataSign = isClinicalDataSign
+                                                IsClinicalDataSign = isClinicalDataSign,
+                                                IsFrontTaskNeedSignButNotSign = isFrontTaskNeedSignButNotSign
                                             });
                                         }
 
@@ -746,7 +751,8 @@ namespace IRaCIS.Core.Application.Service
 
                                                 TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
                                                 IsNeedClinicalDataSign = isNeedClinicalDataSign,
-                                                IsClinicalDataSign = isClinicalDataSign
+                                                IsClinicalDataSign = isClinicalDataSign,
+                                                IsFrontTaskNeedSignButNotSign = isFrontTaskNeedSignButNotSign
                                             });
                                         }
 
@@ -1068,7 +1074,8 @@ namespace IRaCIS.Core.Application.Service
 
                                             TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
                                             IsNeedClinicalDataSign = isNeedClinicalDataSign,
-                                            IsClinicalDataSign = isClinicalDataSign
+                                            IsClinicalDataSign = isClinicalDataSign,
+                                            IsFrontTaskNeedSignButNotSign= isFrontTaskNeedSignButNotSign
                                         });
 
 
@@ -1602,17 +1609,18 @@ namespace IRaCIS.Core.Application.Service
                         var oncologySubjectUser = await _subjectUserRepository.Where(x => x.SubjectId == item.SubjectId && x.ArmEnum == Arm.TumorArm && x.IsConfirmed && x.TrialReadingCriterionId == originalTaskInfo.TrialReadingCriterionId).FirstOrDefaultAsync();
 
                         item.VisitNum = await _readModuleRepository.Where(x => x.Id == item.ReadModuleId).Select(x => x.SubjectVisit.VisitNum).FirstOrDefaultAsync();
-
+                        var id= NewId.NextGuid();
 
 						var singleTask = await _visitTaskRepository.AddAsync(new VisitTask()
                         {
+                            Id= id,
 							TrialId = trialId,
                             SubjectId = item.SubjectId,
                             IsUrgent = originalTaskInfo.IsUrgent,
                             TaskName = item.ReadingName,
                             //IsConvertedTask = originalTaskInfo.IsConvertedTask,
-                            // 原任务是全局任务  加0.03 就好
+                            // 这里可能是
-                            VisitTaskNum = originalTaskInfo.VisitTaskNum + 0.03m,
+                            VisitTaskNum = originalTaskInfo.VisitTaskNum - ReadingCommon.TaskNumDic[originalTaskInfo.ReadingCategory] + ReadingCommon.TaskNumDic[ReadingCategory.Oncology],
                             ArmEnum = Arm.TumorArm, //特殊
                             Code = currentMaxCodeInt + 1,
                             SouceReadModuleId = item.ReadModuleId,
@@ -1637,6 +1645,22 @@ namespace IRaCIS.Core.Application.Service
 
                         currentMaxCodeInt = currentMaxCodeInt + 1;
 
+                        // 生成肿瘤学需要 肿瘤学阅片结果中基线，统一显示为NA
+                        // 找到基线任务ID
+                        var baseLineTaskId = await _visitTaskRepository.Where(x => x.TaskState == TaskState.Effect
+                        && x.ArmEnum == originalTaskInfo.ArmEnum && x.VisitTaskNum == 0 
+                        && x.SubjectId== originalTaskInfo.SubjectId
+						&& x.ReadingTaskState == ReadingTaskState.HaveSigned && x.TrialReadingCriterionId == originalTaskInfo.TrialReadingCriterionId).Select(x => x.Id).FirstNotNullAsync();
+                        await _readingOncologyTaskInfoRepository.AddAsync(new ReadingOncologyTaskInfo()
+                        {
+                            EvaluationResult = "-1",
+                            EvaluationReason=string.Empty,
+                            OncologyTaskId = id,
+                            VisitTaskId = baseLineTaskId,
+                            SubjectId = originalTaskInfo.SubjectId,
+                            TrialId = originalTaskInfo.TrialId
+                        });
+
 						_provider.Set<int>($"{trialId}_{StaticData.CacheKey.TaskMaxCode}", currentMaxCodeInt, TimeSpan.FromMinutes(30));
                     }
                     break;

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

@@ -105,7 +105,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
             var list = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId && t.IsConfirm)
 
                 .OrderBy(t => t.ShowOrder)
-                .Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, IsAutoCreate = t.IsAutoCreate, IsAdditionalAssessment = t.IsAdditionalAssessment, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, ReadingType = t.ReadingType, ReadingInfoSignTime = t.ReadingInfoSignTime })
+                .Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, IsAutoCreate = t.IsAutoCreate, IsAdditionalAssessment = t.IsAdditionalAssessment, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, ReadingType = t.ReadingType, ReadingInfoSignTime = t.ReadingInfoSignTime , IsReadingPeriod= t.IsReadingPeriod })
                 .ToListAsync();
 
             //if (list.Count == 0)
@@ -128,7 +128,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<(PageOutput<SubjectAssignStat>, object?)> GetSubjectAssignAndTaskStatList(SubjectAssignStatQuery querySubjectAssign)
+        public async Task<IResponseOutput<PageOutput<SubjectAssignStat>>> GetSubjectAssignAndTaskStatList(SubjectAssignStatQuery querySubjectAssign)
         {
 
             var isAddtinoarlCriterion = await _trialReadingCriterionRepository.AnyAsync(t => t.Id == querySubjectAssign.TrialReadingCriterionId && t.IsAutoCreate == false);
@@ -138,6 +138,14 @@ namespace IRaCIS.Core.Application.Service.Allocation
                  .WhereIf(querySubjectAssign.SubjectId != null, t => t.Id == querySubjectAssign.SubjectId)
                  .WhereIf(querySubjectAssign.DoctorUserId != null, t => t.SubjectDoctorList.Any(t => t.DoctorUserId == querySubjectAssign.DoctorUserId && t.TrialReadingCriterionId == querySubjectAssign.TrialReadingCriterionId))
                  .WhereIf(!string.IsNullOrEmpty(querySubjectAssign.SubjectCode), t => t.Code.Contains(querySubjectAssign.SubjectCode))
+                 //未分配
+                 .WhereIf(querySubjectAssign.SubjectAllocateState == 0, t => !t.SubjectDoctorList.Any(t => t.AssignTime!=null && t.TrialReadingCriterionId == querySubjectAssign.TrialReadingCriterionId))
+                 //已分配
+                  .WhereIf(querySubjectAssign.SubjectAllocateState == 1, t => t.SubjectDoctorList.Any(t => t.AssignTime != null && t.TrialReadingCriterionId == querySubjectAssign.TrialReadingCriterionId))
+
+                  .WhereIf(querySubjectAssign.ArmList.Count >0 , t => !querySubjectAssign.ArmList.Except(t.SubjectDoctorList.Where(t => t.AssignTime != null && t.TrialReadingCriterionId == querySubjectAssign.TrialReadingCriterionId).Select(c => c.ArmEnum)).Any()  )
+                  
+
                  .WhereIf(isAddtinoarlCriterion, t => t.SubjectCriteriaEvaluationList.Where(t => t.TrialReadingCriterionId == querySubjectAssign.TrialReadingCriterionId).Any(t => t.IsJoinEvaluation))
 
 
@@ -150,7 +158,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == querySubjectAssign.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsReadingTaskViewInOrder, x.ReadingType, x.IsArbitrationReading, x.IsOncologyReading, x.IsGlobalReading }).FirstOrDefaultAsync()).IfNullThrowException();
 
-            return (pageList, criterionConfig);
+            return ResponseOutput.Ok (pageList, criterionConfig);
         }
 
         /// <summary>
@@ -758,6 +766,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
                .WhereIf(!string.IsNullOrEmpty(queryVisitTask.SubjectCode), t => (t.Subject.Code.Contains(queryVisitTask.SubjectCode) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(queryVisitTask.SubjectCode) && t.IsAnalysisCreate))
                .WhereIf(queryVisitTask.BeginAllocateDate != null, t => t.AllocateTime > queryVisitTask.BeginAllocateDate)
                .WhereIf(queryVisitTask.EndAllocateDate != null, t => t.AllocateTime < queryVisitTask.EndAllocateDate!.Value.AddDays(1))
+				  .WhereIf(queryVisitTask.BeginSignTime != null, t => t.SignTime > queryVisitTask.BeginSignTime)
+			   .WhereIf(queryVisitTask.EndSignTime != null, t => t.SignTime < queryVisitTask.EndSignTime!.Value.AddDays(1))
 			   .ProjectTo<ReadingTaskView>(_mapper.ConfigurationProvider);
 
             var defalutSortArray = new string[] { nameof(VisitTask.IsUrgent) + " desc", nameof(VisitTask.SubjectId), nameof(VisitTask.VisitTaskNum) };
@@ -835,10 +845,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 .Where(t => t.RequestReReadingType == RequestReReadingType.DocotorApply)
                 .Where(t => t.OriginalReReadingTask.DoctorUserId == _userInfo.Id)
                 .Where(t => t.OriginalReReadingTask.TrialId == queryVisitTask.TrialId)
-
+		    	 .WhereIf(queryVisitTask.RequestReReadingResultEnum != null, t => t.RequestReReadingResultEnum == queryVisitTask.RequestReReadingResultEnum)
 				.WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId || t.OriginalReReadingTaskId == queryVisitTask.RootReReadingTaskId)
                 .WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskCode), t => t.OriginalReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode!) || t.RootReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode!))
                 .WhereIf(queryVisitTask.TaskState != null, t => t.OriginalReReadingTask.TaskState == queryVisitTask.TaskState)
+				   .WhereIf(queryVisitTask.ReadingCategory != null, t => t.OriginalReReadingTask.ReadingCategory == queryVisitTask.ReadingCategory)
 				 .WhereIf(queryVisitTask.ReReadingApplyState != null, t => t.OriginalReReadingTask.ReReadingApplyState == queryVisitTask.ReReadingApplyState)
                 .WhereIf(queryVisitTask.SiteId != null, t => t.OriginalReReadingTask.Subject.SiteId == queryVisitTask.SiteId)
                 .WhereIf(queryVisitTask.SubjectId != null, t => t.OriginalReReadingTask.SubjectId == queryVisitTask.SubjectId)
@@ -1074,7 +1085,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
         {
             var trialReadingCriterionId = inDto.TrialReadingCriterionId;
 
-            //Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.DoctorUserId == _userInfo.Id && x.TaskState == TaskState.Effect && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId;
 
             var critrion = await _trialReadingCriterionRepository.FindAsync(trialReadingCriterionId);
 
@@ -1086,7 +1096,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                  .WhereIf(critrion.IsAutoCreate == false, t => !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum))
 
                 // 前序 不存在 未一致性核查未通过的
-                .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
+                .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum >= sv.VisitNum))
                 //.WhereIf(critrion.IsAutoCreate == false, t => t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(t => t.IsGeneratedTask == false) ?
                 //t.VisitTaskNum <= t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.IsGeneratedTask == false).Min(t => t.SubjectVisit.VisitNum) : true)
                 //.Where(t => t.Subject.SubjectVisitList.Any(t => t.CheckState != CheckStateEnum.CVPassed) ? t.VisitTaskNum <= t.Subject.SubjectVisitList.Where(t => t.CheckState != CheckStateEnum.CVPassed).Min(t => t.VisitNum) : true)
@@ -1115,6 +1125,32 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 ).Count(),
 
 
+				UnReadCanReadTaskList= x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned)
+				.Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
+				.OrderBy(x => x.VisitTaskNum)
+				.Select(u => new IRUnreadTaskView()
+				{
+					Id = u.Id,
+					IsUrgent = u.IsUrgent,
+					VisitNum = u.VisitTaskNum,
+					TaskBlindName = u.TaskBlindName,
+					VisistId = u.SourceSubjectVisitId,
+					SuggesteFinishedTime = u.SuggesteFinishedTime,
+					ReadingCategory = u.ReadingCategory,
+					IsAnalysisCreate = u.IsAnalysisCreate,
+					ArmEnum = u.ArmEnum,
+					TrialReadingCriterionId = u.TrialReadingCriterionId,
+					IsNeedClinicalDataSign = u.IsNeedClinicalDataSign,
+					IsClinicalDataSign = u.IsClinicalDataSign,
+					IsFrontTaskNeedSignButNotSign = u.IsFrontTaskNeedSignButNotSign
+				})
+				.ToList(),
+
+
+				UrgentCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned)
+				.Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
+				.Where(x=>x.IsUrgent).Count(),
+
 				//已读任务量
 				HaveReadTaskCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState == ReadingTaskState.HaveSigned).Count(),
 
@@ -2253,7 +2289,13 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                     #region 方式二
 
-                    var origenalTask = influenceTaskList.Where(t => t.Id == task.Id).FirstOrDefault();
+
+                    //pm退回的时候，影响的任务里不一定有该任务id  双重 分配了一个人，退回的时候，选择的是未分配的
+
+                    //var origenalTask = influenceTaskList.Where(t => t.Id == task.Id).FirstOrDefault();
+
+                    var origenalTask = await _visitTaskRepository.FindAsync(task.Id);
+
 
                     foreach (var influenceTask in influenceTaskList)
                     {
@@ -2312,7 +2354,9 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                     await SetMedicalReviewInvalidAsync(currentVisitList);
 
-                    var origenalTask = currentVisitList.Where(t => t.Id == task.Id).First();
+                    //var origenalTask = currentVisitList.Where(t => t.Id == task.Id).First();
+
+                    var origenalTask = await _visitTaskRepository.FindAsync(task.Id);
 
                     foreach (var influenceTask in currentVisitList)
                     {
@@ -2667,7 +2711,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                     //throw new BusinessValidationFailedException("仅允许PM 同意 IR 申请的任务");
                 }
-                //PM     影响所有阅片人 仅仅针对访视   SPM  CPM  掉用
+                //PM     影响所有阅片人 仅仅针对访视   SPM  CPM  调用
 
                 else if (((_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM) && applyId != null && await _visitTaskReReadingRepository.AnyAsync(t => t.Id == applyId && t.CreateUser.UserTypeEnum == UserTypeEnum.ProjectManager) && filterObj.IsAnalysisCreate == false && filterObj.ReadingCategory == ReadingCategory.Visit)
                        || (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager && applyId == null))

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

@@ -257,27 +257,27 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-            CreateMap<TaskMedicalReviewRule, TaskMedicalReviewRuleView>()
+            //CreateMap<TaskMedicalReviewRule, TaskMedicalReviewRuleView>()
-              .ForMember(o => o.DoctorUser, t => t.MapFrom(u => u.DoctorUser))
+            //  .ForMember(o => o.DoctorUser, t => t.MapFrom(u => u.DoctorUser))
-              .ForMember(o => o.ActualVisitTaskList, t => t.MapFrom(u => u.DoctorTrialVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Visit && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect
+            //  .ForMember(o => o.ActualVisitTaskList, t => t.MapFrom(u => u.DoctorTrialVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Visit && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect
-               && t.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.Id, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })))
+            //   && t.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.Id, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })))
 
-              .ForMember(o => o.ActualJudgeTaskList, t => t.MapFrom(u => u.DoctorTrialVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Judge && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect &&
+            //  .ForMember(o => o.ActualJudgeTaskList, t => t.MapFrom(u => u.DoctorTrialVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Judge && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect &&
-              t.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.Id, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })))
+            //  t.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.Id, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })))
 
-              .ForMember(o => o.ActualGlobalTaskList, t => t.MapFrom(u => u.DoctorTrialVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Global && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect &&
+            //  .ForMember(o => o.ActualGlobalTaskList, t => t.MapFrom(u => u.DoctorTrialVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Global && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect &&
-              t.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.Id, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })))
+            //  t.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.Id, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })))
 
-              .ForMember(o => o.ActualTumorTaskList, t => t.MapFrom(u => u.DoctorTrialVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Oncology && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect &&
+            //  .ForMember(o => o.ActualTumorTaskList, t => t.MapFrom(u => u.DoctorTrialVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Oncology && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect &&
-              t.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.Id, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })))
+            //  t.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.Id, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })))
 
-              .ForMember(o => o.GeneratedGlobalTaskList, t => t.MapFrom(u => u.TaskMedicalReviewList.Where(t => t.VisitTask.ReadingCategory == ReadingCategory.Global && t.VisitTask.IsAnalysisCreate == false && t.VisitTask.TaskState == TaskState.Effect && t.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.VisitTask.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.VisitTaskId, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })))
+            //  .ForMember(o => o.GeneratedGlobalTaskList, t => t.MapFrom(u => u.TaskMedicalReviewList.Where(t => t.VisitTask.ReadingCategory == ReadingCategory.Global && t.VisitTask.IsAnalysisCreate == false && t.VisitTask.TaskState == TaskState.Effect && t.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.VisitTask.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.VisitTaskId, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })))
 
-              .ForMember(o => o.GeneratedJudgeTaskList, t => t.MapFrom(u => u.TaskMedicalReviewList.Where(t => t.VisitTask.ReadingCategory == ReadingCategory.Judge && t.VisitTask.IsAnalysisCreate == false && t.VisitTask.TaskState == TaskState.Effect && t.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.VisitTask.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.VisitTaskId, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })))
+            //  .ForMember(o => o.GeneratedJudgeTaskList, t => t.MapFrom(u => u.TaskMedicalReviewList.Where(t => t.VisitTask.ReadingCategory == ReadingCategory.Judge && t.VisitTask.IsAnalysisCreate == false && t.VisitTask.TaskState == TaskState.Effect && t.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.VisitTask.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.VisitTaskId, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })))
 
-              .ForMember(o => o.GeneratedTumorTaskList, t => t.MapFrom(u => u.TaskMedicalReviewList.Where(t => t.VisitTask.ReadingCategory == ReadingCategory.Oncology && t.VisitTask.IsAnalysisCreate == false && t.VisitTask.TaskState == TaskState.Effect && t.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.VisitTask.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.VisitTaskId, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })))
+            //  .ForMember(o => o.GeneratedTumorTaskList, t => t.MapFrom(u => u.TaskMedicalReviewList.Where(t => t.VisitTask.ReadingCategory == ReadingCategory.Oncology && t.VisitTask.IsAnalysisCreate == false && t.VisitTask.TaskState == TaskState.Effect && t.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.VisitTask.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.VisitTaskId, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })))
 
-              .ForMember(o => o.GeneratedVisitTaskList, t => t.MapFrom(u => u.TaskMedicalReviewList.Where(t => t.VisitTask.ReadingCategory == ReadingCategory.Visit && t.VisitTask.IsAnalysisCreate == false && t.VisitTask.TaskState == TaskState.Effect && t.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.VisitTask.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.VisitTaskId, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })));
+            //  .ForMember(o => o.GeneratedVisitTaskList, t => t.MapFrom(u => u.TaskMedicalReviewList.Where(t => t.VisitTask.ReadingCategory == ReadingCategory.Visit && t.VisitTask.IsAnalysisCreate == false && t.VisitTask.TaskState == TaskState.Effect && t.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned).OrderBy(t => t.VisitTask.SignTime).Select(t => new TaskBasicIdView() { TaskId = t.VisitTaskId, TrialId = t.TrialId, DoctorUserId = t.DoctorUserId })));
 
             CreateMap<TaskMedicalReviewRuleAddOrEdit, TaskMedicalReviewRule>();
 

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

@@ -91,6 +91,8 @@ namespace IRaCIS.Application.Contracts
     public class GetBasicDataAllSelectInDto
     {
         public Guid? TrialReadingCriterionId { get; set; }
+
+		public Guid? SystemReadingCriterionId { get; set; }
 	}
 
 

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

@@ -42,6 +42,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public string Value { get; set; } = string.Empty;
         public string ValueCN { get; set; } = string.Empty;
 
+        public string FrontType { get; set; } = string.Empty;
+
         public int InternationalizationType { get; set; }
     }
 
@@ -55,19 +57,23 @@ namespace IRaCIS.Core.Application.ViewModel
     }
 
 
-    public class BatchAddInternationalizationDto 
+    public class BatchInternationalizationDto
     {
         public string Description { get; set; } = string.Empty;
         public string Code { get; set; } = string.Empty;
         public string Value { get; set; } = string.Empty;
+        public string FrontType { get; set; } = string.Empty;
         public string ValueCN { get; set; } = string.Empty;
     }
 
-    public class InternationalizationSimpleDto
+    public class BatchAddInternationalizationDto : BatchInternationalizationDto
     {
-        public string Code { get; set; } = string.Empty;
+      
-        public string Value { get; set; } = string.Empty;
+    }
-        public string ValueCN { get; set; } = string.Empty;
+
+    public class InternationalizationSimpleDto: BatchInternationalizationDto
+    {
+       
     }
 
 }

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

@@ -23,7 +23,7 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<SystemCriterionDictionaryCode> _systemCriterionDictionaryCodeRepository;
         private readonly IRepository<TrialCriterionDictionaryCode> _trialCriterionDictionaryCodeRepository;
 		private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository;
-
+		private readonly IRepository<ReadingSystemCriterionDictionary> _readingSystemCriterionDictionaryRepository;
 		private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
 		private readonly IRepository<ReadingQuestionCriterionSystem> _readingQuestionCriterionSystem;
         private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrial;
@@ -34,6 +34,7 @@ namespace IRaCIS.Application.Services
              IRepository<SystemCriterionDictionaryCode> systemCriterionDictionaryCodeRepository,
                    IRepository<TrialCriterionDictionaryCode> trialCriterionDictionaryCodeRepository,
 						 IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository,
+						  IRepository<ReadingSystemCriterionDictionary> readingSystemCriterionDictionaryRepository,
 			 IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
                  IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystem,
                    IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrial
@@ -49,6 +50,7 @@ namespace IRaCIS.Application.Services
             this._systemCriterionDictionaryCodeRepository = systemCriterionDictionaryCodeRepository;
             this._trialCriterionDictionaryCodeRepository = trialCriterionDictionaryCodeRepository;
 			this._readingTrialCriterionDictionaryRepository = readingTrialCriterionDictionaryRepository;
+			this._readingSystemCriterionDictionaryRepository = readingSystemCriterionDictionaryRepository;
 			this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository;
             this._readingQuestionCriterionSystem = readingQuestionCriterionSystem;
             this._readingQuestionCriterionTrial = readingQuestionCriterionTrial;
@@ -462,11 +464,11 @@ namespace IRaCIS.Application.Services
 
             var result = searchList.GroupBy(t => t.ParentCode).ToDictionary(g => g.Key, g => g.OrderBy(t => t.ShowOrder).ToList());
 
-            if (inDto.TrialReadingCriterionId == null)
+            if (inDto.TrialReadingCriterionId == null && inDto.SystemReadingCriterionId == null)
             {
                 return result;
             }
-            else
+            else if (inDto.TrialReadingCriterionId != null)
             {
                 var trialCriterionType = await _readingQuestionCriterionTrial.Where(x => x.Id == inDto.TrialReadingCriterionId).Select(x => x.CriterionType).FirstOrDefaultAsync();
                 if (trialCriterionType == CriterionType.SelfDefine)
@@ -520,8 +522,52 @@ namespace IRaCIS.Application.Services
 
                 return result;
             }
+            else
+            {
+				List<string> selectCode = await _systemCriterionDictionaryCodeRepository.Where(x => x.SystemCriterionId == inDto.SystemReadingCriterionId).Select(x => x.Code).ToListAsync();
 
 
+				var criterionCode = await _dicRepository.Where(x => x.ConfigDictionary.Code == "Reading_eCRF_Criterion").Select(x => x.Code).ToListAsync();
+
+
+				foreach (var item in criterionCode)
+				{
+					if (result.ContainsKey(item))
+					{
+						result[item] = new List<BasicDicSelect>();
+					}
+				}
+
+				var criterionDictionList = await _readingSystemCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.SystemReadingCriterionId).Select(x => new BasicDicSelect()
+				{
+					ChildGroup = x.Dictionary.ChildGroup,
+					Code = x.Dictionary.Code,
+					Description = x.Dictionary.Description,
+					DataTypeEnum = x.Dictionary.DataTypeEnum,
+					ParentChildCodeEnum = x.Dictionary.Parent.ChildCodeEnum,
+					ShowOrder = x.Dictionary.ShowOrder,
+					ParentCode = x.ParentCode,
+					Id = x.DictionaryId,
+					CrterionDictionaryGroup = x.CrterionDictionaryGroup,
+					ParentId = x.Dictionary.ParentId,
+					Value = x.Dictionary.Value,
+					ValueCN = x.Dictionary.ValueCN
+
+				}).ToListAsync();
+
+				criterionDictionList = criterionDictionList.Where(x => selectCode.Contains(x.ParentCode)).ToList();
+
+				var criterionDic = criterionDictionList.GroupBy(x => x.ParentCode).ToDictionary(g => g.Key, g => g.OrderBy(t => t.ShowOrder).ToList());
+
+				foreach (var item in criterionDic)
+				{
+					result[item.Key] = item.Value;
+				}
+
+				return result;
+
+			}
+
         }
 
         #region 稽查相关

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

@@ -3,6 +3,7 @@ using DocumentFormat.OpenXml.Presentation;
 using DocumentFormat.OpenXml.Spreadsheet;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
+using IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Contracts.DTO;
 using IRaCIS.Core.Application.Service.Reading.Dto;
@@ -59,7 +60,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == param.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
-            exportInfo.List = await _trialUseRepository.Where(t => t.TrialId == param.TrialId).IgnoreQueryFilters()
+            var list = await _trialUseRepository.Where(t => t.TrialId == param.TrialId).IgnoreQueryFilters()
                 .WhereIf(param.UserTypeId != null, t => t.User.UserTypeId == param.UserTypeId)
                 .WhereIf(!string.IsNullOrWhiteSpace(param.UserName), t => t.User.UserName.Contains(param.UserName))
 
@@ -70,8 +71,10 @@ namespace IRaCIS.Core.Application.Service.Common
                     t => (t.User.FullName).Contains(param.UserRealName))
                 .ProjectTo<TrialMaintenanceDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
-
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
+
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialUserList_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(TrialMaintenanceDTO));
 
@@ -100,7 +103,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == param.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
-            exportInfo.List = await _trialSiteUserRepository.Where(t => t.TrialId == param.TrialId).IgnoreQueryFilters()
+            var list = await _trialSiteUserRepository.Where(t => t.TrialId == param.TrialId).IgnoreQueryFilters()
                  .WhereIf(param.IsDeleted != null, t => t.IsDeleted == param.IsDeleted)
                  .WhereIf(!string.IsNullOrWhiteSpace(param.SiteName), t => t.Site.SiteName.Contains(param.SiteName))
                  .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteAliasName),
@@ -114,7 +117,12 @@ namespace IRaCIS.Core.Application.Service.Common
 
                  .ProjectTo<SiteUserExportDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
+
+
+
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSiteUserList_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SiteUserExportDTO));
 
         }
@@ -161,13 +169,14 @@ namespace IRaCIS.Core.Application.Service.Common
                 .WhereIf(!string.IsNullOrEmpty(queryParam.OrganizationName), t => t.OrganizationName.Contains(queryParam.OrganizationName))
                 .ProjectTo<TrialSiteUserSummaryDto>(_mapper.ConfigurationProvider);
 
-            data.List = await query.ToListAsync();
+            var list = await query.ToListAsync();
-
+            data.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
-
 
             var exportInfo = data;
 
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
+
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSiteUserSummary_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(TrialSiteUserSummaryDto));
 
         }
@@ -230,8 +239,9 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == visitSearchDTO.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialCRCUploadImageList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(CRCVisitExportDTO));
@@ -280,8 +290,9 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == challengeQuery.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialQCImageChanllengeList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(QCChanllengeExportDto));
         }
@@ -317,8 +328,9 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == param.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SubjectExportDTO));
 
@@ -425,8 +437,9 @@ namespace IRaCIS.Core.Application.Service.Common
 
             exportInfo.CriterionName = await _repository.Where<ReadingQuestionCriterionTrial>(u => u.TrialId == dto.TrialId && u.IsConfirm && u.Id == dto.TrialReadingCriterionId).Select(t => t.CriterionName).FirstOrDefaultAsync();
 
-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
             var (memoryStream, fileName) = await ExcelExportHelper.DataExport_NpoiTestAsync(StaticData.Export.TrialSubjectProgressList_Export, exportInfo, /*"", */_commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SubjectProgressDto));
 
@@ -491,7 +504,7 @@ namespace IRaCIS.Core.Application.Service.Common
             }
 
             var memoryStream2 = new MemoryStream();
-            wb.Write(memoryStream2,true);
+            wb.Write(memoryStream2, true);
             memoryStream2.Seek(0, SeekOrigin.Begin);
 
             return new FileStreamResult(memoryStream2, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
@@ -565,8 +578,9 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == studyQuery.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialStudyUploadMonitor_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(UnionStudyMonitorExportDto));
@@ -601,8 +615,9 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == param.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectReadingPeriodList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReadPeriodExportDto));
 
@@ -690,8 +705,9 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == studyQuery.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialStudyList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(UnionStudyExportDTO));
         }
@@ -729,8 +745,9 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == checkQuery.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectVisitCheckList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(PMKCheckEXportDTO));
         }
@@ -780,8 +797,9 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialReadingTaskList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReadingTaskExportDto));
         }
@@ -831,8 +849,9 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialReReadingTaskList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReReadingTaskExportDto));
         }
@@ -873,8 +892,9 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == inQuery.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialMedicalReviewList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(TaskMedicalReviewExportDto));
         }
@@ -941,7 +961,7 @@ namespace IRaCIS.Core.Application.Service.Common
             foreach (var item in list)
             {
                 //找到一致性分析的结果
-                var selfAnalysisTask = allList.Where(t => t.IsSelfAnalysis == true && t.SubjectCode == item.SubjectCode && t.VisitTaskNum == item.VisitTaskNum && t.TaskName == t.TaskName).FirstOrDefault();
+                var selfAnalysisTask = allList.Where(t => t.IsSelfAnalysis == true && t.SubjectCode == item.SubjectCode && t.VisitTaskNum == item.VisitTaskNum && t.TaskName == t.TaskName && t.UserName == item.UserName).FirstOrDefault();
 
 
                 //因为基线的评估结果是 是否存在疾病 而 其他访视的结果是 整体肿瘤评估结果 是用不同的枚举翻译的 所以这里手动翻译 不把翻译逻辑耦合到通用的翻译代码里面 在此特殊处理
@@ -957,8 +977,9 @@ namespace IRaCIS.Core.Application.Service.Common
             var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
             exportInfo.CriterionName = await _repository.Where<ReadingQuestionCriterionTrial>(u => u.TrialId == queryVisitTask.TrialId && u.IsConfirm && u.Id == queryVisitTask.TrialReadingCriterionId).Select(t => t.CriterionName).FirstOrDefaultAsync();
-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSelfAnalysisList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SelftAnalysisExport));
         }
@@ -1014,7 +1035,7 @@ namespace IRaCIS.Core.Application.Service.Common
                .ProjectTo<GroupAnalysisExport>(_mapper.ConfigurationProvider).ToListAsync();
 
 
-
+            //找到原任务（非组间一致性分析的）
             var list = allList.Where(t => t.IsSelfAnalysis == null).OrderBy(t => t.TrialSiteCode).ThenBy(t => t.SubjectCode).ThenBy(t => t.VisitTaskNum).ToList();
 
 
@@ -1060,8 +1081,9 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
             exportInfo.CriterionName = await _repository.Where<ReadingQuestionCriterionTrial>(u => u.TrialId == queryVisitTask.TrialId && u.IsConfirm && u.Id == queryVisitTask.TrialReadingCriterionId).Select(t => t.CriterionName).FirstOrDefaultAsync();
-            exportInfo.List = newList;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(newList, _userInfo.TimeZoneId); ;
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialGroupAnalysisList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(GroupAnalysisExport));
         }
@@ -1128,7 +1150,6 @@ namespace IRaCIS.Core.Application.Service.Common
         {
             //处理裁判标记
 
-            {
             var resultList = list.Where(t => t.ReadingCategory != ReadingCategory.Judge).ToList();
 
             if (arbitrationRule == ArbitrationRule.Visit)
@@ -1145,15 +1166,27 @@ namespace IRaCIS.Core.Application.Service.Common
             {
                 foreach (var item in resultList)
                 {
-                        item.IsGenerateJudge = list.Where(t => t.ReadingCategory == ReadingCategory.Judge && t.SubjectCode == item.SubjectCode && t.VisitTaskNum>item.VisitTaskNum
+                    item.IsGenerateJudge = list.Where(t => t.ReadingCategory == ReadingCategory.Judge && t.SubjectCode == item.SubjectCode && t.VisitTaskNum > item.VisitTaskNum
                    ).OrderByDescending(t => t.VisitTaskNum).FirstOrDefault()?.JudgeArmEnum == item.ArmEnum ? true : false;
                 }
             }
 
-                return resultList;
+            //如果没有产生裁判，默认选择R1
+
+            //找到没有裁判的访视任务
+            var notJudgeList = resultList.GroupBy(t => new { t.SubjectCode, t.VisitTaskNum }).Where(g => g.All(t => t.IsGenerateJudge == false)).Select(g => new { g.Key.SubjectCode, g.Key.VisitTaskNum }).ToList();
+
+            foreach (var item in resultList)
+            {
+                if (notJudgeList.Any(t => t.SubjectCode == item.SubjectCode && t.VisitTaskNum == item.VisitTaskNum) && item.ArmEnum == Arm.DoubleReadingArm1)
+                {
+                    item.IsGenerateJudge = true;
                 }
             }
 
+            return resultList;
+        }
+
 
 
         /// <summary>
@@ -1205,7 +1238,7 @@ namespace IRaCIS.Core.Application.Service.Common
                .WhereIf(queryVisitTask.EndAllocateDate != null, t => t.AllocateTime < queryVisitTask.EndAllocateDate!.Value.AddDays(1))
                .ProjectTo<OverallTumorEvaluationExport>(_mapper.ConfigurationProvider, new { criterionType = criterion.CriterionType }).ToListAsync();
 
-            list = list.OrderBy(t => t.SubjectCode).ThenBy(t => t.VisitTaskNum).ToList();
+            list = list.OrderBy(t => t.SubjectCode).ThenBy(t => t.ArmEnum).ThenBy(t => t.VisitTaskNum).ToList();
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
             exportInfo.CriterionName = criterion.CriterionName;
@@ -1213,8 +1246,9 @@ namespace IRaCIS.Core.Application.Service.Common
             //处理裁判标记
             list = DealJudgeMark(criterion.ArbitrationRule, list);
 
-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.OverallTumorEvaluation_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(OverallTumorEvaluationExport), criterion.CriterionType);
@@ -1267,13 +1301,14 @@ namespace IRaCIS.Core.Application.Service.Common
             {
                 var list = await query.ProjectTo<RECIST1Point1EvaluationOfTumorEfficacyExport>(_mapper.ConfigurationProvider, new { criterionType = criterion.CriterionType }).ToListAsync();
 
-                list = list.OrderBy(t => t.SubjectCode).ThenBy(t => t.VisitTaskNum).ToList();
+                list = list.OrderBy(t => t.SubjectCode).ThenBy(t => t.ArmEnum).ThenBy(t => t.VisitTaskNum).ToList();
 
                 //处理裁判标记
                 list = DealJudgeMark(criterion.ArbitrationRule, list);
 
-                exportInfo.List = list;
+                exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
                 exportInfo.IsEn_US = _userInfo.IsEn_Us;
+                exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
 
                 return await ExcelExportHelper.DataExportAsync(StaticData.Export.RECIST1Point1EvaluationOfTumorEfficacy_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(RECIST1Point1EvaluationOfTumorEfficacyExport), criterion.CriterionType);
@@ -1305,7 +1340,7 @@ namespace IRaCIS.Core.Application.Service.Common
         {
 
             //每次查询必须是单标准的
-            var criterion = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName,t.ArbitrationRule }).FirstOrDefaultAsync();
+            var criterion = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName, t.ArbitrationRule }).FirstOrDefaultAsync();
 
             var query = _repository.Where<VisitTask>(t => t.TrialId == queryVisitTask.TrialId && t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false && t.ReadingTaskState == ReadingTaskState.HaveSigned)
 
@@ -1335,7 +1370,7 @@ namespace IRaCIS.Core.Application.Service.Common
             {
                 var list = await query.ProjectTo<RECIST1Point1DetailedOfEvaluatedLesionExport>(_mapper.ConfigurationProvider, new { criterionType = criterion.CriterionType, isEn_Us = _userInfo.IsEn_Us }).ToListAsync();
 
-                list = list.OrderBy(t => t.SubjectCode).ThenBy(t => t.VisitTaskNum).ToList();
+                list = list.OrderBy(t => t.SubjectCode).ThenBy(t => t.ArmEnum).ThenBy(t => t.VisitTaskNum).ToList();
 
                 var exportList = list.SelectMany(c =>
                 {
@@ -1345,6 +1380,7 @@ namespace IRaCIS.Core.Application.Service.Common
                         var clone = c.Clone();
                         clone.LessionCode = u.LessionCode;
                         clone.LessionType = u.LessionType;
+                        clone.BeforeTranslateLessionTypeValue = u.LessionType;
 
                         clone.IsLymph = u.IsLymph;
 
@@ -1363,8 +1399,9 @@ namespace IRaCIS.Core.Application.Service.Common
 
                 //处理裁判标记
                 list = DealJudgeMark(criterion.ArbitrationRule, list);
-                exportInfo.List = exportList;
+                exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(exportList, _userInfo.TimeZoneId);
                 exportInfo.IsEn_US = _userInfo.IsEn_Us;
+                exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
                 return await ExcelExportHelper.DataExportAsync(StaticData.Export.RECIST1Point1DetailedOfEvaluatedLesion_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(RECIST1Point1DetailedOfEvaluatedLesionExport), criterion.CriterionType);
 
@@ -1396,8 +1433,10 @@ namespace IRaCIS.Core.Application.Service.Common
 
                 //处理裁判标记
                 list = DealJudgeMark(criterion.ArbitrationRule, list);
-                exportInfo.List = exportList;
+
+                exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(exportList, _userInfo.TimeZoneId); ;
                 exportInfo.IsEn_US = _userInfo.IsEn_Us;
+                exportInfo.ClientZoneId = _userInfo.TimeZoneId;
 
                 return await ExcelExportHelper.DataExportAsync(StaticData.Export.PCWG3Point1DetailedOfEvaluatedLesion_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(PCWG3DetailedOfEvaluatedLesionExport), criterion.CriterionType);
 

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

@@ -10,6 +10,9 @@ using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using Microsoft.AspNetCore.Authorization;
 using IRaCIS.Core.Application.Helper;
+using EasyCaching.Core;
+using IRaCIS.Core.Domain.Share;
+using OfficeOpenXml.FormulaParsing.Utilities;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -19,30 +22,79 @@ namespace IRaCIS.Core.Application.Service
     [ApiExplorerSettings(GroupName = "Common")]
     public class InternationalizationService : BaseService, IInternationalizationService
     {
-
+        private readonly IEasyCachingProvider _provider;
         private readonly IRepository<Internationalization> _internationalizationRepository;
 
-        public InternationalizationService(IRepository<Internationalization> internationalizationRepository)
+        public InternationalizationService(IRepository<Internationalization> internationalizationRepository, IEasyCachingProvider provider)
         {
             _internationalizationRepository = internationalizationRepository;
+            _provider = provider;
         }
 
-
+        /// <summary>
+        /// 前端国际化内容接口
+        /// </summary>
+        /// <returns></returns>
         [AllowAnonymous]
-
+        [HttpGet]
-        public async Task<List<InternationalizationSimpleDto>> GetFrontInternationalizationList()
+        public async Task<IEnumerable<InternationalizationSimpleDto>> GetFrontInternationalizationList()
         {
+           var cacheList= _provider.Get<List<InternationalizationSimpleDto>>(StaticData.InternationalData.Front).Value;
 
+            if(cacheList != null && cacheList.Count!=0)
+            {
+                return cacheList;
+            }
+            else
+            {
                 var list = await _internationalizationRepository.Where(t => t.InternationalizationType == 0).Select(t => new InternationalizationSimpleDto()
                 {
                     Code = t.Code,
                     Value = t.Value,
-                ValueCN = t.ValueCN
+                    ValueCN = t.ValueCN,
+                    FrontType = t.FrontType,
+                    Description = t.Description,
                 }).ToListAsync();
 
+                _provider.Set<List<InternationalizationSimpleDto>>(StaticData.InternationalData.Front, list, TimeSpan.FromDays(1));
+
                 return list;
             }
        
+        }
+
+        /// <summary>
+        /// 前端批量提交，后端判断不存在就添加，存在就更新
+        /// </summary>
+        /// <returns></returns>
+        [AllowAnonymous]
+        public async Task<IResponseOutput> BatchAddOrUpdateFrontInternationalization(List<BatchInternationalizationDto> batchList)
+        {
+            foreach (var item in batchList)
+            {
+                var find = await _internationalizationRepository.FirstOrDefaultAsync(t => t.Code == item.Code && t.Description == item.Description && t.InternationalizationType == 0);
+
+                if (find != null)
+                {                  
+                    _mapper.Map(item, find);
+                }
+                else
+                {
+                    var mapItem = _mapper.Map<Internationalization>(item);
+                    mapItem.InternationalizationType = 0;
+                    mapItem.State = 1;
+
+                    await _internationalizationRepository.AddAsync(mapItem);
+                }
+            }
+            await _internationalizationRepository.SaveChangesAsync();
+
+            //清理缓存
+            _provider.Set<List<InternationalizationSimpleDto>>(StaticData.InternationalData.Front, new List<InternationalizationSimpleDto>(), TimeSpan.FromDays(1));
+
+            return ResponseOutput.Ok();
+        }
+
         [HttpPost]
         public async Task<PageOutput<InternationalizationView>> GetInternationalizationList(InternationalizationQuery inQuery)
         {
@@ -63,6 +115,11 @@ namespace IRaCIS.Core.Application.Service
             return pageList;
         }
 
+        /// <summary>
+        /// 后端之前批量添加接口
+        /// </summary>
+        /// <param name="batchAdd"></param>
+        /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput> BatchAddInternationalization(BatchAddInternationalization batchAdd)
         {
@@ -87,29 +144,50 @@ namespace IRaCIS.Core.Application.Service
 
             await _internationalizationRepository.SaveChangesAsync();
 
-
+            //清理缓存
+            _provider.Set<List<InternationalizationSimpleDto>>(StaticData.InternationalData.Front, new List<InternationalizationSimpleDto>(), TimeSpan.FromDays(1));
 
             return ResponseOutput.Ok();
         }
 
+        /// <summary>
+        /// 前后端添加的时候，区分了，前端判断重复多了多了一个路由  路由+标识唯一
+        /// </summary>
+        /// <param name="addOrEditInternationalization"></param>
+        /// <returns></returns>
         public async Task<IResponseOutput> AddOrUpdateInternationalization(InternationalizationAddOrEdit addOrEditInternationalization)
         {
+            var internationalizationType = addOrEditInternationalization.InternationalizationType;
+
+            //后端验证标识重复与否
             var verifyExp1 = new EntityVerifyExp<Internationalization>()
             {
                 VerifyExp = t => t.Code == addOrEditInternationalization.Code && t.InternationalizationType == addOrEditInternationalization.InternationalizationType,
 
                 VerifyMsg = $"该类型已有{addOrEditInternationalization.Code}名称的国际化标识",
-                IsVerify = true
+                IsVerify =  true /*internationalizationType == 1*/
             };
 
-            var entity = await _internationalizationRepository.InsertOrUpdateAsync(addOrEditInternationalization, true, verifyExp1);
+            //前端验证标识重复与否
+            //var verifyExp2 = new EntityVerifyExp<Internationalization>()
+            //{
+            //    VerifyExp = t => t.Code == addOrEditInternationalization.Code && t.InternationalizationType == addOrEditInternationalization.InternationalizationType && t.Description == addOrEditInternationalization.Description,
+
+            //    VerifyMsg = $"该类型已有{addOrEditInternationalization.Description}下的{addOrEditInternationalization.Code}名称的国际化标识",
+            //    IsVerify = internationalizationType == 0
+            //};
+
+            var entity = await _internationalizationRepository.InsertOrUpdateAsync(addOrEditInternationalization, true, verifyExp1/*, verifyExp2*/);
 
             if (addOrEditInternationalization.InternationalizationType == 1)
             {
                 await InternationalizationHelper.AddOrUpdateJsonKeyValueAsync(entity.Code, addOrEditInternationalization.Value, addOrEditInternationalization.ValueCN);
-
             }
-
+            else
+            {
+                //清理缓存
+                _provider.Set<List<InternationalizationSimpleDto>>(StaticData.InternationalData.Front, new List<InternationalizationSimpleDto>(), TimeSpan.FromDays(1));
+            }
             return ResponseOutput.Ok(entity.Id.ToString());
 
         }
@@ -119,6 +197,9 @@ namespace IRaCIS.Core.Application.Service
         public async Task<IResponseOutput> DeleteInternationalization(Guid internationalizationId)
         {
             var success = await _internationalizationRepository.DeleteFromQueryAsync(t => t.Id == internationalizationId, true);
+
+            //清理缓存
+            _provider.Set<List<InternationalizationSimpleDto>>(StaticData.InternationalData.Front, new List<InternationalizationSimpleDto>(), TimeSpan.FromDays(1));
             return ResponseOutput.Ok();
         }
 

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

@@ -8,6 +8,7 @@ using AutoMapper;
 using IRaCIS.Application.Contracts;
 using Microsoft.Extensions.Options;
 using Medallion.Threading;
+using System.Text.RegularExpressions;
 
 namespace IRaCIS.Application.Services
 {
@@ -70,9 +71,6 @@ namespace IRaCIS.Application.Services
             _systemEmailConfig = systemEmailConfig.CurrentValue;
             _verificationCodeRepository = verificationCodeRepository;
             _systemBasicDatarepository = systemBasicDatarepository;
-
-
-
             _tokenService = tokenService;
             _userRepository = userRepository;
             _trialRepository = trialRepository;
@@ -80,6 +78,17 @@ namespace IRaCIS.Application.Services
             _userTypeRepository = userTypeRepository;
             _doctorTypeRepository = doctorTypeRepository;
             _distributedLockProvider = distributedLockProvider;
+
+        }
+
+
+
+        private string ReplaceCompanyName(string needDealtxt)
+        {
+            var str= needDealtxt.Replace("{company}", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyName : _systemEmailConfig.CompanyNameCN)
+                .Replace("{company abbreviation}", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN);
+
+            return str;
         }
 
         //重置邮箱 
@@ -95,7 +104,7 @@ namespace IRaCIS.Application.Services
             messageToSend.To.Add(new MailboxAddress(userName, emailAddress));
             //主题
                 //---[来自展影IRC] 关于重置邮箱的提醒
-            messageToSend.Subject = _localizer["Mail_EmailResetReminder"];
+            messageToSend.Subject = _localizer["Mail_EmailResetReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN];
 
             var builder = new BodyBuilder();
 
@@ -112,10 +121,11 @@ namespace IRaCIS.Application.Services
                 var templateInfo = SourceReader.ReadToEnd();
 
 
-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
 
+                    userName,
                   //---尊敬的
-                  _localizer["Mail_Dear", userName],
+                  //_localizer["Mail_Dear", userName],
                   //---您正在进行邮箱重置操作
                     _localizer["Mail_ResettingEmail"],
                     verificationCode
@@ -161,7 +171,7 @@ namespace IRaCIS.Application.Services
             messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress));
             //主题
                 //---[来自展影IRC] 关于重置密码的提醒
-            messageToSend.Subject = _localizer["Mail_IRCResettingPassword"];
+            messageToSend.Subject = _localizer["Mail_IRCResettingPassword", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN];
 
 
 
@@ -179,7 +189,7 @@ namespace IRaCIS.Application.Services
                 var templateInfo = SourceReader.ReadToEnd();
 
 
-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
                     "",
                 //---您正在进行邮箱重置密码操作
                    _localizer["Mail_ResettingPassword"],
@@ -229,7 +239,7 @@ namespace IRaCIS.Application.Services
             messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress));
             //主题
                 //---[来自展影IRC]的提醒
-            messageToSend.Subject = _localizer["Mail_ImagingIRCReminder"];
+            messageToSend.Subject = _localizer["Mail_ImagingIRCReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN];
 
 
 
@@ -247,9 +257,10 @@ namespace IRaCIS.Application.Services
                 var templateInfo = SourceReader.ReadToEnd();
 
 
-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
+                    "Sir or Madam",
                 //---您正在参与展影医疗IRC项目
-                   _localizer["Mail_IRCProject"],
+                   _localizer["Mail_IRCProject", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN],
                     verificationCode
                     );
             }
@@ -294,7 +305,7 @@ namespace IRaCIS.Application.Services
             messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress));
             //主题
             //$"[来自展影IRC] [{researchProgramNo}] 关于中心调研的提醒";
-            messageToSend.Subject = _localizer["Mail_ProjectParticipationReminder", researchProgramNo];
+            messageToSend.Subject = _localizer["Mail_ProjectParticipationReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN, researchProgramNo];
 
 
 
@@ -313,10 +324,10 @@ namespace IRaCIS.Application.Services
                 var templateInfo = SourceReader.ReadToEnd();
 
 
-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
-                    "",
+                    "Sir or Madam",
                 //---您正在参与展影医疗IRC项目中心调研工作
-                   _localizer["Mail_CenterResearchReminder"],
+                   _localizer["Mail_CenterResearchReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN],
                     verificationCode
                     );
             }
@@ -374,7 +385,7 @@ namespace IRaCIS.Application.Services
             messageToSend.To.Add(new MailboxAddress(sysUserInfo.FullName, sysUserInfo.EMail));
             //主题
                 //---[来自展影IRC] 关于创建账户的提醒
-            messageToSend.Subject = _localizer["Mail_AccountCreationReminder"];
+            messageToSend.Subject = _localizer["Mail_AccountCreationReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN];
 
 
 
@@ -402,7 +413,7 @@ namespace IRaCIS.Application.Services
                 var templateInfo = SourceReader.ReadToEnd();
 
 
-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
                    sysUserInfo.FullName,
                    sysUserInfo.UserName,
                    sysUserInfo.UserTypeRole.UserTypeShortName,
@@ -430,7 +441,7 @@ namespace IRaCIS.Application.Services
             messageToSend.To.Add(new MailboxAddress(sysUserInfo.FullName, sysUserInfo.EMail));
             //主题
                 //---[来自展影IRC] 关于重置账户密码的提醒
-            messageToSend.Subject = _localizer["Mail_AccountPasswordResetReminder"];
+            messageToSend.Subject = _localizer["Mail_AccountPasswordResetReminder", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN];
 
 
 
@@ -449,7 +460,7 @@ namespace IRaCIS.Application.Services
                 var templateInfo = SourceReader.ReadToEnd();
 
 
-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
                    sysUserInfo.FullName,
                    sysUserInfo.UserName,
                    sysUserInfo.UserTypeRole.UserTypeShortName,
@@ -480,7 +491,7 @@ namespace IRaCIS.Application.Services
             messageToSend.To.Add(new MailboxAddress(sysUserInfo.FullName, sysUserInfo.EMail));
             //主题
             // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信";
-            messageToSend.Subject = _localizer["Mail_InvitationEmail", trialInfo.ResearchProgramNo];
+            messageToSend.Subject = _localizer["Mail_InvitationEmail", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN, trialInfo.ResearchProgramNo];
 
 
 
@@ -511,7 +522,7 @@ namespace IRaCIS.Application.Services
 
                 var redirectUrl = $"{domain}/api/User/UserRedirect?url={System.Web.HttpUtility.UrlEncode(routeUrl)}";
 
-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
                     sysUserInfo.FullName,
                     trialInfo.ExperimentName,
                     trialInfo.ResearchProgramNo,
@@ -544,7 +555,7 @@ namespace IRaCIS.Application.Services
             messageToSend.To.Add(new MailboxAddress(String.Empty, sysUserInfo.EMail));
             //主题
             // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信";
-            messageToSend.Subject = _localizer["Mail_InvitationEmail", trialInfo.ResearchProgramNo];
+            messageToSend.Subject = _localizer["Mail_InvitationEmail", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN,trialInfo.ResearchProgramNo];
 
 
             var builder = new BodyBuilder();
@@ -573,7 +584,7 @@ namespace IRaCIS.Application.Services
 
                 var redirectUrl = $"{domain}/api/User/UserRedirect?url={System.Web.HttpUtility.UrlEncode(routeUrl)}";
 
-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
                     sysUserInfo.FullName,
                     trialInfo.ExperimentName,
                     trialInfo.ResearchProgramNo,
@@ -659,7 +670,7 @@ namespace IRaCIS.Application.Services
             messageToSend.To.Add(new MailboxAddress(doctor.FullName, doctor.EMail));
             //主题
             // $"[来自展影IRC] [{trialInfo.ResearchProgramNo}]邀请信";
-            messageToSend.Subject = _localizer["Mail_InvitationEmail", trialInfo.ResearchProgramNo];
+            messageToSend.Subject = _localizer["Mail_InvitationEmail", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN, trialInfo.ResearchProgramNo];
 
 
             var builder = new BodyBuilder();
@@ -695,7 +706,7 @@ namespace IRaCIS.Application.Services
 
                 var redirectUrl = $"{domain}/api/User/UserRedirect?url={System.Web.HttpUtility.UrlEncode(routeUrl)}";
 
-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
                     sysUserInfo.FullName,
                     trialInfo.ExperimentName,
                     trialInfo.ResearchProgramNo,

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

@@ -69,6 +69,9 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<Internationalization, InternationalizationView>();
             CreateMap<Internationalization, InternationalizationAddOrEdit>().ReverseMap();
 
+            CreateMap<Internationalization, BatchInternationalizationDto>().ReverseMap();
+            
+
             CreateMap<BatchAddInternationalizationDto, InternationalizationAddOrEdit>();
 
 

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

@@ -79,7 +79,7 @@ namespace IRaCIS.Application.Services
                     return ResponseOutput.NotOk(_localizer["Doctor_DupEmail"], new DoctorBasicInfoCommand());
                 }
 
-                doctor.Code = (await _doctorRepository.MaxAsync(t => t.Code)) + 1;
+                doctor.Code = await _doctorRepository.Select(t => t.Code).DefaultIfEmpty().MaxAsync() + 1;
 
                 doctor.ReviewerCode = AppSettings.GetCodeStr(doctor.Code, nameof(Doctor));
 
@@ -432,11 +432,11 @@ namespace IRaCIS.Application.Services
             //判断 合作协议、正式简历 是否有。如果没有，显示提示信息，并且不能保存
             var attachmentList = await _attachmentRepository.Where(u => u.DoctorId == auditResumeParam.Id)
                 .Select(u => u.Type).ToListAsync();
-            if (auditResumeParam.ResumeStatus == ResumeStatusEnum.Pass && ((!attachmentList.Contains("Resume")) || (!attachmentList.Contains("Consultant Agreement"))))
+            //if (auditResumeParam.ResumeStatus == ResumeStatusEnum.Pass && ((!attachmentList.Contains("Resume")) || (!attachmentList.Contains("Consultant Agreement"))))
-            {
+            //{
-                //---Resume & Consultant Agreement must be upload 
+            //    //---Resume & Consultant Agreement must be upload 
-                return ResponseOutput.NotOk(_localizer["Doctor_RequiredDocumentsError"]);
+            //    return ResponseOutput.NotOk(_localizer["Doctor_RequiredDocumentsError"]);
-            }
+            //}
             var success = await _doctorRepository.BatchUpdateNoTrackingAsync(o => o.Id == auditResumeParam.Id, u => new Doctor()
             {
                 CooperateStatus = auditResumeParam.CooperateStatus,

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

@@ -147,12 +147,12 @@ namespace IRaCIS.Application.Services
             var successs = await _repository.BatchUpdateAsync<Doctor>(o => o.Id == updateGCPExperienceParam.Id, u => new Doctor()
             {
                 GCP = updateGCPExperienceParam.GCP,
-                GCPId = updateGCPExperienceParam.GCP==0&&updateGCPExperienceParam.GCPId==null?Guid.Empty: updateGCPExperienceParam.GCPId!.Value
+                GCPId = (updateGCPExperienceParam.GCP==0||updateGCPExperienceParam.GCPId==null)?Guid.Empty: updateGCPExperienceParam.GCPId!.Value
             });
 
-            if (updateGCPExperienceParam.GCP == 0 && updateGCPExperienceParam.GCPId != null) 
+            if (updateGCPExperienceParam.GCP == 0 ) 
             {
-                await _repository.BatchDeleteAsync<Attachment>(a => a.Id == updateGCPExperienceParam.GCPId);
+                await _repository.BatchDeleteAsync<Attachment>(a => a.DoctorId == updateGCPExperienceParam.Id && a.Type=="GCP");
             }
 
             return ResponseOutput.Result(successs, updateGCPExperienceParam.GCPId.ToString());

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

@@ -121,6 +121,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<Doctor, SpecialtyDTO>()
                  .ForMember(o => o.Speciality, t => t.MapFrom(u => u.Speciality.Value))
+                 .ForMember(o => o.SpecialityCN, t => t.MapFrom(u => u.Speciality.ValueCN))
                 .ForMember(o => o.DictionaryList, t => t.MapFrom(u => u.DoctorDicRelationList.Where(t => t.KeyName == StaticData.ReadingType || t.KeyName == StaticData.Subspeciality).Select(t => t.Dictionary).OrderBy(t => t.ShowOrder)));
             CreateMap<SpecialtyCommand, Doctor>();
 

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

@@ -35,14 +35,25 @@ namespace IRaCIS.Core.Application.Contracts
 
     }
 
+    public class TrialSignDocView:UnionDocumentWithConfirmInfoView
+    {
+        public string TrialCode { get; set; }
+        public string ResearchProgramNo { get; set; }
+
+        public string ExperimentName { get; set; }
+
+    }
+
 
     public class UnionDocumentWithConfirmInfoView: UnionDocumentView
     {
+        
+
         public DateTime? ConfirmTime { get; set; }
 
         public Guid? ConfirmUserId { get; set; }
 
-        public bool IsConfirmed => ConfirmTime is not null;
+        public bool IsConfirmed => ConfirmTime != null;
 
         public string UserName { get; set; } = string.Empty;
 
@@ -101,18 +112,34 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string Name { get; set; } = string.Empty;
 
+        public bool IsSigned { get; set; }
+
 
     }
 
     public class GetNextUnSignDocumentInDto
     {
-        [NotDefault]
+        public Guid? TrialId { get; set; }
-        public Guid TrialId { get; set; }
 
         public bool Asc { get; set; } = true;
         public string SortField { get; set; } = "";
     }
 
+    public class TrialDocQuery : PageInput
+    {
+        public Guid? TrialId { get; set; }
+
+        public Guid? FileTypeId { get; set; }
+
+        public string TrialCode { get; set;} = string.Empty;
+
+
+        public string Name { get; set; } = string.Empty;
+
+        public bool IsSigned { get; set; }
+
+    }
+
     public class TrialUserDocUnionQuery: PageInput
     {
         [NotDefault]
@@ -144,6 +171,10 @@ namespace IRaCIS.Core.Application.Contracts
        
         public Guid? UserTypeId { get; set; }
         public Guid? UserId { get; set; }
+
+		public bool? IsConfirmed { get; set; }
+
+		public bool? IsDeleted { get; set; }
 	}
 
     ///<summary> SystemDocumentAddOrEdit  列表查询参数模型</summary>

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

@@ -33,7 +33,7 @@ namespace IRaCIS.Core.Application.Contracts
     ///<summary>TrialDocumentQuery  列表查询参数模型</summary>
     public class TrialDocumentQuery : PageInput
     {
-
+		public bool? IsDeleted { get; set; }
 		public Guid? FileTypeId { get; set; }
 
         public string Name { get; set; } = String.Empty;

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

@@ -108,6 +108,9 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public bool IsDistinguishCriteria { get; set; }
 
+        public string SortField { get; set; } = string.Empty;
+
+        public bool Asc { get; set; }
     }
 
 

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

@@ -302,7 +302,7 @@ namespace IRaCIS.Core.Application.Service
            .Include(t => t.TrialEmailNoticeUserList).Include(t => t.TrialEmailBlackUserList).FirstOrDefaultAsync();
 
 
-            if (trialEmailConfig == null || trialEmailConfig.IsAutoSend == false)
+            if (trialEmailConfig == null || trialEmailConfig.IsAutoSend == false || trialEmailConfig.IsEnable==false)
             {
                 return (null,null);
             }

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

@@ -25,6 +25,9 @@ namespace IRaCIS.Core.Application.Contracts
 
         Task<IResponseOutput> DeleteSystemDocumentAsync(Guid systemDocumentId);
 
+        Task<PageOutput<UnionDocumentWithConfirmInfoView>> getWaitSignSysDocList(SystemDocumentQuery querySystemDocument);
+
+
 
 
 	}

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

@@ -23,6 +23,7 @@ namespace IRaCIS.Core.Application.Services
         private readonly IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository;
 
         public SystemDocumentService( IRepository<SystemDocument> systemDocumentRepository,
+
             IRepository<SystemDocNeedConfirmedUserType> systemDocNeedConfirmedUserTypeRepository,
             IRepository<SystemDocConfirmedUser> systemDocConfirmedUserRepository)
         {
@@ -183,7 +184,9 @@ namespace IRaCIS.Core.Application.Services
                             UserTypeShortName = user.UserTypeRole.UserTypeShortName
                         };
 
-            return await query.Where(t=>t.ConfirmTime==null).ToPagedListAsync(querySystemDocument.PageIndex, querySystemDocument.PageSize, querySystemDocument.SortField, querySystemDocument.Asc); 
+            return await query.WhereIf(querySystemDocument.IsSigned==true,t=>t.ConfirmTime!=null)
+                              .WhereIf(querySystemDocument.IsSigned == false, t => t.ConfirmTime == null)
+                              .ToPagedListAsync(querySystemDocument.PageIndex, querySystemDocument.PageSize, querySystemDocument.SortField, querySystemDocument.Asc); 
 
 
 

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

@@ -25,6 +25,7 @@ namespace IRaCIS.Core.Application.Services
         private readonly IRepository<TrialDocument> _trialDocumentRepository;
         private readonly IRepository<TrialDocConfirmedUser> _trialDocUserTypeConfirmedUserRepository;
         private readonly IRepository<Trial> _trialRepository;
+		private readonly ISystemDocumentService _systemDocumentService;
 		private readonly IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository;
         private readonly IRepository<SystemDocument> _systemDocumentRepository;
         private readonly IRepository<TrialCriterionAdditionalAssessmentType> _trialCriterionAdditionalAssessmentTypeRepository;
@@ -34,6 +35,7 @@ namespace IRaCIS.Core.Application.Services
         public TrialDocumentService(IRepository<TrialDocument> trialDocumentRepository,
              IRepository<TrialDocConfirmedUser> trialDocUserTypeConfirmedUserRepository,
                   IRepository<Trial> trialRepository,
+				  ISystemDocumentService systemDocumentService,
 			IRepository<SystemDocConfirmedUser> systemDocConfirmedUserRepository,
              IRepository<TrialCriterionAdditionalAssessmentType> trialCriterionAdditionalAssessmentTypeRepository,
             IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository
@@ -42,6 +44,7 @@ namespace IRaCIS.Core.Application.Services
             _trialDocumentRepository = trialDocumentRepository;
             this._trialDocUserTypeConfirmedUserRepository = trialDocUserTypeConfirmedUserRepository;
             this._trialRepository = trialRepository;
+			this._systemDocumentService = systemDocumentService;
 			this._systemDocConfirmedUserRepository = systemDocConfirmedUserRepository;
             _systemDocumentRepository = systemDocumentRepository;
             _readingQuestionCriterionTrialRepository = readingQuestionCriterionTrialRepository;
@@ -60,11 +63,60 @@ namespace IRaCIS.Core.Application.Services
             var trialDocumentQueryable = _trialDocumentRepository.AsQueryable(true).Where(t => t.TrialId == queryTrialDocument.TrialId)
             .WhereIf(!string.IsNullOrEmpty(queryTrialDocument.Name), t => t.Name.Contains(queryTrialDocument.Name))
             .WhereIf(queryTrialDocument.FileTypeId != null, t => t.FileTypeId == queryTrialDocument.FileTypeId)
+              .WhereIf(queryTrialDocument.IsDeleted != null, t => t.IsDeleted == queryTrialDocument.IsDeleted)
             .ProjectTo<TrialDocumentView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, isEn_Us = _userInfo.IsEn_Us });
 
             return await trialDocumentQueryable.ToPagedListAsync(queryTrialDocument.PageIndex, queryTrialDocument.PageSize, queryTrialDocument.SortField, queryTrialDocument.Asc);
         }
 
+        [HttpPost]
+        public async Task<PageOutput<TrialSignDocView>> GetTrialSignDocumentList(TrialDocQuery querySystemDocument)
+        {
+            var trialDocQueryable = from trialDoc in _trialDocumentRepository.AsQueryable(true)
+                                    .WhereIf(querySystemDocument.TrialId!=null,t=>t.TrialId==querySystemDocument.TrialId)
+                                    .Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId) )
+
+                                    join trialUser in _repository.Where<TrialUser>(t=>t.UserId==_userInfo.Id) on trialDoc.TrialId equals trialUser.TrialId
+                                    join confirm in _repository.Where<TrialDocConfirmedUser>() on
+                                    new { trialUser.UserId, TrialDocumentId = trialDoc.Id } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
+
+                                    from confirm in cc.DefaultIfEmpty()
+                                    select new TrialSignDocView()
+                                    {
+                                        TrialCode=trialDoc.Trial.TrialCode,
+                                        ResearchProgramNo = trialDoc.Trial.ResearchProgramNo,
+                                        ExperimentName = trialDoc.Trial.ExperimentName,
+                                        Id = trialDoc.Id,
+                                        IsSystemDoc = false,
+                                        CreateTime = trialDoc.CreateTime,
+                                        FullFilePath = trialDoc.Path,
+                                        IsDeleted = trialDoc.IsDeleted,
+                                        Name = trialDoc.Name,
+                                        Path = trialDoc.Path,
+                                        FileTypeId = trialDoc.FileTypeId,
+                                        FileType = _userInfo.IsEn_Us ? trialDoc.FileType.Value : trialDoc.FileType.ValueCN,
+                                        UpdateTime = trialDoc.UpdateTime,
+                                        SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
+
+                                        //IsConfirmed = confirm.ConfirmTime != null,
+                                        ConfirmUserId = confirm.ConfirmUserId,
+                                        ConfirmTime = confirm.ConfirmTime,
+                                        RealName = trialUser.User.FullName,
+                                        UserName = trialUser.User.UserName,
+                                        UserTypeId = trialUser.User.UserTypeId,
+                                        UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName
+
+                                    };
+
+            trialDocQueryable = trialDocQueryable.WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name))
+                .WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId)
+               .WhereIf(querySystemDocument.IsSigned == true, t => t.ConfirmTime != null)
+               .WhereIf(querySystemDocument.IsSigned == false, t => t.ConfirmTime == null);
+
+
+             return await trialDocQueryable.ToPagedListAsync(querySystemDocument.PageIndex, querySystemDocument.PageSize, querySystemDocument.SortField, querySystemDocument.Asc);
+
+        }
 
         /// <summary>
         /// 获取下一个未签名的文件
@@ -74,19 +126,37 @@ namespace IRaCIS.Core.Application.Services
         [HttpPost]
         public async Task<UnionDocumentWithConfirmInfoView?> GetNextUnSignDocument(GetNextUnSignDocumentInDto inDto)
         {
-            var result = await this.GetUserDocumentList(new TrialUserDocUnionQuery()
+            var result = new PageOutput<UnionDocumentWithConfirmInfoView>() { };
+
+            if (inDto.TrialId != null)
+            {
+                result = (await this.GetUserDocumentList(new TrialUserDocUnionQuery()
                 {
                     Asc = inDto.Asc,
                     IsSign = false,
                     SortField = inDto.SortField,
-                TrialId = inDto.TrialId,
+                    TrialId = inDto.TrialId.Value,
                     PageIndex = 1,
                     PageSize = 1,
+                })).Data;
+            }
+            else 
+            {
+                result = await _systemDocumentService.getWaitSignSysDocList(new SystemDocumentQuery()
+                {
+                    PageIndex=1,
+                    IsSigned = false,
+                    PageSize=1,
+                    Asc=false,
+					SortField="UpdateTime",
 				});
 
-            if (result.Data.CurrentPageData.Count > 0)
+			}
+			
+
+            if (result.CurrentPageData.Count > 0)
             {
-                return result.Data.CurrentPageData.First();
+                return result.CurrentPageData.First();
             }
             else
             {
@@ -165,7 +235,7 @@ namespace IRaCIS.Core.Application.Services
 
             var trialId = querySystemDocument.TrialId;
 
-            var trialInfo = await (_repository.Where<Trial>(t => t.Id == querySystemDocument.TrialId,ignoreQueryFilters:true).Select(t => new { t.TrialFinishedTime, t.TrialStatusStr }).FirstNotNullAsync());
+            var trialInfo = await (_repository.Where<Trial>(t => t.Id == querySystemDocument.TrialId, ignoreQueryFilters: true).Select(t => new { t.TrialFinishedTime, t.TrialStatusStr }).FirstNotNullAsync());
 
             //系统文档查询
             var systemDocumentQueryable = from needConfirmedUserType in _repository.Where<SystemDocNeedConfirmedUserType>(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId)
@@ -193,6 +263,7 @@ namespace IRaCIS.Core.Application.Services
 
                                               FullFilePath = needConfirmedUserType.SystemDocument.Path,
 
+                                              //IsConfirmed = confirm.ConfirmTime != null,
                                               ConfirmUserId = confirm.ConfirmUserId,
                                               ConfirmTime = confirm.ConfirmTime,
                                               RealName = trialUser.User.FullName,
@@ -224,6 +295,7 @@ namespace IRaCIS.Core.Application.Services
                                         UpdateTime = trialDoc.UpdateTime,
                                         SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
 
+                                        //IsConfirmed = confirm.ConfirmTime != null,
                                         ConfirmUserId = confirm.ConfirmUserId,
                                         ConfirmTime = confirm.ConfirmTime,
                                         RealName = trialUser.User.FullName,
@@ -359,6 +431,7 @@ namespace IRaCIS.Core.Application.Services
                                     FileTypeId = trialDocumentNeedConfirmedUserType.TrialDocument.FileTypeId,
                                     FileType = _userInfo.IsEn_Us ? trialDocumentNeedConfirmedUserType.TrialDocument.FileType.Value : trialDocumentNeedConfirmedUserType.TrialDocument.FileType.ValueCN,
                                     UpdateTime = trialDocumentNeedConfirmedUserType.TrialDocument.UpdateTime,
+                                    //IsConfirmed= confirm.ConfirmTime!=null,
 
 
 
@@ -394,7 +467,7 @@ namespace IRaCIS.Core.Application.Services
                                      FileType = _userInfo.IsEn_Us ? needConfirmEdUserType.SystemDocument.FileType.Value : needConfirmEdUserType.SystemDocument.FileType.ValueCN,
                                      FileTypeId = needConfirmEdUserType.SystemDocument.FileTypeId,
                                      UpdateTime = needConfirmEdUserType.SystemDocument.UpdateTime,
-
+                                     //IsConfirmed = confirm.ConfirmTime != null,
 
                                      ConfirmUserId = confirm.ConfirmUserId,
                                      ConfirmTime = confirm.ConfirmTime,
@@ -409,6 +482,9 @@ namespace IRaCIS.Core.Application.Services
             var unionQuery = trialDocQuery.Union(systemDocQuery)
                 .WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name))
                 .WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId)
+                .WhereIf(querySystemDocument.IsConfirmed == true, t => t.ConfirmTime != null)
+                .WhereIf(querySystemDocument.IsConfirmed == false, t => t.ConfirmTime == null)
+                .WhereIf(querySystemDocument.IsDeleted != null, t => t.IsDeleted == querySystemDocument.IsDeleted)
                 .WhereIf(querySystemDocument.UserTypeId != null, t => t.UserTypeId == querySystemDocument.UserTypeId);
 
             var result = await unionQuery.ToPagedListAsync(querySystemDocument.PageIndex, querySystemDocument.PageSize, querySystemDocument.SortField, querySystemDocument.Asc);

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

@@ -26,6 +26,8 @@ using System;
 using System.Runtime.InteropServices;
 using SharpCompress.Common;
 using SkiaSharp;
+using DocumentFormat.OpenXml.Bibliography;
+using System.Linq.Dynamic.Core;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -316,13 +318,13 @@ namespace IRaCIS.Core.Application.Service
             };
 
 
-            var (trialEmailConfig, sendEmailConfig) = await _emailSendService.BuildEmailConfig(taskInfo.TrialId, businessScenarioEnum, topicAndHtmlFunc, taskInfo.SiteId,taskInfo.TrialReadingCriterionId);
+            var (trialEmailConfig, sendEmailConfig) = await _emailSendService.BuildEmailConfig(taskInfo.TrialId, businessScenarioEnum, topicAndHtmlFunc, taskInfo.SiteId, taskInfo.TrialReadingCriterionId);
 
             #endregion
 
 
             //自动发送
-            if (sendEmailConfig != null && trialEmailConfig !=null)
+            if (sendEmailConfig != null && trialEmailConfig != null)
             {
                 #region 不同标准 不同项目配置 发送邮件的时机 处理具体逻辑
 
@@ -679,7 +681,7 @@ namespace IRaCIS.Core.Application.Service
                     }
                     else
                     {
-                        var wordStoreServerPath = Path.Combine(Path.GetDirectoryName(serverFilePath), Path.GetFileNameWithoutExtension(serverFilePath)+".docx"); 
+                        var wordStoreServerPath = Path.Combine(Path.GetDirectoryName(serverFilePath), Path.GetFileNameWithoutExtension(serverFilePath) + ".docx");
 
                         using (FileStream fileStream = new FileStream(wordStoreServerPath, FileMode.Create, FileAccess.Write))
                         {
@@ -1355,7 +1357,9 @@ namespace IRaCIS.Core.Application.Service
               .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
               .ProjectTo<TrialEmailNoticeConfigView>(_mapper.ConfigurationProvider);
 
-            return await trialEmailNoticeConfigQueryable.ToListAsync();
+            var sortField = string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TrialEmailNoticeConfigView.Code) : inQuery.SortField;
+            var orderQuery = inQuery.Asc ? trialEmailNoticeConfigQueryable.OrderBy(sortField) : trialEmailNoticeConfigQueryable.OrderBy(sortField + " desc");
+            return await orderQuery.ToListAsync();
         }
 
 

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

@@ -0,0 +1,175 @@
+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 IRaCIS.Core.Application.Contracts.Dicom;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace IRaCIS.Core.Application.Service.ImageAndDoc
+{
+    /// <summary>
+    /// 后台托管服务的方式运行
+    /// </summary>
+    //public class CStoreSCPHostedService : IHostedService
+    //{
+    //    private readonly ILogger<CStoreSCPHostedService> _logger;
+    //    private readonly IDicomServerFactory _dicomServerFactory;
+    //    private IDicomServer? _server;
+
+    //    public CStoreSCPHostedService(ILogger<CStoreSCPHostedService> logger, IDicomServerFactory dicomServerFactory)
+    //    {
+    //        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+    //        _dicomServerFactory = dicomServerFactory ?? throw new ArgumentNullException(nameof(dicomServerFactory));
+    //    }
+
+    //    public async Task StartAsync(CancellationToken cancellationToken)
+    //    {
+    //        _logger.LogInformation("Starting DICOM server");
+    //        _server = _dicomServerFactory.Create<CStoreSCPService>(104);
+    //        _logger.LogInformation("DICOM server is running");
+    //    }
+
+    //    public Task StopAsync(CancellationToken cancellationToken)
+    //    {
+    //        if (_server != null)
+    //        {
+    //            _server.Stop();
+    //            _server.Dispose();
+    //            _server = null;
+    //        }
+    //        return Task.CompletedTask;
+    //    }
+    //}
+
+
+    public class CStoreSCPService : DicomService, IDicomServiceProvider, IDicomCStoreProvider, IDicomCEchoProvider
+    {
+        private  IServiceProvider _serviceProvider { 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,
+               DicomTransferSyntax.JPEG2000Lossless,
+               DicomTransferSyntax.JPEGProcess14SV1,
+               DicomTransferSyntax.JPEGProcess14,
+               DicomTransferSyntax.RLELossless,
+               // Lossy
+               DicomTransferSyntax.JPEGLSNearLossless,
+               DicomTransferSyntax.JPEG2000Lossy,
+               DicomTransferSyntax.JPEGProcess1,
+               DicomTransferSyntax.JPEGProcess2_4,
+               // Uncompressed
+               DicomTransferSyntax.ExplicitVRLittleEndian,
+               DicomTransferSyntax.ExplicitVRBigEndian,
+               DicomTransferSyntax.ImplicitVRLittleEndian
+        };
+
+
+        public CStoreSCPService(INetworkStream stream, Encoding fallbackEncoding, ILogger log, DicomServiceDependencies dependencies)
+            : base(stream, fallbackEncoding, log, dependencies)
+        {
+            var tt = base.UserState;
+            //_dicomArchiveService = dicomArchiveService;
+        }
+
+
+
+
+        public Task OnReceiveAssociationRequestAsync(DicomAssociation association)
+        {
+            _serviceProvider =(IServiceProvider) this.UserState;
+
+            if (association.CalledAE != "STORESCP")
+            {
+                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 Task OnReceiveAssociationReleaseRequestAsync()
+        {
+            return SendAssociationReleaseResponseAsync();
+        }
+
+
+        public void OnReceiveAbort(DicomAbortSource source, DicomAbortReason reason)
+        {
+            /* nothing to do here */
+        }
+
+
+        public void OnConnectionClosed(Exception exception)
+        {
+            /* nothing to do here */
+        }
+
+
+        public async Task<DicomCStoreResponse> OnCStoreRequestAsync(DicomCStoreRequest request)
+        {
+           var tt= _serviceProvider.GetService<IDicomArchiveService>();
+
+            var studyUid = request.Dataset.GetSingleValue<string>(DicomTag.StudyInstanceUID).Trim();
+            var instUid = request.SOPInstanceUID.UID;
+
+            var path = Path.GetFullPath(@".\DICOM-Store");
+
+            path = Path.Combine(path, studyUid);
+
+            if (!Directory.Exists(path))
+            {
+                Directory.CreateDirectory(path);
+            }
+
+            path = Path.Combine(path, instUid) + ".dcm";
+
+            await request.File.SaveAsync(path);
+
+            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));
+        }
+
+    }
+}

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

@@ -36,8 +36,8 @@ namespace IRaCIS.Core.Application.Contracts
     public class DicomTrialSiteSubjectInfo
     {
         public string TrialSiteCode { get; set; } = string.Empty;
-        public string SiteCode { get; set; } = string.Empty;
+        public string TrialSiteAliasName { get; set; } = string.Empty;
-        public string SiteName { get; set; } = string.Empty;
+
         public string SubjectCode { get; set; } = string.Empty;
         public int? SubjectAge { get; set; }
         public string SubjectSex { get; set; } = string.Empty;

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

@@ -42,6 +42,7 @@ namespace IRaCIS.Core.Application.Contracts
         //[JsonIgnore]
         //public int NoneDicomCode { get; set; }
 
+        public string RecordPath { get; set; } = string.Empty;
         public bool IsDicom { get; set; }
     }
 
@@ -90,25 +91,6 @@ namespace IRaCIS.Core.Application.Contracts
 
                 return $" {uploadTimeSpan?.Hours}:{uploadTimeSpan?.Minutes}:{uploadTimeSpan?.Seconds}.{uploadTimeSpan?.Milliseconds}";
 
-                #region 废弃
-                //if (uploadTimeSpan.Seconds == 0 && uploadTimeSpan.Minutes==0 && uploadTimeSpan.Hours == 0)
-                //{
-                //    return $"{uploadTimeSpan.Milliseconds}毫秒";
-                //}
-                //else if (uploadTimeSpan.Minutes == 0 && uploadTimeSpan.Hours == 0)
-                //{
-                //    return $"{uploadTimeSpan.Seconds}秒";
-                //}
-                //else if (uploadTimeSpan.Hours == 0)
-                //{
-                //    return $"{uploadTimeSpan.Minutes} 分钟 {uploadTimeSpan.Seconds} 秒";
-                //}
-                //else
-                //{
-                //    return $" {uploadTimeSpan.Hours} 小时 {uploadTimeSpan.Minutes} 分钟 {uploadTimeSpan.Seconds} 秒 {uploadTimeSpan.Milliseconds}毫秒";
-                //}
-                #endregion
-
             }
         }
 
@@ -175,6 +157,13 @@ namespace IRaCIS.Core.Application.Contracts
 
         public Guid? VisitTaskId { get; set; }
 
+		public bool? IsDicom { get; set; }
+
+		public string? Uploader { get; set; }
+
+		public bool? IsSuccess { get; set; }
+
+        public string? StudyCode { get; set; }
 	}
 
 
@@ -215,6 +204,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public int FailedFileCount { get; set; }
 
+        public string RecordPath { get; set; } = string.Empty;
+
         public AddOrUpdateStudyDto Study { get; set; }
     
 

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

@@ -9,6 +9,9 @@ using IRaCIS.Core.Infrastructure;
 using Medallion.Threading;
 using FellowOakDicom;
 using FellowOakDicom.Imaging.Codec;
+using System.Data;
+using IRaCIS.Core.Domain.Models;
+using FellowOakDicom.Network;
 
 namespace IRaCIS.Core.Application.Services
 {
@@ -474,11 +477,205 @@ namespace IRaCIS.Core.Application.Services
         }
 
 
+        /// <summary>
+        /// 单个文件接收 归档
+        /// </summary>
+        /// <param name="dataset"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task ArchiveDicomFileAsync(DicomDataset dataset)
+        {
+            string studyInstanceUid = dataset.GetString(DicomTag.StudyInstanceUID);
+            string seriesInstanceUid = dataset.GetString(DicomTag.SeriesInstanceUID);
+            string sopInstanceUid = dataset.GetString(DicomTag.SOPInstanceUID);
+
+            Guid studyId = IdentifierHelper.CreateGuid(studyInstanceUid);
+            Guid seriesId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid);
+            Guid instanceId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, sopInstanceUid);
+
+            var isStudyNeedAdd = false;
+            var isSeriesNeedAdd = false;
+            var isInstanceNeedAdd = false;
+
+            var @lock = _distributedLockProvider.CreateLock($"StudyInstanceUid");
+
+            using (@lock.Acquire())
+            {
+                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);
+
+
+                if (findStudy == null)
+                {
+                    isStudyNeedAdd = true;
+                    findStudy = new DicomStudy
+                    {
+                        Id = studyId,
+                        StudyInstanceUid = studyInstanceUid,
+                        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),
+                        //Modalities = modality,
+                        //ModalityForEdit = modalityForEdit,
+                        Description = dataset.GetSingleValueOrDefault(DicomTag.StudyDescription, string.Empty),
+                        InstitutionName = dataset.GetSingleValueOrDefault(DicomTag.InstitutionName, string.Empty),
+                        PatientId = 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),
+
+
+                        SiteId = Guid.Empty,
+                        TrialId = Guid.Empty,
+                        SubjectId = Guid.Empty,
+                        SubjectVisitId = Guid.Empty,
+                        //IsDoubleReview = addtionalInfo.IsDoubleReview,
+                        SeriesCount = 0,
+                        InstanceCount = 0
+                    };
+
+                    //特殊逻辑
+
+                    var modality = dataset.GetSingleValueOrDefault(DicomTag.Modality, string.Empty);
+
+                    var dicModalityList = _dictionaryRepository.Where(t => t.Code == "Modality").SelectMany(t => t.ChildList.Select(c => c.Value)).ToList();
+
+                    var modalityForEdit = dicModalityList.Contains(modality) ? modality : String.Empty;
+
+                    if (modality == "MR")
+                    {
+                        modalityForEdit = "MRI";
+                    }
+
+                    if (modality == "PT")
+                    {
+                        modalityForEdit = "PET";
+                    }
+                    if (modality == "PT、CT")
+                    {
+                        modalityForEdit = "PET-CT";
+                    }
+
+                    findStudy.Modalities = modality;
+                    findStudy.ModalityForEdit= modalityForEdit;
+
+                    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 DicomSeries
+                    {
+                        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),
+
+                        SiteId = Guid.Empty,
+                        TrialId = Guid.Empty,
+                        SubjectId = Guid.Empty,
+                        SubjectVisitId = Guid.Empty,
+
+                        InstanceCount = 0
+                    };
+
+                    ++findStudy.SeriesCount;
+                }
+
+
+                if (findInstance == null)
+                {
+                    isInstanceNeedAdd = true;
+                    findInstance = new DicomInstance
+                    {
+                        Id = instanceId,
+                        StudyId = findStudy.Id,
+                        SeriesId = findSerice.Id,
+                        StudyInstanceUid = findStudy.StudyInstanceUid,
+                        SeriesInstanceUid = findSerice.SeriesInstanceUid,
+
+                        SiteId = Guid.Empty,
+                        TrialId = Guid.Empty,
+                        SubjectId = Guid.Empty,
+                        SubjectVisitId = Guid.Empty,
 
 
 
+                        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),
+                    };
 
+                    ++findStudy.InstanceCount;
+                    ++findSerice.InstanceCount;
+                }
+
+                if (isStudyNeedAdd)
+                {
+                   await _studyRepository.AddAsync(findStudy);
+                }
+                if(isSeriesNeedAdd)
+                {
+                    await _seriesRepository.AddAsync(findSerice);
+                }
+                if(isInstanceNeedAdd)
+                {
+                    await _instanceRepository.AddAsync(findInstance);
+                }
+                await _studyRepository.SaveChangesAsync();
+            }
 
         }
+    }
 }

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

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Authorization;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Helper;
+using System.Linq.Dynamic.Core;
 
 namespace IRaCIS.Core.Application.Services
 {
@@ -26,7 +27,7 @@ namespace IRaCIS.Core.Application.Services
         [HttpGet("{seriesId:guid}")]
         public async Task<IResponseOutput<List<DicomInstanceDTO>>> List(Guid seriesId)
         {
-            var list = await _instanceRepository.Where(s => s.SeriesId == seriesId).OrderBy(s => s.InstanceNumber).
+            var list = await _instanceRepository.Where(s => s.SeriesId == seriesId)/*.OrderBy(s => s.SliceLocation)*/.OrderBy(s => s.InstanceNumber).
                 ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
                 .ProjectTo<DicomInstanceDTO>(_mapper.ConfigurationProvider).ToListAsync();
 

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

@@ -1,4 +1,6 @@
-namespace IRaCIS.Core.Application.Contracts.Dicom
+using FellowOakDicom;
+
+namespace IRaCIS.Core.Application.Contracts.Dicom
 {
     public interface IDicomArchiveService
     {
@@ -18,7 +20,7 @@
         ////[EasyCachingAble(Expiration = 6000)]
         //string GetSeriesPreview(Guid seriesId);
 
-
+        Task ArchiveDicomFileAsync(DicomDataset dicomDataset);
 
     }
 }

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

@@ -132,26 +132,34 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         [HttpGet]
         public IResponseOutput DicomUploadInProgress(Guid trialId, string studyInstanceUid)
         {
-            _provider.Set($"StudyUid_{trialId}_{studyInstanceUid}", _userInfo.Id, TimeSpan.FromSeconds(30));
+            _provider.Set($"StudyUid_{trialId}_{studyInstanceUid}", _userInfo.Id, TimeSpan.FromSeconds(15));
 
             return ResponseOutput.Ok();
 
         }
 
 
-
+        /// <summary>
+        /// 上传临床数据
+        /// </summary>
+        /// <param name="incommand"></param>
+        /// <returns></returns>
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> AddOrUpdateArchiveStudy(NewArchiveStudyCommand incommand)
         {
+            var modalitys = string.Empty;
+
             try
             {
                 var trialId = incommand.TrialId;
 
+
                 var studyMonitor = await _studyMonitorRepository.FirstOrDefaultAsync(t => t.Id == incommand.StudyMonitorId);
                 studyMonitor.UploadFinishedTime = DateTime.Now;
                 studyMonitor.ArchiveFinishedTime = DateTime.Now;
                 studyMonitor.FailedFileCount = incommand.FailedFileCount;
-                studyMonitor.IsSuccess = true;
+                studyMonitor.IsSuccess = incommand.FailedFileCount==0;
+                studyMonitor.RecordPath=incommand.RecordPath;
 
                 //上传
                 if (studyMonitor.IsDicomReUpload == false)
@@ -189,6 +197,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                     //特殊处理逻辑
                     study.Modalities = string.Join("、", incommand.Study.SeriesList.Select(t => t.Modality).Distinct());
                     SpecialArchiveStudyDeal(study);
+                    modalitys = study.Modalities;
 
                     await _dicomstudyRepository.AddAsync(study);
 
@@ -209,6 +218,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                         series.SubjectId = incommand.SubjectId;
                         series.SubjectVisitId = incommand.SubjectVisitId;
 
+                        //前端传递的数量不准，上传的时候，把失败的也加进来了，以实际数组的数字为准
+                        series.InstanceCount = seriesItem.InstanceList.Count;
+
                         await _dicomSeriesRepository.AddAsync(series);
 
                         foreach (var instanceItem in seriesItem.InstanceList)
@@ -241,11 +253,14 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                     var study = await _dicomstudyRepository.FirstOrDefaultAsync(t => t.Id == studyId);
 
+                    //重传的时候也要赋值检查Id
+                    studyMonitor.StudyId = study.Id;
+                    studyMonitor.StudyCode = study.StudyCode;
 
                     //特殊处理逻辑
                     study.Modalities = string.Join("、", incommand.Study.SeriesList.Select(t => t.Modality).Union(study.Modalities.Split("、", StringSplitOptions.RemoveEmptyEntries)).Distinct());
                     SpecialArchiveStudyDeal(study);
-
+                    modalitys = study.Modalities;
 
 
                     // 少了整个序列
@@ -329,12 +344,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
 
 
-            return ResponseOutput.Ok();
+            return ResponseOutput.Ok(modalitys);
         }
 
 
-
-
         [HttpPost]
         public async Task<PageOutput<UnionStudyViewModel>> GetDicomAndNoneDicomStudyList(StudyQuery studyQuery)
         {
@@ -457,6 +470,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                  .WhereIf(studyQuery.SubjectId != null, t => t.SubjectId == studyQuery.SubjectId)
                  .WhereIf(studyQuery.SubjectVisitId != null, t => t.SubjectId == studyQuery.SubjectVisitId)
                  .WhereIf(studyQuery.SiteId != null, t => t.SiteId == studyQuery.SiteId)
+				 .WhereIf(studyQuery.IsDicom != null, t => t.IsDicom == studyQuery.IsDicom )
+				 .WhereIf(!string.IsNullOrWhiteSpace(studyQuery.Uploader), t => t.Uploader.UserName.Contains(studyQuery.Uploader))
+				 .WhereIf(studyQuery.IsSuccess != null, t => t.IsSuccess == studyQuery.IsSuccess)
+                 .WhereIf(!string.IsNullOrWhiteSpace(studyQuery.StudyCode), t => t.StudyCode.Contains(studyQuery.StudyCode))
                  .Select(t => new UnionStudyMonitorModel()
                  {
                      TrialId = t.TrialId,
@@ -489,7 +506,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                      ArchiveFinishedTime = t.ArchiveFinishedTime,
 
 
-
+                     RecordPath=t.RecordPath,
 
                      IsDicomReUpload = t.IsDicomReUpload,
                      StudyId = t.Id,
@@ -763,7 +780,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var result = new VerifyStudyUploadResult();
 
-            if (_provider.Exists($"StudyUid_{trialId}_{studyInstanceUid}"))
+            if (_provider.Exists($"StudyUid_{trialId}_{studyInstanceUid}") && _provider.Get<Guid>($"StudyUid_{trialId}_{studyInstanceUid}").Value!=_userInfo.Id)
             {
 
                 result.AllowUpload = false;

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

@@ -59,9 +59,11 @@ namespace IRaCIS.Core.Application.Service
                 ;
 
             CreateMap<DicomStudy, QAStudyInfoDTO>()
+                .ForMember(o => o.IsCompleteClinicalData, t =>  t.MapFrom(u => !u.ReadingClinicalDataList.Any(x=>x.ReadingClinicalDataPDFList.Count()==0)))
 				.ForMember(o => o.UploadedTime, t => t.MapFrom(u => u.CreateTime))
                 .ForMember(o => o.Uploader, t => t.MapFrom(u => u.Uploader.LastName + " / " + u.Uploader.FirstName))
                 .ForMember(o => o.StudyId, t => t.MapFrom(u => u.Id))
+                 .ForMember(o => o.IsHaveUploadFailed, t => t.MapFrom(u => u.DicomStudyMonitorList.Any(t=>t.FailedFileCount>0)))
                 .ForMember(o => o.Modalities, t => t.MapFrom(u => string.Join('、', u.SeriesList.Select(t => t.Modality).Distinct()) ));
 
 

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

@@ -298,7 +298,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
         public T Data { get; set; }
 
        
-        public SignDTO SignInfo { get; set; }
+        public SignDTO? SignInfo { get; set; }
 
       
     }
@@ -485,6 +485,11 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
         /// </summary>
         public string ReaderUser { get; set; } = string.Empty;
 
+        /// <summary>
+        /// 角色
+        /// </summary>
+		public string RoleName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 是否有签名
 		/// </summary>

IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs

@@ -1078,7 +1078,8 @@ namespace IRaCIS.Core.Application.Service
         [HttpGet]
         public async Task<List<string>> GetModuleTypeDescriptionList(Guid moduleTypeId)
         {
-            var result = await _frontAuditConfigRepository.Where(x => x.ModuleTypeId == moduleTypeId && x.ObjectTypeId != null && x.OptTypeId != null && x.Description.Length > 0).Select(x => new { x.Description, x.DescriptionCN, x.Sort }).OrderBy(t => t.Sort).Select(t =>  _userInfo.IsEn_Us? t.Description:t.DescriptionCN).Distinct().ToListAsync();
+            var result =( await _frontAuditConfigRepository.Where(x => x.ModuleTypeId == moduleTypeId && x.ObjectTypeId != null && x.OptTypeId != null && x.Description.Length > 0).Select(x => new { x.Description, x.DescriptionCN, x.Sort }).OrderBy(t => t.Sort).ToListAsync()
+                ).Select(t =>  _userInfo.IsEn_Us? t.Description:t.DescriptionCN).Distinct().ToList();
             return result;
         }
 

IRaCIS.Core.Application/Service/Inspection/InspectionService.cs

@@ -186,6 +186,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
                    
 
                  .WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))
+				 .WhereIf(!dto.RoleName.IsNullOrEmpty(), x => x.RoleName.Contains(dto.RoleName))
 				 //.WhereIf(dto.VisitPlanInfo != null&& dto.VisitPlanInfo!=(decimal) 1.11, x => x.VisitNum == dto.VisitPlanInfo)
 				 //.WhereIf(dto.VisitPlanInfo != (decimal)1.11,x=>x.InPlan!=null&& x.InPlan==false)
 				 .WhereIf(dto.StartTime != null, x => x.CreateTime >= dto.StartTime)

IRaCIS.Core.Application/Service/Institution/DTO/SiteModel.cs

@@ -35,6 +35,9 @@ namespace IRaCIS.Application.Contracts
     {
         public Guid Id { get; set; }
         public string SiteName { get; set; } = String.Empty;
+
+        public string SiteNameCN { get; set; } = String.Empty;
+
         public string City { get; set; } = String.Empty;
 
         public string Province { get; set; } = string.Empty;

IRaCIS.Core.Application/Service/Institution/HospitalService.cs

@@ -3,19 +3,22 @@ using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Infra.EFCore;
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Infrastructure;
+using Microsoft.Data.Sqlite;
 
 namespace IRaCIS.Application.Services
 {
-    [ ApiExplorerSettings(GroupName = "Institution")]
+    [ApiExplorerSettings(GroupName = "Institution")]
     public class HospitalService : BaseService, IHospitalService
     {
         private readonly IRepository<Hospital> _hospitalRepository;
         private readonly IRepository<Doctor> _doctorRepository;
+        private readonly IRepository<Site> _siteRepository;
 
-        public HospitalService(IRepository<Hospital> hospitalRepository, IRepository<Doctor> doctorRepository)
+        public HospitalService(IRepository<Hospital> hospitalRepository, IRepository<Doctor> doctorRepository, IRepository<Site> siteRepository)
         {
             _hospitalRepository = hospitalRepository;
-            this._doctorRepository = doctorRepository;
+            _doctorRepository = doctorRepository;
+            _siteRepository = siteRepository;
         }
 
         /// <summary> 获取所有医院列表 </summary>
@@ -38,13 +41,24 @@ namespace IRaCIS.Application.Services
             var exp1 = new EntityVerifyExp<Hospital>()
             {
                 VerifyExp = x => x.SiteId == hospitalCommand.SiteId && hospitalCommand.SiteId != null,
-                //---已经存在同名的医院，请确认。
+                //---当前中心已经添加到其他医院了。
                 VerifyMsg = _localizer["Hospital_SiteAdded"]
             };
 
 
-            var hospital = await _hospitalRepository.InsertOrUpdateAsync(hospitalCommand, true, exp,exp1);
+            var hospital = await _hospitalRepository.InsertOrUpdateAsync(hospitalCommand, true, exp, exp1);
 
+            //手动解绑医院与site的关系
+            if (hospitalCommand.SiteId == null && hospital.SiteId != null)
+            {
+                await _siteRepository.BatchUpdateNoTrackingAsync(t => t.Id == hospital.SiteId, u => new Site() { HospitalId = null });
+            }
+
+            //手动绑
+            if (hospitalCommand.SiteId != null)
+            {
+                await _siteRepository.BatchUpdateNoTrackingAsync(t => t.Id == hospitalCommand.SiteId, u => new Site() { HospitalId = hospital.Id});
+            }
             return ResponseOutput.Ok(hospital.Id.ToString());
 
         }
@@ -74,7 +88,7 @@ namespace IRaCIS.Application.Services
 
             var hospitalQueryable =
                 _hospitalRepository
-                .WhereIf(hospitalSearchModel.HospitalName!=null, t => t.HospitalName.Contains(hospitalSearchModel.HospitalName!) || t.HospitalNameCN.Contains(hospitalSearchModel.HospitalName!))
+                .WhereIf(hospitalSearchModel.HospitalName != null, t => t.HospitalName.Contains(hospitalSearchModel.HospitalName!) || t.HospitalNameCN.Contains(hospitalSearchModel.HospitalName!))
                 .WhereIf(hospitalSearchModel.City != null, t => t.City.Contains(hospitalSearchModel.City!) || t.HospitalNameCN.Contains(hospitalSearchModel.City!))
                 .WhereIf(hospitalSearchModel.Province != null, t => t.Province.Contains(hospitalSearchModel.Province!) || t.HospitalNameCN.Contains(hospitalSearchModel.Province!))
                 .ProjectTo<HospitalDTO>(_mapper.ConfigurationProvider);

IRaCIS.Core.Application/Service/Institution/SiteService.cs

@@ -4,6 +4,7 @@ using IRaCIS.Core.Infra.EFCore;
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Domain.Share;
 using Medallion.Threading;
+using IRaCIS.Core.Domain.Models;
 
 namespace IRaCIS.Application.Services
 {
@@ -13,12 +14,14 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<Site> _siteRepository;
         private readonly IRepository<TrialSiteUser> _trialSiteUserRepository;
         private readonly IDistributedLockProvider _distributedLockProvider;
+        private readonly IRepository<Hospital> _hospitalRepository;
 
-        public SiteService(IRepository<Site> siteRepository, IRepository<TrialSiteUser> trialSiteUserRepository, IDistributedLockProvider distributedLockProvider)
+        public SiteService(IRepository<Site> siteRepository, IRepository<TrialSiteUser> trialSiteUserRepository, IDistributedLockProvider distributedLockProvider, IRepository<Hospital> hospitalRepository)
         {
             _siteRepository = siteRepository;
             _trialSiteUserRepository = trialSiteUserRepository;
             _distributedLockProvider = distributedLockProvider;
+            _hospitalRepository= hospitalRepository;
         }
 
         /// <summary> 分页获取研究中心列表 </summary>
@@ -67,11 +70,23 @@ namespace IRaCIS.Application.Services
 
                     siteCommand.Code = await _siteRepository.Select(t => t.Code).DefaultIfEmpty().MaxAsync() + 1;
 
-                    siteCommand.SiteCode = AppSettings.GetCodeStr(siteCommand.Code, nameof(User));
+                    siteCommand.SiteCode = AppSettings.GetCodeStr(siteCommand.Code, nameof(Site));
                 }
 
                 var site = await _siteRepository.InsertOrUpdateAsync(siteCommand, true, exp);
 
+                //手动解绑医院与site的关系
+                if (siteCommand.HospitalId == null && site.HospitalId != null)
+                {
+                    await _hospitalRepository.BatchUpdateNoTrackingAsync(t => t.Id == site.HospitalId, u => new Hospital() { SiteId = null });
+                }
+
+                //手动绑
+                if(siteCommand.HospitalId != null)
+                {
+                    await _hospitalRepository.BatchUpdateNoTrackingAsync(t => t.Id == siteCommand.HospitalId, u => new Hospital() { SiteId = site.Id });
+                }
+
                 return ResponseOutput.Ok(site.Id.ToString());
 
             }

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

@@ -51,6 +51,10 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public DateTime? EndDate { get; set; }
 
+        public string? LoginUserName { get; set; }
+
+        public UserTypeEnum? LoginUserTypeEnum { get; set; }
+
 
     }
 

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

@@ -13,6 +13,9 @@ using static IRaCIS.Core.Domain.Share.StaticData;
 using IRaCIS.Core.Application.ViewModel;
 using Medallion.Threading;
 using EasyCaching.Core;
+using IRaCIS.Core.Application.Contracts;
+using LoginReturnDTO = IRaCIS.Application.Contracts.LoginReturnDTO;
+using OfficeOpenXml.FormulaParsing.Utilities;
 
 namespace IRaCIS.Application.Services
 {
@@ -28,7 +31,7 @@ namespace IRaCIS.Application.Services
 
         private readonly IDistributedLockProvider _distributedLockProvider;
         private readonly IEasyCachingProvider _cache;
-
+		private readonly IReadingImageTaskService _readingImageTaskService;
 		private readonly IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig;
 
 
@@ -38,6 +41,7 @@ namespace IRaCIS.Application.Services
             IRepository<VerificationCode> verificationCodeRepository,
             IRepository<Doctor> doctorRepository,
             IEasyCachingProvider cache,
+			IReadingImageTaskService readingImageTaskService,
 			IRepository<TrialUser> userTrialRepository,
             IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig,
             IRepository<UserLog> userLogRepository
@@ -48,6 +52,7 @@ namespace IRaCIS.Application.Services
 
             _verifyConfig = verifyConfig;
             _cache = cache;
+			this._readingImageTaskService = readingImageTaskService;
 			_userRepository = userRepository;
             _mailVerificationService = mailVerificationService;
             _verificationCodeRepository = verificationCodeRepository;
@@ -379,7 +384,7 @@ namespace IRaCIS.Application.Services
                 }
             }
 
-            var list = await _userRepository.Where(t => t.EMail == email).Select(t => new UserAccountDto() { UserId = t.Id, UserName = t.UserName, UserRealName = t.FullName, UserType = t.UserTypeRole.UserTypeShortName }).ToListAsync();
+            var list = await _userRepository.Where(t => t.EMail == email && t.Status== UserStateEnum.Enable).Select(t => new UserAccountDto() { UserId = t.Id, UserName = t.UserName, UserRealName = t.FullName, UserType = t.UserTypeRole.UserTypeShortName }).ToListAsync();
 
 
 
@@ -407,7 +412,7 @@ namespace IRaCIS.Application.Services
                 IsFirstAdd = false
             });
 
-            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = Guid.Empty, OptUserId = userId,LoginPassword=newPwd,  OptType = UserOptType.UnloginModifyPasswoed }, true);
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = userId, OptUserId = userId,LoginPassword=newPwd,  OptType = UserOptType.UnloginModifyPasswoed }, true);
 
             return ResponseOutput.Result(success);
 
@@ -687,8 +692,14 @@ namespace IRaCIS.Application.Services
 
             userLoginReturnModel.BasicInfo = loginUser;
 
+
             // 登录 清除缓存
-            _cache.Remove(userLoginReturnModel.BasicInfo.Id.ToString());
+            //_cache.Remove(userLoginReturnModel.BasicInfo.Id.ToString());
+
+            var userId = loginUser.Id;
+            await _cache.SetAsync($"{userId.ToString()}_Online", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromMinutes(_verifyConfig.CurrentValue.AutoLoginOutMinutes));
+
+
             return ResponseOutput.Ok(userLoginReturnModel);
 
         }
@@ -703,6 +714,8 @@ namespace IRaCIS.Application.Services
                .WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType)
                .WhereIf(inQuery.BeginDate != null, t => t.CreateTime >= inQuery.BeginDate)
                .WhereIf(inQuery.EndDate != null, t => t.CreateTime <= inQuery.EndDate)
+                .WhereIf(inQuery.LoginUserTypeEnum != null, t => t.LoginUser.UserTypeEnum== inQuery.LoginUserTypeEnum)
+               .WhereIf(!string.IsNullOrEmpty(inQuery.LoginUserName), t => t.LoginUser.UserName.Contains(inQuery.LoginUserName!))
                .WhereIf(!string.IsNullOrEmpty(inQuery.LoginFaildName), t => t.LoginFaildName.Contains(inQuery.LoginFaildName!))
                .WhereIf(!string.IsNullOrEmpty(inQuery.IP), t => t.IP.Contains(inQuery.IP!))
              .ProjectTo<UserLogView>(_mapper.ConfigurationProvider);

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

@@ -144,14 +144,13 @@ namespace IRaCIS.Core.Application.Contracts
             {
                 userTypeEnums = new List<UserTypeEnum>() { UserTypeEnum.CRA, UserTypeEnum.ClinicalResearchCoordinator };
 
-
             }
 
 
 
             var query = _userTypeRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin)
               .WhereIf(userTypeSelectEnum != UserTypeSelectEnum.None, t => userTypeEnums.Contains(t.UserTypeEnum))
-              .OrderBy(t => t.Order).ProjectTo<TrialUserType>(_mapper.ConfigurationProvider);
+              .OrderBy(t => t.UserTypeShortName).ProjectTo<TrialUserType>(_mapper.ConfigurationProvider);
 
             return await query.ToListAsync();
         }
@@ -168,7 +167,7 @@ namespace IRaCIS.Core.Application.Contracts
         {
             var query = _userTypeRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin)
                .Where(t => !t.UserTypeGroupList.Any(t=> t.Group.Code=="3"))
-               .OrderBy(t => t.Order).ProjectTo<TrialUserType>(_mapper.ConfigurationProvider);
+               .OrderBy(t => t.UserTypeShortName).ProjectTo<TrialUserType>(_mapper.ConfigurationProvider);
 
             return await query.ToListAsync();
         }

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

@@ -256,6 +256,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO
     public class TrialVisitQADTO
     {
         public bool ExistsManual { get; set; }
+		public bool IsHaveStudyClinicalData { get; set; }
 		public SubjectClinicalDataDto SubjectClinicalData { get; set; } = new SubjectClinicalDataDto();
 
         public List<NoneDicomStudyView> NoneDicomStudyList { get; set; } = new List<NoneDicomStudyView>();
@@ -386,6 +387,9 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
         public string ModalityForEdit { get; set; } = string.Empty;
 
+        public bool IsHaveUploadFailed { get; set; }
+
+        public bool IsCompleteClinicalData { get; set; }
 
 	}
 

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

@@ -34,6 +34,8 @@ namespace IRaCIS.Core.Application.Contracts
     public class GetNextQCInfoInDto
     {
         public Guid TrialId { get; set; }
+
+		public Guid? VisitId { get; set; }
 	}
 
     public class QCVisitSearchDTO : PageInput
@@ -50,6 +52,8 @@ namespace IRaCIS.Core.Application.Contracts
         public bool? IsUrgent { get; set; }
         public Guid TrialId { get; set; }
         public Guid? SiteId { get; set; }
+
+		public Guid? VisitId { get; set; }
 		public Guid? SubjectId { get; set; }
 
         public string SubjectInfo { get; set; } = String.Empty;
@@ -119,6 +123,9 @@ namespace IRaCIS.Core.Application.Contracts
         public bool IsEnrollementQualificationConfirm { get; set; }
         public bool IsPDProgressView { get; set; }
 
+        public bool IsHaveStudyClinicalData { get; set; }
+
+
 
 		public string OutEnrollmentVisitName { get; set; } = String.Empty;
 
@@ -491,6 +498,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string ArchiveFinishedTimeStr => ArchiveFinishedTime?.ToString("yyyy-MM-dd HH:mm:ss.fff");
 
+
         public string UploadIntervalStr
         {
             get
@@ -512,6 +520,7 @@ namespace IRaCIS.Core.Application.Contracts
         }
 
 
+
         public string TimeInterval
         {
             get
@@ -520,6 +529,7 @@ namespace IRaCIS.Core.Application.Contracts
                 var uploadTimeSpan = ArchiveFinishedTime - UploadStartTime;
 
                 return $" {uploadTimeSpan?.Hours}:{uploadTimeSpan?.Minutes}:{uploadTimeSpan?.Seconds}.{uploadTimeSpan?.Milliseconds}";
+
             }
         }
 
@@ -973,7 +983,7 @@ namespace IRaCIS.Core.Application.Contracts
         //病灶类型
         public string LessionType { get; set; }
 
-
+        public string BeforeTranslateLessionTypeValue { get; set; }
 
         //是否淋巴结
         [DictionaryTranslateAttribute("IsLymph")]
@@ -998,7 +1008,9 @@ namespace IRaCIS.Core.Application.Contracts
         //短径
         public string ShortDiameter { get; set; }
 
-        [DictionaryTranslateAttribute("TargetState")]
+        [DictionaryTranslateAttribute("TargetState", nameof(RECIST1Point1DetailedOfEvaluatedLesionExport.BeforeTranslateLessionTypeValue), "0")]
+        [DictionaryTranslateAttribute("NoTargetState", nameof(RECIST1Point1DetailedOfEvaluatedLesionExport.BeforeTranslateLessionTypeValue), "1")]
+        [DictionaryTranslateAttribute("NewLesionState", nameof(RECIST1Point1DetailedOfEvaluatedLesionExport.BeforeTranslateLessionTypeValue), "2")]
         //病灶状态
         public string LessionState { get; set; }
 
@@ -1095,6 +1107,8 @@ namespace IRaCIS.Core.Application.Contracts
         public int? Age { get; set; }
         public string Sex { get; set; } = string.Empty;
 
+        public bool IsHaveUploadFailed { get; set; }
+
     }
 
 
@@ -1116,6 +1130,7 @@ namespace IRaCIS.Core.Application.Contracts
         public bool? IsOverTime { get; set; }
         public Guid? CreateUserId { get; set; }
 
+
 	}
 
     public class QCCRCChallengeViewModel
@@ -1379,6 +1394,10 @@ namespace IRaCIS.Core.Application.Contracts
 
         public DateTime? SubmitTime { get; set; }
 
+        public string SubmitUserName { get; set; } = String.Empty;
+
+        public string SubmitUserRealName { get; set; } = String.Empty;
+
         public string CurrentActionUserName { get; set; } = String.Empty;
         public string PreliminaryAuditUserName { get; set; } = String.Empty;
 

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

@@ -8,6 +8,7 @@ using IRaCIS.Application.Interfaces;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Application.Service.Reading.Dto;
+using static Org.BouncyCastle.Math.EC.ECCurve;
 
 namespace IRaCIS.Core.Application.Image.QA
 {
@@ -16,6 +17,7 @@ namespace IRaCIS.Core.Application.Image.QA
     {
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
         private readonly IRepository<Trial> _trialRepository;
+		private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
 		private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSet;
         private readonly IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository;
         private readonly IRepository<TrialQCQuestion> _trialQCQuestionRepository;
@@ -26,6 +28,7 @@ namespace IRaCIS.Core.Application.Image.QA
         public QCListService(
               IRepository<SubjectVisit> subjectVisitRepository,
               IRepository<Trial> trialRepository,
+				IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
 			  IRepository<ClinicalDataTrialSet> clinicalDataTrialSet,
               IRepository<TrialQCQuestionAnswer> trialQCQuestionAnswerRepository,
               IRepository<TrialQCQuestion> trialQCQuestionRepository,
@@ -39,6 +42,7 @@ namespace IRaCIS.Core.Application.Image.QA
             this._trialQCQuestionRepository = trialQCQuestionRepository;
             this._consistencyCheckFileRepository = consistencyCheckFileRepository;
             _trialRepository = trialRepository;
+			this._clinicalDataTrialSetRepository = clinicalDataTrialSetRepository;
 			this._clinicalDataTrialSet = clinicalDataTrialSet;
         }
 
@@ -77,8 +81,8 @@ namespace IRaCIS.Core.Application.Image.QA
             var pageList = await query.ToPagedListAsync(visitSearchDTO.PageIndex, visitSearchDTO.PageSize, visitSearchDTO.SortField, visitSearchDTO.Asc, string.IsNullOrWhiteSpace(visitSearchDTO.SortField), defalutSortArray);
 
             var config = await _repository.Where<Trial>(t => t.Id == visitSearchDTO.TrialId).ProjectTo<TrialSubjectAndSVConfig>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
-            config.IsHaveSubjectClinicalData = await _clinicalDataTrialSet.AnyAsync(x => x.TrialId == visitSearchDTO.TrialId && x.IsConfirm && x.ClinicalDataLevel == ClinicalLevel.Subject && x.UploadRole == UploadRole.CRC);
+            config.IsHaveSubjectClinicalData = await _clinicalDataTrialSet.AnyAsync(x => x.TrialId == visitSearchDTO.TrialId && x.IsConfirm && (x.ClinicalDataLevel == ClinicalLevel.Subject ) && x.UploadRole == UploadRole.CRC);
-            config.IsHaveVisitClinicalData = await _clinicalDataTrialSet.AnyAsync(x => x.TrialId == visitSearchDTO.TrialId && x.IsConfirm && x.ClinicalDataLevel == ClinicalLevel.SubjectVisit && x.UploadRole == UploadRole.CRC);
+            config.IsHaveVisitClinicalData = await _clinicalDataTrialSet.AnyAsync(x => x.TrialId == visitSearchDTO.TrialId && x.IsConfirm && (x.ClinicalDataLevel == ClinicalLevel.SubjectVisit) && x.UploadRole == UploadRole.CRC);
             return (pageList, config);
 
         }
@@ -250,13 +254,13 @@ namespace IRaCIS.Core.Application.Image.QA
         [HttpPost]
 		public async Task<QCVisitViewModel?> GetNextQCInfo(GetNextQCInfoInDto inDto)
 		{
-         var result=   await GetQCVisitList(new QCVisitSearchDTO()
+			var result = await GetQCVisitList(new QCVisitSearchDTO()
 			{
-
 				TrialId = inDto.TrialId,
-                CurrentActionUserId=_userInfo.Id,
+				CurrentActionUserId = _userInfo.Id,
-                PageIndex=1,
+				VisitId = inDto.VisitId,
-                PageSize=1,
+				PageIndex = 1,
+				PageSize = 1,
 			});
 
 			return result.Item1.CurrentPageData.Count > 0 ? result.Item1.CurrentPageData[0] : null;
@@ -431,6 +435,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
             var svExpression = QCCommon.GetSubjectVisitFilter(visitSearchDTO.VisitPlanArray);
             var query = _subjectVisitRepository.Where(x => x.TrialId == visitSearchDTO.TrialId)
+							  .WhereIf(visitSearchDTO.VisitId != null, t => t.Id == visitSearchDTO.VisitId)
 						   .WhereIf(visitSearchDTO.CurrentActionUserId != null, t => t.CurrentActionUserId == visitSearchDTO.CurrentActionUserId)
                          .WhereIf(visitSearchDTO.ChallengeState != null, t => t.ChallengeState == visitSearchDTO.ChallengeState)
                         .WhereIf(visitSearchDTO.SiteId != null, t => t.SiteId == visitSearchDTO.SiteId)
@@ -451,7 +456,8 @@ namespace IRaCIS.Core.Application.Image.QA
                         //.WhereIf(visitSearchDTO.ChallengeState != null, t => t.ChallengeState == visitSearchDTO.ChallengeState)
                         .ProjectTo<QCVisitViewModel>(_mapper.ConfigurationProvider);
 
-            var defalutSortArray = new string[] { nameof(SubjectVisit.IsUrgent) + " desc", nameof(QCVisitViewModel.AuditState) +" asc" };
+            var defalutSortArray = new string[] { nameof(QCVisitViewModel.IsUrgent) + " desc", nameof(QCVisitViewModel.SubjectId), nameof(QCVisitViewModel.VisitNum) };
+            //var defalutSortArray = new string[] { nameof(SubjectVisit.IsUrgent) + " desc", nameof(QCVisitViewModel.AuditState) +" asc" };
             var pageList = await query.ToPagedListAsync(visitSearchDTO.PageIndex, visitSearchDTO.PageSize, visitSearchDTO.SortField, visitSearchDTO.Asc, string.IsNullOrWhiteSpace(visitSearchDTO.SortField), defalutSortArray);
 
 
@@ -609,6 +615,8 @@ namespace IRaCIS.Core.Application.Image.QA
             return new TrialVisitQADTO
             {
 				QCQuestionAnswerList = qacheckList,
+
+				IsHaveStudyClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(x => x.IsConfirm && x.TrialId == sv.TrialId && x.ClinicalDataLevel == ClinicalLevel.Study),
 		    	StudyList = temp.StudyList,
                 ExistsManual= (await _IReadingImageTaskService.GetManualList(new GetManualListInDto() { TrialId = sv.TrialId })).Count() > 0,
                 SeriesList = temp.SeriesList,
@@ -758,11 +766,16 @@ namespace IRaCIS.Core.Application.Image.QA
         [HttpGet("{subjectVisitId:guid}")]
         public async Task<(List<QAStudyInfoDTO>,object)> GetSubjectVisitUploadedStudyList(Guid subjectVisitId)
         {
-            var list= await _repository.Where<DicomStudy>(s => s.SubjectVisitId == subjectVisitId).IgnoreQueryFilters().ProjectTo<QAStudyInfoDTO>(_mapper.ConfigurationProvider).ToListAsync();
+
+            var visit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).FirstNotNullAsync();
+            var list= await _repository.Where<DicomStudy>(s => s.SubjectVisitId == subjectVisitId).IgnoreQueryFilters().ProjectTo<QAStudyInfoDTO>(_mapper.ConfigurationProvider).OrderBy(t=>t.StudyCode).ToListAsync();
 
 
             var config = await _repository.Where<SubjectVisit>(t => t.Id == subjectVisitId).Select(t=>t.Trial).ProjectTo<TrialSubjectAndSVConfig>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
 
+            config.IsHaveStudyClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(x => x.IsConfirm && x.TrialId == visit.TrialId && x.ClinicalDataLevel == ClinicalLevel.Study);
+
+
 			return (list, config);
         }
 

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

@@ -28,8 +28,10 @@ namespace IRaCIS.Core.Application.Image.QA
         private readonly IRepository<QCChallenge> _qcChallengeRepository;
         private readonly IRepository<DicomStudy> _dicomStudyRepository;
         private readonly IRepository<DicomSeries> _dicomSeriesrepository;
+		private readonly IReadingClinicalDataService _readingClinicalDataService;
 		private readonly IRepository<Subject> _subjectRepository;
         private readonly IRepository<ReadingClinicalData> _readingClinicalDataRepository;
+		private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
 		private readonly IRepository<QCChallengeDialog> _qCChallengeDialogrepository;
         private readonly IRepository<CheckChallengeDialog> _checkChallengeDialogrepository;
         private readonly IRepository<Trial> _trialRepository;
@@ -43,8 +45,10 @@ namespace IRaCIS.Core.Application.Image.QA
              IRepository<VisitTask> visitTaskRepository,
             IRepository<DicomStudy> dicomStudyRepository,
             IRepository<DicomSeries> dicomSeriesrepository,
+			IReadingClinicalDataService readingClinicalDataService,
 			IRepository<Subject> subjectRepository,
             IRepository<ReadingClinicalData> readingClinicalDataRepository,
+				IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
 			 IRepository<QCChallengeDialog> qCChallengeDialogrepository,
               IRepository<CheckChallengeDialog> checkChallengeDialogrepository,
             IVisitTaskHelpeService visitTaskHelpeService,
@@ -55,8 +59,10 @@ namespace IRaCIS.Core.Application.Image.QA
             _qcChallengeRepository = qcChallengeRepository;
             _dicomStudyRepository = dicomStudyRepository;
             this._dicomSeriesrepository = dicomSeriesrepository;
+			this._readingClinicalDataService = readingClinicalDataService;
 			this._subjectRepository = subjectRepository;
             this._readingClinicalDataRepository = readingClinicalDataRepository;
+			this._clinicalDataTrialSetRepository = clinicalDataTrialSetRepository;
 			this._qCChallengeDialogrepository = qCChallengeDialogrepository;
             this._checkChallengeDialogrepository = checkChallengeDialogrepository;
             _trialRepository = trialRepository;
@@ -925,9 +931,15 @@ namespace IRaCIS.Core.Application.Image.QA
                     return new GetNextIQCQualityOutDto() { };
                     break;
                 case TrialQCProcess.SingleAudit:
-                    visitList = await _subjectVisitRepository.Where(x => x.SubmitState != SubmitStateEnum.None && x.TrialId == inDto.TrialId && x.PreliminaryAuditUserId!= _userInfo.Id&&(x.CurrentActionUserId == _userInfo.Id || (x.AuditState != AuditStateEnum.PrimaryQCPassed && !x.IsTake))).Include(x => x.Subject).ToListAsync();
+                    visitList = await _subjectVisitRepository.Where(x => x.SubmitState == SubmitStateEnum.Submitted
+                    && x.TrialId == inDto.TrialId && x.PreliminaryAuditUserId!= _userInfo.Id&&(x.CurrentActionUserId == _userInfo.Id || (x.AuditState != AuditStateEnum.PrimaryQCPassed && !x.IsTake)))
+						   .Where(x => x.QCChallengeList.Count() == 0 || x.QCChallengeList.Where(y=>!y.IsClosed).OrderByDescending(x => x.CreateTime).FirstOrDefault().CreateUserId != _userInfo.Id)
+						.Include(x => x.Subject).ToListAsync();
 
-                     subjectVisit = visitList.Where(x => x.SubjectId == inDto.SubjectId).OrderBy(x=>x.VisitNum).FirstOrDefault();
+                     subjectVisit = visitList.Where(x => x.SubjectId == inDto.SubjectId)
+                
+
+						.OrderBy(x=>x.VisitNum).FirstOrDefault();
                     if(subjectVisit!=null)
                     {
                         return new GetNextIQCQualityOutDto() { 
@@ -952,9 +964,11 @@ namespace IRaCIS.Core.Application.Image.QA
                     break;
                 case TrialQCProcess.DoubleAudit:
 
-                    visitList = await _subjectVisitRepository.Where(x => x.SubmitState != SubmitStateEnum.None && x.TrialId == inDto.TrialId &&
+                    visitList = await _subjectVisitRepository.Where(x => x.SubmitState == SubmitStateEnum.Submitted && x.TrialId == inDto.TrialId &&
                     ((x.CurrentActionUserId == _userInfo.Id)||(!x.IsTake&& x.AuditState != AuditStateEnum.QCPassed&& (x.PreliminaryAuditUserId != _userInfo.Id)))
-                    ).Include(x => x.Subject).ToListAsync();
+                    )
+				   .Where(x => x.QCChallengeList.Count() == 0 || x.QCChallengeList.Where(y => !y.IsClosed).OrderByDescending(x => x.CreateTime).FirstOrDefault().CreateUserId !=_userInfo.Id)
+						.Include(x => x.Subject).ToListAsync();
                     if (subjectVisit != null)
                     {
                         return new GetNextIQCQualityOutDto()
@@ -1172,6 +1186,7 @@ namespace IRaCIS.Core.Application.Image.QA
         {
             var dbSubjectVisitList = await _subjectVisitRepository.Where(t => cRCRequestToQCCommand.SubjectVisitIds.Contains(t.Id), true).ProjectTo<QCCRCVisitViewModel>(_mapper.ConfigurationProvider).ToListAsync();
 
+            var trialinfo = await _trialRepository.Where(x => x.Id == dbSubjectVisitList[0].TrialId).FirstNotNullAsync();
             //普通提交
             if (dbSubjectVisitList.Count == 1)
             {
@@ -1199,8 +1214,9 @@ namespace IRaCIS.Core.Application.Image.QA
             }
 
             //同时要根据项目有没有配置Subject 级别临床数据
-            if (dbSubjectVisitList.Any(t => t.IsBaseLine && !t.IsHaveClinicalData))
+            if (dbSubjectVisitList.Any(t => t.IsBaseLine && !t.IsHaveClinicalData)&&trialinfo.ClinicalInformationTransmissionEnum!=0)
             {
+
                 //---基线没有临床数据，确认提交？
                 return ResponseOutput.NotOk(_localizer["QCOperation_NoBaselineData"], 0, ApiResponseCodeEnum.NeedTips);
             }
@@ -1219,6 +1235,34 @@ namespace IRaCIS.Core.Application.Image.QA
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput> CRCRequestToQC(CRCRequestToQCCommand cRCRequestToQCCommand)
         {
+			List<string> modalitieTypess = new List<string>() { "PT、CT", "CT、PT", "PET-CT" };
+            // 验证临床数据 是否有Pet类型
+            #region 验证临床数据 是否有Pet类型
+            if (await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == cRCRequestToQCCommand.TrialId && x.IsConfirm && x.ClinicalDataLevel == ClinicalLevel.Study))
+            {
+				foreach (var item in cRCRequestToQCCommand.SubjectVisitIds)
+				{
+
+					if (await _dicomStudyRepository.AnyAsync(x => x.SubjectVisitId == item && modalitieTypess.Contains(x.Modalities)))
+					{
+						var visit = await _subjectVisitRepository.Where(x => x.Id == item).FirstNotNullAsync();
+						var clinicalData = await this._readingClinicalDataService.GetStudyClinicalData(new Service.Reading.Dto.GetStudyClinicalDataInDto()
+						{
+							SubjectVisitId = item,
+						});
+
+						if (!clinicalData.Any(x => x.ClinicalDataLevel == ClinicalLevel.Study && x.ClinicalUploadType == ClinicalUploadType.PDF && x.PDFFileList.Count() > 0))
+						{
+							throw new BusinessValidationFailedException(_localizer["QCOperation_NeedStudyClinical"]);
+						}
+					}
+
+
+				}
+			}
+		
+			#endregion
+
 
 			var trialId = cRCRequestToQCCommand.TrialId;
 
@@ -1309,11 +1353,14 @@ namespace IRaCIS.Core.Application.Image.QA
 
                 // CRC 上传的基线数据签名
 
+                List<ClinicalLevel> clinicalneedSign = new List<ClinicalLevel>() {
+					 ClinicalLevel.Subject,
+					  ClinicalLevel.SubjectVisit,
+						ClinicalLevel.Study,
+				   };
+
                     await _readingClinicalDataRepository.UpdatePartialFromQueryAsync(x =>
-                    
+				    clinicalneedSign.Contains(x.ClinicalDataTrialSet.ClinicalDataLevel)&&
-                    (x.ClinicalDataTrialSet.ClinicalDataLevel== ClinicalLevel.Subject|| x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit)&&
-
-
 					x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ReadingId == dbSubjectVisit.Id && x.IsSign==false, x => new ReadingClinicalData()
                     {
                         IsSign = true,
@@ -1918,6 +1965,29 @@ namespace IRaCIS.Core.Application.Image.QA
                 throw new BusinessValidationFailedException(_localizer["QCOperation_InvalidCompleteResend"]);
             }
 
+			List<string> modalitieTypess = new List<string>() { "PT、CT", "CT、PT", "PET-CT" };
+			// 验证临床数据 是否有Pet类型
+			#region 验证临床数据 是否有Pet类型
+			if (await _clinicalDataTrialSetRepository.AnyAsync(x => x.TrialId == cRCReuploadFinishedCommand.TrialId && x.IsConfirm && x.ClinicalDataLevel == ClinicalLevel.Study))
+			{
+                var item = qcChallenge.SubjectVisitId;
+				if (await _dicomStudyRepository.AnyAsync(x => x.SubjectVisitId == item && modalitieTypess.Contains(x.Modalities)))
+				{
+					var visit = await _subjectVisitRepository.Where(x => x.Id == item).FirstNotNullAsync();
+					var clinicalData = await this._readingClinicalDataService.GetStudyClinicalData(new Service.Reading.Dto.GetStudyClinicalDataInDto()
+					{
+						SubjectVisitId = item,
+					});
+
+					if (!clinicalData.Any(x => x.ClinicalDataLevel == ClinicalLevel.Study && x.ClinicalUploadType == ClinicalUploadType.PDF && x.PDFFileList.Count() > 0))
+					{
+						throw new BusinessValidationFailedException(_localizer["QCOperation_NeedStudyClinical"]);
+					}
+				}
+			}
+
+			#endregion
+
 
 			var subjectVisitId = qcChallenge.SubjectVisitId;