提交全局阅片存在重复 需要同步环境

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -93,6 +93,7 @@ namespace IRaCIS.Api.Controllers
             [FromServices] ITokenService _tokenService, [FromServices] IConfiguration configuration)
         {
 
+
             var returnModel = await _userService.Login(loginUser.UserName, loginUser.Password);
 
             if (returnModel.IsSuccess)
@@ -160,6 +161,17 @@ namespace IRaCIS.Api.Controllers
 
                 returnModel.Data.JWTStr = _tokenService.GetToken(IRaCISClaims.Create(returnModel.Data.BasicInfo));
 
+                // 创建一个 CookieOptions 对象，用于设置 Cookie 的属性
+                var option = new CookieOptions
+                {
+                    Expires = DateTime.Now.AddMonths(1), // 设置过期时间为 30 分钟之后
+                    HttpOnly = false, // 确保 cookie 只能通过 HTTP 访问
+                    SameSite = Microsoft.AspNetCore.Http.SameSiteMode.None, // 设置 SameSite 属性
+                    Secure = false // 确保 cookie 只能通过 HTTPS 访问
+                };
+
+                HttpContext.Response.Cookies.Append("access_token", returnModel.Data.JWTStr, option);
+
             }
 
             var userId = returnModel.Data.BasicInfo.Id.ToString();
@@ -205,6 +217,8 @@ namespace IRaCIS.Api.Controllers
 
             var token = decodeUrl.Substring(decodeUrl.IndexOf("access_token=") + "access_token=".Length);
 
+            var lang = decodeUrl.Substring(decodeUrl.IndexOf("lang=") + "lang=".Length, 2);
+
             var domainStrList = decodeUrl.Split("/").ToList().Take(3).ToList();
 
             var errorUrl = domainStrList[0]+"//"+ domainStrList[2]+ "/error";
@@ -212,7 +226,7 @@ namespace IRaCIS.Api.Controllers
 
             if (!await _userRepository.AnyAsync(t => t.Id == Guid.Parse(userId)  && t.EmailToken == token && t.IsFirstAdd))
             {
-                decodeUrl = errorUrl+ $"?ErrorMessage={System.Web.HttpUtility.UrlEncode("您的初始化链接已过期")} ";
+                decodeUrl = errorUrl+ $"?lang={lang}&ErrorMessage={System.Web.HttpUtility.UrlEncode(lang=="zh"? "您的初始化链接已过期": "Error！The initialization link has expired.    Return")} ";
             }
 
             return Redirect(decodeUrl);

IRaCIS.Core.API/Controllers/FinancialChangeController.cs

@@ -52,7 +52,7 @@ namespace IRaCIS.Core.API.Controllers.Special
         /// <param name="param"></param>
         /// <returns>新记录Id</returns>
         [HttpPost, Route("trial/addOrUpdateTrial")]
-        [Authorize(Policy = IRaCISPolicy.PM_APM)]
+        //[Authorize(Policy = IRaCISPolicy.PM_APM)]
 
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AddOrUpdateTrial", "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput<Trial>>  AddOrUpdateTrial(TrialCommand param)

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -11,6 +11,7 @@ using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.Service.Inspection.DTO;
 using IRaCIS.Core.Application.Service.Inspection.Interface;
 using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Application.Service.Reading.Interface;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
@@ -36,6 +37,7 @@ namespace IRaCIS.Core.API.Controllers
         private readonly IHttpContextAccessor _httpContext;
         private readonly ITrialConfigService _trialConfigService;
         private readonly INoneDicomStudyService _noneDicomStudyService;
+        private readonly IClinicalAnswerService _clinicalAnswerService;
         private readonly ISubjectService _subjectService;
         private readonly IReadingClinicalDataService _readingClinicalDataService;
         private readonly ISubjectVisitService _subjectVisitService;
@@ -62,6 +64,7 @@ namespace IRaCIS.Core.API.Controllers
              IReadingMedicineQuestionService readingMedicineQuestionService,
             ITrialConfigService _trialConfigService,
             INoneDicomStudyService noneDicomStudyService,
+            IClinicalAnswerService clinicalAnswerService,
             ISubjectService _subjectService,
             IReadingClinicalDataService _readingClinicalDataService,
             ISubjectVisitService subjectVisitService,
@@ -82,6 +85,7 @@ namespace IRaCIS.Core.API.Controllers
             this._httpContext = httpContext;
             this._trialConfigService = _trialConfigService;
             this._noneDicomStudyService = noneDicomStudyService;
+            this._clinicalAnswerService = clinicalAnswerService;
             this._subjectService = _subjectService;
             this._readingClinicalDataService = _readingClinicalDataService;
             this._subjectVisitService = subjectVisitService;
@@ -233,6 +237,94 @@ namespace IRaCIS.Core.API.Controllers
         }
 
 
+        /// <summary>
+        /// CRC签名临床数据
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/ClinicalAnswer/CRCSignClinicalData")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> CRCSignClinicalData(DataInspectionDto<CRCSignClinicalDataInDto> opt)
+        {
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _clinicalAnswerService.CRCSignClinicalData(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
+
+        /// <summary>
+        /// CRC确认临床数据
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/ClinicalAnswer/CRCConfirmClinical")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> CRCConfirmClinical(DataInspectionDto<CRCConfirmClinicalInDto> opt)
+        {
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _clinicalAnswerService.CRCConfirmClinical(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
+        /// <summary>
+        /// CRC撤销临床数据
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/ClinicalAnswer/CRCCancelConfirmClinical")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> CRCCancelConfirmClinical(DataInspectionDto<CRCCancelConfirmClinicalInDto> opt)
+        {
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _clinicalAnswerService.CRCCancelConfirmClinical(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
+
+        /// <summary>
+        /// PM确认临床数据
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/ClinicalAnswer/PMConfirmClinical")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> PMConfirmClinical(DataInspectionDto<CRCConfirmClinicalInDto> opt)
+        {
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _clinicalAnswerService.PMConfirmClinical(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
+
+         /// <summary>
+         /// 提交结构化录入并签名
+         /// </summary>
+         /// <param name="opt"></param>
+         /// <returns></returns>
+        [HttpPost, Route("Inspection/ClinicalAnswer/SubmitClinicalFormAndSign")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+        [UnitOfWork]
+        public async Task<IResponseOutput> SubmitClinicalFormAndSign(DataInspectionDto<SubmitClinicalFormInDto> opt)
+        {
+            var singid = await _inspectionService.RecordSing(opt.SignInfo);
+            var result = await _clinicalAnswerService.SubmitClinicalForm(opt.Data);
+            await _inspectionService.CompletedSign(singid, result);
+            return result;
+        }
+
         /// <summary>
         /// 提交阅片裁判问题
         /// </summary>

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -227,6 +227,8 @@ namespace IRaCIS.Core.API.Controllers
             _repository = repository;
         }
 
+
+
         [HttpPost, Route("Study/PreArchiveStudy")]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> PreArchiveStudy(PreArchiveStudyCommand preArchiveStudyCommand,
@@ -262,6 +264,12 @@ namespace IRaCIS.Core.API.Controllers
         }
 
 
+        //public string UploadOOSTest(string filePath, string route)
+        //{
+            
+        //}
+
+
         /// <summary>Dicom 归档</summary>
         [HttpPost, Route("Study/ArchiveStudy")]
         [DisableFormValueModelBinding]
@@ -296,16 +304,24 @@ namespace IRaCIS.Core.API.Controllers
 
             var startTime = DateTime.Now;
 
-            if (_provider.Exists($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}"))
-            {
-                //---当前已有人正在上传和归档该检查!
-                return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_ArchiveInProgress"));
-            }
-            else
+
+            if (_provider.Exists($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}") && _provider.Get<Guid>($"StudyUid_{trialId}_{studyInstanceUid}").Value == _userInfo.Id)
             {
                 _provider.Set($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}", _userInfo.Id, TimeSpan.FromMinutes(30));
             }
           
+      
+             
+            //if (_provider.Exists($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}"))
+            //{
+            //    //---当前已有人正在上传和归档该检查!
+            //    return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_ArchiveInProgress"));
+            //}
+            //else
+            //{
+            //    _provider.Set($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}", _userInfo.Id, TimeSpan.FromMinutes(30));
+            //}
+
             //到了接口，代表上传结束了
 
             var studyMonitor = await _studyMonitorRepository.FirstOrDefaultAsync(t => t.Id == studyMonitorId);
@@ -438,7 +454,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <returns></returns>
         [HttpPost("ClinicalData/UploadVisitClinicalData/{trialId:guid}/{subjectVisitId:guid}")]
         [DisableRequestSizeLimit]
-        [Authorize(Policy = IRaCISPolicy.CRC)]
+        //[Authorize(Policy = IRaCISPolicy.CRC)]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
 
         public async Task<IResponseOutput> UploadVisitClinicalData(Guid subjectVisitId)
@@ -676,7 +692,7 @@ namespace IRaCIS.Core.API.Controllers
         [RequestSizeLimit(1_073_741_824)]
         [HttpPost("NoneDicomStudy/UploadNoneDicomFile/{trialId:guid}/{subjectVisitId:guid}/{noneDicomStudyId:guid}/{studyMonitorId:guid}")]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-        [Authorize(Policy = IRaCISPolicy.CRC)]
+        //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput> UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId, Guid studyMonitorId, 
             [FromServices] IRepository<NoneDicomStudy> _noneDicomStudyRepository, [FromServices] IRepository<StudyMonitor> _studyMonitorRepository)
         {
@@ -733,7 +749,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <returns></returns>
         [HttpPost("QCOperation/UploadVisitCheckExcel/{trialId:guid}")]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-        [Authorize(Policy = IRaCISPolicy.PM_APM)]
+        //[Authorize(Policy = IRaCISPolicy.PM_APM)]
         public async Task<IResponseOutput> UploadVisitCheckExcel(Guid trialId)
         {
 

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

@@ -86,6 +86,8 @@
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
+    <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.6.2" />
+    <PackageReference Include="Quartz.Extensions.Hosting" Version="3.6.2" />
     <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
     <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="1.2.0" />
     <PackageReference Include="Serilog.Sinks.Email" Version="2.4.0" />
@@ -115,12 +117,6 @@
     <Content Update="wwwroot\EmailTemplate\AdminResetUser.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Update="wwwroot\EmailTemplate\EmailConfigTest_US.html">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="wwwroot\EmailTemplate\EmailConfigTest.html">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Update="wwwroot\EmailTemplate\SubjectEnrollConfirmOrPDProgress_US.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

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

@@ -139,6 +139,41 @@
             <param name="opt"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.CRCSignClinicalData(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.CRCSignClinicalDataInDto})">
+            <summary>
+            CRC签名临床数据
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.CRCConfirmClinical(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.CRCConfirmClinicalInDto})">
+            <summary>
+            CRC确认临床数据
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.CRCCancelConfirmClinical(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.CRCCancelConfirmClinicalInDto})">
+            <summary>
+            CRC撤销临床数据
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.PMConfirmClinical(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.CRCConfirmClinicalInDto})">
+            <summary>
+            PM确认临床数据
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.SubmitClinicalFormAndSign(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.SubmitClinicalFormInDto})">
+            <summary>
+            提交结构化录入并签名
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.API.Controllers.InspectionController.SubmitJudgeVisitTaskResult(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.SaveJudgeVisitTaskResult})">
             <summary>
             提交阅片裁判问题

IRaCIS.Core.API/Program.cs

@@ -11,6 +11,8 @@ using MassTransit;
 using MassTransit.NewIdProviders;
 using System.IO;
 using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Core.Application.Helper;
 
 namespace IRaCIS.Core.API
 {
@@ -64,9 +66,7 @@ namespace IRaCIS.Core.API
                 //缓存项目的状态  匿名化数据
                 await InitCache(host);
 
-                WatchJsonFile(Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources, StaticData.En_US_Json)  );
               
-                WatchJsonFile(Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources, StaticData.Zh_CN_Json));
 
 
 
@@ -104,54 +104,24 @@ namespace IRaCIS.Core.API
 
         private static async Task InitCache(IHost host)
         {
+            var _repository = host.Services.GetService(typeof(IRepository)) as IRepository;
+
+            //初始化 国际化数据，并且监测国际化文件变更
+           await InternationalizationHelper.InitInternationlizationDataAndWatchJsonFileAsync(_repository);
+
             var _mediator = host.Services.GetService(typeof(IMediator)) as IMediator;
 
             await _mediator.Send(new AnonymizeCacheRequest());
 
             await _mediator.Send(new TrialStateCacheRequest());
-        }
-
-
-
-        private static void LoadJsonFile(string filePath)
-        {
-            
-                IConfigurationBuilder builder = new ConfigurationBuilder()
-                    .AddJsonFile(filePath);
-
-            IConfigurationRoot enConfiguration = builder.Build();
-
-
-
-            foreach (IConfigurationSection section in enConfiguration.GetChildren())
-            {
-                if (filePath.Contains(StaticData.En_US_Json) )
-                {
-                    StaticData.En_US_Dic[section.Key] = section.Value;
-
-                }
-                else
-                {
-                    StaticData.Zh_CN_Dic[section.Key] = section.Value;
-                }
-            }
-
-
-
 
 
 
         }
-        public static void WatchJsonFile(string filePath)
-        {
-            LoadJsonFile(filePath);
 
 
-            FileSystemWatcher watcher = new FileSystemWatcher(Path.GetDirectoryName(filePath), Path.GetFileName(filePath));
-            watcher.Changed += (sender, e) => LoadJsonFile(filePath);
-            watcher.EnableRaisingEvents = true;
 
-        }
+      
        
     }
 }

IRaCIS.Core.API/Properties/launchSettings.json

@@ -53,6 +53,14 @@
         "ASPNETCORE_ENVIRONMENT": "CertificateApply"
       },
       "applicationUrl": "http://localhost:6400"
+    },
+    "IRaCIS.CenterImageDev": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "CenterImageDev"
+      },
+      "applicationUrl": "http://localhost:6500"
     }
   }
 }

IRaCIS.Core.API/Startup.cs

@@ -83,12 +83,10 @@ namespace IRaCIS.Core.API
                 if (_configuration.GetSection("BasicSystemConfig").GetValue<bool>("OpenLoginLimit"))
                 {
                     options.Filters.Add<LimitUserRequestAuthorization>();
-
                 }
 
 
             })
-
                 .AddNewtonsoftJsonSetup(); // NewtonsoftJson 序列化  处理
 
             services.AddOptions().Configure<SystemEmailSendConfig>( _configuration.GetSection("SystemEmailSendConfig"));
@@ -116,7 +114,7 @@ namespace IRaCIS.Core.API
             //services.AddDistributedMemoryCache();
 
             // hangfire  定时任务框架  有界面，更友好~
-            services.AddhangfireSetup(_configuration);
+            //services.AddhangfireSetup(_configuration);
             //  QuartZ 定时任务框架  使用了hangfire 暂时不用，后续需要可以打开，已经配好
             services.AddQuartZSetup(_configuration);
 
@@ -138,7 +136,7 @@ namespace IRaCIS.Core.API
             //IP 限流 可设置白名单 或者黑名单
             //services.AddIpPolicyRateLimitSetup(_configuration);
             // 用户类型 策略授权
-            services.AddAuthorizationPolicySetup(_configuration);
+            //services.AddAuthorizationPolicySetup(_configuration);
 
             services.AddJsonConfigSetup(_configuration);
             //转发头设置  获取真实IP 
@@ -183,7 +181,7 @@ namespace IRaCIS.Core.API
             app.UseLogDashboard("/LogDashboard");
 
             //hangfire
-            app.UseHangfireConfig(env);
+            //app.UseHangfireConfig(env);
 
             ////暂时废弃
             //app.UseHttpReports();
@@ -219,8 +217,8 @@ namespace IRaCIS.Core.API
 
             app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());
 
-            app.UseIRacisHostStaticFileStore(env);
-
+            //app.UseIRacisHostStaticFileStore(env);
+            app.UseMiddleware<MultiDiskStaticFilesMiddleware>();
 
 
             app.UseAuthentication();

IRaCIS.Core.API/_PipelineExtensions/IRacisHostFile/MultiDiskStaticFilesMiddleware.cs

@@ -11,6 +11,7 @@ using Microsoft.Extensions.Hosting.Internal;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.VisualBasic;
+using SharpCompress.Common;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -23,16 +24,14 @@ namespace IRaCIS.Core.API
     {
         private readonly RequestDelegate _next;
         private readonly IWebHostEnvironment _hostingEnv;
-        private readonly StaticFileOptions _options;
         private readonly ILoggerFactory _loggerFactory;
 
         private string iRaCISDefaultDataFolder = string.Empty;
 
-        public MultiDiskStaticFilesMiddleware(RequestDelegate next, IWebHostEnvironment hostingEnv, StaticFileOptions options, ILoggerFactory loggerFactory)
+        public MultiDiskStaticFilesMiddleware(RequestDelegate next, IWebHostEnvironment hostingEnv,  ILoggerFactory loggerFactory)
         {
             _next = next;
             _hostingEnv = hostingEnv;
-            _options = options;
             _loggerFactory = loggerFactory;
 
             iRaCISDefaultDataFolder = FileStoreHelper.GetIRaCISRootDataFolder(_hostingEnv);
@@ -50,53 +49,101 @@ namespace IRaCIS.Core.API
 
             var isDicomFile = path.Contains($"{StaticData.Folder.DicomFolder}");
 
-            var defaultFileProvider = new PhysicalFileProvider(iRaCISDefaultDataFolder);
-            var staticFileOptions = new StaticFileOptions
-            {
-                FileProvider = defaultFileProvider,
-                RequestPath = $"/{StaticData.Folder.IRaCISDataFolder}",
-                ServeUnknownFileTypes = true,
-                DefaultContentType = "application/octet-stream"
-            };
 
-            var defaultRoot = Path.GetPathRoot(iRaCISDefaultDataFolder);
 
             //先从默认里面去找
             if (isIRacisFile)
             {
-                if (defaultFileProvider.GetFileInfo(context.Request.Path).Exists)
+
+
+
+                #region 方式二
+
+                //var defaultFileProvider = new PhysicalFileProvider(iRaCISDefaultDataFolder);
+
+                //var staticFileOptions = new StaticFileOptions
+                //{
+                //    FileProvider = defaultFileProvider,
+                //    RequestPath = $"/{StaticData.Folder.IRaCISDataFolder}",
+                //    ServeUnknownFileTypes = true,
+                //    DefaultContentType = "application/octet-stream"
+                //};
+
+                //var a = defaultFileProvider.GetFileInfo(context.Request.Path).Exists;
+
+                //var staticFileMiddleware = new StaticFileMiddleware(_next, _hostingEnv, Options.Create(staticFileOptions), _loggerFactory);
+                //await staticFileMiddleware.Invoke(context);
+
+                #endregion
+
+
+
+                #region 文档上传默认会加wwwroot 奇怪...
+
+                var defaultFileProvider = new PhysicalFileProvider(FileStoreHelper.GetIRaCISRootPath(_hostingEnv));
+
+                if (defaultFileProvider.GetFileInfo(path).Exists)
                 {
-                    var staticFileMiddleware = new StaticFileMiddleware(_next, _hostingEnv, Options.Create(staticFileOptions), _loggerFactory);
-                    await staticFileMiddleware.Invoke(context);
+
+                    var actrualPath = defaultFileProvider.GetFileInfo(path).PhysicalPath;                
+
+                    await context.Response.SendFileAsync(new PhysicalFileInfo(new FileInfo(actrualPath)));
+
                     return;
                 }
+                #endregion
+
             }
 
             //没找到  
             //dicom影像，从多个文件夹尝试，因为会存在切换磁盘
             if (isDicomFile)
             {
-                var disks = GetDisks().Where(t=>!t.Contains(defaultRoot));
+                var defaultRoot = Path.GetPathRoot(iRaCISDefaultDataFolder);
+
+                //除默认部署路径的其他路径
+                var disks = DriveInfo.GetDrives()
+                .Where(d => d.IsReady && d.DriveType == DriveType.Fixed)/*.Where(t => !t.Name.Contains("C") && !t.Name.Contains("c"))*/
+                .OrderBy(d => d.AvailableFreeSpace)
+                .Select(d => d.RootDirectory.FullName)
+                .ToArray().Where(t=>!t.Contains(defaultRoot));
 
 
                 foreach (var item in disks)
                 {
                     var otherFileStoreFolder = Path.Combine(item, _hostingEnv.EnvironmentName);
 
+                    if (!Directory.Exists(otherFileStoreFolder))
+                    {
+                        continue;
+                    }
+                 
                     var otherFileProvider= new PhysicalFileProvider(otherFileStoreFolder);
 
-                    var otherStaticFileOptions = new StaticFileOptions
-                    {
-                        FileProvider = otherFileProvider,
-                        RequestPath = $"/{StaticData.Folder.IRaCISDataFolder}",
-                        ServeUnknownFileTypes = true,
-                        DefaultContentType = "application/octet-stream"
-                    };
                   
-                    if (otherFileProvider.GetFileInfo(context.Request.Path).Exists)
+
+                    if (otherFileProvider.GetFileInfo(path).Exists)
                     {
-                        var staticFileMiddleware = new StaticFileMiddleware(_next, _hostingEnv, Options.Create(staticFileOptions), _loggerFactory);
-                        await staticFileMiddleware.Invoke(context);
+
+                        var actrualPath = otherFileProvider.GetFileInfo(path).PhysicalPath;
+
+                        //方式一
+                        await context.Response.SendFileAsync( new PhysicalFileInfo(new FileInfo(actrualPath)));
+
+                        #region 方式二  报错  otherFileProvider 应该还包含/{StaticData.Folder.IRaCISDataFolder} 这一层级
+                        //var otherStaticFileOptions = new StaticFileOptions
+                        //{
+                        //    FileProvider = otherFileProvider,
+                        //    RequestPath = $"/{StaticData.Folder.IRaCISDataFolder}",
+                        //    ServeUnknownFileTypes = true,
+                        //    DefaultContentType = "application/octet-stream"
+                        //};
+                        //var staticFileMiddleware = new StaticFileMiddleware(_next, _hostingEnv, Options.Create(otherStaticFileOptions), _loggerFactory);
+                        //await staticFileMiddleware.Invoke(context);
+                        #endregion
+
+
+
                         return;
                     }
                 }
@@ -109,14 +156,7 @@ namespace IRaCIS.Core.API
 
 
 
-        private string[] GetDisks()
-        {
-            // 获取系统中所有可用的磁盘
-            return DriveInfo.GetDrives()
-                .Where(d => d.IsReady && d.DriveType == DriveType.Fixed).Where(t => !t.Name.Contains("C") && !t.Name.Contains("c"))
-                .Select(d => d.RootDirectory.FullName)
-                .ToArray();
-        }
+
 
 
         //private static string GetContentType(string path)

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

@@ -1,6 +1,7 @@
 using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
@@ -12,9 +13,14 @@ namespace IRaCIS.Core.API
 {
     public class ApiResponseHandler : AuthenticationHandler<AuthenticationSchemeOptions>
     {
-        public ApiResponseHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock)
+        public IStringLocalizer _localizer;
+		public ApiResponseHandler(IOptionsMonitor<AuthenticationSchemeOptions> options,
+			IStringLocalizer localizer,
+			ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock)
         {
-        }
+            _localizer = localizer;
+
+		}
 
         protected override Task<AuthenticateResult> HandleAuthenticateAsync()
         {
@@ -24,14 +30,16 @@ namespace IRaCIS.Core.API
         {
             Response.ContentType = "application/json";
             Response.StatusCode = StatusCodes.Status401Unauthorized;
-            await Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk("您无权访问该接口", ApiResponseCodeEnum.NoToken)));
+                //---您无权访问该接口
+            await Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk(_localizer["ApiResponse_NoAccess"], ApiResponseCodeEnum.NoToken)));
         }
 
         protected override async Task HandleForbiddenAsync(AuthenticationProperties properties)
         {
             Response.ContentType = "application/json";
             Response.StatusCode = StatusCodes.Status403Forbidden;
-            await Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk("您的权限不允许进行该操作",ApiResponseCodeEnum.HaveTokenNotAccess)));
+                //---您的权限不允许进行该操作
+            await Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk(_localizer["ApiResponse_Permission"],ApiResponseCodeEnum.HaveTokenNotAccess)));
         }
 
     }

IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs

@@ -37,6 +37,7 @@ namespace IRaCIS.Core.API
                     triggerOptions.AddTrigger<AddSubjectTrigger>();
                     triggerOptions.AddTrigger<ChallengeStateTrigger>();
                     triggerOptions.AddTrigger<SubjectStateTrigger>();
+                    triggerOptions.AddTrigger<AddCRCCliniaclDataTrigger>();
                     triggerOptions.AddTrigger<SubjectVisitCheckPassedTrigger>();
                     triggerOptions.AddTrigger<SubjectVisitFinalVisitTrigger>();
                     triggerOptions.AddTrigger<SubjectVisitTrigger>();

IRaCIS.Core.API/_ServiceExtensions/QuartZSetup.cs

@@ -1,6 +1,8 @@
 
+using IRaCIS.Application.Services.BackGroundJob;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Quartz;
 
 namespace IRaCIS.Core.API
 {
@@ -8,37 +10,35 @@ namespace IRaCIS.Core.API
     {
         public static void AddQuartZSetup(this IServiceCollection services, IConfiguration configuration)
         {
-            //services.AddTransient<CacheTrialStatusQuartZJob>();
+            services.AddTransient<CacheTrialStatusQuartZJob>();
 
-            //services.AddQuartz(q =>
-            //{
-            //    // base quartz scheduler, job and trigger configuration
+            services.AddQuartz(q =>
+            {
+                // base quartz scheduler, job and trigger configuration
 
-            //    // as of 3.3.2 this also injects scoped services (like EF DbContext) without problems
-            //    q.UseMicrosoftDependencyInjectionJobFactory();
+                // as of 3.3.2 this also injects scoped services (like EF DbContext) without problems
+                q.UseMicrosoftDependencyInjectionJobFactory();
 
-            //    // 基本Quartz调度器、作业和触发器配置
-            //    var jobKey = new JobKey("RegularTrialWork", "regularWorkGroup");
-            //    q.AddJob<CacheTrialStatusQuartZJob>(jobKey, j => j
-            //        .WithDescription("Trial regular work")
-            //    );
-            //    q.AddTrigger(t => t
-            //        .WithIdentity("TrialStatusTrigger")
-            //        .ForJob(jobKey)
-            //        //.StartNow()
-            //        //.WithSimpleSchedule(x => x.WithInterval(TimeSpan.FromSeconds(15))//开始秒数 15s
-            //        //    .RepeatForever())//持续工作
-            //        .WithCronSchedule("0 0 0/2 * * ?")//每小时执行一次
-            //        .WithDescription("My regular trial work trigger")
-            //    );
-            //});
+                // 基本Quartz调度器、作业和触发器配置
+                var jobKey = new JobKey("RegularTrialWork", "regularWorkGroup");
+                q.AddJob<CacheTrialStatusQuartZJob>(jobKey, j => j
+                    .WithDescription("Trial regular work")
+                );
+                q.AddTrigger(t => t
+                    .WithIdentity("TrialStatusTrigger")
+                    .ForJob(jobKey)
                     
-            //// ASP.NET Core hosting
-            //services.AddQuartzServer(options =>
-            //{
-            //    // when shutting down we want jobs to complete gracefully
-            //    options.WaitForJobsToComplete = true;
-            //});
+                    .WithCronSchedule("0 0 * * * ?")
+                    .WithDescription("My regular trial work trigger")
+                );
+            });
+
+            // ASP.NET Core hosting
+            services.AddQuartzHostedService(options =>
+            {
+                // when shutting down we want jobs to complete gracefully
+                options.WaitForJobsToComplete = true;
+            });
 
         }
     }

IRaCIS.Core.API/appsettings.CenterImageDev.json

@@ -0,0 +1,35 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ConnectionStrings": {
+    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=CenterImage_Test;User ID=sa;Password=dev123456DEV;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.Development.json

@@ -7,10 +7,17 @@
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_New_Tet;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true",
+    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Test.IRC;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true",
     "Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Hangfire_IRaCIS;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true"
 
   },
+
+  "AliyunOSS": {
+    "endpoint": "https://zyypacs-code.oss-cn-shanghai.aliyuncs.com",
+    "accessKeyId": "mpXG7Nu6zTpsDrI1",
+    "accessKeySecret": "yNINcEb099SkNfF6vYKaoP8TZNI3xZ",
+    "bucketName": "zyypacs-code"
+  },
   "BasicSystemConfig": {
 
     "OpenUserComplexPassword": false,
@@ -19,7 +26,11 @@
 
     "OpenTrialRelationDelete": true,
 
-    "OpenLoginLimit": false
+    "OpenLoginLimit": false,
+
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes":1
   },
 
   "SystemEmailSendConfig": {

IRaCIS.Core.API/appsettings.Production.json

@@ -17,7 +17,10 @@
 
     "OpenSignDocumentBeforeWork": true,
 
-    "OpenLoginLimit": true
+    "OpenLoginLimit": true,
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes": 30
   },
   //"SystemEmailSendConfig": {
   //  "Port": 465,

IRaCIS.Core.API/appsettings.Staging.json

@@ -16,7 +16,10 @@
 
     "OpenSignDocumentBeforeWork": true,
 
-    "OpenLoginLimit": true
+    "OpenLoginLimit": true,
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes": 30
 
   },
   "SystemEmailSendConfig": {

IRaCIS.Core.API/appsettings.USDemo.json

@@ -19,7 +19,11 @@
 
     "OpenTrialRelationDelete": true,
 
-    "OpenLoginLimit": false
+    "OpenLoginLimit": false,
+
+    "LoginMaxFailCount": 5,
+
+    "LoginFailLockMinutes": 30
   },
 
   "SystemEmailSendConfig": {

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

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

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

@@ -4,35 +4,35 @@
     <meta charset='UTF-8'>
     <title>Title</title>
 </head>
-<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
-    <div style='padding-left: 40px;background: #f6f6f6'>
+<body style='font-family: Times New Roman;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6;font-size: 16px'>
         <div style='padding-top: 20px;'>
-            <div style='line-height: 40px;font-size: 18px'>
+            <div style='line-height: 40px;font-size: 16px'>
                 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:
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                Extensive Imaging has generated a user account for you. <br>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 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;font-size: 16px'>              
                 <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：
-                    <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;'>
-                        Initialize the account information
+                    Before logging in for the first time, please initialize your account information through this link:
+                    <a href='{3}' style='margin-left:30px;font-size:12px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;font-size: 16px'>
+                        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 style="font-size: 14px;">Shanghai Extensive Imaging Medical Technology Co., LTD</div>
+            <div style='line-height: 24px;font-size: 16px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 16px;">Extensive Imaging</div>
             </div>
         </div>
     </div>

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

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

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

@@ -4,19 +4,19 @@
     <meta charset='UTF-8'>
     <title>Title</title>
 </head>
-<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
-    <div style='padding-left: 40px;background: #f6f6f6'>
+<body style='font-family: Times New Roman;padding: 0;margin: 0;'>
+    <div style='padding-left: 40px;background: #f6f6f6;font-size: 16px'>
         <div style='padding-top: 20px;'>
-            <div style='line-height: 40px;font-size: 18px'>
+            <div style='line-height: 40px;font-size: 16px'>
                 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:
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                Extensive Imaging has reset your password.<br>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 style='border: 1px solid #eee;box-sizing:border-box;width: 50%;background: #fff;padding: 20px;line-height: 40px;font-size: 12px;border-radius: 5px;margin-left: 60px;margin-bottom: 30px;font-size: 16px'>
                 <div>
-                    User name: {1}
+                    User ID: {1}
                 </div>
                 <div>
                     Role: {2}
@@ -27,9 +27,9 @@
             </div>
 
 
-            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>Best Regards</div>
-                <div style="font-size: 14px;">Shanghai Extensive Imaging Medical Technology Co., LTD</div>
+            <div style='line-height: 24px;font-size: 16px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 16px;">Extensive Imaging</div>
             </div>
         </div>
     </div>

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

@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html lang='en'>
-<head>
-    <meta charset='UTF-8'>
-    <title>Title</title>
-</head>
-<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
-    <div style='padding-left: 40px;background: #f6f6f6'>
-        <div style='padding-top: 20px;'>
-            <div style='line-height: 40px;font-size: 18px'>
-               您好：
-            </div>
-            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                感谢您使用展影云平台。
-            </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 style="font-size: 14px;">上海展影医疗科技有限公司</div>
-            </div>
-        </div>
-    </div>
-</body>
-</html>

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

@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html lang='en'>
-<head>
-    <meta charset='UTF-8'>
-    <title>Title</title>
-</head>
-<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
-    <div style='padding-left: 40px;background: #f6f6f6'>
-        <div style='padding-top: 20px;'>
-            <div style='line-height: 40px;font-size: 18px'>
-                Dear：
-            </div>
-            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Thank you for using Extensive Imaging 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 style="font-size: 14px;">Shanghai Extensive Imaging Medical Technology Co., LTD</div>
-            </div>
-        </div>
-    </div>
-</body>
-</html>

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

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

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

@@ -4,22 +4,22 @@
     <meta charset='UTF-8'>
     <title>Title</title>
 </head>
-<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
-    <div style='padding-left: 40px;background: #f6f6f6'>
+<body style='font-family: Times New Roman;padding: 0;margin: 0;font-size: 16px'>
+    <div style='padding-left: 40px;background: #f6f6f6;font-size: 16px'>
         <div style='padding-top: 20px;'>
-            <div style='line-height: 40px;font-size: 18px'>
-                Dear：
+            <div style='line-height: 40px;font-size: 16px'>
+                Dear Sir or Madam:
             </div>
-            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Thank you for using Extensive Imaging Cloud System.
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                Thank you for using our IRC imaging system.
             </div>
-            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
                 {0}。
             </div>
 
-            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>Best Regards</div>
-                <div style="font-size: 14px;">Shanghai Extensive Imaging Medical Technology Co., LTD</div>
+            <div style='line-height: 24px;font-size: 16px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 16px;">Extensive Imaging</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 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作，欢迎您提供指导和建议，非常感谢！
+                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC阅片相关工作。
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 该项目采用电子化工作流，系统及您的账号信息如下：
@@ -41,7 +41,7 @@
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
                 <div>祝您顺利！/Best Regards</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">展影医疗</div>
             </div>
         </div>
     </div>

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

@@ -4,20 +4,20 @@
     <meta charset='UTF-8'>
     <title>Title</title>
 </head>
-<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+<body style='font-family: Times New Roman;padding: 0;margin: 0;'>
     <div style='padding-left: 40px;background: #f6f6f6'>
         <div style='padding-top: 20px;'>
-            <div style='line-height: 40px;font-size: 18px'>
+            <div style='line-height: 40px;font-size: 16px'>
                 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.
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                As the IRC service provider of {1} trial（Protocol ID is {2}）, Extensive Imaging invites you to participate in the independent assessment work of this trial.
             </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：
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                Digital workflow is implemented for this trial, and 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;'>
+            <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;font-size: 16px'>
                 <div>
                     Trial ID: {3}
                 </div>
@@ -25,23 +25,22 @@
                     Protocol ID: {2}
                 </div>
                 <div>
-                    Study name: {1}
+                    Study Name: {1}
                 </div>
                 <div>
-                    User name: {4}
+                    User Name: {4}
                 </div>
                 <div>
                     Role: {5}
                 </div>
                 <div>
-                    System login address:{6}
+                    Login URL: {6}
                 </div>
             </div>
 
-
-            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>Best Regards</div>
-                <div style="font-size: 14px;">Shanghai Extensive Imaging Medical Technology Co., LTD</div>
+            <div style='line-height: 24px;font-size: 16px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 16px;">Extensive Imaging</div>
             </div>
         </div>
     </div>

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

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

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

@@ -4,20 +4,21 @@
     <meta charset='UTF-8'>
     <title>Title</title>
 </head>
-<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+<body style='font-family: Times New Roman;padding: 0;margin: 0;'>
     <div style='padding-left: 40px;background: #f6f6f6'>
         <div style='padding-top: 20px;'>
-            <div style='line-height: 40px;font-size: 18px'>
+            <div style='line-height: 40px;font-size: 16px'>
                 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.
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                As the IRC service provider of {1}trial (Protocol ID is {2}), Extensive Imaging invites you to participate in the independent assessment work of this trial. 
             </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：
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                Digital workflow is implemented for this trial, and 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;'>
+            <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;font-size: 16px'>
                 <div>
                     Trial ID: {3}
                 </div>
@@ -25,26 +26,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：
-                    <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;'>
-                        Initialize the account information
+                    Before logging in for the first time, please modify your account information through this link:
+                    <a href='{6}' style='margin-left:30px;font-size:16px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                        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 style="font-size: 14px;">Shanghai Extensive Imaging Medical Technology Co., LTD</div>
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;font-size: 16px'>
+                <div>Best regards,</div>
+                <div style="font-size: 16px;">Extensive Imaging</div>
             </div>
         </div>
     </div>

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

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

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

@@ -4,17 +4,17 @@
     <meta charset='UTF-8'>
     <title>Title</title>
 </head>
-<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
-    <div style='padding-left: 40px;background: #f6f6f6'>
-        <div style='padding-top: 20px;'>
-            <div style='line-height: 40px;font-size: 18px'>
+<body style='font-family: Times New Roman;padding: 0;margin: 0;font-size: 16px'>
+    <div style='padding-left: 40px;background: #f6f6f6;font-size: 16px'>
+        <div style='padding-top: 20px;font-size: 16px'>
+            <div style='line-height: 40px;font-size: 16px'>
                 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：
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                The site survey questionnaire you filled in has been rejected. 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;'>
+            <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;font-size: 16px'>
                 <div>
                     Trial ID: {1}
                 </div>
@@ -22,26 +22,26 @@
                     Protocol ID: {2}
                 </div>
                 <div>
-                    Study name: {3}
+                    Study Name: {3}
                 </div>
                 <div>
                     Site ID: {4}
                 </div>
                 <div>
-                    Site name: {5}
+                    Site Name: {5}
                 </div>
                 <div>
                     Reason for rejection: {6}
                 </div>
 
             </div>
-            <a href='{7}' style='margin-left:60px;font-size:14px;padding: 10px;text-decoration: none;display:{8} ;height: 40px;width: 140px;background: #00D1B2;color:#fff;border-radius: 5px;line-height: 40px;text-align: center;margin-bottom: 100px;'>
-                Login and view
+            <a href='{7}' style='margin-left:60px;font-size:16px;padding: 10px;text-decoration: none;display:{8} ;height: 40px;width: 140px;background: #00D1B2;color:#fff;border-radius: 5px;line-height: 40px;text-align: center;margin-bottom: 100px;font-size: 16px'>
+                Login & View
             </a>
 
-            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>Best Regards</div>
-                <div style="font-size: 14px;">Shanghai Extensive Imaging Medical Technology Co., LTD</div>
+            <div style='line-height: 24px;font-size: 16px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 16px;">Extensive Imaging</div>
             </div>
         </div>
     </div>

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

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

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

@@ -4,20 +4,20 @@
     <meta charset='UTF-8'>
     <title>Title</title>
 </head>
-<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
-    <div style='padding-left: 40px;background: #f6f6f6'>
-        <div style='padding-top: 20px;'>
-            <div style='line-height: 40px;font-size: 18px'>
+<body style='font-family: Times New Roman;padding: 0;margin: 0;font-size: 16px'>
+    <div style='padding-left: 40px;background: #f6f6f6;font-size: 16px'>
+        <div style='padding-top: 20px;font-size: 16px'>
+            <div style='line-height: 40px;font-size: 16px'>
                 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.
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                As the IRC service provider of {1} trial (Protocol ID is {2}), Extensive Imaging invites you to participate in IRC-related work of this trial.
             </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：
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                Digital workflow is implemented for this trial, and 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;'>
+            <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;font-size: 16px'>
                 <div>
                     Trial ID: {3}
                 </div>
@@ -25,23 +25,23 @@
                     Protocol ID: {2}
                 </div>
                 <div>
-                    Study name: {1}
+                    Study Name: {1}
                 </div>
                 <div>
-                    User name: {4}
+                    User Name: {4}
                 </div>
                 <div>
                     Role: {5}
                 </div>
                 <div>
-                    System login address:{6}
+                    Login URL: {6}
                 </div>
             </div>
 
 
-            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>Best Regards</div>
-                <div style="font-size: 14px;">Shanghai Extensive Imaging Medical Technology Co., LTD</div>
+            <div style='line-height: 24px;font-size: 16px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 16px;">Extensive Imaging</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相关工作，欢迎您提供指导和建议，非常感谢！
+                展影医疗作为 [{1}   (试验方案号：{2 })] 项目的IRC供应商，诚邀您参加该项目IRC相关工作。
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 该项目采用电子化工作流，系统及您的账号信息如下：
@@ -44,7 +44,7 @@
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
                 <div>祝您顺利！/Best Regards</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">展影医疗</div>
             </div>
         </div>
     </div>

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

@@ -4,20 +4,20 @@
     <meta charset='UTF-8'>
     <title>Title</title>
 </head>
-<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+<body style='font-family: Times New Roman;padding: 0;margin: 0;font-size: 16px'>
     <div style='padding-left: 40px;background: #f6f6f6'>
         <div style='padding-top: 20px;'>
-            <div style='line-height: 40px;font-size: 18px'>
+            <div style='line-height: 40px;font-size: 16px'>
                 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.
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                As the IRC service provider of {1} trial (Protocol ID is {2}), Extensive Imaging invites you to participate in IRC-related work of this trial.
             </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：
+                Digital workflow is implemented for this trial, and 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;'>
+            <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;font-size: 16px'>
                 <div>
                     Trial ID: {3}
                 </div>
@@ -25,26 +25,26 @@
                     Protocol ID: {2}
                 </div>
                 <div>
-                    Study name: {1}
+                    Study Name: {1}
                 </div>
                 <div>
-                    User name: {4}
+                    User Name: {4}
                 </div>
                 <div>
                     Role: {5}
                 </div>
                 <div>
-                    Before logging in for the first time, please modify your account information by 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;'>
-                        Initialize the account information
+                    Before logging in for the first time, please modify your account information through this link:
+                    <a href='{6}' style='margin-left:30px;font-size:16px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                        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 style="font-size: 14px;">Shanghai Extensive Imaging Medical Technology Co., LTD</div>
+            <div style='line-height: 24px;font-size: 16px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
+                <div>Best regards,</div>
+                <div style="font-size: 16px;">Extensive Imaging</div>
             </div>
         </div>
     </div>

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

@@ -8,18 +8,18 @@
     <div style='padding-left: 40px;background: #f6f6f6'>
         <div style='padding-top: 20px;'>
             <div style='line-height: 40px;font-size: 18px'>
-                Dear  {0},
+             亲爱的用户 ,
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
                 感谢您使用展影云平台。
             </div>
             <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-              {1}，验证码是: {2}，请在3分钟内输入该验证码，进行后续操作。如非本人操作，请忽略该邮件。
+              {0}，验证码是: {1}，请在3分钟内输入该验证码，进行后续操作。如非本人操作，请忽略该邮件。
             </div>
 
             <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
                 <div>祝您顺利！/Best Regards</div>
-                <div style="font-size: 14px;">上海展影医疗科技有限公司</div>
+                <div style="font-size: 14px;">展影医疗</div>
             </div>
         </div>
     </div>

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

@@ -4,23 +4,25 @@
     <meta charset='UTF-8'>
     <title>Title</title>
 </head>
-<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
+<body style='font-family: Times New Roman;padding: 0;margin: 0;'>
     <div style='padding-left: 40px;background: #f6f6f6'>
         <div style='padding-top: 20px;'>
-            <div style='line-height: 40px;font-size: 18px'>
-                Dear {0},
+            <div style='line-height: 40px;font-size: 16px'>
+                Dear Sir or Madam:
             </div>
-            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                Thank you for using Extensive Imaging Cloud System.
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                Thank you for using our IRC imaging system.
             </div>
-            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;'>
-                {1}, the verification code is {2}. Enter the verification code within 3 minutes for subsequent operations. Please ignore this email if not by yourself.
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                {0}, the verification code is {1}. Please enter this code within 3 minutes for follow-up operations.
+            </div>
+            <div style='line-height: 40px;padding-left: 40px;margin-bottom: 10px;font-size: 16px'>
+                If you are not the intended person, please ignore this email.
             </div>
 
-
-            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;'>
-                <div>Best Regards</div>
-                <div style="font-size: 14px;">Shanghai Extensive Imaging Medical Technology Co., LTD</div>
+            <div style='line-height: 24px;font-size: 14px;color:#333;margin-top: 20px;padding-bottom: 40px;font-size: 16px'>
+                <div>Best regards,</div>
+                <div style="font-size: 16px;">Extensive Imaging</div>
             </div>
         </div>
     </div>

IRaCIS.Core.API/wwwroot/swagger/ui/abp.swagger.js

@@ -276,8 +276,10 @@ var abp = abp || {};
         }
 
         var password = document.getElementById('password').value;
-        if (!password) {
-            alert('PassWord Can Not Be Null');
+        var pwdMd5 = document.getElementById('pwdMd5').value;
+        console.log(pwdMd5);
+        if (!password && !pwdMd5) {
+            alert('PassWord And Md5 Can Not Be Null');
             return false;
         }
 
@@ -321,6 +323,9 @@ var abp = abp || {};
             UserName: usernameOrEmailAddress,
             Password: hex_md5(password),
         }
+        if (pwdMd5 != '') {
+            parm.Password = pwdMd5;
+        }
         xhr.send(JSON.stringify(parm));
         //xhr.send("{" + "userName:'" + usernameOrEmailAddress + "'," + "passWord:'" + password + "'}");
 
@@ -414,8 +419,9 @@ var abp = abp || {};
 
         //Inputs
         createInput(modalUxContent, 'tenancyName', 'Tenancy Name (Leave empty for Host)');
-        createInput(modalUxContent, 'userName', 'Username or email address','text','admin');
-        createInput(modalUxContent, 'password', 'Password','password');
+        createInput(modalUxContent, 'userName', 'Username or email address','text','cyldev');
+        createInput(modalUxContent, 'password', 'Password', 'password', '123456');
+        createInput(modalUxContent, 'pwdMd5', 'PwdMd5', 'text', '');
 
         //Buttons
         var authBtnWrapper = document.createElement('div');

IRaCIS.Core.Application/BackGroundJob/CacheTrialStatusQuartZJob.cs

@@ -7,6 +7,7 @@ using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Domain.Models;
 using Microsoft.Extensions.Logging;
 using Quartz;
+using IRaCIS.Core.Domain.Share;
 
 namespace IRaCIS.Application.Services.BackGroundJob
 {
@@ -17,24 +18,25 @@ namespace IRaCIS.Application.Services.BackGroundJob
         private readonly IRepository<Trial> _trialRepository;
         private readonly IEasyCachingProvider _provider;
         private readonly ILogger<CacheTrialStatusQuartZJob> _logger;
+        private readonly IRepository<SystemAnonymization> _systemAnonymizationRepository;
 
-        public CacheTrialStatusQuartZJob(IRepository<Trial> trialRepository, IEasyCachingProvider provider,ILogger<CacheTrialStatusQuartZJob> logger)
+        public CacheTrialStatusQuartZJob(IRepository<Trial> trialRepository, IEasyCachingProvider provider,ILogger<CacheTrialStatusQuartZJob> logger, IRepository<SystemAnonymization> systemAnonymizationRepository)
         {
             _trialRepository = trialRepository;
             _provider = provider;
             _logger = logger;
+            _systemAnonymizationRepository = systemAnonymizationRepository;
         }
 
-        public Task Execute(IJobExecutionContext context)
+        public async Task Execute(IJobExecutionContext context)
         
         {
             _logger.LogInformation($"开始执行QuartZ定时任务作业");
             try
             {
-                var list = _trialRepository.Select(t => new { TrialId = t.Id, TrialStatusStr = t.TrialStatusStr })
-                    .ToList();
+                await MemoryCacheTrialStatus();
 
-                list.ForEach(t => _provider.Set(t.TrialId.ToString(), t.TrialStatusStr, TimeSpan.FromDays(1)));
+                await MemoryCacheAnonymizeData();
 
             }
             catch (Exception e)
@@ -42,10 +44,28 @@ namespace IRaCIS.Application.Services.BackGroundJob
                 _logger.LogError($" 查询和缓存过程出现异常"+e.Message);
             }
             _logger.LogInformation("QuartZ定时任务作业结束");
-            return Task.CompletedTask;
         }
 
 
+        public async Task MemoryCacheTrialStatus()
+        {
+            var list = await _trialRepository.Select(t => new { TrialId = t.Id, TrialStatusStr = t.TrialStatusStr })
+                  .ToListAsync();
+
+            list.ForEach(t => _provider.Set(t.TrialId.ToString(), t.TrialStatusStr, TimeSpan.FromDays(7)));
+
+        }
+
+        public async Task MemoryCacheAnonymizeData()
+        {
+            var systemAnonymizationList = await _systemAnonymizationRepository.Where(t => t.IsEnable).ToListAsync();
+
+            _provider.Set(StaticData.Anonymize.Anonymize_AddFixedFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed).ToList(), TimeSpan.FromDays(7));
+            _provider.Set(StaticData.Anonymize.Anonymize_AddIRCInfoFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed == false).ToList(), TimeSpan.FromDays(7));
+            _provider.Set(StaticData.Anonymize.Anonymize_FixedField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed).ToList(), TimeSpan.FromDays(7));
+            _provider.Set(StaticData.Anonymize.Anonymize_IRCInfoField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed == false).ToList(), TimeSpan.FromDays(7));
+        }
+
 
 
     }

IRaCIS.Core.Application/BusinessFilter/LimitUserRequestAuthorization.cs

@@ -1,8 +1,11 @@
 using EasyCaching.Core;
 using IRaCIS.Core.Domain.Share;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
@@ -11,9 +14,9 @@ namespace IRaCIS.Core.Application.Filter;
 
 
 
-public class LimitUserRequestAuthorization :BaseService, IAsyncAuthorizationFilter
+public class LimitUserRequestAuthorization : IAsyncAuthorizationFilter
 {
-
+    public IStringLocalizer _localizer { get; set; }
 
     private readonly IEasyCachingProvider _provider;
 
@@ -21,11 +24,12 @@ public class LimitUserRequestAuthorization :BaseService, IAsyncAuthorizationFilt
 
     private readonly IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig;
 
-    public LimitUserRequestAuthorization(IEasyCachingProvider provider, IUserInfo userInfo, IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig)
+    public LimitUserRequestAuthorization(IEasyCachingProvider provider, IUserInfo userInfo, IStringLocalizer localizer ,IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig)
     {
         _provider = provider;
         _userInfo = userInfo;
         _verifyConfig = verifyConfig;
+        _localizer = localizer;
     }
 
 
@@ -43,15 +47,15 @@ public class LimitUserRequestAuthorization :BaseService, IAsyncAuthorizationFilt
             {
                 //1、用户登陆的时候，设置缓存
 
-
-
                 //没有从请求中取到token
                 if (string.IsNullOrWhiteSpace(_userInfo.UserToken))
                 {
                     context.HttpContext.Response.ContentType = "application/json";
                     context.HttpContext.Response.StatusCode = StatusCodes.Status200OK;
                 //---当前请求未从Header/Url取到用户Token,请联系开发者
-                    await context.HttpContext.Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk(_localizer["LimitUser_AuthTokenMissing"])));
+                    //await context.HttpContext.Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk(_localizer["LimitUser_AuthTokenMissing"])));
+
+                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["LimitUser_AuthTokenMissing"]));
                 }
 
                 //2、在这里取缓存  进行比较  看是否有其他人进行了登陆，如果其他人登陆了，就把之前用户挤掉
@@ -77,8 +81,13 @@ public class LimitUserRequestAuthorization :BaseService, IAsyncAuthorizationFilt
 
                     context.HttpContext.Response.ContentType = "application/json";
                     context.HttpContext.Response.StatusCode = StatusCodes.Status403Forbidden;
-                //---您的账户在其他地方已登陆，您被迫下线。
-                    await context.HttpContext.Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk(_localizer["LimitUser_AccountLoggedInElsewhere"], ApiResponseCodeEnum.LoginInOtherPlace)));
+                    //---您的账户在其他地方已登陆，您被迫下线。
+
+
+                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["LimitUser_AccountLoggedInElsewhere"], ApiResponseCodeEnum.LoginInOtherPlace));
+                        
+
+                    //await context.HttpContext.Response.WriteAsync(JsonConvert.SerializeObject(ResponseOutput.NotOk(_localizer["LimitUser_AccountLoggedInElsewhere"], ApiResponseCodeEnum.LoginInOtherPlace)));
 
                 }
 

IRaCIS.Core.Application/BusinessFilter/ModelActionFilter .cs

@@ -11,6 +11,12 @@ namespace IRaCIS.Core.Application.Filter
 
     public class ModelActionFilter : ActionFilterAttribute, IActionFilter
     {
+		public IStringLocalizer _localizer;
+		public ModelActionFilter(IStringLocalizer localizer)
+        {
+			_localizer = localizer;
+		}
+
 		public override void OnActionExecuting(ActionExecutingContext context)
 		{
             if (!context.ModelState.IsValid)
@@ -23,7 +29,7 @@ namespace IRaCIS.Core.Application.Filter
                                               .ToArray();
      
                 //---提供给接口的参数无效。
-                context.Result = new JsonResult(ResponseOutput.NotOk("Invalid parameters provided for the API." + JsonConvert.SerializeObject( validationErrors)));
+                context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["ModelAction_InvalidAPIParameter"] + JsonConvert.SerializeObject( validationErrors)));
             }
         }
     }

IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs

@@ -2,6 +2,7 @@
 using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 
 namespace IRaCIS.Core.Application.Filter
@@ -10,10 +11,13 @@ namespace IRaCIS.Core.Application.Filter
     {
         private readonly ILogger<ProjectExceptionFilter> _logger;
 
-        public ProjectExceptionFilter(ILogger<ProjectExceptionFilter> logger)
+		public IStringLocalizer _localizer;
+
+		public ProjectExceptionFilter(IStringLocalizer localizer, ILogger<ProjectExceptionFilter> logger)
         {
             _logger = logger;
-        }
+			_localizer = localizer;
+		}
         public void OnException(ExceptionContext context)
         {
             //context.ExceptionHandled;//记录当前这个异常是否已经被处理过了
@@ -23,7 +27,7 @@ namespace IRaCIS.Core.Application.Filter
                 if (context.Exception.GetType().Name == "DbUpdateConcurrencyException")
                 {
                 //---并发更新，当前不允许该操作
-                    context.Result = new JsonResult(ResponseOutput.NotOk("Concurrent update, operation not allowed at this time." + context.Exception.Message));
+                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["ProjectException_ConcurrentUpdateNotAllowed"] + context.Exception.Message));
                 }
 
                 if (context.Exception.GetType() == typeof(BusinessValidationFailedException))
@@ -36,7 +40,7 @@ namespace IRaCIS.Core.Application.Filter
                 }
                 else
                 {
-                    context.Result = new JsonResult(ResponseOutput.NotOk("程序异常，请联系开发人员。" + (context.Exception.InnerException is null ? (context.Exception.Message /*+ context.Exception.StackTrace*/)
+                    context.Result = new JsonResult(ResponseOutput.NotOk(_localizer["Project_ExceptionContactDeveloper"] + (context.Exception.InnerException is null ? (context.Exception.Message /*+ context.Exception.StackTrace*/)
                         : (context.Exception.InnerException?.Message /*+ context.Exception.InnerException?.StackTrace*/)), ApiResponseCodeEnum.ProgramException));
                 }
 

IRaCIS.Core.Application/Helper/ExcelExportHelper.cs

@@ -1,7 +1,11 @@
 using DocumentFormat.OpenXml.Drawing.Diagrams;
+using DocumentFormat.OpenXml.Spreadsheet;
+using DocumentFormat.OpenXml.Wordprocessing;
+using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Domain.Share;
+using Magicodes.ExporterAndImporter.Excel;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using MiniExcelLibs;
@@ -9,17 +13,22 @@ using MiniExcelLibs.OpenXml;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NPOI.HSSF.UserModel;
+using NPOI.XSSF.UserModel;
+using SkiaSharp;
+using System.IO;
 
 namespace IRaCIS.Core.Application.Service;
 
 public static class ExcelExportHelper
 {
     //MiniExcel_Export
-    public static async Task<IActionResult> DataExportAsync(string code, object data, string exportFileNamePrefix, IRepository<CommonDocument> _commonDocumentRepository, IWebHostEnvironment _hostEnvironment, IDictionaryService? _dictionaryService = null, Type? translateType = null, CriterionType? criterionType = null)
+    public static async Task<IActionResult> DataExportAsync(string code, ExcelExportInfo data, string exportFileNamePrefix, IRepository<CommonDocument> _commonDocumentRepository, IWebHostEnvironment _hostEnvironment, IDictionaryService? _dictionaryService = null, Type? translateType = null, CriterionType? criterionType = null)
     {
 
         //判断是否有字典翻译
 
+        object translateData = data;
+
         if (_dictionaryService != null && translateType != null)
         {
 
@@ -32,7 +41,7 @@ public static class ExcelExportHelper
             var needTranslatePropertyList = translateType.GetProperties().Where(t => t.IsDefined(typeof(DictionaryTranslateAttribute), true))
                 .SelectMany(c =>
                 c.GetCustomAttributes(typeof(DictionaryTranslateAttribute), false).Select(f => (DictionaryTranslateAttribute?)f).Where(t => t?.CriterionType == criterionType || t?.CriterionType == null)
-                .Select(k => new { c.Name, k.DicParentCode ,k.IsTranslateDenpendOtherProperty, k.DependPropertyName,k.DependPropertyValueStr})
+                .Select(k => new { c.Name, k.DicParentCode, k.IsTranslateDenpendOtherProperty, k.DependPropertyName, k.DependPropertyValueStr })
                 ).ToList();
 
 
@@ -61,13 +70,13 @@ public static class ExcelExportHelper
                         foreach (var needTranslateProperty in needTranslatePropertyList)
                         {
                             //翻译的属性依赖其他属性
-                            if(needTranslateProperty.IsTranslateDenpendOtherProperty) 
+                            if (needTranslateProperty.IsTranslateDenpendOtherProperty)
                             {
                                 if (item[needTranslateProperty.DependPropertyName]?.ToString().ToLower() == needTranslateProperty.DependPropertyValueStr.ToLower())
                                 {
                                     var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
 
-                                    itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).FirstOrDefault()?.ValueCN ?? String.Empty;
+                                    itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t=>data.IsEn_US?t.Value:t.ValueCN).FirstOrDefault() ?? String.Empty;
                                 }
                             }
                             //普通翻译 或者某一标准翻译
@@ -76,7 +85,7 @@ public static class ExcelExportHelper
                                 var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
 
 
-                                itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).FirstOrDefault()?.ValueCN ?? String.Empty;
+                                itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => data.IsEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
                             }
 
 
@@ -89,14 +98,15 @@ public static class ExcelExportHelper
                         newObjList.Add(itemDic);
                     }
 
-                    dic[key] =  newObjList ;
+                    dic[key] = newObjList;
 
                 }
             }
 
 
-            data = dic;
+            //data = dic;
 
+            translateData = dic;
 
         }
 
@@ -110,22 +120,65 @@ public static class ExcelExportHelper
         //模板路径
         var tplPath = physicalPath;
 
+        #region 根据中英文  删除模板sheet
+
+        // 打开模板文件
+        var templateFile = new FileStream(tplPath, FileMode.Open, FileAccess.Read);
+
+        // 获取文件流
+        var templateStream = new MemoryStream();
+        templateFile.CopyTo(templateStream);
+        templateStream.Seek(0, SeekOrigin.Begin);
+
+        var workbook = new XSSFWorkbook(templateStream);
+
+        int sheetCount = workbook.NumberOfSheets;
+
+        if (sheetCount == 2)
+        {
+            if (data.IsEn_US)
+            {
+                workbook.RemoveSheetAt(0);
+            }
+            else
+            {
+                workbook.RemoveSheetAt(1);
+            }
+
+            var memoryStream2 = new MemoryStream();
+            workbook.Write(memoryStream2);
+
+            memoryStream2.Seek(0, SeekOrigin.Begin);
+
+            templateStream = memoryStream2;
+        }
+
+        // 文件名称 从sheet里面取
+        fileNmae = workbook.GetSheetName(0);
+        #endregion
+
+
+
+
+
+
         #region MiniExcel
 
-        var memoryStream = new MemoryStream();
+       var memoryStream = new MemoryStream();
 
         var config = new OpenXmlConfiguration()
         {
             IgnoreTemplateParameterMissing = true,
         };
 
-        await MiniExcel.SaveAsByTemplateAsync(memoryStream, tplPath, data, config);
+        await MiniExcel.SaveAsByTemplateAsync(memoryStream, templateStream.ToArray(), translateData, config);
 
         memoryStream.Seek(0, SeekOrigin.Begin);
 
+
         return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
         {
-            FileDownloadName = $"{exportFileNamePrefix}_{fileNmae.Substring(0, fileNmae.LastIndexOf('.'))}_{DateTime.Now.ToString("yyyyMMddHHmmss")}.xlsx"
+            FileDownloadName = $"{exportFileNamePrefix}_{fileNmae/*.Substring(0, fileNmae.LastIndexOf('.'))*/}_{DateTime.Now.ToString("yyyyMMddHHmmss")}.xlsx"
         };
 
         #endregion
@@ -146,10 +199,12 @@ public static class ExcelExportHelper
 
 
 
-    public static async Task<(MemoryStream,string)> DataExport_NpoiTestAsync(string code, object data,  IRepository<CommonDocument> _commonDocumentRepository, IWebHostEnvironment _hostEnvironment, IDictionaryService? _dictionaryService = null, Type? translateType = null, CriterionType? criterionType = null)
+    public static async Task<(MemoryStream, string)> DataExport_NpoiTestAsync(string code, ExcelExportInfo data, IRepository<CommonDocument> _commonDocumentRepository, IWebHostEnvironment _hostEnvironment, IDictionaryService? _dictionaryService = null, Type? translateType = null, CriterionType? criterionType = null)
     {
         //判断是否有字典翻译
 
+        object translateData = data;
+
         if (_dictionaryService != null && translateType != null)
         {
 
@@ -197,7 +252,7 @@ public static class ExcelExportHelper
                                 {
                                     var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
 
-                                    itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).FirstOrDefault()?.ValueCN ?? String.Empty;
+                                    itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => data.IsEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
                                 }
                             }
                             //普通翻译 或者某一标准翻译
@@ -206,7 +261,7 @@ public static class ExcelExportHelper
                                 var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
 
 
-                                itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).FirstOrDefault()?.ValueCN ?? String.Empty;
+                                itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).Select(t => data.IsEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
                             }
 
 
@@ -223,8 +278,8 @@ public static class ExcelExportHelper
             }
 
 
-            data = dic;
-
+            //data = dic;
+            translateData = dic;
 
         }
 
@@ -235,6 +290,43 @@ public static class ExcelExportHelper
         //模板路径
         var tplPath = physicalPath;
 
+        #region 根据中英文  删除模板sheet
+
+        // 打开模板文件
+        var templateFile = new FileStream(tplPath, FileMode.Open, FileAccess.Read);
+
+        // 获取文件流
+        var templateStream = new MemoryStream();
+        templateFile.CopyTo(templateStream);
+        templateStream.Seek(0, SeekOrigin.Begin);
+
+        var workbook = new XSSFWorkbook(templateStream);
+
+        int sheetCount = workbook.NumberOfSheets;
+
+        if (sheetCount == 2)
+        {
+            if (data.IsEn_US)
+            {
+                workbook.RemoveSheetAt(0);
+            }
+            else
+            {
+                workbook.RemoveSheetAt(1);
+            }
+
+            var memoryStream2 = new MemoryStream();
+            workbook.Write(memoryStream2);
+
+            memoryStream2.Seek(0, SeekOrigin.Begin);
+
+            templateStream = memoryStream2;
+        }
+
+        // 文件名称 从sheet里面取
+        fileName = workbook.GetSheetName(0);
+        #endregion
+
         #region MiniExcel
 
         var memoryStream = new MemoryStream();
@@ -244,7 +336,7 @@ public static class ExcelExportHelper
             IgnoreTemplateParameterMissing = true,
         };
 
-        await MiniExcel.SaveAsByTemplateAsync(memoryStream, tplPath, data, config);
+        await MiniExcel.SaveAsByTemplateAsync(memoryStream, tplPath, translateData, config);
 
         memoryStream.Seek(0, SeekOrigin.Begin);
 

IRaCIS.Core.Application/Helper/FileStoreHelper.cs

@@ -1,8 +1,12 @@
 
 
+using Aliyun.OSS;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
+using Newtonsoft.Json.Linq;
+using System.Configuration;
 using System.Text.RegularExpressions;
 
 namespace IRaCIS.Core.Application.Helper;
@@ -10,6 +14,39 @@ namespace IRaCIS.Core.Application.Helper;
 public static class FileStoreHelper
 {
 
+    public static string UploadOOS(string filePath,string route)
+    {
+        var endpoint = ConfigurationManager.AppSettings["AliyunOSS:endpoint"];
+        // yourEndpoint填写Bucket所在地域对应的Endpoint。以华东1（杭州）为例，Endpoint填写为https://oss-cn-hangzhou.aliyuncs.com。
+      
+        // 阿里云账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM用户进行API访问或日常运维，请登录RAM控制台创建RAM用户。
+        var accessKeyId = ConfigurationManager.AppSettings["AliyunOSS:accessKeyId"];
+        var accessKeySecret = ConfigurationManager.AppSettings["AliyunOSS:accessKeySecret"];
+        // 填写Bucket名称，例如examplebucket。
+        var bucketName = ConfigurationManager.AppSettings["AliyunOSS:bucketName"];
+        // 填写Object完整路径，完整路径中不能包含Bucket名称，例如exampledir/exampleobject.txt。
+
+        var fileNameList = filePath.Split(',').ToList();
+        var fileName = fileNameList[fileNameList.Count() - 1];
+
+        var objectName = route+ fileName;
+        // 填写本地文件完整路径，例如D:\\localpath\\examplefile.txt。如果未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件。
+        var localFilename = filePath;
+        // 创建OSSClient实例。
+        var client = new OssClient(endpoint, accessKeyId, accessKeySecret);
+        try
+        {
+            // 上传文件。
+            var result = client.PutObject(bucketName, objectName, localFilename);
+          
+            return result.ETag;
+        }
+        catch (Exception ex)
+        {
+            throw new BusinessValidationFailedException("上传异常!");
+         
+        }
+    }
 
     //处理文件名  压缩包，或者目录类的  会带上相对路径
     public static (string TrustedFileNameForFileStorage, string RealName) GetStoreFileName(string fileName,bool isChangeToPdfFormat=false)
@@ -495,7 +532,12 @@ public static class FileStoreHelper
 
     public static (string PhysicalPath, string RelativePath) GetDicomInstanceFilePath(IWebHostEnvironment _hostEnvironment, Guid trialId, Guid siteId, Guid subjectId, Guid subjectVisitId, Guid studyId, Guid instanceId)
     {
-        var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
+        #region 切换存储前
+        //var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
+        #endregion
+        var rootPath = Path.Combine(FileStoreHelper.GetBestStoreDisk(_hostEnvironment), StaticData.Folder.IRaCISDataFolder) ;
+
+
 
         //加入访视层级  和Data
         var path = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(),
@@ -517,6 +559,62 @@ public static class FileStoreHelper
         return (physicalPath, relativePath);
     }
 
+    public static string GetBestStoreDisk(IWebHostEnvironment _hostEnvironment)
+    {
+
+        var json = File.ReadAllText( Path.Combine(_hostEnvironment.ContentRootPath, "appsettings.json"));
+
+        JObject jsonObject = JObject.Parse(json, new JsonLoadSettings() { CommentHandling = CommentHandling.Load });
+
+        int switchingRatio = 80;
+
+        try
+        {
+            switchingRatio = (int)jsonObject["IRaCISImageStore"]["SwitchingRatio"];
+        }
+        catch (Exception e)
+        {
+
+            //---解析Json文件配置出现问题
+            throw new BusinessValidationFailedException(StaticData.International("SysMon_JsonConfig")  + e.Message);
+        }
+
+        //默认存储的路径
+        var defaultStoreRootFolder = FileStoreHelper.GetIRaCISRootPath(_hostEnvironment);
+
+
+        DriveInfo defaultDrive = new DriveInfo(Path.GetPathRoot(defaultStoreRootFolder));
+
+        var drives = DriveInfo.GetDrives().Where(t => !t.Name.Contains("C") && !t.Name.Contains("c"))
+                        .Where(d => d.DriveType == DriveType.Fixed && d.IsReady)
+                        //剩余空间最多的
+                        .OrderByDescending(d => d.AvailableFreeSpace)
+
+                        //存储空间相同，则按照按照总空间从大到小排序
+                        .ThenByDescending(d => d.TotalSize - d.TotalFreeSpace);
+
+        var bestDrive = drives.FirstOrDefault();
+        var bestStoreRootFolder = string.Empty;
+
+        //仅仅只有C 盘
+        if (bestDrive == null || ((double)(defaultDrive.TotalSize - defaultDrive.TotalFreeSpace) / defaultDrive.TotalSize) * 100 < switchingRatio)
+        {
+            bestStoreRootFolder = defaultStoreRootFolder;
+        }
+        else
+        {
+            bestStoreRootFolder = Path.Combine(bestDrive?.RootDirectory.FullName, _hostEnvironment.EnvironmentName);
+        }
+
+        if (!Directory.Exists(bestStoreRootFolder))
+        {
+            Directory.CreateDirectory(bestStoreRootFolder);
+        }
+
+        return bestStoreRootFolder;
+
+    }
+
 
 
 

IRaCIS.Core.Application/Helper/InternationalizationHelper.cs

@@ -0,0 +1,179 @@
+using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infrastructure;
+using Microsoft.Extensions.Configuration;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static BeetleX.Redis.Commands.HSCAN;
+using static IRaCIS.Core.Application.Service.Common.SystemMonitor;
+
+namespace IRaCIS.Core.Application.Helper
+{
+    public static class InternationalizationHelper
+    {
+        public static string JsonFileFolder = Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources);
+
+        private static void VerifyFolder()
+        {
+            if (!Directory.Exists(JsonFileFolder) ||
+               !Directory.GetFiles(JsonFileFolder).Any(filePath => Path.GetExtension(filePath).Equals(".json", StringComparison.OrdinalIgnoreCase)))
+            {
+                throw new BusinessValidationFailedException("国际化Json文件目录有误");
+            }
+        }
+
+        public static async Task BatchAddJsonKeyValueAsync(List<BatchAddInternationalizationDto> batchAddDtos)
+        {
+            VerifyFolder();
+
+            var usJsonPath = Path.Combine(JsonFileFolder, StaticData.En_US_Json);
+            var cnJsonPath = Path.Combine(JsonFileFolder, StaticData.Zh_CN_Json);
+
+
+            //更新json 文件  同时更新内存缓存的数据
+            foreach (var filePath in new string[] { usJsonPath, cnJsonPath })
+            {
+                var json = await File.ReadAllTextAsync(filePath);
+
+                JObject jsonObject = JObject.Parse(json, new JsonLoadSettings() { CommentHandling = CommentHandling.Load });
+
+                // 添加或更新指定的键值对
+
+                if (filePath.Contains(StaticData.En_US_Json))
+                {
+                    foreach (var item in batchAddDtos)
+                    {
+                        jsonObject[item.Code] = item.Value;
+
+                        StaticData.En_US_Dic[item.Code] = item.Value;
+                    }                   
+                }
+                else
+                {
+                    foreach (var item in batchAddDtos)
+                    {
+                        jsonObject[item.Code] = item.Value;
+
+                        StaticData.Zh_CN_Dic[item.Code] = item.Value;
+                    }                      
+                }
+
+
+                await File.WriteAllTextAsync(filePath, jsonObject.ToString());
+
+            }
+        }
+
+        public static async Task AddOrUpdateJsonKeyValueAsync(string key, string value, string valueCN)
+        {
+
+            VerifyFolder();
+
+            var usJsonPath = Path.Combine(JsonFileFolder, StaticData.En_US_Json);
+            var cnJsonPath = Path.Combine(JsonFileFolder, StaticData.Zh_CN_Json);
+
+
+            //更新json 文件  同时更新内存缓存的数据
+            foreach (var filePath in new string[] { usJsonPath, cnJsonPath })
+            {
+                var json = await File.ReadAllTextAsync(filePath);
+
+                JObject jsonObject = JObject.Parse(json, new JsonLoadSettings() { CommentHandling = CommentHandling.Load });
+
+                // 添加或更新指定的键值对
+
+                if (filePath.Contains(StaticData.En_US_Json))
+                {
+                    jsonObject[key] = value;
+
+                    StaticData.En_US_Dic[key] = value;
+                }
+                else
+                {
+                    jsonObject[key] = valueCN;
+
+                    StaticData.Zh_CN_Dic[key] = valueCN;
+                }
+
+
+                await File.WriteAllTextAsync(filePath, jsonObject.ToString());
+
+            }
+
+        }
+
+        public static async Task InitInternationlizationDataAndWatchJsonFileAsync(IRepository _repository)
+        {
+            //查询数据库的数据
+            var toJsonList = await _repository.Where<Internationalization>(t => t.InternationalizationType == 1).Select(t => new
+            {
+                t.Code,
+                t.Value,
+                t.ValueCN
+            }).ToListAsync();
+
+            //组织成json 文件
+
+            var usJsonPath = Path.Combine(JsonFileFolder, StaticData.En_US_Json);
+            var cnJsonPath = Path.Combine(JsonFileFolder, StaticData.Zh_CN_Json);
+
+
+            //本地静态文件国际化需要
+            foreach (var tojsonItem in toJsonList)
+            {
+                StaticData.En_US_Dic[tojsonItem.Code] = tojsonItem.Value;
+                StaticData.Zh_CN_Dic[tojsonItem.Code] = tojsonItem.ValueCN;
+            }
+
+            File.WriteAllText(usJsonPath, JsonConvert.SerializeObject(StaticData.En_US_Dic));
+            File.WriteAllText(cnJsonPath, JsonConvert.SerializeObject(StaticData.Zh_CN_Dic));
+
+
+            //监测Json文件变更 实时刷新数据
+
+            WatchJsonFile(usJsonPath);
+            WatchJsonFile(cnJsonPath);
+
+        }
+
+        public static void WatchJsonFile(string filePath)
+        {
+            if (!File.Exists(filePath))
+            {
+                throw new BusinessValidationFailedException("国际化Json文件不存在");
+            }
+
+            FileSystemWatcher watcher = new FileSystemWatcher(Path.GetDirectoryName(filePath), Path.GetFileName(filePath));
+            watcher.Changed += (sender, e) => LoadJsonFile(filePath);
+            watcher.EnableRaisingEvents = true;
+
+        }
+
+
+        private static void LoadJsonFile(string filePath)
+        {
+
+            IConfigurationBuilder builder = new ConfigurationBuilder().AddJsonFile(filePath);
+
+            IConfigurationRoot enConfiguration = builder.Build();
+
+            foreach (IConfigurationSection section in enConfiguration.GetChildren())
+            {
+                if (filePath.Contains(StaticData.En_US_Json))
+                {
+                    StaticData.En_US_Dic[section.Key] = section.Value;
+
+                }
+                else
+                {
+                    StaticData.Zh_CN_Dic[section.Key] = section.Value;
+                }
+            }
+        }
+    }
+}

IRaCIS.Core.Application/Helper/SendEmailHelper.cs

@@ -33,6 +33,7 @@ public static class SendEmailHelper
 
                 await smtp.AuthenticateAsync(_systemEmailConfig.FromEmail, _systemEmailConfig.AuthorizationCode);
 
+
                 await smtp.SendAsync(messageToSend);
 
                 await smtp.DisconnectAsync(true);
@@ -42,13 +43,28 @@ public static class SendEmailHelper
         catch (Exception ex)
         {
 
-                //---邮件发送失败，您进行的操作未能成功，请检查邮箱或联系维护人员
+            //---邮件发送失败，您进行的操作未能成功，请检查邮箱或联系维护人员
             throw new Exception(StaticData.International("SendEmail_SendFail"));
         }
 
 
     }
 
+    public static async Task<bool> TestEmailConfigAsync(SystemEmailSendConfig _systemEmailConfig)
+    {
+        using (var client = new MailKit.Net.Smtp.SmtpClient())
+        {
+
+            await client.ConnectAsync(_systemEmailConfig.Host, _systemEmailConfig.Port, SecureSocketOptions.SslOnConnect);
+
+            await client.AuthenticateAsync(_systemEmailConfig.FromEmail, _systemEmailConfig.AuthorizationCode);
+
+            await client.DisconnectAsync(true);
+        }
+
+        return true;
+    }
+
     public static async Task SendEmailAsync(SMTPEmailConfig sMTPEmailConfig, EventHandler<MessageSentEventArgs>? messageSentSuccess = null)
     {
         var messageToSend = new MimeMessage();
@@ -63,7 +79,7 @@ public static class SendEmailHelper
 
         if (sMTPEmailConfig.ToMailAddressList.Count == 0)
         {
-                //---没有收件人
+            //---没有收件人
             throw new ArgumentException(StaticData.International("SendEmail_NoRecipient"));
         }
         else

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

@@ -63,6 +63,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />
 		<PackageReference Include="AutoMapper.Collection.EntityFrameworkCore" Version="9.0.0" />
 		<PackageReference Include="BeetleX.BNR" Version="1.0.1" />
 		<PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />

IRaCIS.Core.Application/Resources/en-US.json

@@ -2,38 +2,65 @@
   "test{0}{1}": "英文本地化{0}{1}",
   "RequiredAttribute": "{0} is required",
 
+  // ------------------------------------------------------------_ServiceExtensions--------------------------------------------------------------------
+  //ApiResponseHandler
+  "ApiResponse_NoAccess": "You do not have access to this API",
+  "ApiResponse_Permission": "You do not have permission to do this",
+
   // ------------------------------------------------------------Controllers--------------------------------------------------------------------
   //FinancialChangeController
   "Financial_ChargeSettled": "Expenses have been settled and workload can not be reset.",
   "Financial_InvalidParameter": "Invalid parameter.",
   //UploadDownLoadController
   "UploadDownLoad_UnsupportedMedia": "Unsupported media type.",
-  "UploadDownLoad_ArchiveInProgress": "Another user is uploading or archiving this inspection.",
+  "UploadDownLoad_ArchiveInProgress": "Another user is uploading or archiving this study.",
   "UploadDownLoad_InvalidData": "Please ensure that the uploaded data conforms to the style of the template file and contains valid data.",
-  "UploadDownLoad_RequestError": "Request error.",
+  "UploadDownLoad_RequestError": "Request error, please try again!",
   "UploadDownLoad_SupportedFormats": "Supports upload of .xlsx, .xls, and .csv formats.",
 
+  // ------------------------------------------------------------_MediatR--------------------------------------------------------------------
+  //ConsistencyVerificationRequest
+  "ConsistencyVerification_Tech": "Study Type",
+  "ConsistencyVerification_Time": "Incorrect time format",
+  //ConsistencyVerificationHandler
+  "ConsistencyVerification_Img": "Hello, according to the automatic recognition of this system, the imaging study submitted by the subject in the current visit in the IRC system is as follows:",
+  "ConsistencyVerification_Of": "Of",
+  "ConsistencyVerification_ImgC": "Imaging study",
+  "ConsistencyVerification_EDCA": "Check EDC data, completely consistent, approved",
+  "ConsistencyVerification_EDCB": "Check EDC data, completely consistent",
+  "ConsistencyVerification_Auto": "Automatically verified pass",
+  "ConsistencyVerification_Prob": "The following problems exist:",
+  "ConsistencyVerification_EdcL": "Image study (EDC missing)",
+  "ConsistencyVerification_IrcL": "Image study (IRC missing)",
+  "ConsistencyVerification_Desc": "Description: In order to efficiently solve all the above doubts, please verify the actual image study accurately. Please note that the image date may not be consistent with the actual study date, and multiple modalities of image studys (such as PET-CT) may exist at the same time. After accurate verification, please reply with the correct image study for this visit.",
+  "ConsistencyVerification_Conf": "According to the imported consistency check data, please confirm the following inconsistent inspection item information of this visit:",
+  "ConsistencyVerification_Edc": "EDC is lack of:",
+  "ConsistencyVerification_IrcLi": "IRC is lack of:",
+
   //-------------------------------------------------------------------------------------Reading-----------------------------------------------------------------
   //ClinicalDataSetService
-  "ClinicalDataSet_DupTypeFail": "There are duplicate clinical data of the same type. The operation failed.",
+  "ClinicalDataSet_Apply": "",
+  "ClinicalDataSet_DupTypeFail": "The same type of clinical data exists. The operation failed.",
+  //ClinicalQuestionService
+  "ClinicalQuestion_Repeat": "",
   //ReadingClinicalDataService
-  "ReadingClinicalData_DupTypeFail": "There are duplicate clinical data of the same type. The operation failed.",
+  "ReadingClinicalData_DupTypeFail": "The same type of clinical data exists. The operation failed.",
   "ReadingClinicalData_Unchecked": "The current clinical data status is not verified and signing is not allowed!",
   //ReadingGlobalTaskService
   "ReadingGlobal_NotGlobal": "System call error. The current read is not a global review read.",
   //ReadingImageTaskService
   "ReadingImage_NotVisit": "System call error. The current read is not a timepoint read.",
   "ReadingImage_CantSplit": "The current read is a baseline read, and lesion split is not allowed.",
-  "ReadingImage_BeSigned": "The current read has already been signed off. Please do not submit it again.",
+  "ReadingImage_BeSigned": "The current read has already been signed. Please do not submit it again.",
   "ReadingImage_Beinvalid": "The current read has already been invalidated, and reading is not allowed anymore.",
-  "ReadingImage_PresenceReview": "The current subject has a review request that has not been processed and is not allowed to operate",
-  "ReadingImage_NotaTask": "The coalesced lesions are not from the same timepoint. ",
+  "ReadingImage_PresenceReview": "The current subject has a re-read request that has not been processed and is not allowed to operate",
+  "ReadingImage_NotaTask": "The coalesced lesions are not from the same timepoint.",
   "ReadingImage_DeleteError": "Other lesions have split from or coalesced into the current lesion. Deletion failed.",
   "ReadingImage_Idnotcorrespond": "Failed to add the lesion mark. The Instance ID and Series ID of the image do not match.",
   "ReadingImage_IsLymphNotbigger": "The short diameter of this nodal non-target lesion on the current visit is smaller than the value on the previous visit, and the state cannot be set to 'Unequivocal progression'.",
   "ReadingImage_NotLymphNotbigger": "The long diameter of this non-nodal non-target lesion on the current visit is smaller than the value on the previous visit, and the state cannot be set to 'Unequivocal progression'.",
   "ReadingImage_Twice": "System call error. Questions & answers submitted are duplicated.",
-  "ReadingImage_MaxQuestion": "According to the imaging charter, the number of the current type of lesion cannot exceed {0}.",
+  "ReadingImage_MaxQuestion": "According to the imaging charter, the number of {0} cannot exceed {1}.",
   "ReadingImage_Maxlesion": "According to the imaging charter, the number of target lesions in the same organ cannot exceed {0}. Please confirm.",
   "ReadingImage_Maximum": "{0} can only be repeated {1} times, and it has been repeated {2} times so far.",
   "ReadingImage_PCWGMaximum": "According to the imaging charter, the number of baseline lesions at the same location should enter only {0} time. Please confirm.",
@@ -44,7 +71,7 @@
   "ReadingImage_TaskFinish": "Please note that all reads of the current subject have been completed.",
   "ReadingImage_NeedRest": "You have been continuously reading for {0} hours. Please take a break of {1} minutes before resumption.",
   //ReadingJudgeTaskService
-  "ReadingJudge_SouceIdNull": "System call failed. The Source ID of the global review which is being adjudicated currently is 'null'. ",
+  "ReadingJudge_SouceIdNull": "System call failed. The Source ID of the global review which is being adjudicated currently is 'null'.",
   //ReadingOncologyTaskService
   "ReadingOncology_TaskError": "System call error. The current read is not an oncology read.",
   "ReadingOncology_Abnormal": "System call exception. The result of adjudication is null",
@@ -59,17 +86,18 @@
   "MedicalReview_invalid": "This medical review read has already been invalidated, and the operation failed.",
   "MedicalReview_SaveQuestion": "Unable to perform the current operation. Please save the medical review questions first.",
   "MedicalReview_NeedSave": "Unable to perform the current operation. Please save the medical review questions and conclusions first.",
-  "MedicalReview_NotClosed": "Unable to perform the current operation. The current medical inquiry conversation has not been closed.",
+  "MedicalReview_NotClosed": "Unable to perform the current operation. The current medical query conversation has not been closed.",
   "MedicalReview_Finish": "The current medical review is the last one.",
   //ReadingMedicineQuestionService
-  "ReadingMed_QNumDup": "Current problem number has duplicates",
-  "ReadingMed_HasSubQ": "This problem has sub-problems, please delete them first",
+  "ReadingMed_QNumDup": "Current question number is repeated",
+  "ReadingMed_HasSubQ": "This question has sub-question, please delete it first",
   "ReadingMed_NoMedQ": "Medical review question has not been added yet. Please add it first before confirming",
-  "ReadingMed_MedQNumDup": "The display number of the medical imaging review question cannot be duplicated",
-  "ReadingMed_ParentNumSmall": "The display number of the parent problem should be smaller than that of the child problem, please confirm",
-  "ReadingMed_GlobalQNotConfig": "The global reading is enabled in the current standard, but the global medical review question has not been configured",
-  "ReadingMed_ArbitrateQNotConfig": "Arbitration reading is enabled in the current standard, but the arbitration medical review question has not been configured",
-  "ReadingMed_TumorQNotConfig": "Oncology reading is enabled in the current standard, but the oncology medical review question has not been configured",
+  "ReadingMed_MedQNumDup": "The display number of the medical imaging review question cannot be duplicated.",
+  "ReadingMed_ParentNumSmall": "The display number of the parent question should be smaller than that of the child question, please confirm.",
+  "ReadingMed_VisitQNotConfig": "This review criteria has no medical review questions for 'visit'",
+  "ReadingMed_GlobalQNotConfig": "The global review read is enabled in the current criterion, but has not configured with medical review questions",
+  "ReadingMed_ArbitrateQNotConfig": "Adjudication review reading is enabled in the current criterion, but has not configured with medical review questions",
+  "ReadingMed_TumorQNotConfig": "Oncology reading is enabled in the current criterion, but the oncology medical review question has not been configured",
   //UserService
   "User_CheckNameOrPw": "Please check the username or password.",
   //Repository
@@ -78,38 +106,44 @@
   //OrganInfoService
   "OrganInfo_DuplicateData": "There are duplicate data, operation failed.",
   //ReadingCriterionService
-  "ReadingCriterion_Referenced": "The current standard has been referenced and cannot be deleted.",
-  "ReadingCriterion_InUse": "This standard has been used in the project and cannot be deleted.",
+  "ReadingCriterion_Referenced": "The current criterion has been referenced and cannot be deleted.",
+  "ReadingCriterion_InUse": "This criterion has been used in the project and cannot be deleted.",
   "ReadingCriterion_ArbitratorWithoutJudgment": "There is no referee problem but there is an arbitration object, operation failed.",
   //ReadingQuestionService
   "ReadingQuestion_IdDup": "Duplicate problem ID.",
   "ReadingQuestion_ChildrenExist": "This problem has sub-problems, please delete the sub-problems first.",
   "ReadingQuestion_GroupReferenced": "This grouping has been referenced, please delete the referenced problems first.",
-  "ReadingQuestion_JudgmentSet": "The current problem already has a referee standard set, modification failed.",
-  "ReadingQuestion_ExcludeWithDependency": "The displayed dependent parent problem and the required dependent problem are the same, but the answers are mutually exclusive, operation failed.",
+  "ReadingQuestion_JudgmentSet": "The current question already has a referee criterion set, modification failed.",
+  "ReadingQuestion_ExcludeWithDependency": "The displayed dependent parent question and the required dependent question are the same, but the answers are mutually exclusive, operation failed.",
   "ReadingQuestion_CircularDependency": "Calculation dependency has looped!",
   //ReadingPeriodSetService
+  "ReadingPeriodSet_NameDup": "Review period name duplicate, operation failed",
+  "ReadingPeriodSet_Global": "Review period name cannot be Global",
   "ReadingPeriodSet_AlreadyAdded": "{0} has already added the review period, cannot set it effective.",
-  "ReadingPeriodSet_TaskCompletedCannotRevoke": "The current standard review has generated tasks and the review is completed, revoke failed.",
+  "ReadingPeriodSet_TaskCompletedCannotRevoke": "The current criterion has generated reads and the reads have been completed, revoke failed.",
   "ReadingPeriodSet_LastVisit": "Last visit.",
   //ReadModuleService
   "ReadModule_AlreadyAdded": "The current visit has already added a review period.",
   "ReadModule_AddGlobalFirst": "Please add global review first.",
-  "ReadModule_VisitNotFound": "No visits found that meet the criteria.",
+  "ReadModule_VisitNotFound": "No qualified visit was found.",
   "ReadModule_SignedDataCannotDelete": "Clinical data has been signed and cannot be deleted.",
-  "ReadModule_TumorExists": "The current visit has a tumor review, please delete the tumor review first.",
-  "ReadModule_TaskGenerated": "The current review has generated tasks, operation failed.",
+  "ReadModule_TumorExists": "The current visit has a tumor review, please delete it first.",
+  "ReadModule_TaskGenerated": "The current review has generated reads, operation failed.",
+  //UserWLTemplateService
+  "UserWLTS_MaxTemplate": "The same user can add a maximum of 10 templates.",
+  "UserWLTS_NameRepeated": "The template name is repeated",
+  "UserWLTS_ContentRepeated": "The template content is repeated",
 
   // ------------------------------------------------------------Allocation--------------------------------------------------------------------
   //TaskAllocationRuleService
-  "TaskAllocation_DoctorIdNotFound": "Error, the doctor is account Id was not found in the enrollment table.",
+  "TaskAllocation_DoctorIdNotFound": "Error, the doctor's account Id was not found in the enrollment table.",
   "TaskAllocation_DoctorConfigExists": "The doctor configuration is already available, and continued additions cannot be allowed.",
-  "TaskAllocation_TaskAssigned": "A task has been assigned to the doctor and it cannot be deleted.",
+  "TaskAllocation_TaskAssigned": "A read has been assigned to the doctor and it cannot be deleted.",
   //TaskConsistentRuleService
   "TaskConsistent_ConsistencyConfigExists": "Please configure the doctor for consistency analysis.",
   "TaskConsistent_TaskGenerated": "The trial configuration is already available, and no continued additions are allowed.",
-  "TaskConsistent_MedicalAuditTaskExists": "The standard already has tasks generated by the Subject, and configuration modification is not allowed.",
-  "TaskConsistent_SignedTaskCannotBeInvalidated": "This standard has generated a consistency analysis task and cannot be deleted.",
+  "TaskConsistent_MedicalAuditTaskExists": "The criterion already has reads generated by the Subject, and configuration modification is not allowed.",
+  "TaskConsistent_SignedTaskCannotBeInvalidated": "This criterion has generated a consistency analysis task and cannot be deleted.",
   //TaskMedicalReviewRuleService
   "TaskMedicalRule_TaskAlreadyAssigned": "The doctor configuration is already available, and continued additions cannot be allowed.",
   "TaskMedicalRule_TaskStarted": "A medical review task has been generated.",
@@ -117,121 +151,123 @@
   "TaskMedical_DirtyData": "Signed files cannot be set to invalid.",
   "TaskMedical_SubjectInOtherArm": "A task is currently assigned to someone else,and it cannot be assigned. Please refresh the list.",
   //VisitTaskService
-  "VisitTask_VisitTask_TaskAlreadyApplied": "The project has not confirmed any of the reading criteria.",
+  "VisitTask_VisitTask_TaskAlreadyApplied": "The trial has not confirmed any of the review criteria.",
   "VisitTask_DoctorConfigNotFound": "The current doctor has begun to do the task of this standard of subject, so assignment cannot be canceled.",
-  "VisitTask_BackendDataError": "One of the tasks has been assigned to the doctor and is not allowed to be assigned.",
+  "VisitTask_BackendDataError": "One of the reeads has been assigned to the doctor and is not allowed to be assigned.",
   "VisitTask_DirtyData": "Dirty data appears, and the task source field has no value.",
   "VisitTask_MissingTaskSource": "The subject had a visit and entered the return process, which has not been verified for consistency and is not allowed to be assigned.",
-  "VisitTask_InconsistentSubjectStatus": "There is a subject that already has the doctor in another Arm group, it is not allowed to add the doctor to a new group.",
+  "VisitTask_InconsistentSubjectStatus": "There is a subject that already has the doctor in another Arm group.  It is not allowed to add the doctor to a new group.",
   "VisitTask_DuplicateDoctorInArm": "There is a subject that already has the doctor in another Arm group, so the futher assignment is not allowed. Please refresh the page to confirm whether the data on the page is expired.",
   "VisitTask_DoctorAlreadyInArm": "The assignment of a Subject task cannot be canceled because it has been applied.",
   "VisitTask_TaskAlreadyApplied": "The configured doctor cannot be found in the configuration table, and the binding cannot be applied. Please check the data.",
-  "VisitTask_DoctorConfiguration": "",
-  "VisitTask_BackendData": "Tasks that have not been completed or have not taken effect are not allowed to request re-reading.",
-  "VisitTask_UnreadTask": "Tasks that re-read has been applied or approved  are not allowed to apply for re-read.",
-  "VisitTask_NoPMRecheck": "",
-  "VisitTask_Reapply": "PM does not allow apply for  re-read of consistency analysis tasks.",
-  "VisitTask_ConsistencyAnalysis": "PM only allows apply for re-read that the view type is visit.",
-  "VisitTask_VisitTypeRestriction": "It is currently an ordered read type, and the subject has visit that has applied for re-read, but has not been processed (project team apply for), so it cannot been applied for continuing re-read at this time.",
-  "VisitTask_SequentialReading": "It is currently an ordered read type, and the subject has visit that has applied for re-read, but has not been processed, so it cannot been applied for  re-read for now.",
-  "VisitTask_ImageProblem": "It is currently an ordered read type that there is something wrong with the image. The trial team has applied for returning, so it cannot been applied for  re-read for now.",
-  "VisitTask_LastReading": "It is an ordered read type,  and only the request for re-readinng by the subject reader  after completing the global task for the last time is allowed.",
-  "VisitTask_LastOncologistRecheck": "",
-  "VisitTask_LastAdjudicatorRecheck": "",
-  "VisitTask_IRGlobalRecheck": "",
-  "VisitTask_IRReapply": "It is an disordered read type, only tasks that IR applies for global and visit read type to re-read are allowed.",
-  "VisitTask_InvalidReapplyStatus": "The current re-read task state is not in the requested state and cannot be processed. Please refresh the page.",
-  "VisitTask_ReapplyStatusConflict": "The status of the current task requested to be re-read has been affected by another re-read task.  The re-read yes/no operation is not allowed for the task in this state",
-  "VisitTask_ReReadTaskNotApplied": "Only tasks the read type is visit are allowed to be approved of re-read.",
-  "VisitTask_ReReadTaskAlreadyAffected": "Do not conform to the PM request and SPM / CPM approve | IR request and PM approve.",
-  "VisitTask_TaskTypeNotApproved": "The current re-read task state is not in the requested state and cannot be processed. Please refresh the page.",
-  "VisitTask_NoImageReturn": "",
-  "VisitTask_NonEffectiveTaskCannotBeReturned": "Only effective and unfinished visit tasks can be returned. Please refresh the page data.",
-  "VisitTask_NoFurtherReturn": "",
-  "VisitTask_ConsistencyTaskCannotBeReturned": "The consistency analysis task is not allowed to be set return back.",
-  "VisitTask_PMOnlyAllowedForReturn": "Only the PM can perform the rollback.",
-  "VisitTask_UnsupportedTaskType": "Re-read task types are not supported.",
+  "VisitTask_DoctorConfiguration": "Background data error",
+  "VisitTask_BackendData": "Reads that have not been completed or have not been effective are not allowed to request re-reading.",
+  "VisitTask_UnreadTask": "Reads that re-read has been applied or approved  are not allowed to apply for re-reading.",
+  "VisitTask_NoPMRecheck": "Additional review reads do not allow the PM to apply for re-reading",
+  "VisitTask_Reapply": "PM is not allowed to apply for re-reading of consistency analysis reads.",
+  "VisitTask_ConsistencyAnalysis": "PM is only allowed to apply for re-reading that the view type is visit.",
+  "VisitTask_VisitTypeRestriction": "This is chronological read, and the subject has visit that has applied for re-read by PM, but has not been processed, so it cannot been applied for continuing re-read at this time.",
+  "VisitTask_SequentialReading": "This is chronological read, and the subject has visit that has applied for re-read, but has not been processed, so it cannot been applied for  re-read for now.",
+  "VisitTask_ImageProblem": "This is chronological read, and  there is something wrong with the image. PM has applied for returning, so it cannot been applied for re-reading now.",
+  "VisitTask_LastReading": "This is chronological read,  and only the request for re-readinng by the subject reader  after completing the global task for the last time is allowed.",
+  "VisitTask_LastOncologistRecheck": "This is chronological read, and the subject will only be allowed to re-read after IR completing the last oncology read ",
+  "VisitTask_LastAdjudicatorRecheck": "This is chronological read, and the subject will only be allowed to re-read after IR completing the last adjudication read ",
+  "VisitTask_IRGlobalRecheck": "This is random read, IR is only allowed to apply for re-reading global and visit reads",
+  "VisitTask_IRReapply": "This is random read, IR is only allowed to apply for re-reading global and visit reads ",
+  "VisitTask_InvalidReapplyStatus": "The current re-read status is not requested and cannot be processed. Please refresh the page.",
+  "VisitTask_ReapplyStatusConflict": "The current re-read status has been affected by another re-read reads.  The re-read review operation is not allowed for reads in this state",
+  "VisitTask_ReReadTaskNotApplied": "Only reads with visit type are allowed to approve of re-read.",
+  "VisitTask_ReReadTaskAlreadyAffected": "Do not conform to the PM request and SPM / CPM approve , or IR request and PM approve.",
+  "VisitTask_TaskTypeNotApproved": "The current re-read status is not requested and cannot be processed. Please refresh the page.",
+  "VisitTask_NoImageReturn": "Additional review reads do not allow PM to apply for re-reading",
+  "VisitTask_NonEffectiveTaskCannotBeReturned": "Only effective and unfinished visit read can be returned. Please refresh the page data.",
+  "VisitTask_NoFurtherReturn": "The current visit has been returned to image upload, so continuing to return is not allowed!",
+  "VisitTask_ConsistencyTaskCannotBeReturned": "The consistency analysis read is not allowed to be set return back.",
+  "VisitTask_PMOnlyAllowedForReturn": "Only PM can perform the return back.",
+  "VisitTask_UnsupportedTaskType": "Re-read types are not supported.",
   "VisitTask_UndefinedList": "The current user view list is not defined.",
-  "VisitTask_NoConsistencyReturn": "",
-  "VisitTask_VisitTypeTaskAllowedForPMOnly": "Only visit task type can be returned by PM.",
+  "VisitTask_NoConsistencyReturn": "The conformance analysis read cannot be returned back",
+  "VisitTask_VisitTypeTaskAllowedForPMOnly": "Only read with visit type can be returned by PM.",
 
   // ------------------------------------------------------------Common--------------------------------------------------------------------
   //CommonDocumentService
   "Document_CodeDuplication": "The Code of the document cannot be repeated.",
-  "Document_SingleTemplate": "Only one template document is allowed per scenario and  standard.",
+  "Document_SingleTemplate": "Only one template file is allowed per scenario and  standard.",
   "Document_ TemplateRead": "Failed to read the template content, please try saving the file as docx format!",
   //DictionaryService
   "Dictionary_DictionaryName": "There is already a dictionary with the name {0}.",
   "Dictionary_DictionaryDeletion": "The current dictionary is referenced in the standard and cannot be deleted!",
   "Dictionary_SubitemDeletion": "There is child data, direct deletion is not allowed!",
   "Dictionary_ResumeReference": "The current entry has been referenced in the reader resume.",
-  "Dictionary_ProjectReference": "The current entry has been referenced in the project information.",
-  "Dictionary_StandardReference": "The current entry has been referenced in the reading standard.",
+  "Dictionary_ProjectReference": "The current entry has been referenced in the trial information.",
+  "Dictionary_StandardReference": "The current entry has been referenced in the review criteria.",
   //ExcelExportService
-  "ExcelExport_UnsupportedExport": "Currently the standard export is not supported.",
+  "ExcelExport_UnsupportedExport": "Currently the criterion export is not supported.",
   //MailService
-  "Mail_EmailResetReminder": "[from Extensive Imaging IRC] A reminder about resetting email.",
+  "Mail_EmailResetReminder": "[From Extensive Imaging IRC] A reminder about resetting the email.",
   "Mail_Dear": "Dear {0},",
   "Mail_ResettingEmail": "You are resetting an email address.",
-  "Mail_IRCResettingPassword ": "[from Extensive Imaging IRC] A reminder about resetting your  password",
-  "Mail_ResettingPassword ": "You are resetting the email password ",
-  "Mail_ImagingIRCReminder": "[from Extensive Imaging IRC] A reminder",
-  "Mail_IRCProject": "You are participating in the Extensive Imaging IRC project",
-  "Mail_ProjectParticipationReminder": "[from Extensive Imaging IRC] [{0}] A reminder of the site info collection",
-  "Mail_CenterResearchReminder": "You are participating in  the Site information collection of the IRC Program for Extensive Imaging.",
-  "Mail_AccountCreationReminder": "[from Extensive Imaging IRC] A reminder about creating an account",
-  "Mail_AccountPasswordResetReminder": "[from Film IRC] A reminder about resetting account passwords",
-  "Mail_InvitationEmail": "[from Extensive Imaging IRC][{0}]Invitation",
+  "Mail_IRCResettingPassword ": "[From Extensive Imaging IRC] A reminder about resetting your  password",
+  "Mail_ResettingPassword ": "You are resetting the email password",
+  "Mail_ImagingIRCReminder": "[From Extensive Imaging IRC] A reminder",
+  "Mail_IRCProject": "You are participating in the Extensive Imaging IRC trial",
+  "Mail_ProjectParticipationReminder": "[From Extensive Imaging IRC] [{0}] A reminder of the Site Survey",
+  "Mail_CenterResearchReminder": "You are participating in the Site Survey of the Extensive Imaging IRC trial.",
+  "Mail_AccountCreationReminder": "[From Extensive Imaging IRC] A reminder about creating an account",
+  "Mail_AccountPasswordResetReminder": "[From Extensive Imaging IRC] A reminder about resetting account passwords",
+  "Mail_InvitationEmail": "[From Extensive Imaging IRC][{0}]Invitation",
+  //SystemMonitor
+  "SysMon_JsonConfig": "Parsing the Json file configuration failed",
 
   // ------------------------------------------------------------Doctor--------------------------------------------------------------------
   //DoctorService
-  "Doctor_DupPhoneOrEmail": "current phone or email number already existed",
-  "Doctor_DupPhone": "The current phone number already existed!",
+  "Doctor_DupPhoneOrEmail": "The current tel or email number already existed",
+  "Doctor_DupPhone": "The current tel number already existed!",
   "Doctor_DupEmail": "The current email already existed!",
   "Doctor_StandardDuplicateFileTypeError": "This type of file has already been added to the current criterion.",
-  "Doctor_RequiredDocumentsError": "Resume & Consultant Agreement must be upload ",
+  "Doctor_RequiredDocumentsError": "Resume & Consultant Agreement must be upload",
 
   // ------------------------------------------------------------Document--------------------------------------------------------------------
   //SystemDocumentService
-  "SystemD_DuplicateFile": "A file of the same type and name already exists in the system.",
-  "SystemD_CannotDeleteSignedFile": "The document has already been read and signed by a user,  and not allowed to be deleted.",
+  "SystemD_DuplicateFile": "A file with the same type and same name already exists in the system.",
+  "SystemD_CannotDeleteSignedFile": "The file has already been read and signed by a user,  and not allowed to be deleted.",
   //TrialDocumentService
-  "TrialD_DuplicateFileInProject": "A file of the same type with the same name already exists in the trial project .",
-  "TrialD_DocumentHasAlready": "The document has already been read and signed by a user,  and not allowed to be deleted.",
+  "TrialD_DuplicateFileInProject": "A file with the same type and same name already exists in this trial .",
+  "TrialD_DocumentHasAlready": "The file has already been read and signed by a user,  and not allowed to be deleted.",
   "TrialD_FileAlreadySigned": "The file has been signed.",
-  "TrialD_ObsoleteFile": "Document has been annulled. Signature failed!",
+  "TrialD_ObsoleteFile": "The file has been revoked. Signature failed!",
   //TrialEmailNoticeConfigService
   "TrialEmailN_TaskNotSigned": "Before sending the email, the task must have been signed and triggered to complete the corresponding task generation.",
   "TrialEmailN_NoRecipient": "The message cannot be sent without the recipient.",
-  "TrialEmailN_InvalidEmailConfig": "The configuration of the sender mailbox of the trial is wrong, please check it.",
-  "TrialEmailN_EmailTemplateNotFound": "The email template in the standard scenario of this project cannot be found.",
+  "TrialEmailN_InvalidEmailConfig": "The configuration of the sender mail of the trial is wrong, please check.",
+  "TrialEmailN_EmailTemplateNotFound": "The email template in the standard scenario of this trial cannot be found.",
   "TrialEmailN_EnrollmentConfirmation": "[Enrollment Confirmation Report] About  {0} item {1}Subject",
-  "TrialEmailN_Enrollment": "The attachment is the enrollment confirmation report, please check it.",
-  "TrialEmailN_PDReport": "[PD Report] About  {0} item {1}Subject",
-  "TrialEmailN_SubjectDiseaseProgression": "The attachment is the confirmation report of disease progress, please check it.",
-  "TrialEmailN_SingleBlindedSet": "The configuration of the single and ordered reading is incorrect (there should be no adjudicator configuration), please check!",
-  "TrialEmailN_SingleBlindedSequenced": "The single and ordered reading, this type of task should not enter the logic here, please contact the background developers to check!",
+  "TrialEmailN_Enrollment": "The attachment is the Enrollment Confirmation Report, please check.",
+  "TrialEmailN_PDReport": "[PD Confirmation Report] About  {0} item {1}Subject",
+  "TrialEmailN_SubjectDiseaseProgression": "The attachment is the PD Confirmation Report, please check.",
+  "TrialEmailN_SingleBlindedSet": "The configuration of the single and chronological read is incorrect (there should be no adjudicator configuration), please check!",
+  "TrialEmailN_SingleBlindedSequenced": "The single and chronological read, should not enter the logic here, please contact the background developers to check!",
   "TrialEmailN_PDProgressEmailTask": "Send PD progress email found problem with the task data!",
-  "TrialEmailN_DoubleBlindedError": "The adjudication rule processing logic for double and ordered reading is not defined, please contact the business and background developers to check!",
-  "TrialEmailN_InCons": "",
-  "TrialEmailN_NoBaseLine": "",
-  "TrialEmailN_IncompBase": "",
-  "TrialEmailN_EmailFail": "",
-  "TrialEmailN_NoReader": "",
-  "TrialEmailN_NoPDConfig": "",
-  "TrialEmailN_NoPDTasks": "",
-  "TrialEmailN_PDNotFinished": "",
-  "TrialEmailN_PDNoImaging": "",
-  "TrialEmailN_PDPhaseNotFinished": "",
-  "TrialEmailN_NoRuleDefined": "",
-  "TrialEmailN_NoDoubleOrder": "",
-  "TrialEmailN_NoSendLogicDefined": "",
-  "TrialEmailN_BlindedSequencedReading": "The configuration of the ordered reading is wrong (should be single or double reading), please check!",
-  "TrialEmailN_UnblindedSequencedReading": "The configuration of unordered reading is wrong (should be single reading without adjudication, or double reading with adjudication for visiting ), please check!",
-  "TrialEmailN_InvalidTaskTypeForEmailSending": "Do not send emails for other types of tasks except visit,  adjudication and global read. Please check the business logic.",
-  "TrialEmailN_PDLogicNotDefined": "The standard task has not yet defined the PD acquisition logic,  please supplement it after consultation with the business and background developer.",
+  "TrialEmailN_DoubleBlindedError": "The double and chronological read does not defined the adjudication rule logic, please contact the developers to check!",
+  "TrialEmailN_InCons": "The trial is not configured with the Enrollment Confirmation!",
+  "TrialEmailN_NoBaseLine": "There is no baseline visit configured with Enrollment Confirmation and IR readed，so email failed to send",
+  "TrialEmailN_IncompBase": "The baseline reads for enrollment confirmation has not been finished for IR!",
+  "TrialEmailN_EmailFail": "Email failed to generate manually，please  contact developer to verify the failure cause",
+  "TrialEmailN_NoReader": "No IR has finished the baseline read at present!",
+  "TrialEmailN_NoPDConfig": "The trial is not configured with PD Confirmation!",
+  "TrialEmailN_NoPDTasks": "There is no baseline visit configured with “PD Confirmation” and IR readed，so email failed to send",
+  "TrialEmailN_PDNotFinished": "The completion status of the latest PD interview and film reading task of the current subject does not meet the sending conditions",
+  "TrialEmailN_PDNoImaging": "The trial is configured with review period adjudication, but the current subject' s latest visit marked 'PD' have no review period",
+  "TrialEmailN_PDPhaseNotFinished": "The review period status of the current subject's latest PD visit  does not meet the sending conditions",
+  "TrialEmailN_NoRuleDefined": "The sending logic for adjudication rule is not defined! ",
+  "TrialEmailN_NoDoubleOrder": "The current trial is not double and chronological read, so the sending condition is not met",
+  "TrialEmailN_NoSendLogicDefined": "The current trial is not defined sending logic",
+  "TrialEmailN_BlindedSequencedReading": "The configuration of the chronological read is wrong (should be single or double reading), please check!",
+  "TrialEmailN_UnblindedSequencedReading": "The configuration of random read is wrong (should be single read without adjudication, or double read with adjudication for visiting ), please check!",
+  "TrialEmailN_InvalidTaskTypeForEmailSending": "Do not send emails for other type except visit, adjudication and global read. Please check the logic.",
+  "TrialEmailN_PDLogicNotDefined": "Reads for this criterion has not yet defined the PD logic,  please supplement it after consultation with the developer.",
   "TrialEmailN_MailboxWrong": "The configuration of the sender mailbox of the trial is wrong, please check it.",
-  "TrialEmailN_InvalidRecipient": "The trial does not have a valid recipient and the message cannot be sent.",
+  "TrialEmailN_InvalidRecipient": "The trial does not have a valid recipient, so the message cannot be sent.",
   "TrialEmailN_EmailTestMessage": "Trial mail test",
   "TrialEmailN_ConfigurationCorrect": "If this email is received, the email configuration is correct.",
   "TrialEmailN_InvalidSenderEmailConfig": "The sender configuration is incorrect. Please check whether the server address or authorization code is correct or not.",
@@ -251,12 +287,12 @@
 
   // ------------------------------------------------------------ImageAndDoc--------------------------------------------------------------------
   //DicomArchiveService
-  "DAS_NoAnonCacheData": "The cache  data for  anonymous config is not obtained, and the upload stops. Please contact the developer for verification.",
+  "DAS_NoAnonCacheData": "The cache data for anonymous config is not obtained, and the upload stops. Please contact the developer to verify.",
   //ImageShareService
-  "ISS_NoImgToShare": "There are no images to share for the current check.",
-  "ISS_ResNotExists": " The request resource wasn’t found.",
-  "ISS_SharePwdError": "The shared password is incorrect",
-  "ISS_ShareExpiration": "Resource sharing expires",
+  "ISS_NoImgToShare": "There are no images to share for the current study.",
+  "ISS_ResNotExists": "The request resource wasn’t found.",
+  "ISS_SharePwdError": "The shared password is incorrect.",
+  "ISS_ShareExpiration": "Resource sharing expires.",
   //StudyService
   "Study_VisitBeforePrevError": "The current visit  check time {0} cannot be earlier than the previous visit check time {1}. Please check whether the check data is correct.",
   "Study_VisitAfterSubseqError": "The current visit check time {0} cannot be later than the visit check time {1} .Please check whether the check data is correct.",
@@ -268,181 +304,182 @@
   //FrontAuditConfigService
   "FrontAudit_IdDup": "The identifier is duplicated.",
   "FrontAudit_NameDup": "The name is duplicated .",
-  "FrontAudit_CannotDelSub": "Subclasses  exist，do not delete.",
+  "FrontAudit_CannotDelSub": "Subclasses exist, cannot delete.",
   //InspectionService
   "Inspection_UserDisabled": "The current user has been disabled.",
 
   // ------------------------------------------------------------Institution--------------------------------------------------------------------
   //CROService
-  "CRO_DupName": "CRO with the same name already exists.Please confirm",
-  "CRO_InProject": "The CRO has participated in the project and cannot be deleted.",
+  "CRO_DupName": "CRO with the same name already exists. Please confirm.",
+  "CRO_InProject": "The CRO has participated in the trial and cannot be deleted.",
   //HospitalService
-  "Hospital_DupName": "Hospital with the same name already exists.Please confirm",
-  "Hospital_SiteAdded": "The current Site has been added to another Hospital",
+  "Hospital_DupName": "Hospital with the same name already exists. Please confirm.",
+  "Hospital_SiteAdded": "The current Site has been added to another Hospital.",
   "Hospital_HasDoctors": "There are already doctors registered under the hospital's account and cannot be deleted.",
   //SiteService
-  "Site_DupName": "Site with  the same name already exists.Please confirm",
+  "Site_DupName": "Site with  the same name already exists. Please confirm.",
   "Site_InProject": "This site has been added to the project and cannot be deleted.",
   //SponsorService
-  "Sponsor_DupName": "Sponsor with the same name already exists.Please confirm.",
-  "Sponsor_InProject": "The sponsor has been added to the project and it is not allowed to delete.",
+  "Sponsor_DupName": "Sponsor with the same name already exists. Please confirm.",
+  "Sponsor_InProject": "The sponsor has been added to the trial and it is not allowed to delete.",
 
   // ------------------------------------------------------------Management--------------------------------------------------------------------
   //MenuService
   "Menu_ParentDupChild": "A child node with the same name already exists under the parent node.",
-  "Menu_ChildExist": " Child nodes already exists under this node . Delete the child nodes before deleting the node.",
+  "Menu_ChildExist": "Child nodes already exists under this node . Delete the child nodes before deleting the node.",
   //UserService
   "User_UsernameExist": "The user name already exists.",
   "User_PhoneDup": "A user with the same phone number already exists in this user type.",
   "User_EmailDup": "A user with the same email already exists in this user type.",
   "User_NewOldPwdSame": "The new password is the same as the old one.",
-  "User_OldPwdInvalid": "Failed to verify the old password. ",
-  "User_LegalEmail": "Please input a legal email",
+  "User_OldPwdInvalid": "Failed to verify the old password.",
+  "User_LegalEmail": "Please input a legal email.",
   "User_VerificationCodeError": "The verification code is wrong.",
   "User_VerificationCodeExpired": "The verification code has expired.",
-  "User_CreateFailed": "Check the email address or contact maintainers. The email fails to be sent and the account cannot be created",
+  "User_CreateFailed": "Check the email address or contact maintainers. The email fails to be sent and the account cannot be created.",
   "User_InvalidEmail": "Please enter a correct E-mail address.",
   "User_EmailError": "The email adress is wrong.",
-  "User_InProject": "The user has participated in the project and cannot be deleted.",
+  "User_InProject": "The user has participated in the trial and cannot be deleted.",
   "User_Disabled": "The user has been disabled.",
   //UserTypeService
   "UserType_InUse": "User already exists in that user type, and it cannot be deleted.",
 
   // ------------------------------------------------------------QC--------------------------------------------------------------------
   //QCCommon
-  "QCCommon_CannotOperate": "CRC has submitted the image and it cannot be operated.",
-  "QCCommon_NoPermission": "You are not the current recipient of the quality control task, so no operation authority!",
-  "QCCommon_CheckTimeEarly": "The current visit  check time {0} cannot be earlier than the previous visit check time {1}. Please check whether the check data is correct.",
-  "QCCommon_CheckTimeLate": "The current visit check time {0} cannot be later than the visit check time {1} .Please check whether the check data is correct.",
+  "QCCommon_CannotOperate": "CRC has submitted the image. Operation is not allowed.",
+  "QCCommon_NoPermission": "You are not the current recipient of the image QC. No operation authority!",
+  "QCCommon_CheckTimeEarly": "The current visit study time {0} cannot be earlier than the previous visit study time {1}. Please check whether the study data is correct.",
+  "QCCommon_CheckTimeLate": "The current visit study time {0} cannot be later than the visit study time {1} .Please check whether the study data is correct.",
   //QCOperationService
-  "QCOperation_CheckFirst": "Please check the image first and save  review questions before inquiry.",
-  "QCOperation_QuestionExist": "The current visit with unclosed  inquiry  has been set to allow CRC to reupload the image. After CRC has  reuploaded image, please close the original inquiry first and then add a new inquiry.",
-  "QCOperation_QuestionCannotClose": "CRC has applied for reuploading or QC has agreed to reuploading and to close the inquiry is not allowed. Please do not close the inquiry until the QC rejects the reuploading request or the CRC reuploads the image.",
+  "QCOperation_CheckFirst": "Please check the image first and save review questions before query.",
+  "QCOperation_QuestionExist": "The unclosed query of the current visit has been set to approve CRC reupload. After CRC has  reuploaded image, please close the original query first and then add a new query.",
+  "QCOperation_QuestionCannotClose": "CRC has applied for reuploading or QC has agreed to reupload. To close the query is not allowed. Please do not close the query until the QC rejects or the CRC reuploads the image.",
   "QCOperation_CloseReason": "Reason for closing:",
-  "QCOperation_QuestionReplied": "The QC inquiry has been answered.",
+  "QCOperation_QuestionReplied": "The QC query has been answered.",
   "QCOperation_NoPermissionReply": "You do not have permission to reply to the data reconciliation conversation.",
-  "QCOperation_CannotClose": "The current visit is in the request fallback state, and the inquiry is not allowed to be closed.",
-  "QCOperation_Reason": "Reason:",
-  "QCOperation_CannotPass": "The current visit is in the rollback state, and the data reconciliation cannot be set.",
-  "QCOperation_PassAfterClose": "Please close the data reconciliation inquiry first, and then set the data reconciliation pass.",
-  "QCOperation_Cannotback": "The current visit has passed the consistency check and cannot be applied for rollback.",
-  "QCOperation_CRCRollback": "CRC Apples for rollback.",
+  "QCOperation_CannotClose": "The current visit status is CRC request re-upload. The query is not allowed to be closed.",
+  "QCOperation_Reason": "Notes:",
+  "QCOperation_CannotPass": "The current visit is in the return status, and the data reconciliation cannot be set.",
+  "QCOperation_PassAfterClose": "Please close the data reconciliation query first, and then set the data reconciliation pass.",
+  "QCOperation_Cannotback": "The current visit has passed the consistency check and cannot be applied for re-upload.",
+  "QCOperation_CRCRollback": "CRC apples for re-upload.",
   "QCOperation_OtherCRC": "Other CRCs have applied for processing. Please refresh the page.",
-  "QCOperation_PMReject": "PM/APM rejected the data reconciliation rollback.",
+  "QCOperation_PMReject": "PM/APM rejected the data reconciliation return.",
   "QCOperation_NoPermission": "You do not have operation permission.",
-  "QCOperation_CannotRollback": "If the current visit has not been studied or study has passed, setbacks are not allowed.",
+  "QCOperation_CannotRollback": "If the current visit has not do reconciliation or has passed, setbacks are not allowed.",
   "QCOperation_PMAPMConsistency": "PM/APM agrees to the data reconciliation rollback.",
   "QCOperation_NoModifyAfterSubmit": "Once submitted, no modifications are allowed.",
-  "QCOperation_UnresolvedQCQuery": "This operation is not allowed, because the inquiry of the current visitis is not closed. ",
+  "QCOperation_UnresolvedQCQuery": "Image query of the current visit is not closed. This operation is not allowed.",
   "QCOperation_CrcNoDelete": "The CRC has been committed and cannot be deleted.",
   "QCOperation_NoRecipient": "You are not the current recipient of the quality control task, no operation authority!",
-  "QCOperation_QCImageTaskAlreadyReleased": "The image quality control task of the current visit has been released by the original recipient. You can get it by 'pick up'.",
-  "QCOperation_QCTaskNoAccess": "The image quality control task of the current visit has been claimed by other QC, so it is not allowed to pick up.",
-  "QCOperation_QCConfigFirst": "Please configure the image quality control review question before receiving the image quality control task.",
-  "QCOperation_NoQC": "The project configuration of image QC process was not check, and the QC Task was not picked up.",
+  "QCOperation_QCImageTaskAlreadyReleased": "The image QC of the current visit has been released by the original recipient. You can get it by 'claime'.",
+  "QCOperation_QCTaskNoAccess": "The image quality control task of the current visit has been claimed by other QC, so it is not allowed to claim.",
+  "QCOperation_QCConfigFirst": "Please configure the image QC questions before claiming any image QC work.",
+  "QCOperation_NoQC": "The trial configuration of image QC was not check, and the QC Task was not be claimed.",
   "QCOperation_InitialAuditPassed": "The first review has passed, continue to receive can not be allowed.",
-  "QCOperation_NoSingleAudit": "The project is configured for single check, does not meet Submmit State: Submitted or Audit State: pending review/ in review, not allowed to collect.Please refresh the page.",
+  "QCOperation_NoSingleAudit": "The trial is configured with single image QC , does not meet Submmit State: Submitted or Audit State: pending QC/ in QC, not allowed to collect.Please refresh the page.",
   "QCOperation_NoSameReviewer": "The secondary QC cannot be the same person as the primary QC.",
-  "QCOperation_NoSecondaryAudit": "The project is configured for double check, does not meet Submmit State: Submitted or Audit State: pending review/ in QC review, not allowed to collect.Please refresh the page.",
+  "QCOperation_NoSecondaryAudit": "The trial is configured withr double image QC , does not meet Submmit State: Submitted or Audit State: pending review/ in QC, not allowed to collect.Please refresh the page.",
   "QCOperation_NoTaskAccess": "You are not the current recipient of the quality control task, no operation authority!",
   "QCOperation_NoQCFunction": "The project configuration of image QC process was not check, so there is no need to cancel the task function.",
-  "QCOperation_NoTaskOwner": "The current visiting image QC task has not been claimed by anyone，and cannot been released.",
-  "QCOperation_DiseaseProgressConfirmation": "Current visit required confirmation of PD. Please process the unsubmitted prior visit before submitting the current visit: {0}.",
-  "QCOperation_UnsubmittedVisits": " After submitting the current visit, please as soon as possible process any prior visits that have not been submitted: {0}.",
-  "QCOperation_NoBaselineData": "No clinical data at baseline, confirm submission?",
-  "QCOperation_NoImageData": "Dicom/ non-dicom image data has not been uploaded. Submission is not allowed.",
-  "QCOperation_ImagesSubmitted": "The image data for the current visit has been submitted by another CRC.",
-  "QCOperation_BatchImagesSubmitted": "The image data for visiting is currently submitted in batches, part of which has been submitted by other CRCS.",
-  "QCOperation_MissingBaselineDate": "The project is configured with the visit base time. However, the subject did not fill in the visit base time, which is not allowed to submit.",
-  "QCOperation_RemoveItem": "You have been removed from the project and have no operation rights.",
-  "QCOperation_QCNotClosed": "This operation cannot be performed because the image quality control inquiry has not been closed for the current visit.",
-  "QCOperation_NoQCNeeded": "The project configuration of image QC process was not check, and no need to set to image quality control pass.",
-  "QCOperation_QCNotSaved": "Image quality control review question is not saved, and cannot be performed.",
-  "QCOperation_NotChangePass": "The project configuration of image QC process was double check, so the current image QC task cannot change from the current state to pass.",
-  "QCOperation_CannotChangeToPass": "The project configuration of image QC process was double check. The current audit state is {0}, which cannot be changed to  approved.",
-  "QCOperation_NoQCNeededNotEnd": "The project configuration of image QC process was not check, and setting image quality control termination is not allowed.",
-  "QCOperation_CannotChangeToStop": "The project configuration of image QC process was single check, and the current review state is not In Primary QC and cannot be changed to the QC termination.",
-  "QCOperation_CannotChangeStop": "The project configuration of image QC process was double check, and the current review state is {0} and cannot be changed to the QC termination.",
+  "QCOperation_NoTaskOwner": "The current visiting image QC has not been claimed by anyone, and cannot been released.",
+  "QCOperation_DiseaseProgressConfirmation": "Current visit required PD Confirmation. Please process the unsubmitted prior visit before submitting the current visit: {0}.",
+  "QCOperation_UnsubmittedVisits": "After submitting the current visit, please submit any prior visits which have not been submitted as soon as possible. ({0})",
+  "QCOperation_NoBaselineData": "No clinical data at baseline. Confirm to submit?",
+  "QCOperation_NoImageData": "Dicom/ Non-dicom image data has not been uploaded. Submission is not allowed.",
+  "QCOperation_ImagesSubmitted": "The image data of the current visit has been submitted by another CRC.",
+  "QCOperation_BatchImagesSubmitted": "The visit image data is currently submitted in batches, part of which has been submitted by other CRCs.",
+  "QCOperation_MissingBaselineDate": "The trial is configured with the visit start date, but the visit start date for the subject is not filled. Submittion is not allowed.",
+  "QCOperation_RemoveItem": "You have been removed from the trial and have no operation rights.",
+  "QCOperation_QCNotClosed": "The QC query has not been closed for the current visit. This operation cannot be performed.",
+  "QCOperation_NoQCNeeded": "The trial configuration of image QC was no. No need to set image QC as pass.",
+  "QCOperation_QCNotSaved": "Image QC question is not saved. This operation is not allowed.",
+  "QCOperation_NotChangePass": "The trial configuration of image QC process was double check, so the current image QC task cannot change from the current state to pass.",
+  "QCOperation_CannotChangeToPass": "The trial configuration of image QC process was double check. The current audit state is {0}, which cannot be changed to  approved.",
+  "QCOperation_NoQCNeededNotEnd": "The trial configuration of image QC process was not check, and setting image quality control termination is not allowed.",
+  "QCOperation_CannotChangeToStop": "The trial configuration of image QC process was single check, and the current review state is not In Primary QC and cannot be changed to the QC termination.",
+  "QCOperation_CannotChangeStop": "The trial configuration of image QC process was double check, and the current review state is {0} and cannot be changed to the QC termination.",
   "QCOperation_InvalidResend": "The current reupload state is not QC agree, so reuploading is not allowed.",
   "QCOperation_NoResendNeeded": "No check operation, there will be no need to reupload!",
-  "QCOperation_InvalidAgreeResend": "The current reuploading state is  not CRC requested and the approve of reuploading  cannot be set.",
-  "QCOperation_CannotAgreeResend": "At the current visit, there is an unclosed inquiry that QC set to agree to reupload, CRC has not completed the upload, currently is not allowed to set again.",
-  "QCOperation_AgreeResend": "QC agrees to reupload.",
-  "QCOperation_InvalidCompleteResend": "The current reupload state is not QC agree, setting reuploading completion is not allowed.",
-  "QCOperation_NoImageNotAllowed": "No image is currently available, setting reuploading completion is not allowed.",
+  "QCOperation_InvalidAgreeResend": "The current re-upload- status is  not CRC requested and the approve of reuploading cannot be set.",
+  "QCOperation_CannotAgreeResend": "At the current visit, there is an unclosed query that QC set to agree to reupload, CRC has not uploaded, currently is not allowed to set again.",
+  "QCOperation_AgreeResend": "QC agrees to re-upload.",
+  "QCOperation_InvalidCompleteResend": "The current reupload status is not QC approved, setting reuploading completion is not allowed.",
+  "QCOperation_NoImageNotAllowed": "No image is currently available. Setting reuploaded is not allowed.",
   "QCOperation_CRCTransferCompleted": "CRC reuploading has been completed. ",
-  "QCOperation_InvalidTransferStatus": "The current inquiry reupload state is not the initial state| CRC reupload completed state, and requests for reuploading are not allowed",
+  "QCOperation_InvalidTransferStatus": "The current query re-upload status is not the initial| CRC re-uploaded. Application for re-uploading is not allowed",
   "QCOperation_CRCTransfer": "CRC requests to reupload/upload images.",
   "QCOperation_CannotModifyConfirmation": "The visit has been submitted, and the  enrollment confirmation state cannot be modified.",
-  "QCOperation_CannotModifyPDStatus": "This visit is regarded as a rollback visit, and modification of PD confirmation status is not allowed.",
+  "QCOperation_CannotModifyPDStatus": "This visit status is return back. Modification of PD Confirmation status is not allowed.",
   "QCOperation_ForwardingFailed": "Failed to forward the image:",
   //QCQuestionService
   "QCQuestion_DuplicateIndexFailed": "Operation failed because the serial number is repeated.",
-  "QCQuestion_HasChildQuestion": "The current task has a sub-question and the deletion fails.",
+  "QCQuestion_HasChildQuestion": "The current task has a sub-question. Deletion failed.",
   //TrialQCQuestionService
-  "TrialQCQuestion_TemplateConfirmed": "Image quality control review question template has been confirmed, and no operation is allowed.",
+  "TrialQCQuestion_TemplateConfirmed": "Image QC question template has been confirmed. No operation is allowed.",
   "TrialQCQuestion_DuplicateIndexFailed": "Operation failed because the serial number is repeated.",
   "TrialQCQuestion_DeleteChildFirst": "Before deleting the parent question, delete the child question that references the parent question.",
-  "TrialQCQuestion_ReferencedByQCProcess": "This review question has been cited by the image quality control process and is not allowed to be deleted.",
+  "TrialQCQuestion_ReferencedByQCProcess": "This review question has been cited by the image QC. Deletion is not allowed.",
 
   // ------------------------------------------------------------QC--------------------------------------------------------------------
 
   // ------------------------------------------------------------SiteSurvey--------------------------------------------------------------------
   //TrialSiteEquipmentSurveyService
-  "TrialSiteEquipment_Locked": "Locked and not allowed to operate.",
+  "TrialSiteEquipment_Locked": "Locked and operation is not allowed.",
   //TrialSiteSurveyService
   "TrialSiteSurvey_InvalidEmail": "Please enter the correct email address.",
   "TrialSiteSurvey_WrongVerificationCode": "The verification code is incorrect.",
   "TrialSiteSurvey_ExpiredVerificationCode": "The verification code has expired.",
   "TrialSiteSurvey_NoRecordToUpdate": "The site does not have a site survey record for the transferor , so it is not allowed to choose to update.",
   "TrialSiteSurvey_RecordUnderReview": "Your site survey record is in review and cannot be updated. If you need to update, please do so after rejection.",
-  "TrialSiteSurvey_LockedByCurrentUser": "In the current site, the survey record form you submitted has been locked, and it is not allowed to update other people's email survey records.",
-  "TrialSiteSurvey_LockedByOtherUsers": "In the current site, the survey record you submitted has been locked, Currently, the survey record form submitted by other personnel is not locked, so it is not allowed to update the survey record submitted by you before.",
+  "TrialSiteSurvey_LockedByCurrentUser": "In the current site, the submitted survey record has been locked. Updation of other people's email survey records is not allowed.",
+  "TrialSiteSurvey_LockedByOtherUsers": "The submitted survey record of the current site has been locked. Currently, the survey record submitted by other personnel is not locked. Updation of the survey submitted before is not allowed.",
   "TrialSiteSurvey_UnlockedRecordsExist": "The current site has unlocked survey records. Locked survey records cannot be updated.",
-  "TrialSiteSurvey_NonLatestLockedRecord": "The site survey corresponding to the mailbox {0} is not the latest locked record and is not allowed to be updated!",
-  "TrialSiteSurvey_AlreadyFilledByOtherUsers": "There are already survey forms filled out by other users under this site, and you are not allowed to fill them out",
+  "TrialSiteSurvey_NonLatestLockedRecord": "The site survey corresponding to the mailbox {0} is not the latest. Updation is not allowed",
+  "TrialSiteSurvey_AlreadyFilledByOtherUsers": "There are already survey filled out by other users under this site. You are not allowed to fill them out",
   "TrialSiteSurvey_Locked": "The site survey has been locked, and no operation is allowed.",
   "TrialSiteSurvey_IRCNotification": "[from Extensive Imaging IRC] A reminder about the site survey approval.",
   "TrialSiteSurvey_CancelUnsubmittedRecord": "Only unsubmitted records are allowed to be repealed.",
   "TrialSiteSurvey_NoAdminAcces": "The operation is not allowed by the administrator.",
-  "TrialSiteSurvey_FailedToGenerateAccountId": "If no value is obtained for the generated account Id, please check.",
+  "TrialSiteSurvey_FailedToGenerateAccountId": "If no value is obtained for the generated account Id. Please check.",
   "TrialSiteSurvey_IRCInvitation": "[from Extensive Imaging IRC][{0}] Invitation letter",
-  "TrialSiteSurvey_IRCInvitationContent": "Hello, as the IRC supplier of experiment plan No. {0} project, Extensive Imaging sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome.",
+  "TrialSiteSurvey_IRCInvitationContent": "Hello, as the IRC supplier of experiment plan No. {0} trial, Extensive Imaging sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome.",
   "TrialSiteSurvey_ViewAndConfirm": "Check and confirm",
   //TrialSiteUserSurveyService
   "TrialSiteUser_Locked": "Locked and not allowed to operate.",
-  "TrialSiteUser_InconsistentInfo": "The user's account name in the system is{0}, and there are inconsistent items with the information filled in. Now modify the interface information to be consistent with the system and save it.",
-  "TrialSiteUser_NoTestUserForFormal": "It is Formal and training projects that are not allowed to add test users.",
+  "TrialSiteUser_InconsistentInfo": "The corresponding user of this email address is {0}, and the phone number is {1}. Please modify the inputted information and make it consistent with that already in the system, and then save.",
+  "TrialSiteUser_NoTestUserForFormal": "Formal and training triala are not allowed to add test users.",
   "TrialSiteUser_NoFormalUserForTest": "It is the test project that regular users are not allowed in.",
 
   // ------------------------------------------------------------Stat--------------------------------------------------------------------
 
   // ------------------------------------------------------------TrialSiteUser--------------------------------------------------------------------
   //TrialConfigService
-  "TrialConfig_JudgeTaskFail": "There are judge questions that the conditions for generating judge reading task are not configured, and the operation has failed!",
-  "TrialConfig_StdConfigMissing": "Questions are not configured under the current standard.",
+  "TrialConfig_JudgeTaskFail": "There are adjudication questions that the conditions for generating adjudication review read are not configured. Operation failed!",
+  "TrialConfig_StdConfigMissing": "Questions are not configured under the current criterion.",
+  "TrialConfig_AddEvalReq": "Selected additional assessment, must check additional assessment type",
   "TrialConfig_SignTemplateMissing": "This operation requires electronic signature confirmation, but the signature template for this scenario is not found in the system.",
-  "TrialConfig_ProjectEnded": "The trial project has ended or stopped, and configuration changes are not allowed.",
-  "TrialConfig_NoImageAuditQuestion": "No image quality control review question is currently added. Please add the image quality control review question first, and then confirm.",
-  "TrialConfig_DuplicateAuditQuestionId": "Image quality control review question display number cannot be repeated.",
-  "TrialConfig_InvalidParentQuestionId": "Make sure that the display sequence number of the parent question is smaller than that of the child question.",
-  "TrialConfig_AuditQuestionConfirmed": "The question of image quality control review has been confirmed by other personnel, and it is not allowed to be confirmed again.",
-  "TrialConfig_ProjectNotInitialized": "This operation is not allowed because the current state of the project is not initialized.",
-  "TrialConfig_UnconfirmedConfiguration": "There are unconfirmed items in the project configuration (logical configuration, process configuration, expedite configuration) and visit management, so the project state cannot be set to start.",
-  "TrialConfig_UnconfirmedUNACKD": "Unable to change project status. There are unconfirmed items in the project configuration and visit management.",
-  "TrialConfig_ProjectNotStarted": "The project is not in the start state and cannot be set to stop or complete.",
+  "TrialConfig_ProjectEnded": "The trial has ended or stopped. Configuration changes are not allowed.",
+  "TrialConfig_NoImageAuditQuestion": "No image QC question is currently added. Please add the image QC questions first, and then confirm.",
+  "TrialConfig_DuplicateAuditQuestionId": "Image QC question display number cannot be repeated.",
+  "TrialConfig_InvalidParentQuestionId": "Make sure that the display sequence number of the parent question is smaller than that of the child.",
+  "TrialConfig_AuditQuestionConfirmed": "The image QC questions have been confirmed by other personnel. Cofirmation again is not allowed. ",
+  "TrialConfig_ProjectNotInitialized": "The current trial status is not initialized. This operation is not allowed.",
+  "TrialConfig_UnconfirmedConfiguration": "This trial’s project configuration, & visit management  have not been finished, and its status cannot be changed to “Ongoing”.",
+  "TrialConfig_UnconfirmedUNACKD": "This trial’s project configuration, & visit management  have not been all confirmed, and its status cannot be changed",
+  "TrialConfig_ProjectNotStarted": "This trial status is not “Ongoing”, and cannot be set to Stoped or Completed.",
   //TrialExternalUserService
-  "TrialExternalUser_Inconsistency": "The user's account name in the system is{0}, and there are inconsistent items with the information filled in. Now modify the interface information to be consistent with the system and save it.",
+  "TrialExternalUser_Inconsistency": "The corresponding user of this email address is {0}, and the phone number is {1}. Please modify the inputted information and make it consistent with that already in the system, and then save.",
   "TrialExternalUser_EmailTypeDuplicate": "Please confirm that the system already has an account with the same email address and user type as the one entered in the list.",
-  "TrialExternalUser_TestUserNotAllowed": "It is Formal and training projects that are not allowed to add test users.",
-  "TrialExternalUser_FormalUserNotAllowed": "It is the test project that regular users are not allowed in.",
-  "TrialExternalUser_NotEditable": "Personnel information cannot be edited. Please delete it and add it again.",
-  "TrialExternalUser_CannotDelete": "The current user has participated in the project and cannot be deleted.",
-  "TrialExternalUser_IRCInvitation": "Hello, as the IRC supplier of experiment plan No. {0} project, Extensive Imaging sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome.",
+  "TrialExternalUser_TestUserNotAllowed": "Formal and training trials are not allowed to add test users.",
+  "TrialExternalUser_FormalUserNotAllowed": "It is a training trial that regular users are not allowed in.",
+  "TrialExternalUser_NotEditable": "Staff  information cannot be edited. Please delete it and add it again.",
+  "TrialExternalUser_CannotDelete": "The current user has participated in the trial and cannot be deleted.",
+  "TrialExternalUser_IRCInvitation": "Hello, as the IRC supplier of experiment plan No. {0} trial, Extensive Imaging sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome.",
   "TrialExternalUser_ViewAndConfirm": "Check and confirm",
   "TrialExternalUser_InvitationExpired": "The invitation time has expired. You can only confirm it after you are invited again.",
   "TrialExternalUser_AccountInfo": "[from Extensive Imaging IRC][{0}] account information",
-  "TrialExternalUser_Welcome": "Hello, welcome to participate in the relevant work of trial scheme No. {0}IRC of the project. This project adopts electronic workflow. The system and your account information are as follows:",
+  "TrialExternalUser_Welcome": "Hello, welcome to participate in the relevant work of trial scheme No. {0}IRC of the project. This trial adopts electronic workflow. The system and your account information are as follows:",
   "TrialExternalUser_ProjectNumber": "Trial ID: {0}",
   "TrialExternalUser_ExperimentPlanNumber": "Protocol ID: {0}",
   "TrialExternalUser_ExperimentName": "Study Name: {0}",
@@ -465,37 +502,37 @@
   "TrialSite_ParticipantJoined": "The subjects has been added to  this site, and couldn't be disable.",
   "TrialSite_CodeDuplicate": "Code is not allowed to be repeated",
   "TrialSite_CannotDeleteAssociatedCRC": "The site has been associated with CRC, and couldn't be deleted.",
-  "TrialSite_CannotDeleteAssociatedSubject": "The subjects has been added to  this site, and couldn't be deleted.",
-  "TrialSite_CannotDeleteUploadedData": "The site has been uploaded study, and couldn't be deleted.",
+  "TrialSite_CannotDeleteAssociatedSubject": "The subjects has been added, and couldn't be deleted.",
+  "TrialSite_CannotDeleteUploadedData": "The site has been uploaded survey, and couldn't be deleted.",
 
   // ------------------------------------------------------------Visit--------------------------------------------------------------------
   //SubjectService
-  "Subject_NoConfirmedPlan": "The visit plan of the project is not confirmed. Please contact the program Manager to confirm the visit plan before adding subjects.",
+  "Subject_NoConfirmedPlan": "The visit plan of the trial is not confirmed. Please contact PM to confirm the visit plan before adding subjects.",
   "Subject_DuplicateSubjectNum": "Subjects with the relevant subject ID already exists.",
-  "Subject_UploadedVisitNoDelete": "The subject has visit that has uploaded the image, so deletion is not allowed.",
+  "Subject_UploadedVisitNoDelete": "The subject has visit that has uploaded the image. Deletion is not allowed.",
   //SubjectVisitService
   "Visit_DuplicateVisitNo": "The subject's visit schedule already includes a visit with the same visit ID.",
-  "Visit_LastVisitNoChange": "The subject has already had a visit set as the last visit, and the current visit is not allowed to be set as the last visit.",
+  "Visit_LastVisitNoChange": "The subject has already had a visit set as the last, and the current visit cannot be set as the last visit.",
   "Visit_DuplicateVisitName": "The subject's visit schedule already includes a visit with the same visit name.",
-  "Visit_NoExtraVisitAfterLast": "Unplanned visits are not allowed after the last evaluation is set.",
-  "Visit_FinishedTasksNoAdd": "The subject has already completed the task of reading ( ordered reading standard ) in follow-up visit, which is not allowed to be added here. If necessary, please return.",
-  "Visit_NoPDStatusChangeAfterSubmission": "The PD confirmation status cannot be modified after the current visit image is submitted.",
+  "Visit_NoExtraVisitAfterLast": "Unplanned visits cannot be added after the last assessment is set.",
+  "Visit_FinishedTasksNoAdd": "The subject has reads completed in follow-up visit ( chronological read ) , which is not allowed to be added here. If necessary, please return.",
+  "Visit_NoPDStatusChangeAfterSubmission": "The PD Confirmation status cannot be modified after the current visit image is submitted.",
   "Visit_UploadedNoLost": "The current visit has already uploaded images and cannot be set as visit lost to follow-up.",
   "Visit_UploadedNoDelete": "The current visit has already uploaded images and deletion is not allowed.",
   "Visit_PlanVisitNoDelete": "Planned visits are not allowed to be deleted.",
   "Visit_PreviousVisitNoDelete": "The current visit has been set to the previous visit of another visit and cannot be deleted.",
   //VisitPlanService
-  "VisitPlan_OnlyInitOrOngoing": "Can be operated only when the project state is: Initialization or ongoing.",
+  "VisitPlan_OnlyInitOrOngoing": "Can be operated only when the trial state is: Initialized or ongoing.",
   "VisitPlan_LargerVisitNumLargerInterval": "In the visit plan, the interval between visits with a large number should also be larger than that of a visit with a smaller number.",
   "VisitPlan_LargerPlanNumLargerInterval": "In the visit plan, the planned visit with a large number should also have a larger interval than the planned visit with a smaller event number.",
-  "VisitPlan_ExistNameOrNumTemplate": "A plan visit template with visit name or visit ID of project  already exists in the visit plan.",
+  "VisitPlan_ExistNameOrNumTemplate": "A plan visit template with visit name or visit ID of trial already exists in the visit plan.",
   "VisitPlan_ExistBaseline": "A baseline already exists in the visit plan.",
-  "VisitPlan_ExistBaselineImgNoModify": "Subjects’ baseline image data has been uploaded, so modification of baseline visits is not allowed.",
-  "VisitPlan_OnlyInitOrOngoingModifyConfirm": "Modification validation is allowed only when the project is initialized or ongoing.",
-  "VisitPlan_NoBaselineNotConfirm": "No baseline, no validation allowed.",
-  "VisitPlan_ConfigNotConfirmNotConfirm": "If the project configuration is not confirmed, the visit plan cannot be confirmed.",
-  "VisitPlan_BaselineNotMinDayNotConfirm": "Baseline VisitDay is not minimal and does not allow validation.",
-  "VisitPlan_CheckExport": "Check and export _{0}.xlsx",
+  "VisitPlan_ExistBaselineImgNoModify": "The subjects’ baseline image data has been uploaded, so modification of baseline visits is not allowed.",
+  "VisitPlan_OnlyInitOrOngoingModifyConfirm": "Modification confirmation is allowed only when the trial is initialized or ongoing.",
+  "VisitPlan_NoBaselineNotConfirm": "No baseline, no confirmation allowed.",
+  "VisitPlan_ConfigNotConfirmNotConfirm": "If the trial configuration is not confirmed, the visit plan cannot be confirmed.",
+  "VisitPlan_BaselineNotMinDayNotConfirm": "Baseline's VisitDay is not minimal. Confirmation is not allowed.",
+  "VisitPlan_CheckExport": "Study export _{0}.xlsx",
   "VisitPlan_Assigned": "The visit plan has been assigned to the subjects and executed.",
 
   // ------------------------------------------------------------WorkLoad--------------------------------------------------------------------
@@ -510,10 +547,10 @@
 
   // ------------------------------------------------------------Triggers--------------------------------------------------------------------
   //AddlTrialUserTrigger
-  "AddlTrialUser_NoTestUser": "It is Formal and training projects that are not allowed to add test users.",
-  "AddlTrialUser_NoFormalUser": "It is the test project that regular users are not allowed in.",
+  "AddlTrialUser_NoTestUser": "Formal and training trials are not allowed to be added test users.",
+  "AddlTrialUser_NoFormalUser": "It is a training trial that regular users are not allowed in.",
   //SubjectStateTrigger
-  "SubjectState_CannotSetCurrentAsLastVisit": "The subject has already had a visit set as the last visit, and the current visit is not allowed to be set as the last visit.",
+  "SubjectState_CannotSetCurrentAsLastVisit": "The subject has already had a visit set as the last, and the current visit cannot be set as the last.",
   "SubjectState_CannotSetAsLastVisitWithImage": "The image of the subject's visit after the current visit has been uploaded, and the current visit is not allowed to be set as the last visit.",
   //SubjectVisitFinalVisitTrigger
   "SubjectVisit_CannotSetAsLastVisit": "The subject's follow-up visits has uploaded images or submitted , and the current visit is not allowed to be set as the last visit.",
@@ -538,13 +575,19 @@
   // ------------------------------------------------------------Helper--------------------------------------------------------------------
   //FileStoreHelper
   "FileStore_TemplateFileNotFound": "Database did not find the corresponding data template file for FileStoreHelper, please contact system maintenance personnel.",
-  "FileStore_TemplateFileStoragePathInvalid": "No corresponding file was found on the storage path for the data template file of FileStoreHelper, please contact system maintenance personnel.",
+  "FileStore_TemplateFileStoragePathInvalid": "File doesn’t exist. Please contact the system administrator!",
   //SendEmailHelper
   "SendEmail_SendFail": "Failed to send email in SendEmailHelper. Your operation was unsuccessful, please check your email or contact maintenance personnel.",
   "SendEmail_NoRecipient": "No recipient in SendEmailHelper.",
 
   // ------------------------------------------------------------IRaCIS.Core.Domain--------------------------------------------------------------------
   //Trial
-  "Trial_number": "The serial number consists of five digits. The first two digits are the center number and the last three digits are the serial number. The serial number must be the same as that recorded by the EDC"
+  "Trial_number": "Subject ID is composed of 5 digits. The first 2 are the Site ID, and the following 3 are the order number. Please ensure it is identical to the ID from the EDC system. ",
+
+  // ------------------------------------------------------------IRaCIS.Core.Infrastructure--------------------------------------------------------------------
+  //ResponseOutput
+  "RO_BizObjNotExistsOrParamIncorrect": "The business object{0} does not exist in the database, or was deleted by someone else, or an incorrect parameter query caused",
+  "RO_ExpectChangeButNoEffect": "Expect a change, but the database data has not changed",
+  "RO_SaveFailed": "Saved failed"
 
 }

IRaCIS.Core.Application/Resources/zh-CN.json

@@ -2,6 +2,11 @@
   "test{0}{1}": "中文本地化{0}{1}",
   "RequiredAttribute": "{0} 字段是必须的",
 
+  // ------------------------------------------------------------_ServiceExtensions--------------------------------------------------------------------
+  //ApiResponseHandler
+  "ApiResponse_NoAccess": "您无权访问该接口",
+  "ApiResponse_Permission": "您的权限不允许进行该操作",
+
   // ------------------------------------------------------------Controllers--------------------------------------------------------------------
   //FinancialChangeController
   "Financial_ChargeSettled": "费用已经结算，无法重置工作量",
@@ -13,9 +18,31 @@
   "UploadDownLoad_RequestError": "请求异常,请重试！",
   "UploadDownLoad_SupportedFormats": "支持.xlsx、.xls、.csv格式的文件上传。",
 
+  // ------------------------------------------------------------_MediatR--------------------------------------------------------------------
+  //ConsistencyVerificationRequest
+  "ConsistencyVerification_Tech": "检查技术",
+  "ConsistencyVerification_Time": "时间格式不对",
+  //ConsistencyVerificationHandler
+  "ConsistencyVerification_Img": "您好,根据本系统自动识别，该受试者当前访视在IRC系统中已提交的影像检查情况如下：",
+  "ConsistencyVerification_Of": "的",
+  "ConsistencyVerification_ImgC": "影像检查",
+  "ConsistencyVerification_EDCA": "核对EDC数据，完全一致, 审核通过",
+  "ConsistencyVerification_EDCB": "核对EDC数据，完全一致",
+  "ConsistencyVerification_Auto": "自动核查通过",
+  "ConsistencyVerification_Prob": "存在问题如下：",
+  "ConsistencyVerification_EdcL": "影像检查(EDC 缺少)",
+  "ConsistencyVerification_IrcL": "影像检查(IRC 缺少)",
+  "ConsistencyVerification_Desc": "说明：为高效解决/处理以上全部质疑问题，麻烦您准确核实实际影像检查情况。请注意影像日期与实际检查的日期可能会不一致，部分检查（如PET -CT)可能同时存在多种模态影像。准确核实后，请回复该访视正确的影像检查情况。",
+  "ConsistencyVerification_Conf": "根据导入的一致性核查数据，请确认本访视以下不一致检查项信息：",
+  "ConsistencyVerification_Edc": "EDC 缺少：",
+  "ConsistencyVerification_IrcLi": "IRC 缺少:",
+
   // ------------------------------------------------------------Reading--------------------------------------------------------------------
   //ClinicalDataSetService
+  "ClinicalDataSet_Apply": "当前临床数据需要配置一个检查日期才能应用",
   "ClinicalDataSet_DupTypeFail": "存在同类型的临床数据,操作失败",
+  //ClinicalQuestionService
+  "ClinicalQuestion_Repeat": "存在相同的问题名称！",
   //ReadingClinicalDataService
   "ReadingClinicalData_DupTypeFail": "存在同类型的临床数据,操作失败",
   "ReadingClinicalData_Unchecked": "当前临床数据状态不是已核查状态，不允许签名！",
@@ -33,8 +60,8 @@
   "ReadingImage_IsLymphNotbigger": "当前访视该淋巴结非靶病灶的短径小于上一访视的值，不能设置为显著增大。",
   "ReadingImage_NotLymphNotbigger": "当前访视该非淋巴结非靶病灶的长径小于上一访视的值，不能设置为显著增大。",
   "ReadingImage_Twice": "系统调用错误，提交的问题及答案重复。",
-  "ReadingImage_MaxQuestion": "按照《独立影像评估章程》的相关规则，当前病灶类型的病灶数量不超过{0}个。",
-  "ReadingImage_Maxlesion": "按照《独立影像评估章程》的相关规则，同一器官的靶病灶数量不超过{0}个，请确认",
+  "ReadingImage_MaxQuestion": "按照《独立影像评估章程》的相关规则，当前{0}的病灶数量不能超过{1}个。",
+  "ReadingImage_Maxlesion": "按照《独立影像评估章程》的相关规则，同一器官的靶病灶数量不能超过{0}个，请确认",
   "ReadingImage_Maximum": "{0}的重复次数限制为{1},目前已重复{2}次。",
   "ReadingImage_PCWGMaximum": "按照《独立影像评估章程》的相关规则，同一部位的基线病灶只需录入{0}次，请确认。",
   "ReadingImage_NotNewFocus": "转换后的任务不应该存在新病灶",
@@ -67,6 +94,7 @@
   "ReadingMed_NoMedQ": "当前未添加医学审核问题。请先添加医学审核问题，再进行确认。",
   "ReadingMed_MedQNumDup": "影像医学审核问题显示序号不能重复。",
   "ReadingMed_ParentNumSmall": "父问题的显示序号要比子问题的显示序号小，请确认。",
+  "ReadingMed_VisitQNotConfig": "当前标准未配置访视医学审核问题。",
   "ReadingMed_GlobalQNotConfig": "当前标准启用了全局阅片,但未配置全局医学审核问题",
   "ReadingMed_ArbitrateQNotConfig": "当前标准启用了仲裁阅片,但未配置仲裁医学审核问题",
   "ReadingMed_TumorQNotConfig": "当前标准启用了肿瘤学阅片,但未配置肿瘤学医学审核问题",
@@ -89,6 +117,8 @@
   "ReadingQuestion_ExcludeWithDependency": "显示依赖父问题和必填依赖的问题为同一个,但答案互斥,操作失败",
   "ReadingQuestion_CircularDependency": "计算依赖循环了！",
   //ReadingPeriodSetService
+  "ReadingPeriodSet_NameDup": "阅片期名称重复,操作失败",
+  "ReadingPeriodSet_Global": "阅片期名称不能为Global",
   "ReadingPeriodSet_AlreadyAdded": "{0}已经添加过阅片期,无法设置生效",
   "ReadingPeriodSet_TaskCompletedCannotRevoke": "当前标准阅片已生成任务并且阅片完成,撤销失败。",
   "ReadingPeriodSet_LastVisit": "末次访视",
@@ -99,6 +129,10 @@
   "ReadModule_SignedDataCannotDelete": "临床资料已签名，不允许删除",
   "ReadModule_TumorExists": "当前访视存在肿瘤学阅片,请先删除肿瘤学阅片",
   "ReadModule_TaskGenerated": "当前阅片已生成任务,操作失败。",
+  //UserWLTemplateService
+  "UserWLTS_MaxTemplate": "同一个用户最多只能添加10个模板",
+  "UserWLTS_NameRepeated": "模板名称存在重复",
+  "UserWLTS_ContentRepeated": "模板内容存在重复",
 
   // ------------------------------------------------------------Allocation--------------------------------------------------------------------
   //TaskAllocationRuleService
@@ -129,7 +163,7 @@
   "VisitTask_DoctorConfiguration": "后台数据有错误",
   "VisitTask_BackendData": "未阅片完成，或者未生效的任务不允许申请重阅",
   "VisitTask_UnreadTask": "重阅已申请，或者重阅已同意状态下不允许申请重阅",
-  "VisitTask_NoPMRecheck": "手动生成任务的不允许PM 申请影像重阅",
+  "VisitTask_NoPMRecheck": "附加评估标准任务不允许PM 申请影像重阅",
   "VisitTask_Reapply": "PM 不允许对一致性分析任务进行申请重阅",
   "VisitTask_ConsistencyAnalysis": "PM 仅仅允许对访视类型的任务申请重阅",
   "VisitTask_VisitTypeRestriction": "当前为有序阅片，该受试者已有访视已申请重阅还未处理(项目组申请)，暂不能继续申请重阅",
@@ -138,14 +172,14 @@
   "VisitTask_LastReading": "有序阅片，只允许申请该受试者阅片人最后一次完成全局任务重阅",
   "VisitTask_LastOncologistRecheck": "有序阅片，只允许申请该受试者阅片人最后一次完成肿瘤学任务重阅",
   "VisitTask_LastAdjudicatorRecheck": "有序阅片，只允许申请该受试者阅片人最后一次完成裁判的任务重阅",
-  "VisitTask_IRGlobalRecheck": "无序阅片，仅仅允许IR 申请  全局和访视类型类别的任务进行重阅",
+  "VisitTask_IRGlobalRecheck": "无序阅片，仅仅允许IR 申请 全局和访视类型类别的任务进行重阅",
   "VisitTask_IRReapply": "无序阅片，仅仅允许IR申请全局和访视类型类别的任务进行重阅",
   "VisitTask_InvalidReapplyStatus": "当前重阅任务状态不为已申请状态，不允许进行处理，请刷新页面",
   "VisitTask_ReapplyStatusConflict": "当前申请重阅任务的状态，已被其他任务重阅已影响，不允许对该状态下的任务进行重阅同意与否操作",
   "VisitTask_ReReadTaskNotApplied": "仅允许同意访视类型的任务重阅",
   "VisitTask_ReReadTaskAlreadyAffected": "不符合  PM申请   SPM / CPM审批 | IR申请  PM 审批 ",
   "VisitTask_TaskTypeNotApproved": "当前重阅任务状态不为已申请状态，不允许进行处理，请刷新页面",
-  "VisitTask_NoImageReturn": "手动生成任务的不允许在此入口影像退回",
+  "VisitTask_NoImageReturn": "附加评估标准任务不允许在此入口影像退回",
   "VisitTask_NonEffectiveTaskCannotBeReturned": "仅仅允许针对生效、未完成的访视任务进行退回操作，请刷新页面数据",
   "VisitTask_NoFurtherReturn": "当前访视已回退到影像上传，不允许继续回退！",
   "VisitTask_ConsistencyTaskCannotBeReturned": "一致性分析的任务，不允许设置退回",
@@ -182,6 +216,8 @@
   "Mail_AccountCreationReminder": "[来自展影IRC] 关于创建账户的提醒",
   "Mail_AccountPasswordResetReminder": "[来自展影IRC] 关于重置账户密码的提醒",
   "Mail_InvitationEmail": "[来自展影IRC] [{0}]邀请信",
+  //SystemMonitor
+  "SysMon_JsonConfig": "解析Json文件配置出现问题",
 
   // ------------------------------------------------------------Doctor--------------------------------------------------------------------
   //DoctorService
@@ -214,12 +250,12 @@
   "TrialEmailN_PDProgressEmailTask": "发送PD 进展邮件中发现任务数据有问题！",
   "TrialEmailN_DoubleBlindedError": "双重有序阅片 没有定义该仲裁规则处理逻辑，请联系业务和后台开发核查！",
   "TrialEmailN_InCons": "项目未配置入组确认！",
-  "TrialEmailN_NoBaseLine": "不存在配置了入组确认的并且生成任务的基线访视",
+  "TrialEmailN_NoBaseLine": "不存在配置了入组确认的并且已阅的基线访视",
   "TrialEmailN_IncompBase": "做入组确认的阅片人基线任务没有阅片完！",
   "TrialEmailN_EmailFail": "邮件手动生成失败，请联系开发核实该场景失败原因",
   "TrialEmailN_NoReader": "当前未有阅片人读完基线任务！",
   "TrialEmailN_NoPDConfig": "项目未配置PD进展！",
-  "TrialEmailN_NoPDTasks": "不存在配置了PD进展的并且生成任务的访视",
+  "TrialEmailN_NoPDTasks": "不存在配置了PD进展的并且已阅的访视",
   "TrialEmailN_PDNotFinished": "当前受试者最新PD访视阅片任务完成状态不符合发送条件",
   "TrialEmailN_PDNoImaging": "项目配置了阅片期仲裁，但是当前受试者最新PD访视没有影像学阅片期",
   "TrialEmailN_PDPhaseNotFinished": "当前受试者最新PD访视阅片期任务完成状态不符合发送条件",
@@ -228,7 +264,7 @@
   "TrialEmailN_NoSendLogicDefined": "当前项目配置，未定义发送业务逻辑！",
   "TrialEmailN_BlindedSequencedReading": "有序阅片配置有误(应为单重或者双重阅片)，请核查！",
   "TrialEmailN_UnblindedSequencedReading": "无序阅片配置有误(应为单重无仲裁对象，双重针对访视仲裁)，请核查！",
-  "TrialEmailN_InvalidTaskTypeForEmailSending": "不应有 除访视、裁判、全局其他类型的任务进行发送邮件，请核查业务逻辑",
+  "TrialEmailN_InvalidTaskTypeForEmailSending": "不应有除访视、裁判、全局其他类型的任务进行发送邮件，请核查业务逻辑",
   "TrialEmailN_PDLogicNotDefined": "该标准任务还未定义PD获取逻辑，联系业务和后台开发协商后补充",
   "TrialEmailN_MailboxWrong": "项目发件邮箱配置有误，请核实",
   "TrialEmailN_InvalidRecipient": "项目没有有效的收件人，无法发送邮件",
@@ -278,7 +314,7 @@
   "CRO_InProject": "该CRO已经参与项目，不能被删除。",
   //HospitalService
   "Hospital_DupName": "已经存在同名的医院，请确认。",
-  "Hospital_SiteAdded": "当前Site已经添加到其他Hospital了",
+  "Hospital_SiteAdded": "当前Site已经添加到其他Hospital了。",
   "Hospital_HasDoctors": "该医院下已经注册有医生，不可以删除。",
   //SiteService
   "Site_DupName": "已经存在同名的中心，请确认。",
@@ -297,10 +333,10 @@
   "User_EmailDup": "该用户类型中已存在具有相同邮箱的用户。",
   "User_NewOldPwdSame": "新密码与旧密码相同。",
   "User_OldPwdInvalid": "旧密码验证失败。",
-  "User_LegalEmail": "请输入合法的电子邮件",
+  "User_LegalEmail": "请输入合法的电子邮件。",
   "User_VerificationCodeError": "验证码错误。",
   "User_VerificationCodeExpired": "验证码已经过期。",
-  "User_CreateFailed": "请检查邮箱地址或者联系维护人员, 邮件发送失败, 未能创建账户成功",
+  "User_CreateFailed": "请检查邮箱地址或者联系维护人员, 邮件发送失败, 未能创建账户成功。",
   "User_InvalidEmail": "请输入一个正确的邮箱。",
   "User_EmailError": "邮箱错误。",
   "User_InProject": "该用户已经参加项目，不能够删除。",
@@ -310,7 +346,7 @@
 
   // ------------------------------------------------------------QC--------------------------------------------------------------------
   //QCCommon
-  "QCCommon_CannotOperate": "CRC 已提交影像，不能进行操作。",
+  "QCCommon_CannotOperate": "CRC已提交影像，不能进行操作。",
   "QCCommon_NoPermission": "您不是该质控任务当前领取人，没有操作权限!",
   "QCCommon_CheckTimeEarly": "当前访视检查时间{0}不能早于前序访视检查时间{1}，请核对检查数据是否有误",
   "QCCommon_CheckTimeLate": "当前访视检查时间{0}不能晚于该访视之后的检查时间{1}，请核对检查数据是否有误",
@@ -321,12 +357,12 @@
   "QCOperation_CloseReason": "关闭原因: ",
   "QCOperation_QuestionReplied": "当前QC质疑已经回复。",
   "QCOperation_NoPermissionReply": "您没有权限回复一致性核查对话。",
-  "QCOperation_CannotClose": "当前访视处于申请回退状态， 不允许关闭质疑。",
+  "QCOperation_CannotClose": "当前访视处于申请重传状态， 不允许关闭质疑。",
   "QCOperation_Reason": "原因:",
   "QCOperation_CannotPass": "当前访视处于回退状态,不允许设置一致性核查通过",
   "QCOperation_PassAfterClose": "请先关闭一致性核查质疑后，再设置一致性核查通过。",
-  "QCOperation_Cannotback": "当前访视已通过一致性核查，不允许申请回退",
-  "QCOperation_CRCRollback": "CRC申请回退",
+  "QCOperation_Cannotback": "当前访视已通过一致性核查，不允许申请重传",
+  "QCOperation_CRCRollback": "CRC申请重传",
   "QCOperation_OtherCRC": "其他CRC已申请处理，请刷新页面",
   "QCOperation_PMReject": "PM/APM拒绝一致性核查回退",
   "QCOperation_NoPermission": "您不具备操作权限。",
@@ -343,7 +379,7 @@
   "QCOperation_InitialAuditPassed": "初审已通过，不能继续领取",
   "QCOperation_NoSingleAudit": "项目配置为单审,不满足Submmit State：已提交 或者 Audit State：待审核/审核中, 不允许领取,请刷新界面",
   "QCOperation_NoSameReviewer": "复审不能和初审是同一个人",
-  "QCOperation_NoSecondaryAudit": "项目配置为复审，不满足提交状态：已提交 或者 审核状态：待审核/QC中, 不允许领取,请刷新界面",
+  "QCOperation_NoSecondaryAudit": "项目配置为复审，不满足提交状态：已提交或者审核状态：待审核/QC中, 不允许领取,请刷新界面",
   "QCOperation_NoTaskAccess": "您不是该质控任务当前领取人，没有操作权限!",
   "QCOperation_NoQCFunction": "项目配置影像质控为不审，不需要取消任务功能",
   "QCOperation_NoTaskOwner": "当前访视影像质控任务没有当前领取人，不能释放。",
@@ -411,7 +447,7 @@
   "TrialSiteSurvey_ViewAndConfirm": "查看并确认",
   //TrialSiteUserSurveyService
   "TrialSiteUser_Locked": "已锁定,不允许操作",
-  "TrialSiteUser_InconsistentInfo": "该用户在系统中账户名为：{0} ，与填写信息存在不一致项, 现将界面信息修改为与系统一致，可进行保存",
+  "TrialSiteUser_InconsistentInfo": "该邮件地址在系统中所对应的用户为 {0}, 电话号码是 {1}。请将所输入的信息修改为与系统一致后，再保存。",
   "TrialSiteUser_NoTestUserForFormal": "正式类型 、培训类型的项目 不允许加入测试用户",
   "TrialSiteUser_NoFormalUserForTest": "测试项目  不允许加入正式用户",
 
@@ -421,6 +457,7 @@
   //TrialConfigService
   "TrialConfig_JudgeTaskFail": "有裁判问题未配置产生裁判阅片任务的条件,操作失败！",
   "TrialConfig_StdConfigMissing": "当前标准下未配置问题",
+  "TrialConfig_AddEvalReq": "选择了附加评估,必须勾选附加评估类型",
   "TrialConfig_SignTemplateMissing": "该操作需要电子签名确认，但未在系统中找到该场景的签名模板。",
   "TrialConfig_ProjectEnded": "该项目已结束或停止，不允许修改配置。",
   "TrialConfig_NoImageAuditQuestion": "当前未添加影像质控审核问题。请先添加影像质控审核问题，再进行确认。",
@@ -428,11 +465,11 @@
   "TrialConfig_InvalidParentQuestionId": "父问题的显示序号要比子问题的显示序号小，请确认。",
   "TrialConfig_AuditQuestionConfirmed": "影像质控审核问题已被其他人员确认，不允许再次确认。",
   "TrialConfig_ProjectNotInitialized": "该项目当前状态不是初始化，不允许进行该操作。",
-  "TrialConfig_UnconfirmedConfiguration": "该项目的项目配置（基础配置、流程配置、加急配置） 、访视管理，有配置未确认，不能设置项目状态为启动。",
-  "TrialConfig_UnconfirmedUNACKD": "无法变更项目状态。该项目的项目配置、访视管理中，有未确认项",
+  "TrialConfig_UnconfirmedConfiguration": "该项目的项目配置、访视管理尚未完成，无法将项目状态设为”启动”。",
+  "TrialConfig_UnconfirmedUNACKD": "该项目的项目配置、访视管理中，有未确认项，无法变更项目状态。",
   "TrialConfig_ProjectNotStarted": "项目没有进入启动状态，不能设置为停止或完成状态",
   //TrialExternalUserService
-  "TrialExternalUser_Inconsistency": "该用户在系统中的用户名为：{0} 电话：{1}，与填写信息存在不一致项, 请将界面信息修改为与系统一致，再进行保存",
+  "TrialExternalUser_Inconsistency": "该邮件地址在系统中所对应的用户为 {0}, 电话号码是 {1}。请将所输入的信息修改为与系统一致后，再保存。",
   "TrialExternalUser_EmailTypeDuplicate": "系统已经存在与列表中填写的邮箱和用户类型相同的账户，请确认。",
   "TrialExternalUser_TestUserNotAllowed": "正式类型 、培训类型的项目 不允许加入测试用户 ",
   "TrialExternalUser_FormalUserNotAllowed": "测试项目  不允许加入正式用户 ",
@@ -511,7 +548,7 @@
   // ------------------------------------------------------------Triggers--------------------------------------------------------------------
   //AddlTrialUserTrigger
   "AddlTrialUser_NoTestUser": "正式类型 、培训类型的项目 不允许加入测试用户",
-  "AddlTrialUser_NoFormalUser": "测试项目  不允许加入正式用户",
+  "AddlTrialUser_NoFormalUser": "测试项目不允许加入正式用户",
   //SubjectStateTrigger
   "SubjectState_CannotSetCurrentAsLastVisit": "该受试者已经有访视被设置为末次访视，不允许将当前访视设置为末次访视。",
   "SubjectState_CannotSetAsLastVisitWithImage": "该受试者当前访视后有访视的影像已上传，当前访视不允许设置为末次访视。",
@@ -538,13 +575,19 @@
   // ------------------------------------------------------------Helper--------------------------------------------------------------------
   //FileStoreHelper
   "FileStore_TemplateFileNotFound": "数据库没有找到对应的数据模板文件,请联系系统运维人员。",
-  "FileStore_TemplateFileStoragePathInvalid": "数据模板文件存储路径上未找对应文件,请联系系统运维人员。",
+  "FileStore_TemplateFileStoragePathInvalid": "文件不存在，请联系系统管理员！",
   //SendEmailHelper
   "SendEmail_SendFail": "邮件发送失败，您进行的操作未能成功，请检查邮箱或联系维护人员",
   "SendEmail_NoRecipient": "没有收件人",
 
   // ------------------------------------------------------------IRaCIS.Core.Domain--------------------------------------------------------------------
   //Trial
-  "Trial_number": "编号由5位数字组成，前2位为中心编号，后3位为顺序号，请与EDC录入的编号保持一致"
+  "Trial_number": "编号由5位数字组成，前2位为中心编号，后3位为顺序号，请与EDC录入的编号保持一致",
+
+  // ------------------------------------------------------------IRaCIS.Core.Infrastructure--------------------------------------------------------------------
+  //ResponseOutput
+  "RO_BizObjNotExistsOrParamIncorrect": "业务对象{0}在数据库中不存在，或被他人删除，或参数查询不正确导致",
+  "RO_ExpectChangeButNoEffect": "期望发生更改，但数据库数据没有更改",
+  "RO_SaveFailed": "保存失败"
 
 }

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}天{1}小时{2}分钟", (SignTime - FirstReadingTime)?.Days, (SignTime - FirstReadingTime)?.Hours, (SignTime - FirstReadingTime)?.Minutes)
+                else return string.Format("{0}d {1}h {2}min", (SignTime - FirstReadingTime)?.Days, (SignTime - FirstReadingTime)?.Hours, (SignTime - FirstReadingTime)?.Minutes)
                          /*string.Format("{0}分钟", (ReadingDurationTimeSpan)?.TotalMinutes)*/;
             }
         }

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

@@ -257,7 +257,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid SubjectId { get; set; }
         public string SubjectCode { get; set; } = String.Empty;
 
-        public bool IsUrgent => UnReadTaskList.Any(t => t.IsUrgent);
+        public bool IsUrgent => UnReadCanReadTaskList.Any(t => t.IsUrgent);
 
         public int UnReadTaskCount { get; set; }
 
@@ -271,6 +271,38 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public DateTime? SuggesteFinishedTime { get; set; }
 
+        public int? UrgentColor
+        {
+            get
+            {
+                if (this.SuggesteFinishedTime != null)
+                {
+                    var date = DateTime.Now;
+                    var timeSpan = SuggesteFinishedTime.Value- date;
+                    if (timeSpan.TotalDays <= 2)
+                    {
+                        return 1;
+                    }
+                    else if (timeSpan.TotalDays <= 5)
+                    {
+                        return 2;
+                    }
+                    else
+                    {
+                        return 3;
+                    }
+                }
+                else
+                {
+                    return null;
+                }
+            }
+        }
+
+
+
+        public int UrgentCount => UnReadCanReadTaskList.Count(t => t.IsUrgent);
+
         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>();

IRaCIS.Core.Application/Service/Allocation/Interface/ITaskMedicalReviewService.cs

@@ -17,7 +17,7 @@ namespace IRaCIS.Core.Application.Interfaces
 
         //Task<PageOutput<TaskMedicalReviewView>> GetTaskMedicalReviewList(TaskMedicalReviewQuery queryTaskMedicalReview);
 
-
-
+        Task<TaskMedicalReviewView> GetNextMedicalReviewTask(GetNextMedicalReviewTaskInDto inDto);
+        Task<IResponseOutput<PageOutput<TaskMedicalReviewView>>> GetMIMMedicalReviewTaskList(TaskMedicalReviewQuery inQuery);
     }
 }

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

@@ -138,7 +138,7 @@ namespace IRaCIS.Core.Application.Service
         {
             var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.MedicalReviewId).Include(x=>x.VisitTask).FirstNotNullAsync();
 
-            var subjectReview = await GetMIMMedicalReviewTaskList(new TaskMedicalReviewQuery()
+            var subjectReview = (await GetMIMMedicalReviewTaskList(new TaskMedicalReviewQuery()
             {
 
                 TrialId = medicalReview.TrialId,
@@ -148,14 +148,14 @@ namespace IRaCIS.Core.Application.Service
                 TrialReadingCriterionId = medicalReview.VisitTask.TrialReadingCriterionId,
                 PageIndex=1,
                 PageSize=1,
-            });
+            })).Data;
 
-            if (subjectReview.Item1.CurrentPageData.Count == 1)
+            if (subjectReview.CurrentPageData.Count == 1)
             {
-                return subjectReview.Item1.CurrentPageData[0];
+                return subjectReview.CurrentPageData[0];
             }
 
-            var data = await GetMIMMedicalReviewTaskList(new TaskMedicalReviewQuery()
+            var data = (await GetMIMMedicalReviewTaskList(new TaskMedicalReviewQuery()
             {
 
                 TrialId = medicalReview.TrialId,
@@ -164,11 +164,11 @@ namespace IRaCIS.Core.Application.Service
                 TrialReadingCriterionId = medicalReview.VisitTask.TrialReadingCriterionId,
                 PageIndex = 1,
                 PageSize = 1,
-            });
+            })).Data;
 
-            if (data.Item1.CurrentPageData.Count == 1)
+            if (data.CurrentPageData.Count == 1)
             {
-                return data.Item1.CurrentPageData[0];
+                return data.CurrentPageData[0];
             }
             else
             {
@@ -186,7 +186,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inQuery"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<(PageOutput<TaskMedicalReviewView>, object)> GetMIMMedicalReviewTaskList(TaskMedicalReviewQuery inQuery)
+        public async Task<IResponseOutput< PageOutput<TaskMedicalReviewView>>> GetMIMMedicalReviewTaskList(TaskMedicalReviewQuery inQuery)
         {
 
             var taskMedicalReviewQueryable = _taskMedicalReviewRepository.Where(t => t.VisitTask.TrialId == inQuery.TrialId && t.MedicalManagerUserId == _userInfo.Id&&t.VisitTask.TrialReadingCriterionId==inQuery.TrialReadingCriterionId)
@@ -206,7 +206,7 @@ namespace IRaCIS.Core.Application.Service
 
             var pageList = await taskMedicalReviewQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TaskMedicalReviewView.Id) : inQuery.SortField, inQuery.Asc);
 
-            return (pageList, new
+            return  ResponseOutput.Ok(pageList, new
             {
 
                 IsConfirmMedicineQuestion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inQuery.TrialReadingCriterionId).Select(x => x.IsConfirmMedicineQuestion).FirstOrDefaultAsync()

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

@@ -237,7 +237,7 @@ namespace IRaCIS.Core.Application.Service
                     //为防止脏数据 这里也多判断一次  
                     var existCurrentVisitTaskList = _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId
                                 && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.TaskState == TaskState.Effect
-                                && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null && t.SourceSubjectVisitId == subjectVisit.Id).ToList();
+                                 && t.SourceSubjectVisitId == subjectVisit.Id).ToList();
 
                     if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Double)
                     {
@@ -459,6 +459,13 @@ namespace IRaCIS.Core.Application.Service
             var haveSignedCount = _readingClinicalDataRepository
                 .Where(t => t.TrialId == trialId && t.IsSign && t.ReadingClinicalDataState == ReadingClinicalDataStatus.HaveSigned && t.ReadingId == readingId && t.ClinicalDataTrialSet.UploadRole == UploadRole.PM).Count();
 
+
+            var readModule =  _readModuleRepository.Where(t => t.Id == readingId).FirstOrDefault();
+            //CRC 阅片期自定义结构化录入是否签名
+            bool crcReadModuleSign = true;
+
+        
+
             //访视
             if (readingCategory == ReadingCategory.Visit)
             {
@@ -478,16 +485,37 @@ namespace IRaCIS.Core.Application.Service
             {
 
             }
+
             //阅片期
             else if (readingCategory == ReadingCategory.Global)
             {
                 needSignCount = trialClinicalDataSetList.Where(t => t.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCriterionId) && t.ClinicalDataLevel == ClinicalLevel.ImageRead && t.UploadRole == UploadRole.PM).Count();
 
+                if (readModule != null)
+                {
+                    // 不存在需要CRC上传的临床数据 或者 PM已确认
+                    crcReadModuleSign =
+                    !trialClinicalDataSetList.Any(x =>
+                     x.UploadRole == UploadRole.CRC
+                    && x.ClinicalDataLevel == ClinicalLevel.ImageRead
+                    && x.ClinicalUploadType == ClinicalUploadType.Structuring
+                    && x.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCriterionId)) || readModule.IsPMConfirm;
+                }
             }
             // 肿瘤学
             else if (readingCategory == ReadingCategory.Oncology)
             {
-                return trialClinicalDataSetList.Any(t => t.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCriterionId) && t.ClinicalDataLevel == ClinicalLevel.OncologyRead);
+                needSignCount= trialClinicalDataSetList.Where(t => t.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCriterionId) && t.ClinicalDataLevel == ClinicalLevel.OncologyRead && t.UploadRole == UploadRole.PM).Count();
+                if (readModule != null)
+                {
+                    // 不存在需要CRC上传的临床数据 或者 PM已确认
+                    crcReadModuleSign =
+                    !trialClinicalDataSetList.Any(x =>
+                     x.UploadRole == UploadRole.CRC
+                    && x.ClinicalDataLevel == ClinicalLevel.OncologyRead
+                    && x.ClinicalUploadType == ClinicalUploadType.Structuring
+                    && x.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCriterionId)) || readModule.IsPMConfirm;
+                }
             }
             else
             {
@@ -495,7 +523,7 @@ namespace IRaCIS.Core.Application.Service
             }
 
             //可能仅仅CRC 基线   没有PM
-            if (needSignCount == haveSignedCount /*&& needSignCount != 0*/)
+            if (needSignCount == haveSignedCount && crcReadModuleSign )
             {
                 isClinicalDataSign = true;
 
@@ -620,7 +648,7 @@ namespace IRaCIS.Core.Application.Service
 
                             foreach (var trialReadingCriterionConfig in trialReadingCriterionConfigList)
                             {
-
+                                var trialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId;
                                 //var subjectCriteriaEvaluation = _subjectCriteriaEvaluationRepository.Where(t => t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.IsJoinEvaluation && t.SubjectId == subjectVisit.SubjectId).FirstOrDefault();
 
                                 if (trialReadingCriterionConfig.IsAutoCreate == true /*|| (trialReadingCriterionConfig.IsAutoCreate == false && subjectCriteriaEvaluation != null && subjectCriteriaEvaluation?.IsJoinEvaluation == true)*/)
@@ -660,7 +688,7 @@ namespace IRaCIS.Core.Application.Service
                                     {
 
                                         var existCurrentVisitTaskList = _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId
-                                        && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.TaskState == TaskState.Effect
+                                        && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect
                                         && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null && t.SourceSubjectVisitId == subjectVisit.Id).ToList();
 
                                         VisitTask? task1 = null;
@@ -1061,7 +1089,7 @@ namespace IRaCIS.Core.Application.Service
 
 
                                                     //该Subject 之前是否有已分配的   如果改变配置  可能会出现  一个Subject 分配的同一个医生 有的在Arm1 有的在Arm2
-                                                    var allocateSubjectArmList = _visitTaskRepository.Where(t => t.SubjectId == subjectVisit.SubjectId && t.TrialId == trialId && t.DoctorUserId != null && t.ArmEnum != Arm.JudgeArm)
+                                                    var allocateSubjectArmList = _visitTaskRepository.Where(t => t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.TrialId == trialId && t.DoctorUserId != null && t.ArmEnum != Arm.JudgeArm)
                                                         .Select(t => new { t.DoctorUserId, t.ArmEnum }).Distinct().ToList();
 
                                                     //不是初次分配
@@ -1082,7 +1110,7 @@ namespace IRaCIS.Core.Application.Service
                                                             if (trialReadingCriterionConfig.IsReadingTaskViewInOrder)
                                                             {
                                                                 //之前有回退到影像上传的访视 那么当前访视一致性核查通过的时候，当前访视生成但是不分配出去(排除失访的)
-                                                                var beforeBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum < subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
+                                                                var beforeBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.VisitTaskNum < subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
 
 
                                                                 if (beforeBackVisitTask == null)
@@ -1107,11 +1135,11 @@ namespace IRaCIS.Core.Application.Service
                                                                     #endregion
 
 
-                                                                    var followBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
+                                                                    var followBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.VisitTaskNum > subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed && t.SourceSubjectVisit.IsLostVisit == false).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync();
 
                                                                     //存在退回访视1  又退回基线 这种情况   生成任务  考虑基线先一致性核查通过，但是访视1还未通过时  生成任务
                                                                     var followVisitTaskList = await _visitTaskRepository
-                                                                         .Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.SourceSubjectVisit.CheckState == CheckStateEnum.CVPassed && t.ReadingCategory == ReadingCategory.Visit && t.IsAnalysisCreate == false, true)
+                                                                         .Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.VisitTaskNum > subjectVisit.VisitNum && t.SourceSubjectVisit.CheckState == CheckStateEnum.CVPassed && t.ReadingCategory == ReadingCategory.Visit && t.IsAnalysisCreate == false, true)
                                                                          .WhereIf(followBackVisitTask != null, t => t.VisitTaskNum < followBackVisitTask.VisitTaskNum)
                                                                          .ToListAsync();
 
@@ -1290,6 +1318,11 @@ namespace IRaCIS.Core.Application.Service
 
                     //加一个去重的判断   IR 申请重阅的时候，有脏数据 （例如多个follow 2 ），但是生成时候不生成
 
+                    //var existTask = _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == reReadingVisitTask.SubjectId
+                    //&& t.TrialReadingCriterionId == reReadingVisitTask.TrialReadingCriterionId && t.TaskState == TaskState.Effect
+                    // && t.SourceSubjectVisitId == reReadingVisitTask.SourceSubjectVisitId && t.ArmEnum == reReadingVisitTask.ArmEnum && t.DoctorUserId == reReadingVisitTask.DoctorUserId).FirstOrDefault();
+
+
                     var newTask = await _visitTaskRepository.AddAsync(new VisitTask()
                     {
 
@@ -1322,7 +1355,7 @@ namespace IRaCIS.Core.Application.Service
                         IsNeedClinicalDataSign = reReadingVisitTask.IsNeedClinicalDataSign,
                         IsClinicalDataSign = reReadingVisitTask.IsClinicalDataSign,
                         BeforeConvertedTaskId = reReadingVisitTask.BeforeConvertedTaskId,
-                        ReReadingApplyState= ReReadingApplyState.Default,
+                        ReReadingApplyState = ReReadingApplyState.Default,
                         // TaskAllocationState = reReadingVisitTask.TaskAllocationState,
                         // AllocateTime = DateTime.Now,
                         //DoctorUserId = reReadingVisitTask.DoctorUserId,

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

@@ -107,14 +107,12 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 .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 })
                 .ToListAsync();
 
-            if (list.Count == 0)
-            {
-                //---该项目还未确认任何一个阅片标准
-                throw new BusinessValidationFailedException(_localizer["VisitTask_VisitTask_TaskAlreadyApplied"]);
-
-            }
-
+            //if (list.Count == 0)
+            //{
+            //    //---该项目还未确认任何一个阅片标准
+            //    throw new BusinessValidationFailedException(_localizer["VisitTask_VisitTask_TaskAlreadyApplied"]);
 
+            //}
 
 
             return list.AsQueryable().WhereIf(isHaveSigned == true, t => t.ReadingInfoSignTime != null)
@@ -122,6 +120,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
         }
 
 
+
+
         /// <summary>
         /// Subject 任务类型  统计 +分配情况
         /// </summary>
@@ -1081,18 +1081,22 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             var visitQuery = _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.DoctorUserId == _userInfo.Id
             && x.TaskState == TaskState.Effect /*&& x.TrialReadingCriterionId== inDto.TrialReadingCriterionId*/)
-                .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)
 
+                //前序 不存在  未生成任务的访视
+                 .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(t => t.CheckState != CheckStateEnum.CVPassed) ? t.VisitTaskNum <= t.Subject.SubjectVisitList.Where(t => t.CheckState != CheckStateEnum.CVPassed).Min(t => t.VisitNum) : true)
+                // 前序 不存在 未一致性核查未通过的
+                .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)
                 //满足前序访视不存在 需要签署但是未签署  sql  相当复杂    同时想查询所有未读的统计数字 就无法统计   byzhouhang  
                 //但是加字段 IsFrontTaskNeedSignButNotSign   那么签名临床数据的时候，要对该subject 该标准的有效的任务  这个字段需要在签名的时候维护   采取这种方式   统计数字灵活
                 //.Where(t => t.Subject.SubjectVisitTaskList.AsQueryable().Where(visitTaskLambda).Any(c => c.IsNeedClinicalDataSign == true && c.IsClinicalDataSign == false && c.VisitTaskNum < t.VisitTaskNum))
                 .WhereIf(!string.IsNullOrEmpty(inDto.SubjectCode), t => (t.Subject.Code.Contains(inDto.SubjectCode) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(inDto.SubjectCode) && t.IsAnalysisCreate));
 
 
-			var visitGroupQuery = visitQuery.GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode });
+            var visitGroupQuery = visitQuery.GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode });
 
             var visitTaskQuery = visitGroupQuery.Select(x => new IRUnReadSubjectView()
             {
@@ -1141,7 +1145,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             // 不这样写会有问题
             var count = visitQuery.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned && y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
-			 .GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode }).Count();
+             .GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode }).Count();
 
             var result = new List<IRUnReadSubjectView>();
 
@@ -1269,7 +1273,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
             var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == trialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsAutoCreate, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
 
 
-
             foreach (var task in taskList)
             {
 
@@ -1334,13 +1337,13 @@ namespace IRaCIS.Core.Application.Service.Allocation
                     // 有序
                     if (criterionConfig.IsReadingTaskViewInOrder)
                     {
-
+                        // 针对同一个subject   不同阅片人 针对同一个访视申请重阅，是允许的，所以同一阅片人，针对同一suject 有访视申请重阅还未处理，不允许申请重阅
                         if (await _visitTaskReReadingRepository.AnyAsync(t => t.OriginalReReadingTask.TrialId == task.TrialId && t.OriginalReReadingTask.SubjectId == task.SubjectId && t.OriginalReReadingTask.TaskState == TaskState.Effect
-                                                       && t.OriginalReReadingTask.TrialReadingCriterionId == task.TrialReadingCriterionId
+                                                       && t.OriginalReReadingTask.TrialReadingCriterionId == task.TrialReadingCriterionId && t.OriginalReReadingTask.DoctorUserId == task.DoctorUserId
                                                        && t.OriginalReReadingTask.ReadingTaskState == ReadingTaskState.HaveSigned && t.RequestReReadingType == RequestReReadingType.DocotorApply && t.RequestReReadingResultEnum == RequestReReadingResult.Default))
                         {
                             //---当前为有序阅片，该受试者已有访视已申请重阅还未处理，暂不能继续申请重阅
-                            return ResponseOutput.NotOk(_localizer["VisitTask_SequentialReading"]);
+                            throw new BusinessValidationFailedException(_localizer["VisitTask_SequentialReading"]);
                         }
 
 
@@ -1354,10 +1357,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
                             var originalTask = pmApply.OriginalReReadingTask;
 
                             //PM 有序影响列表
-                            if (await _visitTaskRepository.Where(t => t.TrialId == originalTask.TrialId && t.SubjectId == originalTask.SubjectId && t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.Allocated && t.IsAnalysisCreate == false && t.TrialReadingCriterionId == originalTask.TrialReadingCriterionId && t.VisitTaskNum > originalTask.VisitTaskNum).AnyAsync(t => t.VisitTaskNum == task.VisitTaskNum))
+                            if (await _visitTaskRepository.Where(t => t.TrialId == originalTask.TrialId && t.SubjectId == originalTask.SubjectId && t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.Allocated && t.IsAnalysisCreate == false && t.TrialReadingCriterionId == originalTask.TrialReadingCriterionId && t.VisitTaskNum >= originalTask.VisitTaskNum)
+                                .AnyAsync(t => t.VisitTaskNum == task.VisitTaskNum))
                             {
                                 //---当前为有序阅片，影像存在问题，项目组已申请回退,暂不能申请重阅
-                                return ResponseOutput.NotOk(_localizer["VisitTask_ImageProblem"]);
+                                throw new BusinessValidationFailedException(_localizer["VisitTask_ImageProblem"]);
                             }
 
                         }
@@ -1412,7 +1416,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 //添加申请记录
                 var visitTaskReReading = await _visitTaskReReadingRepository.AddAsync(new VisitTaskReReading()
                 {
-
+                    TrialId=applyReReadingCommand.TrialId,
                     RootReReadingTaskId = rootReReadingTaskId == Guid.Empty ? task.Id : rootReReadingTaskId,
                     OriginalReReadingTaskId = task.Id,
                     RequestReReadingTime = DateTime.Now,
@@ -1526,7 +1530,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                 var criterionConfig = await _trialReadingCriterionRepository.Where(x => x.Id == origenalTask.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.CriterionType, x.IsAdditionalAssessment, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync();
 
-
                 //更新申请信息
                 var visitTaskReReadingAppply = await _visitTaskReReadingRepository.FirstOrDefaultAsync(t => t.Id == item.Id);
                 visitTaskReReadingAppply.RequestReReadingConfirmUserId = _userInfo.Id;
@@ -1539,6 +1542,44 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 //是否是一致性分析任务  正常申请 会影响一致性分析任务
                 filterExpression = filterExpression.And(t => t.IsAnalysisCreate == origenalTask.IsAnalysisCreate);
 
+                //IR 申请1.1 基线重阅，影响附加评估两个IR所有的任务
+                var isIR1Point1AdditionalAssessmentBaseline = false;
+
+                //附加评估  IR  和PM 看到的影响列表不一样
+
+                //1.1 有附加评估，会影响其他标准的任务
+                if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment)
+                {
+                   // PM申请 SPM / CPM审批
+                    if (visitTaskReReadingAppply.RequestReReadingType == RequestReReadingType.TrialGroupApply && (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM))
+                    {
+                        filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
+                    }
+                    //IR 申请  PM审批
+                    else
+                    {
+
+                        // 1.1 基线任务影响BM任务
+                        if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager && _subjectVisitRepository.Any(t => t.Id == origenalTask.SourceSubjectVisitId && t.IsBaseLine == true))
+                        {
+
+                            isIR1Point1AdditionalAssessmentBaseline = true;
+
+                            //filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
+                        }
+                        // 1.1 非基线任务不影响BM任务
+                        else
+                        {
+                            filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId);
+                        }
+                    }
+                }
+                else
+                {
+                    //默认影响的都是该标准的任务
+                    filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId);
+                }
+
 
                 if (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree)
                 {
@@ -1735,43 +1776,12 @@ namespace IRaCIS.Core.Application.Service.Allocation
                     //IR申请  PM 审批  注意这里有一致性分析的申请同意  不会回退访视，在此要生成影响的访视任务
                     else if (visitTaskReReadingAppply.RequestReReadingType == RequestReReadingType.DocotorApply && (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.AIR))
                     {
-                        #region 两个IR 申请同一访视,其他人的申请记录也设置为同意   
-
-
-                        await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.OriginalReReadingTask.SubjectId == origenalTask.SubjectId &&
-                        t.OriginalReReadingTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed &&
-                        t.RequestReReadingType == RequestReReadingType.DocotorApply &&
-                       t.OriginalReReadingTask.VisitTaskNum == origenalTask.VisitTaskNum &&
-                       t.Id != item.Id, u => new VisitTaskReReading()
-                       {
-                           RequestReReadingConfirmUserId = _userInfo.Id,
-                           RequestReReadingResultEnum = RequestReReadingResult.Agree,
-                       });
-
-
-
-
-                        #endregion
 
 
 
                         //有序阅片
                         if (criterionConfig.IsReadingTaskViewInOrder)
                         {
-                            //1.1 有附加评估，会影响其他标准的任务
-                            if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment == true)
-                            {
-                                filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
-
-                            }
-                            else
-                            {
-                                filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId);
-                            }
-
-
-
-
                             #region 有序 IR 申请  重阅 影响的其他访视查询
 
 
@@ -1795,6 +1805,17 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                       )) || t.Id == origenalTask.Id)
                                        ;
                                     }
+                                    else if (isIR1Point1AdditionalAssessmentBaseline)
+                                    {
+                                        filterExpression = filterExpression.And(t => t.VisitTaskNum >= origenalTask.VisitTaskNum &&
+               (((
+                 ((t.ReadingCategory == ReadingCategory.Visit || t.ReadingCategory == ReadingCategory.Global) && t.DoctorUserId == origenalTask.DoctorUserId)
+                   // 裁判 肿瘤学是另外的医生做
+                   || t.ReadingCategory == ReadingCategory.Judge
+                   || t.ReadingCategory == ReadingCategory.Oncology
+               ) && t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId) || (t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB))
+                );
+                                    }
                                     else
                                     {
                                         filterExpression = filterExpression.And(t => t.VisitTaskNum >= origenalTask.VisitTaskNum &&
@@ -1899,7 +1920,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                 }
 
                                 // 影响的任务 仅仅访视类别的才生成  或者就是IR 申请的任务
-                                if ( influenceTask.ReadingCategory == ReadingCategory.Visit || influenceTask.Id == origenalTask.Id)
+                                if (influenceTask.ReadingCategory == ReadingCategory.Visit || influenceTask.Id == origenalTask.Id)
                                 {
 
 
@@ -1912,11 +1933,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
 
                                     // i1.1标准 当前任务是转变任务，并且影响列表里有转变之前的任务 那么该访视任务就不生成
-                                    if (criterionConfig.CriterionType == CriterionType.IRECIST1Point1 )
+                                    if (criterionConfig.CriterionType == CriterionType.IRECIST1Point1)
                                     {
                                         //申请的任务是冻结的任务（该任务发生转变）   影响自己 以及转变后的 以及后续任务 但是生成的时候，仅仅生成转变之前的
                                         //申请的是转变之后的任务 （转变生成的任务）  影响自己以及后续任务     生成转变后的任务
-                                        if ( influenceTask.BeforeConvertedTaskId != null && influenceTaskList.Any(t => t.Id == influenceTask.BeforeConvertedTaskId))
+                                        if (influenceTask.BeforeConvertedTaskId != null && influenceTaskList.Any(t => t.Id == influenceTask.BeforeConvertedTaskId))
                                         {
                                             //有转化的任务  和转化之前的任务时，转化后的任务时不生成的
                                             continue;
@@ -1951,7 +1972,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                             newTask.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
 
 
-                                            if (visitTaskReReadingAppply.IsCopyOrigenalForms && influenceTask.Id==origenalTask.Id)
+                                            if (visitTaskReReadingAppply.IsCopyOrigenalForms && influenceTask.Id == origenalTask.Id)
                                             {
                                                 if (origenalTask.ReadingCategory == ReadingCategory.Visit)
                                                 {
@@ -2035,7 +2056,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                         else
                         {
 
-                            filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == origenalTask.TrialReadingCriterionId);
+
                             //1.当前任务及裁判任务
                             //2.影响当前阅片人的任务
                             filterExpression = filterExpression.And(t => t.Id == origenalTask.Id || t.Id == origenalTask.JudgeVisitTaskId);
@@ -2205,7 +2226,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             var task = (await _visitTaskRepository.Where(t => t.Id == taskId).FirstOrDefaultAsync()).IfNullThrowException();
 
-            var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == task.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.CriterionType, x.IsAutoCreate, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
+            var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == task.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.CriterionType, x.IsAutoCreate, x.IsAdditionalAssessment, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
 
             if (criterionConfig.IsAutoCreate == false)
             {
@@ -2234,6 +2255,21 @@ namespace IRaCIS.Core.Application.Service.Allocation
             }
 
             Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == task.SubjectId && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze) && t.TaskAllocationState == TaskAllocationState.Allocated;
+
+            
+            if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment)
+            {
+                //影像退回，必定影响两个标准的任务
+                filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == task.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
+
+
+            }
+            else
+            {
+                //默认影响的都是该标准的任务
+                filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == task.TrialReadingCriterionId);
+            }
+
             //PM 才允许操作
             if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
             {
@@ -2458,7 +2494,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
 
                     //BM后续访视 ，筛选状态不变，任务生成状态重置（实际该访视任务状态 可能是重阅重置了或者失效了，需要后续生成，或者取消分配了，需要后续重新分配）
-                    await _subjectCriteriaEvaluationVisitFilterRepository.BatchUpdateNoTrackingAsync(t => t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB && t.SubjectVisit.SubjectId == task.SubjectId && otherVisitIdList.Contains(t.SubjectVisitId),
+                    await _subjectCriteriaEvaluationVisitFilterRepository.UpdatePartialFromQueryAsync(t => t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB && t.SubjectVisit.SubjectId == task.SubjectId && otherVisitIdList.Contains(t.SubjectVisitId),
                         t => new SubjectCriteriaEvaluationVisitFilter()
                         {
                             IsGeneratedTask = false
@@ -2564,6 +2600,49 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             filterExpression = filterExpression.And(t => t.IsAnalysisCreate == filterObj.IsAnalysisCreate);
 
+            //IR 申请1.1 基线重阅，影响附加评估所有的任务
+            var isIR1Point1AdditionalAssessmentBaseline = false;
+
+            //附加评估  IR  和PM 看到的影响列表不一样
+            if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment)
+            {
+
+                //  IR 申请  PM 同意  
+                if (((_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager && applyId != null && await _visitTaskReReadingRepository.AnyAsync(t => t.Id == applyId && t.CreateUser.UserTypeEnum == UserTypeEnum.IndependentReviewer))
+                    || (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer && applyId == null)))
+                {
+
+                    // 1.1 基线任务影响BM任务
+                    if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager &&  _subjectVisitRepository.Any(t=>t.Id==filterObj.SourceSubjectVisitId && t.IsBaseLine==true))
+                    {
+
+                        isIR1Point1AdditionalAssessmentBaseline=true;
+                        //filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
+
+
+                    }
+                    // 1.1 非基线任务不影响BM任务
+                    else
+                    {
+                        filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId);
+                    }
+
+                }
+                //（1、PM回退，PM申请重阅，SPM同意回退）
+                else
+                {
+                    filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
+                 
+                }
+            }
+            else
+            {
+                //默认影响的都是该标准的任务
+                filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId);
+            }
+
+
+
             //重阅影响  
             if (isReReading)
             {
@@ -2576,30 +2655,10 @@ namespace IRaCIS.Core.Application.Service.Allocation
                     || (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer && applyId == null))
                 {
 
-                    //附加评估  IR  和PM 看到的影响列表不一样
-                    if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment)
-                    {
-                        if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
-                        {
-                            filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
-                        }
-                        else
-                        {
+                        //当前任务及其之后的所有访视任务、全局任务、裁判任务、肿瘤学阅片任务
 
-                            filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId);
-                        }
-                    }
-                    else
-                    {
-                        //默认影响的都是该标准的任务
-                        filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId);
-                    }
-
-
-                    //当前任务及其之后的所有访视任务、全局任务、裁判任务、肿瘤学阅片任务
-
-                    //有序
-                    if (criterionConfig.IsReadingTaskViewInOrder)
+                        //有序
+                        if (criterionConfig.IsReadingTaskViewInOrder)
                     {
 
                         switch (filterObj.ReadingCategory)
@@ -2608,11 +2667,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                 //影响当前医生 以及当前医生之后的 1、访视任务 已经读完的
                                 //2、后续任务如果是全局、肿瘤学阅片任务，状态为阅片完成标记为重阅重置；若在阅片中，则标记为失效；若为待阅片，则标记为失效；
                                 //3、当前任务、后续访视任务或者全局任务触发了裁判任务，若裁判任务状态为阅片完成，则标记为重阅重置；若在阅片中或待阅片，则标记为失效
-                                // filterExpression = filterExpression.And(t => t.VisitTaskNum >= filterObj.VisitTaskNum &&
-                                //((t.DoctorUserId == filterObj.DoctorUserId && ((t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState == ReadingTaskState.HaveSigned) || t.ReadingCategory == ReadingCategory.Global))
-                                // ||
-                                //   t.ReadingCategory == ReadingCategory.Judge || t.ReadingCategory == ReadingCategory.Oncology)
-                                // );
 
                                 //申请的是转化的，那么影响列表要排除转化之前的
                                 if (criterionConfig.CriterionType == CriterionType.IRECIST1Point1 && filterObj.BeforeConvertedTaskId != null)
@@ -2628,6 +2682,18 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                   )) || t.Id == filterObj.Id)
                                    ;
                                 }
+                               // IR 申请1.1 基线重阅，影响附加评估所有的任务
+                                else if (isIR1Point1AdditionalAssessmentBaseline)
+                                {
+                                    filterExpression = filterExpression.And(t => t.VisitTaskNum >= filterObj.VisitTaskNum &&
+                          (((
+                            ((t.ReadingCategory == ReadingCategory.Visit || t.ReadingCategory == ReadingCategory.Global) && t.DoctorUserId == filterObj.DoctorUserId)
+                              // 裁判 肿瘤学是另外的医生做
+                              || t.ReadingCategory == ReadingCategory.Judge
+                              || t.ReadingCategory == ReadingCategory.Oncology
+                          )&& t.TrialReadingCriterionId==filterObj.TrialReadingCriterionId )||( t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB))
+                           );
+                                }
                                 else
                                 {
                                     filterExpression = filterExpression.And(t => t.VisitTaskNum >= filterObj.VisitTaskNum &&
@@ -2706,6 +2772,10 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 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))
                 {
+
+
+
+
                     //有序
                     if (criterionConfig.IsReadingTaskViewInOrder)
                     {

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

@@ -165,7 +165,40 @@ namespace IRaCIS.Application.Contracts
 
 
 
+    public class AddBasicDicAndChild
+    {
+        [NotDefault]
+        public Guid ConfigTypeId { get; set; }
 
+        public bool IsEnable { get; set; }
+
+        public string Code { get; set; } = String.Empty;
+
+        public int ShowOrder { get; set; }
+        public string Description { get; set; } = String.Empty;
+
+        public DicDataTypeEnum DataTypeEnum { get; set; }
+
+
+        public List<AddBasicDicChild> ChildList { get; set; } = new List<AddBasicDicChild>();
+    }
+
+
+    public class AddBasicDicChild
+    {
+        public string Code { get; set; } = String.Empty;
+        public string Value { get; set; } = String.Empty;
+
+        public string ValueCN { get; set; } = String.Empty;
+
+        public string ChildGroup { get; set; } = String.Empty;
+
+        public int ShowOrder { get; set; }
+
+        public string Description { get; set; } = String.Empty;
+
+        public bool IsEnable { get; set; } = true;
+    }
 
 
 

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

@@ -144,6 +144,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public string Value { get; set; } = string.Empty;
         public string ValueCN { get; set; } = string.Empty;
         public string Description { get; set; } = string.Empty;
+        public string DescriptionCN { get; set; } = string.Empty;
         public DateTime CreateTime { get; set; }
         public Guid CreateUserId { get; set; }
         public DateTime UpdateTime { get; set; }

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

@@ -0,0 +1,75 @@
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2023-06-01 13:38:20 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.Collections.Generic;
+namespace IRaCIS.Core.Application.ViewModel
+{
+    /// <summary> InternationalizationView  列表视图模型 </summary>
+    public class InternationalizationView : InternationalizationAddOrEdit
+    {
+        public int ShowOrder { get; set; }
+        public Guid CreateUserId { get; set; }
+        public DateTime CreateTime { get; set; }
+        public DateTime UpdateTime { get; set; }
+        public Guid UpdateUserId { get; set; }
+
+    }
+
+    ///<summary>InternationalizationQuery  列表查询参数模型</summary>
+    public class InternationalizationQuery : PageInput
+    {
+        public int? InternationalizationType { get; set; }
+        public int? State { get; set; }
+        public string? Description { get; set; }
+        public string? Code { get; set; }
+        public string? Value { get; set; }
+
+        public string? ValueCN { get; set; }
+
+    }
+
+    ///<summary> InternationalizationAddOrEdit  列表查询参数模型</summary>
+    public class InternationalizationAddOrEdit
+    {
+        public Guid? Id { get; set; }
+        public int State { get; set; }
+        public string Description { get; set; } = string.Empty;
+        public string Code { get; set; } = string.Empty;
+        public string Value { get; set; } = string.Empty;
+        public string ValueCN { get; set; } = string.Empty;
+
+        public int InternationalizationType { get; set; }
+    }
+
+    public class BatchAddInternationalization
+    {
+        public int InternationalizationType { get; set; }
+
+        public int State { get; set; }
+
+        public List<BatchAddInternationalizationDto> AddList { get; set; }
+    }
+
+
+    public class BatchAddInternationalizationDto 
+    {
+        public string Description { get; set; } = string.Empty;
+        public string Code { get; set; } = string.Empty;
+        public string Value { get; set; } = string.Empty;
+        public string ValueCN { get; set; } = string.Empty;
+    }
+
+    public class InternationalizationSimpleDto
+    {
+        public string Code { get; set; } = string.Empty;
+        public string Value { get; set; } = string.Empty;
+        public string ValueCN { get; set; } = string.Empty;
+    }
+
+}
+
+

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

@@ -0,0 +1,44 @@
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2023-06-27 15:47:02 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.Collections.Generic;
+namespace IRaCIS.Core.Application.ViewModel
+{
+    /// <summary> PublishLogView  列表视图模型 </summary>
+    public class PublishLogView : PublishLogAddOrEdit
+    {
+
+        public DateTime CreateTime { get; set; }
+        public Guid CreateUserId { get; set; }
+        public Guid UpdateUserId { get; set; }
+        public DateTime UpdateTime { get; set; }
+    }
+
+    ///<summary>PublishLogQuery  列表查询参数模型</summary>
+    public class PublishLogQuery:PageInput
+    {
+
+        public string? Version { get; set; }
+
+        public string? UpdateContent { get; set; }
+
+    }
+
+    ///<summary> PublishLogAddOrEdit  列表查询参数模型</summary>
+    public class PublishLogAddOrEdit
+    {
+        public Guid? Id { get; set; }
+        public string Version { get; set; }
+        public DateTime PublishTime { get; set; }
+        public string UpdateContent { get; set; }
+
+    }
+
+
+}
+
+

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

@@ -88,6 +88,39 @@ namespace IRaCIS.Application.Services
             return ResponseOutput.Ok(entity.Id.ToString());
         }
 
+
+        /// <summary>
+        /// 添加字典 的同时 一起添加子项  --New  
+        /// </summary>
+        /// <param name="addBasicDicAndChild"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> AddBasicDicAndChild(AddBasicDicAndChild addBasicDicAndChild)
+        {
+            var verifyExp1 = new EntityVerifyExp<Dictionary>()
+            {
+                VerifyExp = t => t.Code == addBasicDicAndChild.Code && t.ParentId == null,
+                VerifyMsg = $"已有{addBasicDicAndChild.Code}名称的字典",
+                IsVerify = true
+            };
+
+
+            var entity = await _dicRepository.InsertFromDTOAsync(addBasicDicAndChild, false, verifyExp1);
+
+            var childList = _mapper.Map<List<Dictionary>>(addBasicDicAndChild.ChildList);
+
+            foreach (var item in childList)
+            {
+                item.DataTypeEnum = addBasicDicAndChild.DataTypeEnum;
+                item.ParentId = entity.Id;
+            }
+
+            await _dicRepository.AddRangeAsync(childList);
+
+            await _dicRepository.SaveChangesAsync();
+            return ResponseOutput.Ok(entity.Id.ToString());
+        }
+
         /// <summary>
         /// New  查询条件  
         /// </summary>

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

@@ -1,8 +1,10 @@
 using DocumentFormat.OpenXml.Office2010.ExcelAc;
+using DocumentFormat.OpenXml.Presentation;
 using DocumentFormat.OpenXml.Spreadsheet;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Contracts.DTO;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
@@ -28,9 +30,167 @@ namespace IRaCIS.Core.Application.Service.Common
     public class ExcelExportService : BaseService
     {
 
+
+        #region 后续需要移动过来
+
+
+
+        /// <summary>
+        /// 项目参与人员导出
+        /// </summary>
+        /// <param name="param"></param>
+        /// <param name="_commonDocumentRepository"></param>
+        /// <param name="_dictionaryService"></param>
+        /// <param name="_trialRepository"></param>
+        /// <param name="_trialUseRepository"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<IActionResult> TrialUserListExport(TrialMaintenanceExportQuery param,
+            [FromServices] IRepository<CommonDocument> _commonDocumentRepository,
+            [FromServices] IDictionaryService _dictionaryService,
+              [FromServices] IRepository<Trial> _trialRepository,
+               [FromServices] IRepository<TrialUser> _trialUseRepository
+
+            )
+        {
+
+
+            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()
+                .WhereIf(param.UserTypeId != null, t => t.User.UserTypeId == param.UserTypeId)
+                .WhereIf(!string.IsNullOrWhiteSpace(param.UserName), t => t.User.UserName.Contains(param.UserName))
+
+                .WhereIf(param.IsDeleted != null, t => t.IsDeleted == param.IsDeleted)
+                .WhereIf(!string.IsNullOrWhiteSpace(param.OrganizationName),
+                    t => t.User.OrganizationName.Contains(param.OrganizationName))
+                .WhereIf(!string.IsNullOrWhiteSpace(param.UserRealName),
+                    t => (t.User.FullName).Contains(param.UserRealName))
+                .ProjectTo<TrialMaintenanceDTO>(_mapper.ConfigurationProvider).ToListAsync();
+
+
+            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialUserList_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(TrialMaintenanceDTO));
+
+        }
+
+        /// <summary>
+        /// Site用户列表导出
+        /// </summary>
+        /// <param name="param"></param>
+        /// <param name="_commonDocumentRepository"></param>
+        /// <param name="_dictionaryService"></param>
+        /// <param name="_trialRepository"></param>
+        /// <param name="_trialSiteUserRepository"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<IActionResult> TrialSiteUserListExport(SiteCRCExportQueryDTO param,
+            [FromServices] IRepository<CommonDocument> _commonDocumentRepository, 
+            [FromServices] IDictionaryService _dictionaryService,
+             [FromServices] IRepository<Trial> _trialRepository,
+               [FromServices] IRepository<TrialSiteUser> _trialSiteUserRepository
+            )
+        {
+
+
+            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()
+                .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),
+                    t => t.TrialSite.TrialSiteAliasName.Contains(param.TrialSiteAliasName))
+                .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteCode),
+                    t => t.TrialSite.TrialSiteCode.Contains(param.TrialSiteCode))
+                .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator,
+                    t => t.UserId == _userInfo.Id)
+                .WhereIf(!string.IsNullOrWhiteSpace(param.UserKeyInfo), t => (t.User.FullName).Contains(param.UserKeyInfo)
+                    || t.User.UserName.Contains(param.UserKeyInfo) || t.User.EMail.Contains(param.UserKeyInfo))
+
+                .ProjectTo<SiteUserExportDTO>(_mapper.ConfigurationProvider).ToListAsync();
+
+            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSiteUserList_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SiteUserExportDTO));
+
+        }
+
+        /// <summary>
+        /// Site用户汇总表导出
+        /// </summary>
+        /// <param name="queryParam"></param>
+        /// <param name="_commonDocumentRepository"></param>
+        /// <param name="_trialSiteSurveyRepository"></param>
+        /// <param name="_trialSiteUserSurveyRepository"></param>
+        /// <param name="_trialRepository"></param>
+        /// <param name="_dictionaryService"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<IActionResult> TrialSiteUserSummaryListExport(TrialSiteUserSurveyExportQueryDto queryParam,
+            [FromServices] IRepository<CommonDocument> _commonDocumentRepository,
+            [FromServices] IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
+            [FromServices] IRepository<TrialSiteUserSurvey> _trialSiteUserSurveyRepository,
+             [FromServices] IRepository<Trial> _trialRepository,
+             [FromServices] IDictionaryService _dictionaryService
+        )
+        {
+
+            var data = (await _trialRepository.Where(t => t.Id == queryParam.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
+
+            var groupSelectIdQuery =
+                _trialSiteSurveyRepository.Where(t => t.TrialId == queryParam.TrialId)
+                    .WhereIf(queryParam.SiteId != null, t => t.SiteId == queryParam.SiteId)
+                    .WhereIf(!string.IsNullOrEmpty(queryParam.FormWriterKeyInfo), t => (t.UserName).Contains(queryParam.FormWriterKeyInfo) || t.Email.Contains(queryParam.FormWriterKeyInfo) || t.Phone.Contains(queryParam.FormWriterKeyInfo))
+                    .GroupBy(t => t.SiteId)
+                    .Select(g => g.OrderByDescending(u => u.CreateTime).Select(t => t.Id).First());
+
+
+            var query = _trialSiteUserSurveyRepository
+                .Where(t => groupSelectIdQuery.Contains(t.TrialSiteSurveyId))
+                .WhereIf(queryParam.UserTypeId != null, t => t.UserTypeId == queryParam.UserTypeId)
+                .WhereIf(queryParam.IsGenerateAccount != null, t => t.IsGenerateAccount == queryParam.IsGenerateAccount)
+                .WhereIf(queryParam.TrialRoleNameId != null, t => t.TrialRoleNameId == queryParam.TrialRoleNameId)
+                .WhereIf(queryParam.State != null && queryParam.State != TrialSiteUserStateEnum.OverTime, t => t.InviteState == queryParam.State)
+                .WhereIf(queryParam.State != null && queryParam.State == TrialSiteUserStateEnum.OverTime, t => t.InviteState == TrialSiteUserStateEnum.HasSend && t.ExpireTime < DateTime.Now)
+                .WhereIf(!string.IsNullOrEmpty(queryParam.UserName), t => (t.LastName + " / " + t.FirstName).Contains(queryParam.UserName))
+                .WhereIf(!string.IsNullOrEmpty(queryParam.OrganizationName), t => t.OrganizationName.Contains(queryParam.OrganizationName))
+                .ProjectTo<TrialSiteUserSummaryDto>(_mapper.ConfigurationProvider);
+
+            data.List = await query.ToListAsync();
+
+
+
+            var exportInfo = data;
+
+            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSiteUserSummary_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(TrialSiteUserSummaryDto));
+
+        }
+
+
+        #endregion
+
+
+
+
+
         #region 导表查询
 
 
+
+
+
+
+
+
+
+
         /// <summary>
         /// 影像上传列表    只导出已上传状态的访视记录
         /// </summary>
@@ -72,7 +232,7 @@ 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.IsEn_US = _userInfo.IsEn_Us;
 
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialCRCUploadImageList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(CRCVisitExportDTO));
@@ -122,6 +282,7 @@ 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.IsEn_US = _userInfo.IsEn_Us;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialQCImageChanllengeList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(QCChanllengeExportDto));
         }
@@ -158,8 +319,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.IsEn_US = _userInfo.IsEn_Us;
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository , _hostEnvironment, _dictionaryService, typeof(SubjectExportDTO));
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SubjectExportDTO));
 
         }
 
@@ -235,15 +397,15 @@ namespace IRaCIS.Core.Application.Service.Common
                                 IsFinalVisit = t.IsFinalVisit,
                                 IsLostVisit = t.IsLostVisit,
                                 ReadingStatus =
-                                t.VisitTaskList.Where(t => t.TaskState == TaskState.Effect && t.TrialReadingCriterionId==dto.TrialReadingCriterionId && t.TaskAllocationState == TaskAllocationState.Allocated && t.IsAnalysisCreate == false && t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState == ReadingTaskState.HaveSigned).Count() == (int)trialReadingCriterion.ReadingType ?
+                                t.VisitTaskList.Where(t => t.TaskState == TaskState.Effect && t.TrialReadingCriterionId == dto.TrialReadingCriterionId && t.TaskAllocationState == TaskAllocationState.Allocated && t.IsAnalysisCreate == false && t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState == ReadingTaskState.HaveSigned).Count() == (int)trialReadingCriterion.ReadingType ?
                                 ReadingStatusEnum.ReadCompleted : t.VisitTaskList.Where(t => t.TaskState == TaskState.Effect && t.TrialReadingCriterionId == dto.TrialReadingCriterionId && t.IsAnalysisCreate == false && t.ReadingCategory == ReadingCategory.Visit && t.TaskAllocationState == TaskAllocationState.Allocated).Count() == (int)trialReadingCriterion.ReadingType ? ReadingStatusEnum.ImageReading :
                                 t.ReadingStatus
                             }).ToList(),
 
-                            ModuleList = subject.ReadModuleList.Where(t=>t.TrialReadingCriterionId==dto.TrialReadingCriterionId).Select(t => new SubjectProgressDto.MouduleProgress()
+                            ModuleList = subject.ReadModuleList.Where(t => t.TrialReadingCriterionId == dto.TrialReadingCriterionId).Select(t => new SubjectProgressDto.MouduleProgress()
                             {
                                 TaskName = t.ModuleName,
-                                VisitTaskNum = (t.ReadingSetType == ReadingSetType.ImageReading ? ReadingCommon.TaskNumDic[ReadingCategory.Global] : ReadingCommon.TaskNumDic[ReadingCategory.Oncology])  + t.SubjectVisit.VisitNum,
+                                VisitTaskNum = (t.ReadingSetType == ReadingSetType.ImageReading ? ReadingCommon.TaskNumDic[ReadingCategory.Global] : ReadingCommon.TaskNumDic[ReadingCategory.Oncology]) + t.SubjectVisit.VisitNum,
                                 ReadingSetType = t.ReadingSetType,
                                 ReadingStatus = t.ModuleTaskList.Where(t => t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false && (t.ReadingCategory == ReadingCategory.Oncology || t.ReadingCategory == ReadingCategory.Global) && t.ReadingTaskState == ReadingTaskState.HaveSigned).Count() == (int)trialReadingCriterion.ReadingType ?
                                  ReadingStatusEnum.ReadCompleted : t.ModuleTaskList.Where(t => t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false && (t.ReadingCategory == ReadingCategory.Oncology || t.ReadingCategory == ReadingCategory.Global) && t.TaskAllocationState == TaskAllocationState.Allocated).Count() == (int)trialReadingCriterion.ReadingType ?
@@ -262,9 +424,10 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == dto.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
-            exportInfo.CriterionName = await _repository.Where<ReadingQuestionCriterionTrial>(u => u.TrialId == dto.TrialId && u.IsConfirm && u.Id == dto.TrialReadingCriterionId).Select(t=>t.CriterionName).FirstOrDefaultAsync();  
+            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.IsEn_US = _userInfo.IsEn_Us;
 
             var (memoryStream, fileName) = await ExcelExportHelper.DataExport_NpoiTestAsync(StaticData.Export.TrialSubjectProgressList_Export, exportInfo, /*"", */_commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SubjectProgressDto));
 
@@ -334,7 +497,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             return new FileStreamResult(memoryStream2, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
             {
-                FileDownloadName = $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}_{fileName.Substring(startIndex: 0, fileName.LastIndexOf('.'))}_{DateTime.Now.ToString("yyyyMMddHHmmss")}.xlsx"
+                FileDownloadName = $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}_{fileName/*.Substring(startIndex: 0, fileName.LastIndexOf('.'))*/}_{DateTime.Now.ToString("yyyyMMddHHmmss")}.xlsx"
             };
 
         }
@@ -385,7 +548,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
                      UploadFinishedTime = t.UploadFinishedTime,
 
-                     ArchiveFinishedTime=t.ArchiveFinishedTime,
+                     ArchiveFinishedTime = t.ArchiveFinishedTime,
 
 
                      UploadTime = t.CreateTime,
@@ -404,6 +567,8 @@ 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.IsEn_US = _userInfo.IsEn_Us;
+
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialStudyUploadMonitor_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(UnionStudyMonitorExportDto));
 
@@ -438,6 +603,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 = list;
+            exportInfo.IsEn_US = _userInfo.IsEn_Us;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectReadingPeriodList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReadPeriodExportDto));
 
@@ -526,6 +692,7 @@ 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.IsEn_US = _userInfo.IsEn_Us;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialStudyList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(UnionStudyExportDTO));
         }
@@ -564,6 +731,7 @@ 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.IsEn_US = _userInfo.IsEn_Us;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectVisitCheckList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(PMKCheckEXportDTO));
         }
@@ -614,6 +782,7 @@ 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.IsEn_US = _userInfo.IsEn_Us;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialReadingTaskList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReadingTaskExportDto));
         }
@@ -664,6 +833,7 @@ 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.IsEn_US = _userInfo.IsEn_Us;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialReReadingTaskList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReReadingTaskExportDto));
         }
@@ -705,6 +875,7 @@ 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.IsEn_US = _userInfo.IsEn_Us;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialMedicalReviewList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(TaskMedicalReviewExportDto));
         }
@@ -738,7 +909,7 @@ namespace IRaCIS.Core.Application.Service.Common
             var subjectQuerybal = _repository.Where<VisitTask>(t => t.TrialId == queryVisitTask.TrialId && t.TaskState == TaskState.Effect && t.IsSelfAnalysis == true).Select(t => t.SubjectId).Distinct();
 
             var allList = await _repository.Where<VisitTask>(t => t.TrialId == queryVisitTask.TrialId && t.TaskState == TaskState.Effect && subjectQuerybal.Contains(t.SubjectId) && t.ReadingCategory == ReadingCategory.Visit)
-                .Where(t => (t.IsSelfAnalysis == true || t.IsSelfAnalysis == null)&& t.VisitTaskNum>0) //一致性分析的结果 + 正常任务的结果 + 仅仅访视的结果 +去除基线
+                .Where(t => (t.IsSelfAnalysis == true || t.IsSelfAnalysis == null) && t.VisitTaskNum > 0) //一致性分析的结果 + 正常任务的结果 + 仅仅访视的结果 +去除基线
 
                //.WhereIf(queryVisitTask.SubjectId != null, t => t.SubjectId == queryVisitTask.SubjectId)
                //.WhereIf(queryVisitTask.TaskState != null, t => t.TaskState == queryVisitTask.TaskState)
@@ -788,6 +959,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             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.IsEn_US = _userInfo.IsEn_Us;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSelfAnalysisList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SelftAnalysisExport));
         }
@@ -812,7 +984,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             if (criterion.CriterionType != CriterionType.RECIST1Point1)
             {
-//---当前标准导出还未支持
+                //---当前标准导出还未支持
                 throw new Exception(_localizer["ExcelExport_UnsupportedExport"]);
             }
 
@@ -891,6 +1063,7 @@ 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.IsEn_US = _userInfo.IsEn_Us;
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialGroupAnalysisList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(GroupAnalysisExport));
         }
@@ -938,7 +1111,7 @@ namespace IRaCIS.Core.Application.Service.Common
                 list.Add(new ExportDocumentDes() { Code = StaticData.Export.RECIST1Point1DetailedOfEvaluatedLesion_Export, ExportCatogory = ExportCatogory.DetailedOfEvaluatedLesion });
             }
 
-            if(criterion.CriterionType == CriterionType.PCWG3)
+            if (criterion.CriterionType == CriterionType.PCWG3)
             {
                 list.Add(new ExportDocumentDes() { Code = StaticData.Export.OverallTumorEvaluation_Export, ExportCatogory = ExportCatogory.OverallTumorEvaluation });
                 list.Add(new ExportDocumentDes() { Code = StaticData.Export.PCWG3Point1DetailedOfEvaluatedLesion_Export, ExportCatogory = ExportCatogory.DetailedOfEvaluatedLesion });
@@ -950,9 +1123,37 @@ namespace IRaCIS.Core.Application.Service.Common
             {
                 item.FileName = result.Where(t => t.Code == item.Code).FirstOrDefault()?.FileName;
             }
-
             return list;
+        }
 
+        public List<T> DealJudgeMark<T>(ArbitrationRule arbitrationRule, IEnumerable<T> list) where T : OverallTumorEvaluationExport
+        {
+            //处理裁判标记
+
+            {
+                var resultList = list.Where(t => t.ReadingCategory != ReadingCategory.Judge).ToList();
+
+                if (arbitrationRule == ArbitrationRule.Visit)
+                {
+
+                    foreach (var item in resultList)
+                    {
+                        item.IsGenerateJudge = list.FirstOrDefault(t => t.ReadingCategory == ReadingCategory.Judge && t.SubjectCode == item.SubjectCode
+                        && (t.VisitTaskNum - ReadingCommon.TaskNumDic[ReadingCategory.Judge]) == item.VisitTaskNum)?.JudgeArmEnum == item.ArmEnum ? true : false;
+                    }
+
+                }
+                if (arbitrationRule == ArbitrationRule.Reading)
+                {
+                    foreach (var item in resultList)
+                    {
+                        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;
+            }
         }
 
 
@@ -976,11 +1177,11 @@ namespace IRaCIS.Core.Application.Service.Common
 
 
             //每次查询必须是单标准的
-            var criterion = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName }).FirstNotNullAsync();
+            var criterion = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName, t.ArbitrationRule }).FirstNotNullAsync();
 
             if (criterion.CriterionType != CriterionType.RECIST1Point1 && criterion.CriterionType != CriterionType.PCWG3)
             {
-//---当前标准导出还未支持
+                //---当前标准导出还未支持
                 throw new Exception(_localizer["ExcelExport_UnsupportedExport"]);
             }
 
@@ -1006,12 +1207,16 @@ 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.VisitTaskNum).ToList();
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
             exportInfo.CriterionName = criterion.CriterionName;
 
+            //处理裁判标记
+            list = DealJudgeMark(criterion.ArbitrationRule, list);
+
             exportInfo.List = list;
+            exportInfo.IsEn_US = _userInfo.IsEn_Us;
 
 
             return await ExcelExportHelper.DataExportAsync(StaticData.Export.OverallTumorEvaluation_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(OverallTumorEvaluationExport), criterion.CriterionType);
@@ -1034,7 +1239,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} ).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)
 
@@ -1064,14 +1269,21 @@ 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 = DealJudgeMark(criterion.ArbitrationRule, list);
+
                 exportInfo.List = list;
+                exportInfo.IsEn_US = _userInfo.IsEn_Us;
+
 
                 return await ExcelExportHelper.DataExportAsync(StaticData.Export.RECIST1Point1EvaluationOfTumorEfficacy_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(RECIST1Point1EvaluationOfTumorEfficacyExport), criterion.CriterionType);
             }
 
             else
             {
-//---当前标准导出还未支持
+                //---当前标准导出还未支持
                 throw new Exception(_localizer["ExcelExport_UnsupportedExport"]);
             }
 
@@ -1095,7 +1307,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 }).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)
 
@@ -1125,6 +1337,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();
 
                 var exportList = list.SelectMany(c =>
                 {
@@ -1150,7 +1363,10 @@ namespace IRaCIS.Core.Application.Service.Common
                     });
                 }).ToList();
 
+                //处理裁判标记
+                list = DealJudgeMark(criterion.ArbitrationRule, list);
                 exportInfo.List = exportList;
+                exportInfo.IsEn_US = _userInfo.IsEn_Us;
 
                 return await ExcelExportHelper.DataExportAsync(StaticData.Export.RECIST1Point1DetailedOfEvaluatedLesion_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(RECIST1Point1DetailedOfEvaluatedLesionExport), criterion.CriterionType);
 
@@ -1180,7 +1396,10 @@ namespace IRaCIS.Core.Application.Service.Common
                     });
                 }).ToList();
 
+                //处理裁判标记
+                list = DealJudgeMark(criterion.ArbitrationRule, list);
                 exportInfo.List = exportList;
+                exportInfo.IsEn_US = _userInfo.IsEn_Us;
 
                 return await ExcelExportHelper.DataExportAsync(StaticData.Export.PCWG3Point1DetailedOfEvaluatedLesion_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(PCWG3DetailedOfEvaluatedLesionExport), criterion.CriterionType);
 
@@ -1188,7 +1407,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             else
             {
-//---当前标准导出还未支持
+                //---当前标准导出还未支持
                 throw new Exception(_localizer["ExcelExport_UnsupportedExport"]);
             }
 

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

@@ -0,0 +1,24 @@
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2023-06-01 13:38:06 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+
+using IRaCIS.Core.Application.ViewModel;
+namespace IRaCIS.Core.Application.Interfaces
+{
+    /// <summary>
+    /// IInternationalizationService
+    /// </summary>	
+    public interface IInternationalizationService
+    {
+
+        Task<PageOutput<InternationalizationView>> GetInternationalizationList(InternationalizationQuery inQuery);
+
+        Task<IResponseOutput> AddOrUpdateInternationalization(InternationalizationAddOrEdit addOrEditInternationalization);
+
+        Task<IResponseOutput> DeleteInternationalization(Guid internationalizationId);
+
+
+    }
+}

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

@@ -0,0 +1,24 @@
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2023-06-27 15:47:10 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+
+using IRaCIS.Core.Application.ViewModel;
+namespace IRaCIS.Core.Application.Interfaces
+{	
+	/// <summary>
+	/// IPublishLogService
+	/// </summary>	
+	public interface IPublishLogService
+    {
+
+	   	    Task<PageOutput<PublishLogView>>  GetPublishLogList(PublishLogQuery inQuery);
+	    
+         Task<IResponseOutput> AddOrUpdatePublishLog(PublishLogAddOrEdit addOrEditPublishLog);
+
+         Task<IResponseOutput> DeletePublishLog(Guid publishLogId);
+
+       
+    }
+} 

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

@@ -0,0 +1,127 @@
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2023-06-01 13:42:25 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+
+using IRaCIS.Core.Domain.Models;
+using Microsoft.AspNetCore.Mvc;
+using IRaCIS.Core.Application.Interfaces;
+using IRaCIS.Core.Application.ViewModel;
+using Microsoft.AspNetCore.Authorization;
+using IRaCIS.Core.Application.Helper;
+
+namespace IRaCIS.Core.Application.Service
+{
+    /// <summary>
+    /// InternationalizationService
+    /// </summary>	
+    [ApiExplorerSettings(GroupName = "Common")]
+    public class InternationalizationService : BaseService, IInternationalizationService
+    {
+
+        private readonly IRepository<Internationalization> _internationalizationRepository;
+
+        public InternationalizationService(IRepository<Internationalization> internationalizationRepository)
+        {
+            _internationalizationRepository = internationalizationRepository;
+        }
+
+
+        [AllowAnonymous]
+
+        public async Task<List<InternationalizationSimpleDto>> GetFrontInternationalizationList()
+        {
+
+            var list = await _internationalizationRepository.Where(t => t.InternationalizationType == 0).Select(t => new InternationalizationSimpleDto()
+            {
+                Code = t.Code,
+                Value = t.Value,
+                ValueCN = t.ValueCN
+            }).ToListAsync();
+
+            return list;
+        }
+
+        [HttpPost]
+        public async Task<PageOutput<InternationalizationView>> GetInternationalizationList(InternationalizationQuery inQuery)
+        {
+
+            var internationalizationQueryable = _internationalizationRepository
+                .WhereIf(inQuery.Description != null, t => t.Description.Contains(inQuery.Description))
+                .WhereIf(inQuery.Code != null, t => t.Code.Contains(inQuery.Code))
+                .WhereIf(inQuery.State != null, t => t.State == inQuery.State)
+                .WhereIf(inQuery.InternationalizationType != null, t => t.InternationalizationType == inQuery.InternationalizationType)
+                .WhereIf(inQuery.Value != null, t => t.Value.Contains(inQuery.Value))
+                .WhereIf(inQuery.ValueCN != null, t => t.ValueCN.Contains(inQuery.ValueCN))
+                .ProjectTo<InternationalizationView>(_mapper.ConfigurationProvider);
+
+            var pageList = await internationalizationQueryable
+            .ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(InternationalizationView.State) : inQuery.SortField,
+            inQuery.Asc);
+
+            return pageList;
+        }
+
+        [HttpPost]
+        public async Task<IResponseOutput> BatchAddInternationalization(BatchAddInternationalization batchAdd)
+        {
+            foreach (var item in batchAdd.AddList)
+            {
+
+                var mapItem = _mapper.Map<InternationalizationAddOrEdit>(item);
+
+                mapItem.InternationalizationType = batchAdd.InternationalizationType;
+                mapItem.State = batchAdd.State;
+
+                var verifyExp1 = new EntityVerifyExp<Internationalization>()
+                {
+                    VerifyExp = t => t.Code == mapItem.Code && t.InternationalizationType == mapItem.InternationalizationType,
+
+                    VerifyMsg = $"该类型已有{item.Code}名称的国际化标识",
+                    IsVerify = true
+                };
+
+                var entity = await _internationalizationRepository.InsertOrUpdateAsync(mapItem, false, verifyExp1);
+            }
+
+            await _internationalizationRepository.SaveChangesAsync();
+
+
+
+            return ResponseOutput.Ok();
+        }
+
+        public async Task<IResponseOutput> AddOrUpdateInternationalization(InternationalizationAddOrEdit addOrEditInternationalization)
+        {
+            var verifyExp1 = new EntityVerifyExp<Internationalization>()
+            {
+                VerifyExp = t => t.Code == addOrEditInternationalization.Code && t.InternationalizationType == addOrEditInternationalization.InternationalizationType,
+
+                VerifyMsg = $"该类型已有{addOrEditInternationalization.Code}名称的国际化标识",
+                IsVerify = true
+            };
+
+            var entity = await _internationalizationRepository.InsertOrUpdateAsync(addOrEditInternationalization, true, verifyExp1);
+
+            if (addOrEditInternationalization.InternationalizationType == 1)
+            {
+                await InternationalizationHelper.AddOrUpdateJsonKeyValueAsync(entity.Code, addOrEditInternationalization.Value, addOrEditInternationalization.ValueCN);
+
+            }
+
+            return ResponseOutput.Ok(entity.Id.ToString());
+
+        }
+
+
+        [HttpDelete("{internationalizationId:guid}")]
+        public async Task<IResponseOutput> DeleteInternationalization(Guid internationalizationId)
+        {
+            var success = await _internationalizationRepository.DeleteFromQueryAsync(t => t.Id == internationalizationId, true);
+            return ResponseOutput.Ok();
+        }
+
+
+    }
+}

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

@@ -186,7 +186,6 @@ namespace IRaCIS.Application.Services
 
 
                 builder.HtmlBody = string.Format(templateInfo,
-                    "",
                 //---您正在进行邮箱重置密码操作
                    _localizer["Mail_ResettingPassword "],
                     verificationCode
@@ -254,7 +253,6 @@ namespace IRaCIS.Application.Services
 
 
                 builder.HtmlBody = string.Format(templateInfo,
-                    "",
                 //---您正在参与展影医疗IRC项目
                    _localizer["Mail_IRCProject"],
                     verificationCode
@@ -321,7 +319,6 @@ namespace IRaCIS.Application.Services
 
 
                 builder.HtmlBody = string.Format(templateInfo,
-                    "",
                 //---您正在参与展影医疗IRC项目中心调研工作
                    _localizer["Mail_CenterResearchReminder"],
                     verificationCode
@@ -398,7 +395,7 @@ namespace IRaCIS.Application.Services
 
             await _userRepository.BatchUpdateNoTrackingAsync(t => t.Id == sysUserInfo.Id, u => new User() { EmailToken = token });
 
-            routeUrl = routeUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + sysUserInfo.UserTypeRole.UserTypeShortName + "&access_token=" + token;
+            routeUrl = routeUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + sysUserInfo.UserTypeRole.UserTypeShortName + "&lang=" + (_userInfo.IsEn_Us?"en":"zh") + "&access_token=" + token;
 
             var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
 
@@ -512,7 +509,7 @@ namespace IRaCIS.Application.Services
             {
                 var templateInfo = SourceReader.ReadToEnd();
 
-                var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + sysUserInfo.UserTypeRole.UserTypeShortName + "&access_token=" + token;
+                var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + sysUserInfo.UserTypeRole.UserTypeShortName + "&lang=" + (_userInfo.IsEn_Us ? "en" : "zh") + "&access_token=" + token;
 
                 var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
 
@@ -576,7 +573,7 @@ namespace IRaCIS.Application.Services
 
                 var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
 
-                var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + sysUserInfo.UserTypeRole.UserTypeShortName + "&access_token=" + token;
+                var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + sysUserInfo.UserTypeRole.UserTypeShortName + "&lang=" + (_userInfo.IsEn_Us ? "en" : "zh") + "&access_token=" + token;
 
                 var redirectUrl = $"{domain}/api/User/UserRedirect?url={System.Web.HttpUtility.UrlEncode(routeUrl)}";
 
@@ -694,7 +691,7 @@ namespace IRaCIS.Application.Services
             {
                 var templateInfo = SourceReader.ReadToEnd();
 
-                var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + userType.UserTypeShortName + "&access_token=" + token;
+                var routeUrl = rootUrl + "?UserId=" + sysUserInfo.Id + "&Email=" + sysUserInfo.EMail + "&UserName=" + sysUserInfo.UserName + "&UserType=" + userType.UserTypeShortName + "&lang=" + (_userInfo.IsEn_Us ? "en" : "zh") + "&access_token=" + token;
 
                 var domain = baseUrl.Substring(0, baseUrl.IndexOf("/login"));
 

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

@@ -0,0 +1,79 @@
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2023-06-27 15:47:06 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+
+using IRaCIS.Core.Domain.Models;
+using Microsoft.AspNetCore.Mvc;
+using IRaCIS.Core.Application.Interfaces;
+using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Application.Contracts;
+
+namespace IRaCIS.Core.Application.Service
+{
+    /// <summary>
+    /// PublishLogService
+    /// </summary>	
+    [ApiExplorerSettings(GroupName = "Common")]
+    public class PublishLogService : BaseService, IPublishLogService
+    {
+
+        private readonly IRepository<PublishLog> _publishLogRepository;
+
+        public PublishLogService(IRepository<PublishLog> publishLogRepository)
+        {
+            _publishLogRepository = publishLogRepository;
+        }
+
+        [HttpPost]
+        public async Task<PageOutput<PublishLogView>> GetPublishLogList(PublishLogQuery inQuery)
+        {
+
+            var publishLogQueryable = _publishLogRepository
+                .WhereIf(!string.IsNullOrEmpty(inQuery.Version) ,  t => t.Version.Contains(inQuery.Version))
+                .WhereIf(!string.IsNullOrEmpty(inQuery.UpdateContent), t => t.UpdateContent.Contains(inQuery.UpdateContent))
+             .ProjectTo<PublishLogView>(_mapper.ConfigurationProvider);
+
+            var pageList = await publishLogQueryable
+                .ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc);
+
+            return pageList;
+        }
+
+
+        public async Task<IResponseOutput> AddOrUpdatePublishLog(PublishLogAddOrEdit addOrEditPublishLog)
+        {
+            Version version;
+
+            if (!Version.TryParse(addOrEditPublishLog.Version, out version))
+            {
+                return ResponseOutput.NotOk("版本号不符合要求");
+            }
+                     
+            var verifyExp1 = new EntityVerifyExp<PublishLog>()
+            {
+                VerifyExp = u => u.Version == addOrEditPublishLog.Version ,
+               
+                VerifyMsg = "发布编号不能重复"
+            };
+
+
+
+            var entity = await _publishLogRepository.InsertOrUpdateAsync(addOrEditPublishLog, true, verifyExp1);
+
+            return ResponseOutput.Ok(entity.Id.ToString());
+
+        }
+
+
+        [HttpDelete("{publishLogId:guid}")]
+        public async Task<IResponseOutput> DeletePublishLog(Guid publishLogId)
+        {
+            var success = await _publishLogRepository.DeleteFromQueryAsync(t => t.Id == publishLogId, true);
+            return ResponseOutput.Ok();
+        }
+
+
+    }
+}

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

@@ -17,6 +17,7 @@ using System.Text.Encodings.Web;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json;
 using IRaCIS.Core.Infrastructure;
+using IRaCIS.Core.Application.Helper;
 
 namespace IRaCIS.Core.Application.Service.Common
 {
@@ -45,9 +46,6 @@ namespace IRaCIS.Core.Application.Service.Common
         }
 
 
-
-
-
         public string GetBestStoreDisk()
         {
 
@@ -64,11 +62,12 @@ namespace IRaCIS.Core.Application.Service.Common
             catch (Exception e)
             {
 
-                throw new BusinessValidationFailedException("解析Json文件配置出现问题:"+e.Message);
+                //---解析Json文件配置出现问题
+                throw new BusinessValidationFailedException(_localizer["SysMon_JsonConfig"]+e.Message);
             }
 
             //默认存储的路径
-            var defaultStoreRootFolder = Path.Combine((Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\'))).IfNullThrowException().FullName, StaticData.Folder.IRaCISDataFolder);
+            var defaultStoreRootFolder = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
 
 
             DriveInfo defaultDrive = new DriveInfo(Path.GetPathRoot(defaultStoreRootFolder));
@@ -95,14 +94,13 @@ namespace IRaCIS.Core.Application.Service.Common
             }
 
 
-            //找到最优驱动器
-            DriveInfo drive = new DriveInfo(Path.GetPathRoot(bestStoreRootFolder));
+            ////找到最优驱动器
+            //DriveInfo drive = new DriveInfo(Path.GetPathRoot(bestStoreRootFolder));
 
-            //最优盘符使用率超过百分之80  
-            if (((double)(drive.TotalSize - drive.TotalFreeSpace) / drive.TotalSize) * 100 > switchingRatio)
-            {
-
-            }
+            ////最优盘符使用率超过百分之80  
+            //if (((double)(drive.TotalSize - drive.TotalFreeSpace) / drive.TotalSize) * 100 > switchingRatio)
+            //{
+            //}
 
             if (!Directory.Exists(bestStoreRootFolder))
             {
@@ -112,6 +110,9 @@ namespace IRaCIS.Core.Application.Service.Common
             return bestStoreRootFolder;
 
         }
+
+
+
         public class GeneralRule
         {
             public string Endpoint { get; set; }

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

@@ -39,6 +39,10 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<AddOrEditBasicDic, Dictionary>().ReverseMap();
 
+
+            CreateMap<AddBasicDicAndChild, Dictionary>().ForMember(o => o.ChildList, t => t.Ignore());
+            CreateMap<AddBasicDicChild, Dictionary>();
+
             CreateMap<Dictionary, BasicDicSelectCopy>()
                  .ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum))
                  .ForMember(o => o.Value, t => t.MapFrom(u => u.MappedValue))
@@ -54,6 +58,15 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<CommonDocument, CommonDocumentAddOrEdit>().ReverseMap();
 
+            CreateMap<Internationalization, InternationalizationView>();
+            CreateMap<Internationalization, InternationalizationAddOrEdit>().ReverseMap();
+
+            CreateMap<BatchAddInternationalizationDto, InternationalizationAddOrEdit>();
+            
+
+            CreateMap<PublishLog, PublishLogView>();
+            CreateMap<PublishLog, PublishLogAddOrEdit>().ReverseMap();
+
 
         }
     }

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

@@ -17,8 +17,5 @@ namespace IRaCIS.Application.Contracts
         public string AwardsHonorsCN { get; set; } = String.Empty;
 
 
-        public string BlindPublications { get; set; }
-
-
     }
 }

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

@@ -67,9 +67,9 @@ namespace IRaCIS.Application.Services
             ReviewerSelectionQueryDTO selectionQuery)
         {
             //项目配置需要的医生过滤  2表示混合
-            var trialConfig = await _repository.Where<Trial>(s => s.Id == selectionQuery.TrialId).Select(t=>new { t.AttendedReviewerType ,t.TrialType} ).FirstOrDefaultAsync().IfNullThrowException();
+            var trialConfig = await _repository.Where<Trial>(s => s.Id == selectionQuery.TrialId).Select(t=>new { t.AttendedReviewerTypeEnumList ,t.TrialType} ).FirstOrDefaultAsync().IfNullThrowException();
 
-            var nation = trialConfig.AttendedReviewerType;
+            //var nation = trialConfig.AttendedReviewerType;
             // 临床项目经验 多选
             var evaluationCriteriaCount = selectionQuery.EvaluationCriteriaIdList.Count();
 
@@ -78,7 +78,8 @@ namespace IRaCIS.Application.Services
 
             var guidList = selectionQuery.ReadingTypeIdList.Concat(selectionQuery.SubspecialityIdList).Concat(selectionQuery.TitleIdList);
 
-            var query = _doctorRepository.WhereIf(nation != AttendedReviewerType.USAndCN,  t => t.Nation ==(int) nation)
+            var query = _doctorRepository/*.WhereIf(nation != AttendedReviewerType.USAndCN,  t => t.Nation ==(int) nation)*/
+            
              .WhereIf(selectionQuery.DepartmentId != null, t => t.DepartmentId == selectionQuery.DepartmentId)
              .WhereIf(selectionQuery.SpecialityId != null, t => t.SpecialityId == selectionQuery.SpecialityId)
              .WhereIf(trialConfig.TrialType == TrialType.NoneOfficial, t => t.IsVirtual ==true)
@@ -161,6 +162,10 @@ namespace IRaCIS.Application.Services
                     u.OptTime = opt.OptTime;
                     u.OptUserName = opt.OptUserName;
                 }
+                else
+                {
+                    u.DoctorTrialState = param.IntoGroupSearchState == 1 ? (int)EnrollStatus.HasDownloadResume : (int)EnrollStatus.HasCommittedToCRO;
+                }
             });
 
             if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM)

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

@@ -155,8 +155,6 @@ namespace IRaCIS.Application.Services
                 await _repository.BatchDeleteAsync<Attachment>(a => a.Id == updateGCPExperienceParam.GCPId);
             }
 
-
-
             return ResponseOutput.Result(successs, updateGCPExperienceParam.GCPId.ToString());
 
         }

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

@@ -104,6 +104,15 @@ namespace IRaCIS.Core.Application.Contracts
 
     }
 
+    public class GetNextUnSignDocumentInDto
+    {
+        [NotDefault]
+        public Guid TrialId { get; set; }
+
+        public bool Asc { get; set; } = true;
+        public string SortField { get; set; } = "";
+    }
+
     public class TrialUserDocUnionQuery: PageInput
     {
         [NotDefault]

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

@@ -19,7 +19,7 @@ namespace IRaCIS.Core.Application.Contracts
         Task<(PageOutput<UnionDocumentWithConfirmInfoView>, object)> GetDocumentConfirmList(DocumentTrialUnionQuery querySystemDocument);
         Task<PageOutput<TrialDocumentView>> GetTrialDocumentList(TrialDocumentQuery queryTrialDocument);
  
-        Task<(PageOutput<UnionDocumentWithConfirmInfoView>, object)> GetUserDocumentList(TrialUserDocUnionQuery querySystemDocument);
+        Task<IResponseOutput<PageOutput<UnionDocumentWithConfirmInfoView>> > GetUserDocumentList(TrialUserDocUnionQuery querySystemDocument);
         Task<IResponseOutput> SetFirstViewDocumentTime(Guid documentId, bool isSystemDoc);
         Task<IResponseOutput> UserConfirm(UserConfirmCommand userConfirmCommand);
         Task<List<TrialUserDto>> GetTrialUserSelect(Guid trialId);

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

@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Contracts;
 using User = IRaCIS.Core.Domain.Models.User;
+using DocumentFormat.OpenXml.Office2010.Word;
 
 namespace IRaCIS.Core.Application.Services
 {
@@ -19,14 +20,16 @@ namespace IRaCIS.Core.Application.Services
 
         private readonly IRepository<SystemDocument> _systemDocumentRepository;
         private readonly IRepository<SystemDocNeedConfirmedUserType> _systemDocNeedConfirmedUserTypeRepository;
+        private readonly IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository;
 
         public SystemDocumentService( IRepository<SystemDocument> systemDocumentRepository,
-            IRepository<SystemDocNeedConfirmedUserType> systemDocNeedConfirmedUserTypeRepository
-            )
+            IRepository<SystemDocNeedConfirmedUserType> systemDocNeedConfirmedUserTypeRepository,
+            IRepository<SystemDocConfirmedUser> systemDocConfirmedUserRepository)
         {
             _systemDocumentRepository = systemDocumentRepository;
             this._systemDocNeedConfirmedUserTypeRepository = systemDocNeedConfirmedUserTypeRepository;
-        }
+            _systemDocConfirmedUserRepository = systemDocConfirmedUserRepository;
+            }
 
 
 
@@ -109,6 +112,22 @@ namespace IRaCIS.Core.Application.Services
 
         }
 
+        [HttpDelete("{systemDocumentId:guid}")]
+        public async Task<IResponseOutput> AbandonSystemDocumentAsync(Guid systemDocumentId)
+        {
+
+            await _systemDocumentRepository.UpdatePartialFromQueryAsync(systemDocumentId, u => new SystemDocument() { IsDeleted = true });
+
+            await _systemDocConfirmedUserRepository.UpdatePartialFromQueryAsync(x => x.SystemDocumentId == systemDocumentId, x => new SystemDocConfirmedUser()
+            {
+                IsDeleted = true
+            });
+
+            await _systemDocConfirmedUserRepository.SaveChangesAsync();
+            return ResponseOutput.Result(true);
+        }
+
+
 
         [HttpDelete("{systemDocumentId:guid}")]
         public async Task<IResponseOutput> DeleteSystemDocumentAsync(Guid systemDocumentId)

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

@@ -27,11 +27,16 @@ namespace IRaCIS.Core.Application.Services
         private readonly IRepository<Trial> _trialRepository;
         private readonly IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository;
         private readonly IRepository<SystemDocument> _systemDocumentRepository;
+        private readonly IRepository<TrialCriterionAdditionalAssessmentType> _trialCriterionAdditionalAssessmentTypeRepository;
+        private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository;
+
 
         public TrialDocumentService(IRepository<TrialDocument> trialDocumentRepository,
              IRepository<TrialDocConfirmedUser> trialDocUserTypeConfirmedUserRepository,
                   IRepository<Trial> trialRepository,
-            IRepository<SystemDocConfirmedUser> systemDocConfirmedUserRepository
+            IRepository<SystemDocConfirmedUser> systemDocConfirmedUserRepository,
+             IRepository<TrialCriterionAdditionalAssessmentType> trialCriterionAdditionalAssessmentTypeRepository,
+            IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository
             , IRepository<SystemDocument> systemDocumentRepository)
         {
             _trialDocumentRepository = trialDocumentRepository;
@@ -39,6 +44,8 @@ namespace IRaCIS.Core.Application.Services
             this._trialRepository = trialRepository;
             this._systemDocConfirmedUserRepository = systemDocConfirmedUserRepository;
             _systemDocumentRepository = systemDocumentRepository;
+            _readingQuestionCriterionTrialRepository = readingQuestionCriterionTrialRepository;
+            _trialCriterionAdditionalAssessmentTypeRepository = trialCriterionAdditionalAssessmentTypeRepository;
         }
 
         /// <summary>
@@ -59,6 +66,33 @@ namespace IRaCIS.Core.Application.Services
         }
 
 
+        /// <summary>
+        /// 获取下一个未签名的文件
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<UnionDocumentWithConfirmInfoView?> GetNextUnSignDocument(GetNextUnSignDocumentInDto inDto)
+        {
+            var result =await this.GetUserDocumentList(new TrialUserDocUnionQuery()
+            {
+                Asc = inDto.Asc,
+                IsSign = false,
+                SortField = inDto.SortField,
+                TrialId= inDto.TrialId,
+                PageIndex = 1,
+                PageSize = 1,
+            });
+
+            if (result.Data.CurrentPageData.Count() > 0)
+            {
+                return result.Data.CurrentPageData.First();
+            }
+            else {
+                return null;
+            }
+
+        }
 
         /// <summary>
         ///  具体用户看到的 系统文件列表 + 项目类型文档
@@ -66,7 +100,7 @@ namespace IRaCIS.Core.Application.Services
         /// <param name="querySystemDocument"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<(PageOutput<UnionDocumentWithConfirmInfoView>,object)> GetUserDocumentList(TrialUserDocUnionQuery querySystemDocument)
+        public async Task< IResponseOutput<PageOutput<UnionDocumentWithConfirmInfoView>>  > GetUserDocumentList(TrialUserDocUnionQuery querySystemDocument)
         {
             #region https://github.com/dotnet/efcore/issues/16243  操作不行
             ////系统文档查询
@@ -128,6 +162,8 @@ namespace IRaCIS.Core.Application.Services
 
             #endregion
 
+            var trialId = querySystemDocument.TrialId;
+
             var trialInfo = await (_repository.Where<Trial>(t => t.Id == querySystemDocument.TrialId).Select(t => new { t.TrialFinishedTime,t.TrialStatusStr } ).FirstOrDefaultAsync());
 
             //系统文档查询
@@ -218,7 +254,15 @@ namespace IRaCIS.Core.Application.Services
             var trialTaskConfig = _trialRepository.Where(t => t.Id == querySystemDocument.TrialId).ProjectTo<TrialProcessConfigDTO>(_mapper.ConfigurationProvider).FirstOrDefault();
 
 
-            return (result, new { NeedSignCount = needSignTrialDocCount + needSignSystemDocCount, NeedSignTrialDocCount = needSignTrialDocCount, NeedSignSystemDocCount = needSignSystemDocCount, TrialStatusStr= trialInfo.TrialStatusStr,TrialConfig= trialTaskConfig });
+            //var trialCriterionAdditionalAssessmentTypeList = _trialCriterionAdditionalAssessmentTypeRepository
+            //    .Where(t => t.TrialReadingCriterion.TrialId == trialId && t.IsSelected == true && t.TrialReadingCriterion.IsSigned).Select(t=>new { t.CriterionType,t.AdditionalAssessmentType}).ToList();
+
+
+            var isManualGenerateTask= _readingQuestionCriterionTrialRepository.Where(t=>t.TrialId==trialId && t.IsSigned && t.IsAutoCreate==false).Any();
+            var isAdditionalAssessment = _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsSigned && t.IsAdditionalAssessment == true 
+            &&t.TrialCriterionAdditionalAssessmentTypeList.Any(c=>/*c.AdditionalAssessmentType==Domain.Share.Reading.AdditionalAssessmentType.BrainMetastasis &&*/ c.IsSelected==true)).Any();
+
+            return ResponseOutput.Ok<PageOutput<UnionDocumentWithConfirmInfoView>>( result, new { NeedSignCount = needSignTrialDocCount + needSignSystemDocCount, NeedSignTrialDocCount = needSignTrialDocCount, NeedSignSystemDocCount = needSignSystemDocCount, IsAdditionalAssessment = isAdditionalAssessment && isManualGenerateTask, TrialStatusStr = trialInfo.TrialStatusStr,TrialConfig= trialTaskConfig });
         }
 
 
@@ -382,15 +426,15 @@ namespace IRaCIS.Core.Application.Services
         [HttpGet("{trialId:guid}")]
         public async Task<IResponseOutput> GetTrialDocAndSystemDocType(Guid trialId)
         {
-            var result = await _trialDocumentRepository.Where(t => t.TrialId == trialId).Select(t => new { FileType = t.FileType.Value, t.FileTypeId })
-                   .Union(_systemDocumentRepository.Select(t => new { FileType = t.FileType.Value, t.FileTypeId }))
+            var result = await _trialDocumentRepository.Where(t => t.TrialId == trialId).Select(t => new { FileType = _userInfo.IsEn_Us? t.FileType.Value :t.FileType.ValueCN, t.FileTypeId })
+                   .Union(_systemDocumentRepository.Select(t => new { FileType = _userInfo.IsEn_Us ? t.FileType.Value : t.FileType.ValueCN, t.FileTypeId }))
                    .ToListAsync();
 
             return ResponseOutput.Ok(result);
         }
 
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt",  "AfterStopCannNotOpt" })]
-        [Authorize(Policy = IRaCISPolicy.PM)]
+        //[Authorize(Policy = IRaCISPolicy.PM)]
         public async Task<IResponseOutput> AddOrUpdateTrialDocument(AddOrEditTrialDocument addOrEditTrialDocument)
         {
             if (addOrEditTrialDocument.Id == null)
@@ -460,7 +504,7 @@ namespace IRaCIS.Core.Application.Services
         /// <param name="trialId"></param>
         /// <returns></returns>
         [HttpDelete("{trialId:guid}/{trialDocumentId:guid}")]
-        [Authorize(Policy = IRaCISPolicy.PM)]
+        //[Authorize(Policy = IRaCISPolicy.PM)]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt",  "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> DeleteTrialDocument(Guid trialDocumentId, Guid trialId)
         {

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

@@ -1384,8 +1384,6 @@ namespace IRaCIS.Core.Application.Service
 
                 return ResponseOutput.Ok(entity.Id.ToString());
 
-
-
             }
             else
             {
@@ -1424,9 +1422,6 @@ namespace IRaCIS.Core.Application.Service
 
         private async Task TestEmailConfigAsync(TrialEmailNoticeConfigAddOrEdit config)
         {
-            var toUserList = await _repository.Where<TrialUser>(t => t.TrialId == config.TrialId)
-                .WhereIf(config.ToUserTypeList != null, t => config.ToUserTypeList.Contains(t.User.UserTypeEnum))
-                .Select(t => new { t.User.EMail, t.User.FullName }).ToListAsync();
            
 
             if (!config.FromEmail.Contains("@") || string.IsNullOrEmpty(config.FromEmail))
@@ -1435,52 +1430,16 @@ namespace IRaCIS.Core.Application.Service
                 throw new BusinessValidationFailedException(_localizer["TrialEmailN_InvalidEmailConfig"]);
             }
 
-
-            if (toUserList.Count() == 0 || toUserList.Where(t => t.EMail.Contains("@")).Count() == 0)
-            {
-                //---项目没有有效的收件人，无法发送邮件
-                throw new BusinessValidationFailedException(_localizer["TrialEmailN_InvalidRecipient"]);
-            }
-
-            var sendEmailConfig = new SMTPEmailConfig();
-
-            sendEmailConfig.FromEmailAddress = new MimeKit.MailboxAddress(config.FromName, config.FromEmail);
-            sendEmailConfig.AuthorizationCode = config.AuthorizationCode;
-            sendEmailConfig.UserName = config.FromEmail;
-
-            sendEmailConfig.Host = config.SMTPServerAddress;
-            sendEmailConfig.Port = config.SMTPServerPort;
-
-
-            sendEmailConfig.ToMailAddressList.Add(new MimeKit.MailboxAddress(config.FromName, config.FromEmail));
-
-
-            var pathToFile = _hostEnvironment.WebRootPath
-                      + Path.DirectorySeparatorChar.ToString()
-                      + "EmailTemplate"
-                      + Path.DirectorySeparatorChar.ToString()
-                     //+ "EmailConfigTest.html";
-
-                     + (_userInfo.IsEn_Us ? "EmailConfigTest_US.html" : "EmailConfigTest.html");
-
-
-                //---项目邮件测试
-            sendEmailConfig.TopicDescription = _localizer["TrialEmailN_EmailTestMessage"];
-
-            using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile))
-            {
-                var templateInfo = SourceReader.ReadToEnd();
-
-
-                sendEmailConfig.HtmlBodyStr = string.Format(templateInfo,
-                //--- 收到此邮件，代表邮件配置正确
-                    _localizer["TrialEmailN_ConfigurationCorrect"]
-                    );
-            }
-
             try
             {
-                await SendEmailHelper.SendEmailAsync(sendEmailConfig);
+                await SendEmailHelper.TestEmailConfigAsync(new SystemEmailSendConfig()
+                {
+                    AuthorizationCode = config.AuthorizationCode,
+                    FromEmail = config.FromEmail,
+                    FromName = config.FromName,
+                    Host = config.SMTPServerAddress,
+                    Port = config.SMTPServerPort
+                });
 
             }
             catch (Exception ex)
@@ -1491,6 +1450,72 @@ namespace IRaCIS.Core.Application.Service
             }
 
           
+
+
+            #region 人员还未加入，可以先配置邮件  历史废弃
+
+            //var toUserList = await _repository.Where<TrialUser>(t => t.TrialId == config.TrialId)
+            //   .WhereIf(config.ToUserTypeList != null, t => config.ToUserTypeList.Contains(t.User.UserTypeEnum))
+            //   .Select(t => new { t.User.EMail, t.User.FullName }).ToListAsync();
+
+
+            //if (toUserList.Count() == 0 || toUserList.Where(t => t.EMail.Contains("@")).Count() == 0)
+            //{
+            //    //---项目没有有效的收件人，无法发送邮件
+            //    throw new BusinessValidationFailedException(_localizer["TrialEmailN_InvalidRecipient"]);
+            //}
+
+            //var sendEmailConfig = new SMTPEmailConfig();
+
+            //sendEmailConfig.FromEmailAddress = new MimeKit.MailboxAddress(config.FromName, config.FromEmail);
+            //sendEmailConfig.AuthorizationCode = config.AuthorizationCode;
+            //sendEmailConfig.UserName = config.FromEmail;
+
+            //sendEmailConfig.Host = config.SMTPServerAddress;
+            //sendEmailConfig.Port = config.SMTPServerPort;
+
+
+            //sendEmailConfig.ToMailAddressList.Add(new MimeKit.MailboxAddress(config.FromName, config.FromEmail));
+
+
+            //var pathToFile = _hostEnvironment.WebRootPath
+            //          + Path.DirectorySeparatorChar.ToString()
+            //          + "EmailTemplate"
+            //          + Path.DirectorySeparatorChar.ToString()
+            //         //+ "EmailConfigTest.html";
+
+            //         + (_userInfo.IsEn_Us ? "EmailConfigTest_US.html" : "EmailConfigTest.html");
+
+
+            ////---项目邮件测试
+            //sendEmailConfig.TopicDescription = _localizer["TrialEmailN_EmailTestMessage"];
+
+            //using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile))
+            //{
+            //    var templateInfo = SourceReader.ReadToEnd();
+
+
+            //    sendEmailConfig.HtmlBodyStr = string.Format(templateInfo,
+            //    //--- 收到此邮件，代表邮件配置正确
+            //        _localizer["TrialEmailN_ConfigurationCorrect"]
+            //        );
+            //}
+
+            //try
+            //{
+            //    await SendEmailHelper.SendEmailAsync(sendEmailConfig);
+
+            //}
+            //catch (Exception ex)
+            //{
+
+            //    //---发件人配置错误，请核对服务器地址或者授权码是否填写有误
+            //    throw new BusinessValidationFailedException(_localizer["TrialEmailN_InvalidSenderEmailConfig"] + ex.Message);
+            //}
+
+            #endregion
+
+
         }
 
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]

IRaCIS.Core.Application/Service/Financial/DTO/PaymentModel.cs

@@ -174,6 +174,6 @@ namespace IRaCIS.Application.Contracts
         public DateTime BeginDate { get; set; }
         public DateTime EndDate { get; set; }
 
-        public AttendedReviewerType? AttendedReviewerType { get; set; }
+        //public AttendedReviewerType? AttendedReviewerType { get; set; }
     }
 }

IRaCIS.Core.Application/Service/Financial/FinancialService.cs

@@ -552,10 +552,12 @@ namespace IRaCIS.Application.Services
                 trialLambda = trialLambda.And(u => u.TrialCode.Contains(trialCode));
             }
 
-            if (queryParam.AttendedReviewerType != null)
-            {
-                trialLambda = trialLambda.And(u => u.AttendedReviewerType == queryParam.AttendedReviewerType);
-            }
+            //if (queryParam.AttendedReviewerType != null)
+            //{
+            //    trialLambda = trialLambda.And(u => u.AttendedReviewerType == queryParam.AttendedReviewerType);
+            //}
+
+
 
             Expression<Func<Doctor, bool>> doctorLambda = x => true;
 
@@ -936,15 +938,17 @@ namespace IRaCIS.Application.Services
             {
                 trialLambda = trialLambda.And(u => u.CROId == param.CroId);
             }
+
             if (!string.IsNullOrWhiteSpace(param.TrialCode))
             {
                 var trialCode = param.TrialCode.Trim();
                 trialLambda = trialLambda.And(u => u.TrialCode.Contains(trialCode));
             }
-            if (param.AttendedReviewerType != null)
-            {
-                trialLambda = trialLambda.And(u => u.AttendedReviewerType == param.AttendedReviewerType);
-            }
+
+            //if (param.AttendedReviewerType != null)
+            //{
+            //    trialLambda = trialLambda.And(u => u.AttendedReviewerType == param.AttendedReviewerType);
+            //}
 
             var lockedPaymentIdAndYearMonth = _paymentRepository.Where(t => t.IsLock && t.YearMonthDate >= bDate && t.YearMonthDate <= eDate).Select(t => new { PaymentId = t.Id, t.YearMonth, t.DoctorId });
 

IRaCIS.Core.Application/Service/Fixed/CriterionAdditionalAssessment.cs

@@ -20,25 +20,26 @@ namespace IRaCIS.Core.Application.Service
         public AdditionalAssessmentType AdditionalAssessmentType { get; set; }
 
         //附加评估问题
-        public List<ReadingQuestionTrial> AdditionalQuestionList { get; set; }=new List<ReadingQuestionTrial>();
+        public List<ReadingQuestionTrial> AdditionalQuestionList { get; set; } = new List<ReadingQuestionTrial>();
 
     }
 
 
-    public  class AdditionalAssessment
+    public class AdditionalAssessment
     {
 
-        public  List<CriterionAdditionalAssessment> SystemDefeaultAdditionalAssessmentList { get; set; } = new List<CriterionAdditionalAssessment>();
+        public List<CriterionAdditionalAssessment> SystemDefeaultAdditionalAssessmentList { get; set; } = new List<CriterionAdditionalAssessment>();
         public AdditionalAssessment()
         {
-
-            var gropId = NewId.NextGuid();
             //Resist1.1 脑转移 默认评估问题
-            SystemDefeaultAdditionalAssessmentList.Add(new CriterionAdditionalAssessment()
             {
-                CriterionType = CriterionType.RECIST1Point1,
-                AdditionalAssessmentType = AdditionalAssessmentType.BrainMetastasis,
-                AdditionalQuestionList = new List<ReadingQuestionTrial>(){
+                var gropId = NewId.NextGuid();
+
+                SystemDefeaultAdditionalAssessmentList.Add(new CriterionAdditionalAssessment()
+                {
+                    CriterionType = CriterionType.RECIST1Point1,
+                    AdditionalAssessmentType = AdditionalAssessmentType.BrainMetastasis,
+                    AdditionalQuestionList = new List<ReadingQuestionTrial>(){
 
                       new ReadingQuestionTrial()
                 {
@@ -69,7 +70,7 @@ namespace IRaCIS.Core.Application.Service
                     IsJudgeQuestion=false,
                     IsShowInDicom=false,
                     GlobalReadingShowType=GlobalReadingShowType.NotShow,
-                    QuestionEnName="Brain metastases present",
+                    QuestionEnName="Brain Metastasis Present",
                     QuestionName="存在脑转移",
                     Type="radio",
                     QuestionGenre=TableQuestionType.Dictionary,
@@ -81,15 +82,75 @@ namespace IRaCIS.Core.Application.Service
                 } ,
 
                 }
-            });
+                });
+            }
+
+            //Resist1.1 TNM分期
+            {
+
+                //var gropId = NewId.NextGuid();
+
+                //SystemDefeaultAdditionalAssessmentList.Add(new CriterionAdditionalAssessment()
+                //{
+                //    CriterionType = CriterionType.RECIST1Point1,
+                //    AdditionalAssessmentType = AdditionalAssessmentType.TNMStage,
+                //    AdditionalQuestionList = new List<ReadingQuestionTrial>(){
+
+                //      new ReadingQuestionTrial()
+                //{
+                //    LimitEdit=LimitEdit.OnlyBaseLine,
+                //    Id=gropId,
+                //    IsJudgeQuestion=false,
+                //    IsShowInDicom=false,
+                //    GlobalReadingShowType=GlobalReadingShowType.NotShow,
+
+                //    QuestionName="TNM分期评估",
+                //    QuestionEnName="TNM Stage Assessment",
+                //    GroupName="TNM分期评估",
+                //    GroupEnName="TNM Stage Assessment",
+                //    Type="group",
+                //    QuestionGenre=TableQuestionType.Customize,
+                //    DataSource=DataSources.ManualEntry,
+                //    ShowQuestion=ShowQuestion.Show,
+
+
+                //    IsAdditional=true
+                //} ,
+
+                //    new ReadingQuestionTrial()
+                //{
+                //     GroupId=gropId,
+                //    LimitEdit=LimitEdit.OnlyBaseLine,
+                //    DictionaryCode="YesOrNoOrNa",
+                //    IsJudgeQuestion=false,
+                //    IsShowInDicom=false,
+                //    GlobalReadingShowType=GlobalReadingShowType.NotShow,
+                //    QuestionEnName="Brain metastases present",
+                //    QuestionName="存在脑转移",
+                //    Type="radio",
+                //    QuestionGenre=TableQuestionType.Dictionary,
+                //    DataSource=DataSources.ManualEntry,
+                //    ShowQuestion=ShowQuestion.Show,
+
+
+                //    IsAdditional=true
+                //} ,
+
+                //}
+                //});
+
+            }
+
+
+
         }
 
 
-        public  List<CriterionAdditionalAssessment> GetSystemDefeaultAdditionalAssessmentList(CriterionType criterionType, AdditionalAssessmentType? additionalAssessmentType=null)
+        public List<CriterionAdditionalAssessment> GetSystemDefeaultAdditionalAssessmentList(CriterionType criterionType, AdditionalAssessmentType? additionalAssessmentType = null)
         {
 
             return SystemDefeaultAdditionalAssessmentList.Where(t => t.CriterionType == criterionType)
-                .WhereIf(additionalAssessmentType!=null,t=>t.AdditionalAssessmentType==additionalAssessmentType).ToList();
+                .WhereIf(additionalAssessmentType != null, t => t.AdditionalAssessmentType == additionalAssessmentType).ToList();
         }
     }
 

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

@@ -40,6 +40,8 @@
         //存放在instance 上面
         public string WindowCenter { get; set; } = string.Empty;
         public string WindowWidth { get; set; } = string.Empty;
+
+        public string IamgeResizePath { get; set; } 
     }
 
     public class DicomSeriesWithLabelDTO : DicomSeriesDTO

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

@@ -178,6 +178,8 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class PreArchiveDicomStudyCommand
     {
+      //public  string StudyInstanceUid { get; set; }
+
         [NotDefault]
         public Guid TrialId { get; set; }
         [NotDefault]
@@ -278,6 +280,7 @@ namespace IRaCIS.Core.Application.Contracts
         public string AcquisitionNumber { get; set; } = string.Empty;
         public string TriggerTime { get; set; } = string.Empty;
 
+        public string IamgeResizePath { get; set; }=string.Empty;
         public List<AddInstanceDto> InstanceList { get; set; }
 
 

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

@@ -140,13 +140,46 @@ namespace IRaCIS.Core.Application.Services
 
             path = (await _instanceRepository.Where(s => s.SeriesId == seriesId).Select(t => t.Path).FirstOrDefaultAsync()).IfNullThrowException();
 
-            var physicalPath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, path);
+            #region 切换磁盘存储之前
+            //var physicalPath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, path);
 
-            //DicomInstance dicomInstance = await _instanceRepository.FirstOrDefaultAsync(s => s.SeriesId == seriesId).IfNullThrowException();
+            #endregion
+
+            #region 切换磁盘存储后
+
+            var physicalPath  = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, path);
+
+            //不存在，去其他路径找
+            if (!File.Exists(physicalPath))
+            {
+                //找到所有磁盘
+                var drives = DriveInfo.GetDrives()
+                         .Where(d => d.DriveType == DriveType.Fixed && d.IsReady)
+                         //剩余空间最多的
+                         .OrderByDescending(d => d.AvailableFreeSpace)
+
+                         //存储空间相同，则按照按照总空间从大到小排序
+                         .ThenByDescending(d => d.TotalSize - d.TotalFreeSpace)
+                         .Select(d => d.RootDirectory.FullName)
+                         .ToList();
+
+
+                foreach (var drive in drives)
+                {
+                    physicalPath = Path.Combine(drive, _hostEnvironment.EnvironmentName, path.Trim('/'));
+
+                    if (File.Exists(physicalPath))
+                    {
+                        break;
+                    }
+                }
+            }
+
+           
+
+            #endregion
 
-            //DicomStudy dicomStudy = await _studyRepository.FirstOrDefaultAsync(s => s.Id == dicomInstance.StudyId).IfNullThrowException();
 
-            //var (physicalPath, relativePath)  = FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, dicomInstance.Id);
 
             using (var sw = ImageHelper.RenderPreviewJpeg(physicalPath))
             {

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

@@ -21,7 +21,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
     [ApiExplorerSettings(GroupName = "Image")]
     public class StudyService : BaseService, IStudyService
     {
-        private static object lockCodeGenerate = new object();
+        private static object lockObj = new object();
         private static readonly AsyncLock _mutex = new AsyncLock();
         private static readonly AsyncLock _mutex2 = new AsyncLock();
 
@@ -93,8 +93,18 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         public async Task<IResponseOutput> PreArchiveDicomStudy(PreArchiveDicomStudyCommand preArchiveStudyCommand)
         {
 
-
-
+            //lock (lockObj)
+            //{
+            //    if (_provider.Exists($"StudyUid_{preArchiveStudyCommand.TrialId}_{preArchiveStudyCommand.StudyInstanceUid}"))
+            //    {
+            //        //---当前已有人正在上传和归档该检查!
+            //        return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_ArchiveInProgress"));
+            //    }
+            //    else
+            //    {
+            //        _provider.Set($"StudyUid_{preArchiveStudyCommand.TrialId}_{preArchiveStudyCommand.StudyInstanceUid}", _userInfo.Id, TimeSpan.FromSeconds(30));
+            //    }
+            //}
 
             var studyMonitor = new StudyMonitor()
             {
@@ -111,7 +121,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 IsDicomReUpload = preArchiveStudyCommand.IsDicomReUpload,
                 FileSize = preArchiveStudyCommand.FileSize,
                 FileCount = preArchiveStudyCommand.FileCount,
-                //FailedFileCount = preArchiveStudyCommand.FailedFileCount,
 
             };
 
@@ -122,124 +131,77 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
         }
 
+        [HttpGet]
+        public IResponseOutput DicomUploadInProgress(Guid trialId, string studyInstanceUid)
+        {
+            _provider.Set($"StudyUid_{trialId}_{studyInstanceUid}", _userInfo.Id, TimeSpan.FromSeconds(30));
+
+            return ResponseOutput.Ok();
+
+        }
+
 
 
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> AddOrUpdateArchiveStudy(NewArchiveStudyCommand incommand)
         {
-            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;
-
-            //上传
-            if (studyMonitor.IsDicomReUpload == false)
+            try
             {
-                var study = _mapper.Map<DicomStudy>(incommand.Study);
+                var trialId = incommand.TrialId;
 
-                using (await _mutex.LockAsync())
+                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;
+
+                //上传
+                if (studyMonitor.IsDicomReUpload == false)
                 {
-                    //查询数据库获取最大的Code 没有记录则为0
-                    var dbStudyCodeIntMax = _dicomstudyRepository.Where(s => s.TrialId == trialId).Select(t => t.Code).DefaultIfEmpty().Max();
+                    var study = _mapper.Map<DicomStudy>(incommand.Study);
 
-                    //获取缓存中的值 并发的时候，需要记录，已被占用的值 这样其他线程在此占用的最大的值上递增
-                    var cacheMaxCodeInt = _provider.Get<int>($"{trialId}_{StaticData.CacheKey.StudyMaxCode}").Value;
-
-                    int currentNextCodeInt = cacheMaxCodeInt > dbStudyCodeIntMax ? cacheMaxCodeInt + 1 : dbStudyCodeIntMax + 1;
-
-                    study.Code = currentNextCodeInt;
-
-                    study.StudyCode = AppSettings.GetCodeStr(currentNextCodeInt, nameof(DicomStudy));
-
-                    _provider.Set<int>($"{trialId}_{StaticData.CacheKey.StudyMaxCode}", study.Code, TimeSpan.FromMinutes(30));
-
-                }
-
-
-                study.Id = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString());
-                study.TrialId = incommand.TrialId;
-                study.SiteId = incommand.SiteId;
-                study.SubjectId = incommand.SubjectId;
-                study.SubjectVisitId = incommand.SubjectVisitId;
-
-
-                //特殊处理逻辑
-                study.Modalities = string.Join("、", incommand.Study.SeriesList.Select(t => t.Modality).Distinct());
-                SpecialArchiveStudyDeal(study);
-
-                await _dicomstudyRepository.AddAsync(study);
-
-
-                studyMonitor.StudyId = study.Id;
-                studyMonitor.StudyCode = study.StudyCode;
-
-
-                foreach (var seriesItem in incommand.Study.SeriesList)
-                {
-                    var series = _mapper.Map<DicomSeries>(seriesItem);
-
-                    series.Id = IdentifierHelper.CreateGuid(seriesItem.SeriesInstanceUid, incommand.TrialId.ToString());
-                    series.StudyId = study.Id;
-
-                    series.TrialId = incommand.TrialId;
-                    series.SiteId = incommand.SiteId;
-                    series.SubjectId = incommand.SubjectId;
-                    series.SubjectVisitId = incommand.SubjectVisitId;
-
-                    await _dicomSeriesRepository.AddAsync(series);
-
-                    foreach (var instanceItem in seriesItem.InstanceList)
+                    using (await _mutex.LockAsync())
                     {
-                        var isntance = _mapper.Map<DicomInstance>(instanceItem);
-                        isntance.StudyId = study.Id;
-                        isntance.SeriesId = series.Id;
+                        //查询数据库获取最大的Code 没有记录则为0
+                        var dbStudyCodeIntMax = _dicomstudyRepository.Where(s => s.TrialId == trialId).Select(t => t.Code).DefaultIfEmpty().Max();
 
-                        isntance.TrialId = incommand.TrialId;
-                        isntance.SiteId = incommand.SiteId;
-                        isntance.SubjectId = incommand.SubjectId;
-                        isntance.SubjectVisitId = incommand.SubjectVisitId;
+                        //获取缓存中的值 并发的时候，需要记录，已被占用的值 这样其他线程在此占用的最大的值上递增
+                        var cacheMaxCodeInt = _provider.Get<int>($"{trialId}_{StaticData.CacheKey.StudyMaxCode}").Value;
+
+                        int currentNextCodeInt = cacheMaxCodeInt > dbStudyCodeIntMax ? cacheMaxCodeInt + 1 : dbStudyCodeIntMax + 1;
+
+                        study.Code = currentNextCodeInt;
+
+                        study.StudyCode = AppSettings.GetCodeStr(currentNextCodeInt, nameof(DicomStudy));
+
+                        _provider.Set<int>($"{trialId}_{StaticData.CacheKey.StudyMaxCode}", study.Code, TimeSpan.FromMinutes(30));
 
-                        await _dicomInstanceRepository.AddAsync(isntance);
                     }
-                }
 
 
+                    study.Id = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString());
+                    study.TrialId = incommand.TrialId;
+                    study.SiteId = incommand.SiteId;
+                    study.SubjectId = incommand.SubjectId;
+                    study.SubjectVisitId = incommand.SubjectVisitId;
 
 
-            }
-            else
-            {
+                    //特殊处理逻辑
+                    study.Modalities = string.Join("、", incommand.Study.SeriesList.Select(t => t.Modality).Distinct());
+                    SpecialArchiveStudyDeal(study);
 
-                var studyId = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString()); ;
-
-                var study = await _dicomstudyRepository.FirstOrDefaultAsync(t => t.Id == studyId);
-
-                //_mapper.Map(incommand.Study, study);
-
-                //特殊处理逻辑
-                study.Modalities = string.Join("、", incommand.Study.SeriesList.Select(t => t.Modality).Union(study.Modalities.Split("、", StringSplitOptions.RemoveEmptyEntries)).Distinct());
-                SpecialArchiveStudyDeal(study);
+                    await _dicomstudyRepository.AddAsync(study);
 
 
+                    studyMonitor.StudyId = study.Id;
+                    studyMonitor.StudyCode = study.StudyCode;
 
-                // 少了整个序列
 
-                //某个序列下少了instance
-                foreach (var seriesItem in incommand.Study.SeriesList)
-                {
-                    var seriesId = IdentifierHelper.CreateGuid(seriesItem.StudyInstanceUid, seriesItem.SeriesInstanceUid, trialId.ToString());
-
-                    DicomSeries dicomSeries = await _dicomSeriesRepository.FirstOrDefaultAsync(t => t.Id == seriesId);
-
-                    //判断重复
-                    if (dicomSeries == null)
+                    foreach (var seriesItem in incommand.Study.SeriesList)
                     {
                         var series = _mapper.Map<DicomSeries>(seriesItem);
 
-                        series.Id = seriesId;
+                        series.Id = IdentifierHelper.CreateGuid(seriesItem.StudyInstanceUid, seriesItem.SeriesInstanceUid, incommand.TrialId.ToString());
                         series.StudyId = study.Id;
 
                         series.TrialId = incommand.TrialId;
@@ -247,48 +209,118 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                         series.SubjectId = incommand.SubjectId;
                         series.SubjectVisitId = incommand.SubjectVisitId;
 
+                        await _dicomSeriesRepository.AddAsync(series);
 
-                        dicomSeries = await _dicomSeriesRepository.AddAsync(series);
+                        foreach (var instanceItem in seriesItem.InstanceList)
+                        {
+                            var isntance = _mapper.Map<DicomInstance>(instanceItem);
+                            isntance.StudyId = study.Id;
+                            isntance.SeriesId = series.Id;
 
-                        //新的序列 那么  检查的序列数量+1
-                        study.SeriesCount += 1;
+                            isntance.TrialId = incommand.TrialId;
+                            isntance.SiteId = incommand.SiteId;
+                            isntance.SubjectId = incommand.SubjectId;
+                            isntance.SubjectVisitId = incommand.SubjectVisitId;
+
+                            await _dicomInstanceRepository.AddAsync(isntance);
+                        }
                     }
-                    else
+
+
+
+
+                }
+                else
+                {
+
+                    var studyId = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString()); ;
+
+                    var study = await _dicomstudyRepository.FirstOrDefaultAsync(t => t.Id == studyId);
+
+                    //_mapper.Map(incommand.Study, study);
+
+                    //特殊处理逻辑
+                    study.Modalities = string.Join("、", incommand.Study.SeriesList.Select(t => t.Modality).Union(study.Modalities.Split("、", StringSplitOptions.RemoveEmptyEntries)).Distinct());
+                    SpecialArchiveStudyDeal(study);
+
+
+
+                    // 少了整个序列
+
+                    //某个序列下少了instance
+                    foreach (var seriesItem in incommand.Study.SeriesList)
                     {
-                        //该序列掉了instance
-                        dicomSeries.InstanceCount += seriesItem.InstanceCount;
+                        var seriesId = IdentifierHelper.CreateGuid(seriesItem.StudyInstanceUid, seriesItem.SeriesInstanceUid, trialId.ToString());
+
+                        DicomSeries dicomSeries = await _dicomSeriesRepository.FirstOrDefaultAsync(t => t.Id == seriesId);
+
+                        //判断重复
+                        if (dicomSeries == null)
+                        {
+                            var series = _mapper.Map<DicomSeries>(seriesItem);
+
+                            series.Id = seriesId;
+                            series.StudyId = study.Id;
+
+                            series.TrialId = incommand.TrialId;
+                            series.SiteId = incommand.SiteId;
+                            series.SubjectId = incommand.SubjectId;
+                            series.SubjectVisitId = incommand.SubjectVisitId;
+
+
+                            dicomSeries = await _dicomSeriesRepository.AddAsync(series);
+
+                            //新的序列 那么  检查的序列数量+1
+                            study.SeriesCount += 1;
+                        }
+                        else
+                        {
+                            //该序列掉了instance
+                            dicomSeries.InstanceCount += seriesItem.InstanceList.Count;
+                        }
+
+                        foreach (var instanceItem in seriesItem.InstanceList)
+                        {
+                            var insntance = _mapper.Map<DicomInstance>(instanceItem);
+                            insntance.Id = IdentifierHelper.CreateGuid(insntance.StudyInstanceUid, insntance.SeriesInstanceUid, insntance.SopInstanceUid, trialId.ToString());
+                            insntance.StudyId = study.Id;
+                            insntance.SeriesId = dicomSeries.Id;
+
+                            insntance.TrialId = incommand.TrialId;
+                            insntance.SiteId = incommand.SiteId;
+                            insntance.SubjectId = incommand.SubjectId;
+                            insntance.SubjectVisitId = incommand.SubjectVisitId;
+
+                            await _dicomInstanceRepository.AddAsync(insntance);
+                        }
+
+
+                        //  不管是新的序列  还是 该序列 掉了Instance   重传的时候 检查的instance 数量都会增加
+                        study.InstanceCount += seriesItem.InstanceList.Count;
+
                     }
 
 
-                    foreach (var instanceItem in seriesItem.InstanceList)
-                    {
-                        var insntance = _mapper.Map<DicomInstance>(instanceItem);
-                        insntance.Id = IdentifierHelper.CreateGuid(insntance.StudyInstanceUid, insntance.SeriesInstanceUid, insntance.SopInstanceUid, trialId.ToString());
-                        insntance.StudyId = study.Id;
-                        insntance.SeriesId = dicomSeries.Id;
-
-                        insntance.TrialId = incommand.TrialId;
-                        insntance.SiteId = incommand.SiteId;
-                        insntance.SubjectId = incommand.SubjectId;
-                        insntance.SubjectVisitId = incommand.SubjectVisitId;
-
-                        await _dicomInstanceRepository.AddAsync(insntance);
-                    }
-
-
-                    //  不管是新的序列  还是 该序列 掉了Instance   重传的时候 检查的instance 数量都会增加
-                    study.InstanceCount += seriesItem.InstanceCount;
-
                 }
 
+                using (await _mutex2.LockAsync())
+                {
+                    await _dicomInstanceRepository.SaveChangesAsync();
 
+
+                }
             }
-
-            using (await _mutex2.LockAsync())
+            catch (Exception ex)
             {
-                await _dicomInstanceRepository.SaveChangesAsync();
 
+                return ResponseOutput.NotOk(ex.Message);
             }
+            finally
+            {
+                _provider.Remove($"StudyUid_{incommand.TrialId}_{incommand.Study.StudyInstanceUid}");
+            }
+
+
 
 
 
@@ -728,8 +760,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var result = new VerifyStudyUploadResult();
 
-            if (_provider.Exists("StudyUid_" + studyInstanceUid))
+            if (_provider.Exists($"StudyUid_{trialId}_{studyInstanceUid}"))
             {
+                
                 result.AllowUpload = false;
 
                 result.AllowReUpload = false;
@@ -789,6 +822,16 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 }
             }
             result.StudyInstanceUid = studyInstanceUid;
+
+
+            if (result.AllowReUpload || result.AllowUpload)
+            {
+                lock (lockObj)
+                {
+                    _provider.Set($"StudyUid_{trialId}_{studyInstanceUid}", _userInfo.Id, TimeSpan.FromSeconds(30));
+                }
+            }
+
             return result;
         }
 

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

@@ -35,9 +35,7 @@ namespace IRaCIS.Core.Application.Service
             .ForMember(d => d.SiteName, u => u.MapFrom(s => s.Site.SiteName))
             .ForMember(d => d.UploaderFirstName, u => u.MapFrom(s => s.Uploader.FirstName))
             .ForMember(d => d.UploaderLastName, u => u.MapFrom(s => s.Uploader.LastName))
-              .ForMember(d => d.UploadedTime, u => u.MapFrom(s => s.CreateTime))
-
-            .ForMember(d => d.DTFCount, u => u.MapFrom(s => s.StudyDTFList.Count()));
+              .ForMember(d => d.UploadedTime, u => u.MapFrom(s => s.CreateTime));
 
             CreateMap<Subject, StudyDTO>();
 
@@ -61,7 +59,8 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<DicomStudy, QAStudyInfoDTO>()
                 .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.StudyId, t => t.MapFrom(u => u.Id))
+                .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

@@ -275,6 +275,16 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
 
         [NotDefault]
         public Guid TrialReadingCriterionId { get; set; }
+
+        /// <summary>
+        /// 是否盲化
+        /// </summary>
+        public bool? IsBlind { get; set; }
+
+        /// <summary>
+        /// 是否完整
+        /// </summary>
+        public bool? IsComplete { get; set; }
     }
 
     /// <summary>
@@ -365,8 +375,10 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
         public string CreateUserRealName { get; set; } = string.Empty;
 
         public string Description { get; set; } = string.Empty;
+        public string DescriptionCN { get; set; } = string.Empty;
 
         public string ModuleTypeName { get; set; } = string.Empty;
+        public string ModuleTypeNameCN { get; set; } = string.Empty;
 
 
         public string SignText { get; set; } = string.Empty;
@@ -376,6 +388,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
         public bool? InPlan { get; set; }
 
         public string OptType { get; set; } = string.Empty;
+        public string OptTypeCN { get; set; } = string.Empty;
 
         public Guid? FrontAuditConfigId { get; set; }
 

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

@@ -17,6 +17,8 @@ using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Domain.Share.Management;
 using System.Text.Json.Nodes;
 using IRaCIS.Application.Contracts;
+using IRaCIS.Core.Infrastructure.Extention;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Information;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -387,15 +389,6 @@ namespace IRaCIS.Core.Application.Service
                     Dictionary<string, object> jsonDic = JsonConvert.DeserializeObject<Dictionary<string, object>>(relationParentInspection.JsonDetail);
 
 
-                    //  //CommonData 仅仅存放关联对象的 Data里面的数据
-                    //if (jsonDic.ContainsKey(nameof(InspectionJsonDetail.CommonData)))
-                    //{
-                    //    var commonDataDicObj = jsonDic[nameof(InspectionJsonDetail.CommonData)];
-
-                    //    objectLsit.Add(commonDataDicObj);
-                    //}
-
-
                     //避免对象信息记录 把  Data里面的信息也取过去 但是加上稽查对象的前缀
                     var dataDicObj = jsonDic[nameof(InspectionJsonDetail.Data)];
 
@@ -449,112 +442,6 @@ namespace IRaCIS.Core.Application.Service
 
             await AddJsonObjectToDic(id, objectRelationParentId3, createTime, batchId, objectLsit);
 
-
-
-            #region 废弃
-            //if (objectRelationParentId != null)
-            //{
-            //    //父子层级的数据可能在同一个批次 进行更新  但是后插入的是父层级的数据  找父层级的稽查应该优先同一批次的
-            //    var relationParentInspection = await _dataInspectionRepository.Where(t => t.GeneralId == objectRelationParentId && (t.CreateTime <= createTime || t.BatchId == batchId)).OrderByDescending(x => x.CreateTime).Select(t => new { t.ObjectRelationParentId, t.CreateTime, t.JsonDetail, t.BatchId, t.ObjectRelationParentId2, t.EntityName }).FirstOrDefaultAsync();
-
-
-            //    if (relationParentInspection != null)
-            //    {
-            //        Dictionary<string, object> jsonDic = JsonConvert.DeserializeObject<Dictionary<string, object>>(relationParentInspection.JsonDetail);
-
-
-            //        var commonDataDicObj = jsonDic[nameof(InspectionJsonDetail.CommonData)];
-
-            //        objectLsit.Add(commonDataDicObj);
-
-            //        //避免对象信息记录 把  Data里面的信息也取过去 但是加上稽查对象的前缀
-            //        var dataDicObj = jsonDic[nameof(InspectionJsonDetail.Data)];
-
-            //        if (dataDicObj != null)
-            //        {
-            //            var entityName = relationParentInspection.EntityName;
-
-            //            IDictionary<string, object> newNamepDic = new Dictionary<string, object>();
-
-            //            var tempDic = JsonConvert.DeserializeObject<Dictionary<string, object>>(dataDicObj.ToJsonStr());
-
-            //            foreach (var valuePair in tempDic)
-            //            {
-            //                newNamepDic.Add(entityName + "_" + valuePair.Key, valuePair.Value);
-            //            }
-
-
-            //            objectLsit.Add(newNamepDic);
-            //        }
-
-
-
-            //        await GetRelationParentData(relationParentInspection.ObjectRelationParentId, relationParentInspection.ObjectRelationParentId2, relationParentInspection.CreateTime, relationParentInspection.BatchId, objectLsit);
-            //    }
-
-
-
-            //}
-
-            //if (objectRelationParentId2 != null)
-            //{
-            //    //父子层级的数据可能在同一个批次 进行更新  但是后插入的是父层级的数据  找父层级的稽查应该优先同一批次的
-            //    var relationParentInspection = await _dataInspectionRepository.Where(t => t.GeneralId == objectRelationParentId2 && (t.CreateTime <= createTime || t.BatchId == batchId)).OrderByDescending(x => x.CreateTime).Select(t => new { t.ObjectRelationParentId, t.CreateTime, t.JsonDetail, t.BatchId, t.ObjectRelationParentId2, t.EntityName }).FirstOrDefaultAsync();
-
-
-            //    if (relationParentInspection != null)
-            //    {
-            //        Dictionary<string, object> jsonDic = JsonConvert.DeserializeObject<Dictionary<string, object>>(relationParentInspection.JsonDetail);
-
-
-            //        var commonDataDicObj = jsonDic[nameof(InspectionJsonDetail.CommonData)];
-
-            //        objectLsit.Add(commonDataDicObj);
-
-
-            //        //避免对象信息记录 把  Data里面的信息也取过去 但是加上稽查对象的前缀
-            //        var dataDicObj = jsonDic[nameof(InspectionJsonDetail.Data)];
-
-            //        if (dataDicObj != null)
-            //        {
-            //            var entityName = relationParentInspection.EntityName;
-
-            //            IDictionary<string, object> newNamepDic = new Dictionary<string, object>();
-
-            //            var tempDic = JsonConvert.DeserializeObject<Dictionary<string, object>>(dataDicObj.ToJsonStr());
-
-            //            foreach (var valuePair in tempDic)
-            //            {
-            //                newNamepDic.Add(entityName + "_" + valuePair.Key, valuePair.Value);
-            //            }
-
-
-            //            objectLsit.Add(newNamepDic);
-            //        }
-
-
-
-
-            //        await GetRelationParentData(relationParentInspection.ObjectRelationParentId, relationParentInspection.ObjectRelationParentId2, relationParentInspection.CreateTime, relationParentInspection.BatchId, objectLsit);
-            //    }
-            //    else
-            //    {
-            //        //用户的数据稽查没有  临时处理
-
-
-
-            //        var userObj = await _repository.Where<User>(t => t.Id == objectRelationParentId2).Select(t => new { UserRealName = t.FullName, t.Phone, t.UserName, UserType = t.UserTypeRole.UserTypeShortName, t.EMail, t.OrganizationName }).FirstOrDefaultAsync();
-
-            //        objectLsit.Add(userObj);
-            //    }
-
-
-
-            //}
-
-            #endregion
-
-
             return objectLsit;
         }
 
@@ -754,7 +641,7 @@ namespace IRaCIS.Core.Application.Service
                     {
                         JArray arrays = (JArray)value;
 
-
+                        //动态配置表翻译
                         if (item.DataType == "Table")
                         {
                             var tableConfigList = JsonConvert.DeserializeObject<List<TableConfig>>(item.TableConfigJsonStr) ?? new List<TableConfig>();
@@ -767,7 +654,7 @@ namespace IRaCIS.Core.Application.Service
 
 
                             //处理动态翻译   会在数组中提供 一个属性  “DictionaryCode”  这个是默认约束，做稽查的时候记得注意，免得配置麻烦
-                            var dynamicTranslateInfoList = tableConfigList.Where(t => t.IsDynamicTranslate  && t.IsList).Select(t => new { t.ListName, t.ColumnValue }).Distinct().ToList();
+                            var dynamicTranslateInfoList = tableConfigList.Where(t => t.IsDynamicTranslate && t.IsList).Select(t => new { t.ListName, t.ColumnValue }).Distinct().ToList();
 
                             var dynamicDictionaryNameList = new List<string>();
 
@@ -780,6 +667,19 @@ namespace IRaCIS.Core.Application.Service
                                 dynamicDictionaryNameList = dynamicDictionaryNameList.Distinct().ToList();
                             }
 
+                            var specialDynamicColumnValueList = new List<string>();
+                            if (tableConfigList.Any(t => t.IsDynamicTranslate && t.IsList == false))
+                            {
+                                // 兼容之前数组的那种方式  实际配置只会配置一条
+                                 specialDynamicColumnValueList = tableConfigList.Where(t => t.IsDynamicTranslate && t.IsList == false)
+                                        .Select(t =>  t.ColumnValue ).Distinct().ToList();
+
+                               var dicNames= arrays.Where(t=>!string.IsNullOrEmpty( t["DictionaryCode"].ToString()) ).Select(t => t["DictionaryCode"].ToString()).Distinct().ToList();
+
+                                dictionaryNameList.AddRange(dicNames);
+                            }
+                         
+
 
                             var allDictionaryNameList = dictionaryNameList.Union(dynamicDictionaryNameList).Distinct();
 
@@ -798,7 +698,13 @@ namespace IRaCIS.Core.Application.Service
                                 foreach (var translateInfo in translateInfoList)
                                 {
                                     //Json  解析后 true  变为了True
-                                    jsonObject[translateInfo.ColumnValue] = translateDataList[translateInfo.TranslateDictionaryName].Where(t => t.Code.ToLower() == jsonObject[translateInfo.ColumnValue]?.ToString().ToLower()).Select(t => t.ValueCN).FirstOrDefault();
+                                    jsonObject[translateInfo.ColumnValue] = translateDataList[translateInfo.TranslateDictionaryName].Where(t => t.Code.ToLower() == jsonObject[translateInfo.ColumnValue]?.ToString().ToLower()).Select(t => _userInfo.IsEn_Us?t.Value: t.ValueCN).FirstOrDefault();
+                                }
+
+                                foreach (var specialDynamicColumnValue in specialDynamicColumnValueList)
+                                {
+                                    jsonObject[specialDynamicColumnValue] =
+                                        translateDataList[jsonObject["DictionaryCode"].ToString()].Where(t => t.Code.ToLower() == jsonObject[specialDynamicColumnValue]?.ToString().ToLower()).Select(t => _userInfo.IsEn_Us ? t.Value : t.ValueCN).FirstOrDefault();
                                 }
 
                                 //处理动态翻译
@@ -818,16 +724,16 @@ namespace IRaCIS.Core.Application.Service
 
                                         var dicName = innerObject["DictionaryCode"]?.ToString();
 
-                                        if(dicName!=null && !string.IsNullOrEmpty(dicName))
+                                        if (dicName != null && !string.IsNullOrEmpty(dicName))
                                         {
-                                            innerObject[dynamicTranslateInfo.ColumnValue] = translateDataList[dicName].Where(t => t.Code.ToLower() == innerObject[dynamicTranslateInfo.ColumnValue].ToString().ToLower()).Select(t => t.ValueCN).FirstOrDefault();
+                                            innerObject[dynamicTranslateInfo.ColumnValue] = translateDataList[dicName].Where(t => t.Code.ToLower() == innerObject[dynamicTranslateInfo.ColumnValue].ToString().ToLower()).Select(t => _userInfo.IsEn_Us ? t.Value : t.ValueCN).FirstOrDefault();
 
                                         }
                                         innberJsonList.Add(innerObject);
 
                                     }
 
-                                    jsonObject[dynamicTranslateInfo.ListName] = JToken.FromObject(innberJsonList) ;
+                                    jsonObject[dynamicTranslateInfo.ListName] = JToken.FromObject(innberJsonList);
 
                                 }
 
@@ -849,7 +755,7 @@ namespace IRaCIS.Core.Application.Service
                             {
                                 guids.Add(Guid.Parse(x.ToString()));
                             });
-                            jsonDataDic[item.Key] = string.Join(',', await _dictionaryRepository.Where(x => guids.Contains(x.Id)).Select(x => x.ValueCN).ToListAsync());
+                            jsonDataDic[item.Key] = string.Join(',', await _dictionaryRepository.Where(x => guids.Contains(x.Id)).Select(x => _userInfo.IsEn_Us ? x.Value : x.ValueCN).ToListAsync());
                         }
                         else if (item.Type.ToLower() == FrontAudit.ChildGroup.GetDescription().ToLower())
                         {
@@ -865,7 +771,7 @@ namespace IRaCIS.Core.Application.Service
                                         parent = b
                                     }).SelectMany(a => a.parent, (m, n) => new
                                     {
-                                        value = n.ValueCN
+                                        value = _userInfo.IsEn_Us ? n.Value : n.ValueCN 
                                     }).Select(x => x.value).ToListAsync()
                                     );
                         }
@@ -886,7 +792,7 @@ namespace IRaCIS.Core.Application.Service
 
                                         jsonObject[item.Code] = await _dictionaryRepository.Where(x => x.Code == jsonObject["DictionaryCode"].ToString()).Join(_dictionaryRepository.Where(x => x.Code == jsonObject[item.Code].ToString()), a => a.Id, b => b.ParentId, (a, b) => new
                                         {
-                                            value = b.ValueCN
+                                            value = _userInfo.IsEn_Us ? b.Value : b.ValueCN 
                                         }).Select(x => x.value).FirstOrDefaultAsync();
 
                                     }
@@ -931,13 +837,13 @@ namespace IRaCIS.Core.Application.Service
                         if (item.Type.ToLower() == FrontAudit.Id.GetDescription().ToLower())
                         {
                             Guid guid = Guid.Parse(value.ToString());
-                            jsonDataDic[item.Key] = await _dictionaryRepository.Where(x => x.Id == guid).Select(x => x.ValueCN).FirstOrDefaultAsync();
+                            jsonDataDic[item.Key] = await _dictionaryRepository.Where(x => x.Id == guid).Select(x => _userInfo.IsEn_Us ? x.Value : x.ValueCN).FirstOrDefaultAsync();
                         }
                         else if (item.Type.ToLower() == FrontAudit.ChildGroup.GetDescription().ToLower())
                         {
                             jsonDataDic[item.Key] = await _dictionaryRepository.Where(x => x.Code == item.Code).Join(_dictionaryRepository.Where(x => x.ChildGroup == value.ToString()), a => a.Id, b => b.ParentId, (a, b) => new
                             {
-                                value = b.ValueCN
+                                value = _userInfo.IsEn_Us ? b.Value : b.ValueCN
                             }).Select(x => x.value).FirstOrDefaultAsync();
                         }
                         //通过字典项的code 翻译  枚举或者 bool  
@@ -945,7 +851,7 @@ namespace IRaCIS.Core.Application.Service
                         {
                             jsonDataDic[item.Key] = await _dictionaryRepository.Where(x => x.Code == item.Code).Join(_dictionaryRepository.Where(x => x.Code == value.ToString()), a => a.Id, b => b.ParentId, (a, b) => new
                             {
-                                value = b.ValueCN
+                                value = _userInfo.IsEn_Us ? b.Value : b.ValueCN
                             }).Select(x => x.value).FirstOrDefaultAsync();
                         }
                     }
@@ -1170,8 +1076,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.Sort }).OrderBy(t => t.Sort).ToListAsync();
-            return result.Select(t => t.Description).Distinct().ToList();
+            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();
+            return result;
         }
 
         /// <summary>
@@ -1200,6 +1106,7 @@ namespace IRaCIS.Core.Application.Service
                             CreateTime = data.CreateTime,
                             CreateUserId = data.CreateUserId,
                             Description = data.Description,
+                            DescriptionCN=data.DescriptionCN,
                             IsConfig = data.IsConfig,
                             IsEnable = data.IsEnable,
                             ModuleTypeId = data.ModuleTypeId,

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

@@ -138,7 +138,11 @@ namespace IRaCIS.Core.Application.Service.Inspection
                             ResearchProgramNo = leftrial.ResearchProgramNo,
                             ObjectTypeId = data.ObjectTypeId,
                             Description = leftfrontAuditConfig.Description,
-                            ModuleTypeName = leftmoduleTypec.ValueCN,
+                            DescriptionCN=leftfrontAuditConfig.DescriptionCN,
+
+                            ModuleTypeName = leftmoduleTypec.Value,
+                            ModuleTypeNameCN=leftmoduleTypec.ValueCN,
+
                             SignText = lefttrialSign.SignText,
                             Identification = leftfrontAuditConfig.Identification,
                             FrontAuditConfigId = leftfrontAuditConfig.Id,
@@ -149,6 +153,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
                             //IsFrontAdd=data.IsFrontAdd,
                             BatchId = data.BatchId,
                             OptType = leftOptType.Value,
+                            OptTypeCN = leftOptType.ValueCN,
                             ObjectRelationParentId = data.ObjectRelationParentId,
                             GeneralId = data.GeneralId,
 

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

@@ -35,7 +35,7 @@ namespace IRaCIS.Application.Services
         /// <summary> 根据CRO 名称查询所有CRO 列表 </summary>
         public async Task<IEnumerable<CroSelectDTO>> GetAllCROList()
         {
-            return await _croRepository.ProjectTo<CroSelectDTO>(_mapper.ConfigurationProvider).ToListAsync();
+            return await _croRepository.ProjectTo<CroSelectDTO>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us }).ToListAsync();
         }
 
 

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

@@ -35,13 +35,15 @@ namespace IRaCIS.Application.Services
                 VerifyMsg = _localizer["Hospital_DupName"]
             };
 
-            if (await _hospitalRepository.AnyAsync(x => x.SiteId == hospitalCommand.SiteId && hospitalCommand.SiteId != null))
+            var exp1 = new EntityVerifyExp<Hospital>()
             {
-                //---当前Site已经添加到其他Hospital了
-                throw new BusinessValidationFailedException(_localizer["Hospital_SiteAdded"]);
-            }
+                VerifyExp = x => x.SiteId == hospitalCommand.SiteId && hospitalCommand.SiteId != null,
+                //---已经存在同名的医院，请确认。
+                VerifyMsg = _localizer["Hospital_SiteAdded"]
+            };
 
-            var hospital = await _hospitalRepository.InsertOrUpdateAsync(hospitalCommand, true, exp);
+          
+            var hospital = await _hospitalRepository.InsertOrUpdateAsync(hospitalCommand, true, exp,exp1);
         
             return ResponseOutput.Ok(hospital.Id.ToString());
         

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

@@ -40,7 +40,7 @@ namespace IRaCIS.Application.Services
             //{
             //    sponsorLambda = sponsorLambda.And(t => t.SponsorName.Contains(sponsorSearchModel.SponsorName.Trim()));
             //}
-            var sponsorQueryable = _sponsorRepository.ProjectTo<SponsorSelectDTO>(_mapper.ConfigurationProvider);
+            var sponsorQueryable = _sponsorRepository.ProjectTo<SponsorSelectDTO>(_mapper.ConfigurationProvider,new { isEn_Us= _userInfo.IsEn_Us});
             return await sponsorQueryable.ToListAsync();
         }
 

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

@@ -8,6 +8,8 @@ namespace IRaCIS.Core.Application.Service
     {
         public InstitutionConfig()
         {
+            var isEn_Us = false;
+
             CreateMap<HospitalCommand, Hospital>();
             CreateMap<SiteCommand, Site>();
             CreateMap<SponsorCommand, Sponsor>();
@@ -15,8 +17,11 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<Hospital, HospitalDTO>();
             CreateMap<CRO, CROCompanyDTO>().ReverseMap();
             CreateMap<Sponsor, SponsorDTO>();
-            CreateMap<CRO, CroSelectDTO>();
-            CreateMap<Sponsor, SponsorSelectDTO>();
+            CreateMap<CRO, CroSelectDTO>()
+                .ForMember(t => t.CROName, c => c.MapFrom(d => isEn_Us ? d.CROName : d.CRONameCN)); 
+
+            CreateMap<Sponsor, SponsorSelectDTO>()
+                .ForMember(t=>t.SponsorName,c=>c.MapFrom(d=> isEn_Us?d.SponsorName:d.SponsorNameCN));
             CreateMap<Site, SiteSelectionDTO>();
 
 

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

@@ -0,0 +1,61 @@
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2023-07-04 16:10:46 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.Collections.Generic;
+namespace IRaCIS.Core.Application.ViewModel
+{
+    /// <summary> UserLogView  列表视图模型 </summary>
+    public class UserLogView
+    {
+        public Guid? Id { get; set; }
+        public string IP { get; set; }
+
+        public string LoginFaildName { get; set; }
+        public int OptType { get; set; }
+
+
+        public string? LoginUserName { get; set; }
+
+        public UserTypeEnum? LoginUserTypeEnum { get; set; }
+
+        public DateTime CreateTime { get; set; }
+        public Guid CreateUserId { get; set; }
+
+
+
+        public string? OptUserName { get; set; }
+
+        public UserTypeEnum? OptUserTypeEnum { get; set; }
+
+        public Guid? LoginUserId { get; set; }
+
+        public Guid? OptUserId { get; set; }
+    }
+
+    ///<summary>UserLogQuery  列表查询参数模型</summary>
+    public class UserLogQuery : PageInput
+    {
+        public Guid? TrialId { get; set; }
+
+        public UserOptType? OptType { get; set; }
+
+        public string? IP { get; set; }
+
+        public string? LoginFaildName { get; set; }
+
+        public DateTime? BeginDate { get; set; }
+
+        public DateTime? EndDate { get; set; }
+
+
+    }
+
+
+
+}
+
+

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

@@ -9,6 +9,7 @@ namespace IRaCIS.Core.Application.Contracts
     /// <summary> UserTypeRoleView  列表视图模型 </summary>
     public class UserTypeRoleView : UserTypeMenuAddOrEdit
     {
+        public UserTypeEnum UserTypeEnum { get; set; }
         public List<UserTypeGroupInfo> UserTypeGroupList { get; set; } = new List<UserTypeGroupInfo>();
 
         public new  List<Guid> UserTypeGroupIdList => UserTypeGroupList.Select(t=>t.DictionaryId).ToList();
@@ -37,6 +38,8 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class UserTypeMenuAddOrEdit: UserTypeRoleAddOrEdit
     {
+        public UserTypeEnum UserTypeEnum { get; set; }
+
         public List<Guid> MenuIds { get; set; } = new List<Guid>();
 
     }
@@ -52,6 +55,7 @@ namespace IRaCIS.Core.Application.Contracts
         public int Order { get; set; }
 
 
+
         public List<Guid> UserTypeGroupIdList { get; set; } = new List<Guid>();
 
 

IRaCIS.Core.Application/Service/Management/Interface/IUserLogService.cs

@@ -0,0 +1,24 @@
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2023-07-04 16:10:34 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+//--------------------------------------------------------------------
+
+using IRaCIS.Core.Application.ViewModel;
+namespace IRaCIS.Core.Application.Interfaces
+{
+    /// <summary>
+    /// IUserLogService
+    /// </summary>	
+    public interface IUserLogService
+    {
+
+        Task<PageOutput<UserLogView>> GetUserLogList(UserLogQuery inQuery);
+
+        //Task<IResponseOutput> AddOrUpdateUserLog(UserLogAddOrEdit addOrEditUserLog);
+
+        //Task<IResponseOutput> DeleteUserLog(Guid userLogId);
+
+
+    }
+}

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

@@ -11,6 +11,7 @@ using Microsoft.Extensions.Caching.Memory;
 using IRaCIS.Core.Infra.Common.Cache;
 using Microsoft.Identity.Client;
 using static IRaCIS.Core.Domain.Share.StaticData;
+using IRaCIS.Core.Application.ViewModel;
 
 namespace IRaCIS.Application.Services
 {
@@ -22,10 +23,14 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<VerificationCode> _verificationCodeRepository;
         private readonly IRepository<Doctor> _doctorRepository;
         private readonly IRepository<TrialUser> _userTrialRepository;
+        private readonly IRepository<UserLog> _userLogRepository;
+
 
         private readonly IMemoryCache _cache;
 
         private readonly IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig;
+
+
         public UserService(IRepository<User> userRepository,
 
             IMailVerificationService mailVerificationService,
@@ -33,10 +38,12 @@ namespace IRaCIS.Application.Services
             IRepository<Doctor> doctorRepository,
             IMemoryCache cache,
             IRepository<TrialUser> userTrialRepository,
-            IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig
-
+            IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig,
+            IRepository<UserLog> userLogRepository
          )
         {
+            _userLogRepository = userLogRepository;
+
             _verifyConfig = verifyConfig;
             _cache = cache;
             _userRepository = userRepository;
@@ -44,6 +51,7 @@ namespace IRaCIS.Application.Services
             _verificationCodeRepository = verificationCodeRepository;
             _doctorRepository = doctorRepository;
             _userTrialRepository = userTrialRepository;
+            _userLogRepository = userLogRepository;
         }
 
 
@@ -165,9 +173,7 @@ namespace IRaCIS.Application.Services
                 }
                 else //验证码正确 并且 没有超时 
                 {
-                    //更新密码
-                    //var pwd = MD5Helper.Md5(newPwd);
-                    //var count = _doctorRepository.Update<Doctor>().Where(t => t.Id == doctor.Id).Set(d => d.Password == pwd).ExecuteAffrows();
+
 
                     await VerifyUserEmailAsync(_userInfo.Id, _userInfo.UserTypeId, newEmail);
 
@@ -180,6 +186,8 @@ namespace IRaCIS.Application.Services
                     //删除验证码历史记录
                     await _verificationCodeRepository.BatchDeleteNoTrackingAsync(t => t.UserId == _userInfo.Id && t.CodeType == 0);
 
+                    await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id, OptUserId = _userInfo.Id, OptType = UserOptType.UpdateUser }, true);
+
                     return ResponseOutput.Ok();
 
                 }
@@ -198,6 +206,8 @@ namespace IRaCIS.Application.Services
                 Phone = newPhone
             });
 
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id, OptUserId = _userInfo.Id, OptType = UserOptType.UpdateUser }, true);
+
             return ResponseOutput.Ok();
         }
 
@@ -213,19 +223,11 @@ namespace IRaCIS.Application.Services
                 UserName = newUserName
             });
 
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id, OptUserId = _userInfo.Id, OptType = UserOptType.UpdateUser }, true);
             return ResponseOutput.Ok();
         }
 
-        ///// <summary>
-        /////  Result  为true 的时候 认为链接没有失效
-        ///// </summary>
-        ///// <param name="userId"></param>
-        ///// <returns></returns>
-        //[HttpGet]
-        //public async Task<IResponseOutput> VerifyCanInitSetUserNameAndPwd(Guid userId)
-        //{
-        //    return ResponseOutput.Ok(await _userRepository.AnyAsync(t => t.Id == userId && t.EmailToken == _userInfo.UserToken && t.IsFirstAdd));
-        //}
+
 
 
         [HttpGet]
@@ -233,8 +235,6 @@ namespace IRaCIS.Application.Services
         {
 
 
-
-
             await VerifyUserPwdAsync(userId, newPWd);
 
             await VerifyUserNameAsync(userId, newUserName);
@@ -251,6 +251,8 @@ namespace IRaCIS.Application.Services
 
             }, true);
 
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id, OptUserId = _userInfo.Id, OptType = UserOptType.UpdateUser }, true);
+
             return ResponseOutput.Ok();
         }
 
@@ -290,6 +292,8 @@ namespace IRaCIS.Application.Services
                 IsFirstAdd = true
             });
 
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id, OptUserId=userId,  OptType = UserOptType.ResetPassword }, true);
+
             return ResponseOutput.Ok();
         }
 
@@ -400,6 +404,8 @@ 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);
+
             return ResponseOutput.Result(success);
 
         }
@@ -434,23 +440,11 @@ namespace IRaCIS.Application.Services
                 IsFirstAdd = false
             });
 
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id,  OptUserId= _userInfo.Id,   OptType = UserOptType.LoginModifyPassword }, true);
 
             return ResponseOutput.Result(success);
 
 
-            ////医生密码
-            //if (await _doctorRepository.AnyAsync(t => t.Id == _userInfo.Id && t.Password == editPwModel.OldPassWord))
-            //{
-            //    var success = await _doctorRepository.BatchUpdateNoTrackingAsync(t => t.Id == _userInfo.Id, u => new Doctor()
-            //    {
-
-            //        Password = editPwModel.NewPassWord
-            //    });
-
-            //    return ResponseOutput.Result(success);
-            //}
-
-            //return ResponseOutput.NotOk("Old password is wrong.");
 
         }
 
@@ -477,7 +471,6 @@ namespace IRaCIS.Application.Services
 
             return await userQueryable.ToPagedListAsync(param.PageIndex, param.PageSize, param.SortField == string.Empty ? "UserName" : param.SortField, param.Asc);
 
-
         }
 
         /// <summary>
@@ -562,6 +555,9 @@ namespace IRaCIS.Application.Services
             {
                 user.OrganizationName = AppSettings.DefaultInternalOrganizationName;
             }
+
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id, OptUserId= model.Id ,  OptType = UserOptType.UpdateUser }, true);
+
             var success = await _userRepository.SaveChangesAsync();
 
             return ResponseOutput.Ok(success);
@@ -582,6 +578,8 @@ namespace IRaCIS.Application.Services
                 return ResponseOutput.NotOk(_localizer["User_InProject"]);
             }
 
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id, OptUserId= userId, OptType = UserOptType.DeleteUser }, true);
+
             var success = await _userRepository.BatchDeleteNoTrackingAsync(t => t.Id == userId);
 
             return ResponseOutput.Result(success);
@@ -597,6 +595,9 @@ namespace IRaCIS.Application.Services
         [HttpPost("{userId:guid}/{state:int}")]
         public async Task<IResponseOutput> UpdateUserState(Guid userId, UserStateEnum state)
         {
+
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id, OptUserId = userId, OptType = state==UserStateEnum.Enable? UserOptType.AccountEnable: UserOptType.AccountLocked }, true);
+
             var success = await _userRepository.BatchUpdateNoTrackingAsync(u => u.Id == userId, t => new User
             {
                 Status = state
@@ -618,8 +619,8 @@ namespace IRaCIS.Application.Services
         {
 
             const string cachePrefix = "login-failures:";
-            const int maxFailures = 3;
-            const int lockoutMinutes = 1;
+            int maxFailures = _verifyConfig.CurrentValue.LoginMaxFailCount;
+            int lockoutMinutes = _verifyConfig.CurrentValue.LoginFailLockMinutes;
 
             // 生成缓存键
             string cacheKey = $"{cachePrefix}{userName}";
@@ -638,7 +639,9 @@ namespace IRaCIS.Application.Services
 
             if (failCount >= maxFailures)
             {
-                throw new BusinessValidationFailedException($"密码连续错误3次,当前账号已被限制登录，请等待 {lockoutMinutes} 分钟后再试。");
+                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = Guid.Empty, OptUserId = Guid.Empty, LoginFaildName = userName,LoginPassword=password,  OptType = UserOptType.AccountLocked }, true);
+
+                throw new BusinessValidationFailedException($"密码连续错误{maxFailures}次,当前账号已被限制登录，请等待 {lockoutMinutes} 分钟后再试。");
             }
 
             var userLoginReturnModel = new LoginReturnDTO();
@@ -649,28 +652,12 @@ namespace IRaCIS.Application.Services
             if (loginUser == null)
             {
 
-                #region 屏蔽代码，现在没用到
-                ////此处下面 代码 为了支持医生也能登录 而且前端不加选择到底是管理用户 还是医生用户  奇怪的需求 无法理解
-
-                //var loginDoctor = await _doctorRepository.Where(u => u.Phone == userName && u.Password == password).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
-
-                //if (loginDoctor == null)
-                //{
-                //    return ResponseOutput.NotOk(_localizer["User_CheckNameOrPw"], new LoginReturnDTO());
-                //}
-                //userLoginReturnModel.BasicInfo = loginDoctor;
-
-                //登录 清除缓存
-                //_cache.Remove(userLoginReturnModel.BasicInfo.Id.ToString());
-                //return ResponseOutput.Ok(userLoginReturnModel);
-
-                #endregion
-
-
                 //错误次数累加
                 failCount++;
                 _cache.Set(cacheKey, failCount, TimeSpan.FromMinutes(lockoutMinutes));
 
+                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = Guid.Empty, OptUserId=Guid.Empty, LoginFaildName = userName, LoginPassword = password,  OptType = UserOptType.AccountOrPasswordError }, true);
+
                 return ResponseOutput.NotOk(_localizer["User_CheckNameOrPw"], new LoginReturnDTO());
 
 
@@ -679,6 +666,8 @@ namespace IRaCIS.Application.Services
 
             if (loginUser.Status == 0)
             {
+                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = loginUser.Id, OptUserId = loginUser.Id, LoginFaildName = userName, OptType = UserOptType.LoginLockedAccount }, true);
+
                 //---该用户已经被禁用。
                 return ResponseOutput.NotOk(_localizer["User_Disabled"], new LoginReturnDTO());
             }
@@ -687,7 +676,7 @@ namespace IRaCIS.Application.Services
             //登录成功  清除缓存
             _cache.Set(cacheKey, 0, TimeSpan.FromMinutes(lockoutMinutes));
 
-
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = loginUser.Id, OptUserId = loginUser.Id,  OptType = UserOptType.Login }, true);
 
             userLoginReturnModel.BasicInfo = loginUser;
 
@@ -697,35 +686,32 @@ namespace IRaCIS.Application.Services
 
         }
 
+        [HttpPost]
+        public async Task<PageOutput<UserLogView>> GetUserLogList(UserLogQuery inQuery)
+        {
 
+            var userLogQueryable =
+               _userLogRepository
+               .WhereIf(inQuery.TrialId != null, t => t.LoginUser.UserTrials.Any(c => c.TrialId == inQuery.TrialId && c.UserId == t.CreateUserId))
+               .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(!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);
 
+            var pageList = await userLogQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? "Id" : inQuery.SortField, inQuery.Asc);
 
-        //private  bool loginIsLocked(string userName)
-        //{
+            return pageList;
+        }
 
-        //    //if (failCount == null)
-        //    //{
-        //    //    failCount = 0;
-        //    //}
-        //    //else
-        //    //{
-        //    //    failCount++;
-        //    //}
+        [HttpGet]
+        public async Task<IResponseOutput> LoginOut()
+        {
+            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.Id, OptUserId = _userInfo.Id,   OptType = UserOptType.LoginOut },true);
 
-        //    //// 更新缓存中的登录失败次数
-        //    //_cache.Set(cacheKey, failCount, TimeSpan.FromMinutes(lockoutMinutes));
-
-        //    //if (failCount >= maxFailures)
-        //    //{
-        //    //    // 如果登录失败次数达到了 3 次，则锁定用户
-        //    //    _cache.Set(cacheKey + ":locked", true, TimeSpan.FromMinutes(lockoutMinutes));
-        //    //}
-
-
-
-
-        //    //return isLocked;
-        //}
+            return ResponseOutput.Ok();
+        }
 
     }
 }

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

@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Application.Contracts;
 
 namespace IRaCIS.Core.Application.Contracts
 {
@@ -15,18 +16,18 @@ namespace IRaCIS.Core.Application.Contracts
     [ApiExplorerSettings(GroupName = "Management")]
     public class UserTypeRoleService : BaseService, IUserTypeService
     {
-        private readonly IRepository<UserType> userTypeServiceRepository;
+        private readonly IRepository<UserType> _userTypeRepository;
 
-        public UserTypeRoleService(IRepository<UserType> userTypeServiceRepository)
+        public UserTypeRoleService(IRepository<UserType> userTypeRepository)
         {
-            this.userTypeServiceRepository = userTypeServiceRepository;
+            _userTypeRepository = userTypeRepository;
         }
 
         [HttpPost]
         public async Task<List<UserTypeRoleView>> GetUserTypeRoleList(UserTypeQuery userTypeQuery)
         {
 
-            var userTypeRoleQueryable = userTypeServiceRepository
+            var userTypeRoleQueryable = _userTypeRepository
                 .WhereIf(!string.IsNullOrWhiteSpace(userTypeQuery.SearchFilter), t => t.Description.Contains(userTypeQuery.SearchFilter!) || t.UserTypeName.Contains(userTypeQuery.SearchFilter!) || t.UserTypeShortName.Contains(userTypeQuery.SearchFilter!))
 
                 .WhereIf(userTypeQuery.GroupId!=null,t=>t.UserTypeGroupList.Any(t=>t.DictionaryId== userTypeQuery.GroupId))
@@ -40,16 +41,22 @@ namespace IRaCIS.Core.Application.Contracts
         public async Task<IResponseOutput> AddOrUpdateUserTypeRole(UserTypeMenuAddOrEdit addOrEditUserTypeRole)
         {
 
+            var verifyExp1 = new EntityVerifyExp<UserType>()
+            {
+                VerifyExp = u => u.UserTypeEnum == addOrEditUserTypeRole.UserTypeEnum ,
+              
+                VerifyMsg = "已存在该用户类型的角色。"
+            };
+        
             var entity = new UserType();
 
             if (addOrEditUserTypeRole.Id == null)
             {
                 entity = _mapper.Map<UserType>(addOrEditUserTypeRole);
 
-                entity.UserTypeEnum = userTypeServiceRepository.Select(t => t.UserTypeEnum).DefaultIfEmpty().Max() + 1;
-
-                await _repository.AddAsync(entity);
+                //entity.UserTypeEnum = userTypeServiceRepository.Select(t => t.UserTypeEnum).DefaultIfEmpty().Max() + 1;
 
+                await _userTypeRepository.InsertFromDTOAsync(addOrEditUserTypeRole,false, verifyExp1);
 
             }
             else
@@ -57,14 +64,17 @@ namespace IRaCIS.Core.Application.Contracts
 
                 if (addOrEditUserTypeRole.MenuIds.Count > 0)
                 {
-                    entity = userTypeServiceRepository.Where(t => t.Id == addOrEditUserTypeRole.Id, true).Include(t => t.UserTypeMenuList).Include(t=>t.UserTypeGroupList).FirstOrDefault().IfNullThrowException();
+                    entity = _userTypeRepository.Where(t => t.Id == addOrEditUserTypeRole.Id, true).Include(t => t.UserTypeMenuList).Include(t=>t.UserTypeGroupList).FirstOrDefault().IfNullThrowException();
 
                 }
                 else
                 {
-                    entity = userTypeServiceRepository.Where(t => t.Id == addOrEditUserTypeRole.Id, true).FirstOrDefault().IfNullThrowException();
+                    entity = _userTypeRepository.Where(t => t.Id == addOrEditUserTypeRole.Id, true).FirstOrDefault().IfNullThrowException();
                 }
                 _mapper.Map(addOrEditUserTypeRole, entity);
+
+
+                await _userTypeRepository.EntityVerifyAsync(entity.Id, verifyExp1);
             }
 
             var success = await _repository.SaveChangesAsync();
@@ -83,7 +93,7 @@ namespace IRaCIS.Core.Application.Contracts
                 return ResponseOutput.NotOk(_localizer["UserType_InUse"]);
             }
 
-            var success = await userTypeServiceRepository.BatchDeleteNoTrackingAsync(t => t.Id == userTypeId);
+            var success = await _userTypeRepository.BatchDeleteNoTrackingAsync(t => t.Id == userTypeId);
 
             return ResponseOutput.Result(success);
         }
@@ -139,7 +149,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
 
-            var query = userTypeServiceRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin)
+            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);
 
@@ -156,8 +166,8 @@ namespace IRaCIS.Core.Application.Contracts
         /// <returns></returns>
         public async Task<List<TrialUserType>> GetTrialUserTypeList()
         {
-            var query = userTypeServiceRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin)
-               //.Where(t => t.Type == UserTypeGroup.TrialUser)
+            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);
 
             return await query.ToListAsync();

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

@@ -119,7 +119,12 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(d => d.UserTypeId, c => c.MapFrom(t => t));
 
 
-
+            CreateMap<UserLog, UserLogView>()
+                  .ForMember(d => d.LoginUserName, c => c.MapFrom(t => t.LoginUser.UserName))
+                  .ForMember(d => d.LoginUserTypeEnum, c => c.MapFrom(t => t.LoginUser.UserTypeEnum))
+                  .ForMember(d => d.OptUserName, c => c.MapFrom(t => t.OptUser.UserName))
+                  .ForMember(d => d.OptUserTypeEnum, c => c.MapFrom(t => t.OptUser.UserTypeEnum))
+                ;
         }
     }
 

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

@@ -235,7 +235,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO
             {
                 if (!ClosedTime.HasValue)
                     return "";
-                else return string.Format("{0}天{1}小时{2}分钟", (ClosedTime - CreateTime)?.Days, (ClosedTime - CreateTime)?.Hours, (ClosedTime - CreateTime)?.Minutes);
+                else return string.Format("{0}Days{1}Hours{2}Minutes", (ClosedTime - CreateTime)?.Days, (ClosedTime - CreateTime)?.Hours, (ClosedTime - CreateTime)?.Minutes);
             }
         }
 
@@ -255,7 +255,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
     public class TrialVisitQADTO
     {
-
+        public bool ExistsManual { get; set; }
         public SubjectClinicalDataDto SubjectClinicalData { get; set; } = new SubjectClinicalDataDto();
 
         public List<NoneDicomStudyView> NoneDicomStudyList { get; set; } = new List<NoneDicomStudyView>();