升级net8 模型要求严格了

.editorconfig

@@ -126,6 +126,47 @@ csharp_style_deconstructed_variable_declaration = true:suggestion
 csharp_style_unused_value_assignment_preference = discard_variable:suggestion
 csharp_style_unused_value_expression_statement_preference = discard_variable:silent
 
+# SA0001: XML comment analysis disabled
+dotnet_diagnostic.SA0001.severity = suggestion
+
+# SA1002: Semicolons should be spaced correctly
+dotnet_diagnostic.SA1002.severity = suggestion
+
+# SA1005: Single line comments should begin with single space
+dotnet_diagnostic.SA1005.severity = none
+dotnet_diagnostic.CS8618.severity = none
+dotnet_diagnostic.CS8604.severity = none
+dotnet_diagnostic.CS8600.severity = none
+dotnet_diagnostic.CS1570.severity = none
+dotnet_diagnostic.CS8601.severity = none
+dotnet_diagnostic.CS8632.severity = none
+dotnet_diagnostic.CS8625.severity = none
+
+dotnet_diagnostic.CS8603.severity = none
+dotnet_diagnostic.CS8602.severity = none
+dotnet_diagnostic.CS1998.severity = none
+dotnet_diagnostic.CS0168.severity = none
+dotnet_diagnostic.CS0219.severity = none
+dotnet_diagnostic.CS0108.severity = none
+dotnet_diagnostic.CS0120.severity = none
+
+dotnet_diagnostic.CS8620.severity = none
+dotnet_diagnostic.CS8619.severity = none
+dotnet_diagnostic.CS0162.severity = none
+dotnet_diagnostic.CS0472.severity = none
+
+dotnet_diagnostic.CS8629.severity = none
+dotnet_diagnostic.CS8073.severity = none
+dotnet_diagnostic.CS0414.severity = none
+dotnet_diagnostic.CS1573.severity = none
+dotnet_diagnostic.CS0109.severity = none
+
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+dotnet_diagnostic.SA1003.severity = silent
+dotnet_diagnostic.SA1108.severity = silent
+dotnet_diagnostic.SA1107.severity = silent
+
 [*.vb]
 #### 命名样式 ####
 

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -26,6 +26,8 @@ using Aliyun.Acs.Core.Profile;
 using Aliyun.Acs.Sts.Model.V20150401;
 using Microsoft.AspNetCore.Hosting;
 using MassTransit;
+using IRaCIS.Core.Application.Helper;
+using Microsoft.Extensions.Options;
 
 namespace IRaCIS.Api.Controllers
 {
@@ -134,25 +136,82 @@ namespace IRaCIS.Api.Controllers
             return returnModel;
         }
 
+        [HttpGet("user/GetObjectStoreToken")]
+        public IResponseOutput GetObjectStoreToken([FromServices] IOptionsMonitor<ObjectStoreServiceOptions> options)
+        {
+            var serviceOption = options.CurrentValue;
+
+            if (Enum.TryParse<ObjectStoreUse>(serviceOption.ObjectStoreUse, out var parsedEnum) && parsedEnum == ObjectStoreUse.AliyunOSS)
+            {
+
+                var ossOptions = serviceOption.AliyunOSS;
+
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO ,AliyunOSS= serviceOption.AliyunOSS });
+
+                #region 临时token 屏蔽
+                //IClientProfile profile = DefaultProfile.GetProfile(ossOptions.RegionId, ossOptions.AccessKeyId, ossOptions.AccessKeySecret);
+                //DefaultAcsClient client = new DefaultAcsClient(profile);
+
+
+                //// 创建一个STS请求
+                //AssumeRoleRequest request = new AssumeRoleRequest
+                //{
+                //    RoleArn = ossOptions.RoleArn, // 角色ARN，需要替换为你的角色ARN
+                //    RoleSessionName = $"session-name-{NewId.NextGuid()}", // 角色会话名称，可自定义
+                //    DurationSeconds = 900, // 令牌有效期（单位：秒），这里设置为1小时
+                //};
+
+
+                //AssumeRoleResponse response = client.GetAcsResponse(request);
+
+                //// 返回STS令牌信息给前端
+                //var stsToken = new ObjectStoreDTO()
+                //{
+                //    ObjectStoreUse = serviceOption.ObjectStoreUse,
+                //    AliyunOSS = new AliyunOSSTempToken()
+                //    {
+                //        AccessKeyId = response.Credentials.AccessKeyId,
+                //        AccessKeySecret = response.Credentials.AccessKeySecret,
+                //        SecurityToken = response.Credentials.SecurityToken,
+                //        Expiration = response.Credentials.Expiration,
+
+                //        Region = ossOptions.Region,
+                //        BucketName = ossOptions.BucketName,
+                //        ViewEndpoint = ossOptions.ViewEndpoint,
+
+                //    },
+                //    MinIO = serviceOption.MinIO
+                //};
+                //return ResponseOutput.Ok(stsToken);
+
+                #endregion
+
+            }
+            else if (Enum.TryParse<ObjectStoreUse>(serviceOption.ObjectStoreUse, out var parsedValue) && parsedValue == ObjectStoreUse.MinIO)
+            {
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO });
+            }
+            else
+            {
+                return ResponseOutput.Ok(new ObjectStoreDTO() { ObjectStoreUse = serviceOption.ObjectStoreUse, MinIO = serviceOption.MinIO });
+            }
+
+        }
 
         [HttpGet("user/GenerateSTS")]
-        public IResponseOutput GenerateSTS( [FromServices] IWebHostEnvironment webHostEnvironment)
+        public IResponseOutput GenerateSTS([FromServices] IOptionsMonitor<AliyunOSSOptions> options)
         {
-           
-
-            var configuration = new ConfigurationBuilder()
-              .AddJsonFile($"appsettings.{webHostEnvironment.EnvironmentName}.json")
-              .Build();
+            var ossOptions = options.CurrentValue;
 
 
-            IClientProfile profile = DefaultProfile.GetProfile("cn-shanghai", configuration["AliyunOSS:accessKeyId"], configuration["AliyunOSS:accessKeySecret"]);
+            IClientProfile profile = DefaultProfile.GetProfile(ossOptions.regionId, ossOptions.accessKeyId, ossOptions.accessKeySecret);
             DefaultAcsClient client = new DefaultAcsClient(profile);
 
 
             // 创建一个STS请求
             AssumeRoleRequest request = new AssumeRoleRequest
             {
-                RoleArn = "acs:ram::1899121822495495:role/oss-upload", // 角色ARN，需要替换为你的角色ARN
+                RoleArn = ossOptions.roleArn, // 角色ARN，需要替换为你的角色ARN
                 RoleSessionName = $"session-name-{NewId.NextGuid()}", // 角色会话名称，可自定义
                 DurationSeconds = 900, // 令牌有效期（单位：秒），这里设置为1小时
             };
@@ -168,9 +227,9 @@ namespace IRaCIS.Api.Controllers
                 SecurityToken = response.Credentials.SecurityToken,
                 Expiration = response.Credentials.Expiration,
 
-                Region= configuration["AliyunOSS:region"],
-                BucketName = configuration["AliyunOSS:bucketName"],
-                ViewEndpoint = configuration["AliyunOSS:viewEndpoint"],
+                Region = ossOptions.region ,
+                BucketName = ossOptions.bucketName ,
+                ViewEndpoint = ossOptions.viewEndpoint ,
 
             };
 

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -24,6 +24,7 @@ using Magicodes.ExporterAndImporter.Excel;
 using MassTransit;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -37,7 +38,7 @@ using Microsoft.Net.Http.Headers;
 using MiniExcelLibs;
 using Newtonsoft.Json;
 using SharpCompress.Archives;
-using SharpCompress.Common;
+using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -134,6 +135,32 @@ namespace IRaCIS.Core.API.Controllers
             }
         }
 
+        [Route("base")]
+        public virtual async Task FileUploadToOSSAsync(Func<string, Stream, Task<string>> toMemoryStreamFunc)
+        {
+            var boundary = HeaderUtilities.RemoveQuotes(MediaTypeHeaderValue.Parse(Request.ContentType).Boundary).Value;
+
+            var reader = new MultipartReader(boundary, HttpContext.Request.Body);
+
+            var section = await reader.ReadNextSectionAsync();
+
+            while (section != null)
+            {
+                var hasContentDispositionHeader = ContentDispositionHeaderValue.TryParse(section.ContentDisposition, out var contentDisposition);
+                if (hasContentDispositionHeader)
+                {
+                    var fileName = contentDisposition.FileName.Value;
+
+                    await toMemoryStreamFunc(fileName, section.Body);
+
+                }
+
+                section = await reader.ReadNextSectionAsync();
+
+            }
+
+        }
+
 
 
         /// <summary>  流式上传   Dicom上传  </summary>
@@ -280,9 +307,6 @@ namespace IRaCIS.Core.API.Controllers
 
 
 
-
-
-
             if (!HttpContext.Request.HasFormContentType ||
                 !MediaTypeHeaderValue.TryParse(HttpContext.Request.ContentType, out var mediaTypeHeader) ||
                 string.IsNullOrEmpty(mediaTypeHeader.Boundary.Value))
@@ -756,11 +780,13 @@ namespace IRaCIS.Core.API.Controllers
         [HttpPost("QCOperation/UploadVisitCheckExcel/{trialId:guid}")]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
-        public async Task<IResponseOutput> UploadVisitCheckExcel(Guid trialId)
+        public async Task<IResponseOutput> UploadVisitCheckExcel(Guid trialId, [FromServices] IOSSService oSSService)
         {
 
-            var (serverFilePath, relativePath, fileName) = (string.Empty, string.Empty, string.Empty);
-            await FileUploadAsync(async (realFileName) =>
+            var fileName = string.Empty;
+            var templateFileStream = new MemoryStream();
+
+            await FileUploadToOSSAsync(async (realFileName, fileStream) =>
             {
                 fileName = realFileName;
 
@@ -770,19 +796,16 @@ namespace IRaCIS.Core.API.Controllers
                     throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_SupportedFormats"));
                 }
 
-                (serverFilePath, relativePath) = FileStoreHelper.GetTrialCheckFilePath(_hostEnvironment, fileName, trialId);
+                fileStream.CopyTo(templateFileStream);
+                templateFileStream.Seek(0, SeekOrigin.Begin);
 
-                await _repository.AddAsync(new UserUploadFile()
-                {
-                    TrialId = trialId,
-                    CreateTime = DateTime.Now,
-                    FileName = fileName,
-                    FilePath = relativePath,
-                    RelativePath = relativePath,
-                    CreateUserId = _userInfo.Id
-                });
 
-                return serverFilePath;
+                var ossRelativePath = oSSService.UploadToOSS(fileStream, "InspectionUpload/Check", $"{Guid.NewGuid()}_" + realFileName);
+
+                await _repository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId });
+
+                return ossRelativePath;
+
             });
 
 
@@ -814,7 +837,7 @@ namespace IRaCIS.Core.API.Controllers
             {
                 var Importer = new ExcelImporter();
 
-                var import = await Importer.Import<CheckViewModel>(System.IO.File.OpenRead(serverFilePath));
+                var import = await Importer.Import<CheckViewModel>(templateFileStream);
 
                 if (import.Exception != null) return ResponseOutput.NotOk(import.Exception.ToString());
 
@@ -829,7 +852,7 @@ namespace IRaCIS.Core.API.Controllers
                 #region   临时方案   MiniExcel读取  然后保存为xlsx  再用 Magicodes验证数据
 
                 //因为csv 需要加配置文件 不然都是null
-                etcCheckList = MiniExcel.Query<CheckViewModel>(serverFilePath, null, configuration: new MiniExcelLibs.Csv.CsvConfiguration()
+                etcCheckList = MiniExcel.Query<CheckViewModel>(templateFileStream, null, configuration: new MiniExcelLibs.Csv.CsvConfiguration()
                 {
                     StreamReaderFunc = (stream) => new StreamReader(stream, Encoding.GetEncoding("gb2312"))
                 }).ToList();
@@ -874,35 +897,35 @@ namespace IRaCIS.Core.API.Controllers
             else
             {
                 //为了支持 xls  引入新的组件库
-                using (var stream = System.IO.File.Open(serverFilePath, FileMode.Open, FileAccess.Read))
+                //using (var stream = System.IO.File.Open(templateFileStream, FileMode.Open, FileAccess.Read))
+                //{
+                // Auto-detect format, supports:
+                //  - Binary Excel files (2.0-2003 format; *.xls)
+                //  - OpenXml Excel files (2007 format; *.xlsx, *.xlsb)
+                using (var reader = ExcelReaderFactory.CreateReader(templateFileStream))
                 {
-                    // Auto-detect format, supports:
-                    //  - Binary Excel files (2.0-2003 format; *.xls)
-                    //  - OpenXml Excel files (2007 format; *.xlsx, *.xlsb)
-                    using (var reader = ExcelReaderFactory.CreateReader(stream))
+
+                    // 2. Use the AsDataSet extension method
+                    var dateset = reader.AsDataSet();
+
+                    foreach (DataRow col in dateset.Tables[0].Rows)
                     {
 
-                        // 2. Use the AsDataSet extension method
-                        var dateset = reader.AsDataSet();
-
-                        foreach (DataRow col in dateset.Tables[0].Rows)
+                        etcCheckList.Add(new CheckViewModel()
                         {
-
-                            etcCheckList.Add(new CheckViewModel()
-                            {
-                                SiteCode = col[0].ToString(),
-                                SubjectCode = col[1].ToString(),
-                                VisitName = col[2].ToString(),
-                                StudyDate = col[3].ToString(),
-                                Modality = col[4].ToString(),
-                            });
-                        }
-
-                        etcCheckList.Remove(etcCheckList[0]);
-
-                        // The result of each spreadsheet is in result.Tables
+                            SiteCode = col[0].ToString(),
+                            SubjectCode = col[1].ToString(),
+                            VisitName = col[2].ToString(),
+                            StudyDate = col[3].ToString(),
+                            Modality = col[4].ToString(),
+                        });
                     }
+
+                    etcCheckList.Remove(etcCheckList[0]);
+
+                    // The result of each spreadsheet is in result.Tables
                 }
+
             }
 
             if (etcCheckList == null || etcCheckList.Count == 0)
@@ -940,7 +963,6 @@ namespace IRaCIS.Core.API.Controllers
             return ResponseOutput.Ok();
 
         }
-
     }
 
 
@@ -948,6 +970,8 @@ namespace IRaCIS.Core.API.Controllers
 
 
 
+
+
     #region 项目 系统  基本文件 上传  下载 预览
 
     [ApiExplorerSettings(GroupName = "Common")]
@@ -980,30 +1004,38 @@ namespace IRaCIS.Core.API.Controllers
         [DisableFormValueModelBinding]
         [UnitOfWork]
         public async Task<IResponseOutput> UploadTrialSiteSurveyUser(Guid trialId, string baseUrl, string routeUrl,
-            [FromServices] IRepository<TrialSite> _trialSiteRepository,
-             [FromServices] IRepository<UserType> _usertypeRepository,
-             [FromServices] ITrialSiteSurveyService _trialSiteSurveyService)
+    [FromServices] IRepository<TrialSite> _trialSiteRepository,
+     [FromServices] IRepository<UserType> _usertypeRepository,
+     [FromServices] ITrialSiteSurveyService _trialSiteSurveyService,
+     [FromServices] IOSSService oSSService,
+     [FromServices] IRepository<InspectionFile> _inspectionFileRepository)
         {
-            var (serverFilePath, relativePath, fileName) = (string.Empty, string.Empty, string.Empty);
-            await FileUploadAsync(async (realFileName) =>
-            {
-                fileName = realFileName;
+            var templateFileStream = new MemoryStream();
 
-                if (!fileName.EndsWith(".xlsx", StringComparison.OrdinalIgnoreCase))
+
+            await FileUploadToOSSAsync(async (realFileName, fileStream) =>
+            {
+                await fileStream.CopyToAsync(templateFileStream);
+                templateFileStream.Seek(0, SeekOrigin.Begin);
+
+                if (!realFileName.EndsWith(".xlsx", StringComparison.OrdinalIgnoreCase))
                 {
                     //	 请用提供格式的模板excel上传需要处理的数据
                     throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_TemplateUploadData"));
                 }
 
-                (serverFilePath, relativePath) = FileStoreHelper.GetOtherFileUploadPath(_hostEnvironment, StaticData.Folder.TempFile, fileName);
+                var ossRelativePath = oSSService.UploadToOSS(fileStream, "InspectionUpload/SiteSurvey", $"{Guid.NewGuid()}_"+ realFileName);
 
-                //FileStoreHelper.UploadOOS(serverFilePath, "testc/test", true);
+                await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId });
+
+                
+
+                return ossRelativePath;
 
-                return serverFilePath;
             });
 
             //去掉空白行
-            var excelList = MiniExcel.Query<SiteSurveyUserImportDto>(serverFilePath).ToList()
+            var excelList = MiniExcel.Query<SiteSurveyUserImportDto>(templateFileStream,excelType:ExcelType.XLSX).ToList()
                 .Where(t => !(string.IsNullOrWhiteSpace(t.TrialSiteCode) && string.IsNullOrWhiteSpace(t.FirstName) && string.IsNullOrWhiteSpace(t.LastName) && string.IsNullOrWhiteSpace(t.Email)
                 && string.IsNullOrWhiteSpace(t.Phone) && string.IsNullOrWhiteSpace(t.UserTypeStr) && string.IsNullOrWhiteSpace(t.OrganizationName))).ToList();
 
@@ -1033,7 +1065,7 @@ namespace IRaCIS.Core.API.Controllers
                 //有邮箱不符合邮箱格式,请核查Excel数据
                 throw new BusinessValidationFailedException(StaticData.International("UploadDownLoad_InvalidEmail"));
             }
-            var generateUserTypeList = new List<string>() { "CRC", "SR", "CRA" };
+            var generateUserTypeList = new List<string>() { "CRC",  "CRA","SR" };
 
             if (excelList.Any(t => !generateUserTypeList.Contains(t.UserTypeStr.ToUpper())))
             {
@@ -1083,122 +1115,18 @@ namespace IRaCIS.Core.API.Controllers
         }
 
 
-        #region 废弃
+        /// <summary>  通用文件下载 </summary>
+        [AllowAnonymous]
+        [HttpGet("CommonDocument/DownloadCommonDoc")]
+        public async Task<IActionResult> DownloadCommonFile(string code, [FromServices] IRepository<CommonDocument> _commonDocumentRepository)
+        {
+            var (filePath, fileName) = await FileStoreHelper.GetCommonDocPhysicalFilePathAsync(_hostEnvironment, _commonDocumentRepository, code);
 
-        ///// <summary>  缩略图 </summary>
-        //[AllowAnonymous]
-        //[HttpGet("Common/LocalFilePreview")]
-        //public async Task<FileContentResult> LocalFilePreview(string relativePath)
-        //{
-
-        //    var _fileStorePath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, relativePath);
-
-        //    var storePreviewPath = _fileStorePath + ".preview.jpeg";
-
-        //    if (!System.IO.File.Exists(storePreviewPath))
-        //    {
-        //        ImageHelper.ResizeSave(_fileStorePath, storePreviewPath);
-        //    }
-
-        //    return new FileContentResult(await System.IO.File.ReadAllBytesAsync(storePreviewPath), "image/jpeg");
-
-        //}
-
-
-        ///// <summary>  通用文件下载 </summary>
-        //[AllowAnonymous]
-        //[HttpGet("CommonDocument/DownloadCommonDoc")]
-        //public async Task<IActionResult> DownloadCommonFile(string code, [FromServices] IRepository<CommonDocument> _commonDocumentRepository)
-        //{
-        //    var (filePath, fileName) = await FileStoreHelper.GetCommonDocPhysicalFilePathAsync(_hostEnvironment, _commonDocumentRepository, code);
-
-        //    new FileExtensionContentTypeProvider().Mappings.TryGetValue(Path.GetExtension(filePath), out var contentType);
-
-        //    return File(System.IO.File.OpenRead(filePath), contentType ?? "application/octet-stream", fileName);
-
-        //}
-
-        ///// <summary>
-        ///// 下载项目临床数据文件
-        ///// </summary>
-        ///// <param name="clinicalDataTrialSetId"></param>
-        ///// <param name="_clinicalDataTrialSetRepository"></param>
-        ///// <returns></returns>
-        //[AllowAnonymous]
-        //[HttpGet("CommonDocument/DownloadTrialClinicalFile")]
-        //public async Task<IActionResult> DownloadTrialClinicalFile(Guid clinicalDataTrialSetId, [FromServices] IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository)
-        //{
-        //    var (filePath, fileName) = await FileStoreHelper.GetTrialClinicalPathAsync(_hostEnvironment, _clinicalDataTrialSetRepository, clinicalDataTrialSetId);
-
-        //    new FileExtensionContentTypeProvider().Mappings.TryGetValue(Path.GetExtension(filePath), out var contentType);
-
-        //    return File(System.IO.File.OpenRead(filePath), contentType ?? "application/octet-stream", fileName);
-
-        //}
-
-
-        ///// <summary>
-        ///// 下载系统临床数据文件
-        ///// </summary>
-        ///// <param name="clinicalDataSystemSetId"></param>
-        ///// <param name="_clinicalDataSystemSetRepository"></param>
-        ///// <returns></returns>
-        //[AllowAnonymous]
-        //[HttpGet("CommonDocument/DownloadSystemClinicalFile")]
-        //public async Task<IActionResult> DownloadSystemClinicalFile(Guid clinicalDataSystemSetId, [FromServices] IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository)
-        //{
-        //    var (filePath, fileName) = await FileStoreHelper.GetSystemClinicalPathAsync(_hostEnvironment, _clinicalDataSystemSetRepository, clinicalDataSystemSetId);
-
-        //    new FileExtensionContentTypeProvider().Mappings.TryGetValue(Path.GetExtension(filePath), out var contentType);
-
-        //    return File(System.IO.File.OpenRead(filePath), contentType ?? "application/octet-stream", fileName);
-
-        //}
-
-        ///// <summary>
-        /////上传项目签名文档
-        ///// </summary>
-        ///// <param name="trialId"></param>
-        ///// <returns></returns>
-        //[HttpPost("TrialDocument/UploadTrialDoc/{trialId:guid}")]
-        //[DisableRequestSizeLimit]
-        //[DisableFormValueModelBinding]
-        //public async Task<IResponseOutput> UploadTrialDoc(Guid trialId)
-        //{
-
-        //    return await SingleFileUploadAsync((fileName) => FileStoreHelper.GetTrialSignDocPath(_hostEnvironment, trialId, fileName));
-
-        //}
-
-        ///// <summary>
-        ///// 上传系统签名文档
-        ///// </summary>
-        ///// <returns></returns>
-        //[HttpPost("TrialDocument/UploadSystemDoc")]
-        //[DisableRequestSizeLimit]
-        //[DisableFormValueModelBinding]
-        //public async Task<IResponseOutput> UploadSysTemDoc()
-        //{
-
-        //    return await SingleFileUploadAsync((fileName) => FileStoreHelper.GetSystemSignDocPath(_hostEnvironment, fileName));
-
-        //}
-        ///// <summary>
-        ///// 上传系统通知文档
-        ///// </summary>
-        ///// <returns></returns>
-        //[HttpPost("SystemNotice/UploadSystemNoticeDoc")]
-        //[DisableRequestSizeLimit]
-        //[DisableFormValueModelBinding]
-        //public async Task<IResponseOutput> UploadSystemNoticeDoc()
-        //{
-
-        //    return await SingleFileUploadAsync((fileName) => FileStoreHelper.GetSystemNoticePath(_hostEnvironment, fileName));
-
-        //}
-        #endregion
+            new FileExtensionContentTypeProvider().Mappings.TryGetValue(Path.GetExtension(filePath), out var contentType);
 
+            return File(System.IO.File.OpenRead(filePath), contentType ?? "application/octet-stream", fileName);
 
+        }
 
         /// <summary>
         /// 上传通用文档  比如一致性核查的 比如导出的excel 模板

IRaCIS.Core.API/Dockerfile

@@ -1,26 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["IRaCIS.Core.API/IRaCIS.Core.API.csproj", "IRaCIS.Core.API/"]
-COPY ["IRaCIS.Core.Application/IRaCIS.Core.Application.csproj", "IRaCIS.Core.Application/"]
-COPY ["IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj", "IRaCIS.Core.Infra.EFCore/"]
-COPY ["IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj", "IRaCIS.Core.Domain/"]
-COPY ["IRaCIS.Core.Domain.Share/IRaCIS.Core.Domain.Share.csproj", "IRaCIS.Core.Domain.Share/"]
-COPY ["IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj", "IRaCIS.Core.Infrastructure/"]
-RUN dotnet restore "IRaCIS.Core.API/IRaCIS.Core.API.csproj"
-COPY . .
-WORKDIR "/src/IRaCIS.Core.API"
-RUN dotnet build "IRaCIS.Core.API.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "IRaCIS.Core.API.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "IRaCIS.Core.API.dll"]

IRaCIS.Core.API/GrpcToken.proto

@@ -1,16 +1,16 @@
-// 使用的是proto3版本
+// 使用的是proto3版本
 syntax = "proto3";
-// 定义命名空间，后续生成代码时就会生成对应的命名空间
+// 定义命名空间，后续生成代码时就会生成对应的命名空间
 option csharp_namespace = "gRPC.ZHiZHUN.AuthServer.protos";
 
 /*
-每一句需要用分号结尾
-message 用来定义请求和返回数据格式
-tag message后面的值数字代表是字段的标识(tag),不是赋值，
+每一句需要用分号结尾
+message 用来定义请求和返回数据格式
+tag message后面的值数字代表是字段的标识(tag),不是赋值，
 */
 
 
-// 新增用户时需要传递数据消息， 可理解为一个类
+// 新增用户时需要传递数据消息， 可理解为一个类
 message GetTokenReuqest{
 	string id=1;
 	string userName=2;
@@ -22,48 +22,48 @@ message GetTokenReuqest{
 
 }
 
-// 新增时返回的消息格式
+// 新增时返回的消息格式
 message  GetTokenResponse {
 	int32  code=1;
 	string token =2;
 }
 
 
-// service 用标识定义服务的，里面写对应的方法
+// service 用标识定义服务的，里面写对应的方法
 service TokenGrpcService{
-	// 获取token
+	// 获取token
 	rpc GetUserToken(GetTokenReuqest) returns (GetTokenResponse);
 
 }
 
 /*
-// 新增用户时需要传递数据消息， 可理解为一个类
+// 新增用户时需要传递数据消息， 可理解为一个类
 message AddUserReuqest{
 	string name=1;
 	int32 age=2;
 	bool isBoy=3;
 }
-// 新增时返回的消息格式
+// 新增时返回的消息格式
 message ResultResponse {
 	int32 code=1;
 	string msg =2;
 }
-//传递的查询条件信息格式，可理解为平时传入的查询条件对象
+//传递的查询条件信息格式，可理解为平时传入的查询条件对象
 message QueryUserReuqest{
 	string name=1;
 }
-//查询返回的用户信息格式，可理解为返回的类
+//查询返回的用户信息格式，可理解为返回的类
 message UserInfoResponse {
 	string name=1;
 	int32 age=2;
 	string gender=3;
 }
 
-// service 用标识定义服务的，里面写对应的方法
+// service 用标识定义服务的，里面写对应的方法
 service UserService{
-	// 新增用户
+	// 新增用户
 	rpc AddUser(AddUserReuqest) returns (ResultResponse);
-	// 查询用户
+	// 查询用户
 	rpc GetAllUser(QueryUserReuqest) returns (UserInfoResponse);
 }
 */

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

@@ -66,28 +66,28 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="aliyun-net-sdk-sts" Version="3.1.1" />
-    <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
+    <PackageReference Include="aliyun-net-sdk-sts" Version="3.1.2" />
+    <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
-    <PackageReference Include="EasyCaching.InMemory" Version="1.7.0" />
-    <PackageReference Include="EasyCaching.Interceptor.Castle" Version="1.7.0" />
-    <PackageReference Include="EntityFrameworkCore.Triggered.Extensions" Version="3.2.1" />
+    <PackageReference Include="EasyCaching.Interceptor.Castle" Version="1.9.1" />
+    <PackageReference Include="EasyCaching.Serialization.MessagePack" Version="1.9.1" />
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="EasyCaching.InMemory" Version="1.9.1" />
     <PackageReference Include="Hangfire.AspNetCore" Version="1.8.5" />
     <PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
     <PackageReference Include="Hangfire.SqlServer" Version="1.8.5" />
     <PackageReference Include="Invio.Extensions.Authentication.JwtBearer" Version="2.0.1" />
     <PackageReference Include="LogDashboard" Version="1.4.8" />
-    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
-    <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="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.23" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.2" />
+    <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.7.0" />
+    <PackageReference Include="Quartz.Extensions.Hosting" Version="3.7.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
+    <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.1" />
     <PackageReference Include="Serilog.Sinks.Email" Version="2.4.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -219,13 +219,16 @@
             <param name="_noneDicomStudyRepository"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadVisitCheckExcel(System.Guid)">
+        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadVisitCheckExcel(System.Guid,IRaCIS.Core.Application.Helper.IOSSService)">
             <summary>
             一致性核查 excel上传 支持三种格式
             </summary>
             <param name="trialId"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.DownloadCommonFile(System.String,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument})">
+            <summary>  通用文件下载 </summary>
+        </member>
         <member name="M:IRaCIS.Core.API.Controllers.UploadDownLoadController.UploadCommonDoc">
             <summary>
             上传通用文档  比如一致性核查的 比如导出的excel 模板

IRaCIS.Core.API/Program.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Autofac.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
@@ -13,8 +13,7 @@ using System.IO;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Application.Helper;
-using IRaCIS.Application.Services.BackGroundJob;
-using Hangfire;
+using System.Runtime.InteropServices;
 
 namespace IRaCIS.Core.API
 {
@@ -25,7 +24,7 @@ namespace IRaCIS.Core.API
         {
             try
             {
-                //以配置文件为准，否则 从url中取环境值(服务以命令行传递参数启动，配置文件配置了就不需要传递环境参数)
+                //以配置文件为准，否则 从url中取环境值(服务以命令行传递参数启动，配置文件配置了就不需要传递环境参数)
                 var config = new ConfigurationBuilder()
                             .AddEnvironmentVariables()
                             .Build();
@@ -41,11 +40,11 @@ namespace IRaCIS.Core.API
                         : "Development";
                 }
 
-                //Dicom 浏览
+                //Dicom 浏览
                 //ImageManager.SetImplementation(WinFormsImageManager.Instance);
 
                 var host = CreateHostBuilder(args)
-                    .UseEnvironment(enviromentName) //命令行传入环境
+                    .UseEnvironment(enviromentName) //命令行传入环境
                     .ConfigureAppConfiguration((hostContext, config) =>
                     {
 
@@ -58,17 +57,30 @@ namespace IRaCIS.Core.API
 
                 //// Serilog 
                 SerilogExtension.AddSerilogSetup(enviromentName, host.Services);
-                Log.Logger.Warning($"当前环境：{enviromentName}");
 
+                Log.Logger.Warning($"当前环境：{enviromentName}");
+
+
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                {
+                    Log.Logger.Warning($"当前部署平台环境：windows");
+                }
+                else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                {
+                    Log.Logger.Warning($"当前部署平台环境：linux");
+                }
+                else
+                {
+                    Log.Logger.Warning($"当前部署平台环境：OSX  or FreeBSD");
+                }
 
                 NewId.SetProcessIdProvider(new CurrentProcessIdProvider());
 
-                ////缓存项目的状态  匿名化数据
-                //await InitCache(host);
 
                 host.Run();
 
 
+
             }
             catch (Exception e)
             {
@@ -85,13 +97,13 @@ namespace IRaCIS.Core.API
                 {
                     webBuilder.ConfigureKestrel((context, options) =>
                      {
-                         //设置应用服务器Kestrel请求体最大为1GB // if don't set default value is: 30 MB
+                         //设置应用服务器Kestrel请求体最大为1GB // if don't set default value is: 30 MB
                          options.Limits.MaxRequestBodySize = long.MaxValue;
                          options.Limits.KeepAliveTimeout = TimeSpan.FromMinutes(30);
                          options.Limits.RequestHeadersTimeout = TimeSpan.FromMinutes(20);
 
                      });
-                    //webBuilder.UseSerilog();//在宿主机启动的时候配置serilog,与微软ILogger进行整合
+                    //webBuilder.UseSerilog();//在宿主机启动的时候配置serilog,与微软ILogger进行整合
                     webBuilder.UseStartup<Startup>();
                 }).UseSerilog()
                 .UseServiceProviderFactory(new AutofacServiceProviderFactory());
@@ -101,14 +113,14 @@ namespace IRaCIS.Core.API
         {
             var _repository = host.Services.GetService(typeof(IRepository)) as IRepository;
 
-            //初始化 国际化数据，并且监测国际化文件变更
-           //await InternationalizationHelper.InitInternationlizationDataAndWatchJsonFileAsync(_repository);
+            //初始化 国际化数据，并且监测国际化文件变更
+            //await InternationalizationHelper.InitInternationlizationDataAndWatchJsonFileAsync(_repository);
 
         }
 
 
 
-      
-       
+
+
     }
 }

IRaCIS.Core.API/Properties/launchSettings.json

@@ -1,11 +1,13 @@
 {
   "$schema": "http://json.schemastore.org/launchsettings.json",
-  "profiles": {  
-    "Docker": {
-      "commandName": "Docker",
+  "profiles": {
+    "Test_Study": {
+      "commandName": "Project",
       "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
-      "publishAllPorts": true
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Test_Study"
+      },
+      "applicationUrl": "http://localhost:6100"
     },
     "Uat_Study": {
       "commandName": "Project",
@@ -14,14 +16,6 @@
         "ASPNETCORE_ENVIRONMENT": "Uat_Study"
       },
       "applicationUrl": "http://localhost:6100"
-    },
-    "Test_Study": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Test_Study"
-      },
-      "applicationUrl": "http://localhost:6100"
     }
   }
 }

IRaCIS.Core.API/Protos/GrpcToken.proto

@@ -1,16 +1,16 @@
-// 使用的是proto3版本
+// 使用的是proto3版本
 syntax = "proto3";
-// 定义命名空间，后续生成代码时就会生成对应的命名空间
+// 定义命名空间，后续生成代码时就会生成对应的命名空间
 option csharp_namespace = "gRPC.ZHiZHUN.AuthServer.protos";
 
 /*
-每一句需要用分号结尾
-message 用来定义请求和返回数据格式
-tag message后面的值数字代表是字段的标识(tag),不是赋值，
+每一句需要用分号结尾
+message 用来定义请求和返回数据格式
+tag message后面的值数字代表是字段的标识(tag),不是赋值，
 */
 
 
-// 新增用户时需要传递数据消息， 可理解为一个类
+// 新增用户时需要传递数据消息， 可理解为一个类
 message GetTokenReuqest{
 	string id=1;
 	string userName=2;
@@ -22,48 +22,48 @@ message GetTokenReuqest{
 
 }
 
-// 新增时返回的消息格式
+// 新增时返回的消息格式
 message  GetTokenResponse {
 	int32  code=1;
 	string token =2;
 }
 
 
-// service 用标识定义服务的，里面写对应的方法
+// service 用标识定义服务的，里面写对应的方法
 service TokenGrpcService{
-	// 获取token
+	// 获取token
 	rpc GetUserToken(GetTokenReuqest) returns (GetTokenResponse);
 
 }
 
 /*
-// 新增用户时需要传递数据消息， 可理解为一个类
+// 新增用户时需要传递数据消息， 可理解为一个类
 message AddUserReuqest{
 	string name=1;
 	int32 age=2;
 	bool isBoy=3;
 }
-// 新增时返回的消息格式
+// 新增时返回的消息格式
 message ResultResponse {
 	int32 code=1;
 	string msg =2;
 }
-//传递的查询条件信息格式，可理解为平时传入的查询条件对象
+//传递的查询条件信息格式，可理解为平时传入的查询条件对象
 message QueryUserReuqest{
 	string name=1;
 }
-//查询返回的用户信息格式，可理解为返回的类
+//查询返回的用户信息格式，可理解为返回的类
 message UserInfoResponse {
 	string name=1;
 	int32 age=2;
 	string gender=3;
 }
 
-// service 用标识定义服务的，里面写对应的方法
+// service 用标识定义服务的，里面写对应的方法
 service UserService{
-	// 新增用户
+	// 新增用户
 	rpc AddUser(AddUserReuqest) returns (ResultResponse);
-	// 查询用户
+	// 查询用户
 	rpc GetAllUser(QueryUserReuqest) returns (UserInfoResponse);
 }
 */

IRaCIS.Core.API/Startup.cs

@@ -1,4 +1,4 @@
-using Autofac;
+using Autofac;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http.Features;
@@ -29,6 +29,7 @@ using IRaCIS.Core.Application.Helper;
 using Microsoft.AspNetCore.Http;
 using Autofac.Core;
 using DocumentFormat.OpenXml.InkML;
+using EasyCaching.Core;
 
 namespace IRaCIS.Core.API
 {
@@ -52,7 +53,7 @@ namespace IRaCIS.Core.API
             containerBuilder.RegisterModule<AutofacModuleSetup>();
 
             #region  Test
-            //containerBuilder.RegisterType<ClinicalDataService>().PropertiesAutowired().InstancePerLifetimeScope();//注册仓储
+            //containerBuilder.RegisterType<ClinicalDataService>().PropertiesAutowired().InstancePerLifetimeScope();//注册仓储
 
             //var container = containerBuilder.Build();
 
@@ -74,10 +75,12 @@ namespace IRaCIS.Core.API
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            //本地化
+            //健康检查
+            services.AddHealthChecks();
+            //本地化
             services.AddJsonLocalization(options => options.ResourcesPath = "Resources");
 
-            // 异常、参数统一验证过滤器、Json序列化配置、字符串参数绑型统一Trim()
+            // 异常、参数统一验证过滤器、Json序列化配置、字符串参数绑型统一Trim()
             services.AddControllers(options =>
             {
                 //options.Filters.Add<LogActionFilter>();
@@ -92,69 +95,70 @@ namespace IRaCIS.Core.API
 
 
             })
-                .AddNewtonsoftJsonSetup(); // NewtonsoftJson 序列化  处理
+                .AddNewtonsoftJsonSetup(); // NewtonsoftJson 序列化  处理
 
             services.AddOptions().Configure<SystemEmailSendConfig>(_configuration.GetSection("SystemEmailSendConfig"));
             services.AddOptions().Configure<ServiceVerifyConfigOption>(_configuration.GetSection("BasicSystemConfig"));
+            services.AddOptions().Configure<AliyunOSSOptions>(_configuration.GetSection("AliyunOSS"));
+            services.AddOptions().Configure<ObjectStoreServiceOptions>(_configuration.GetSection("ObjectStoreService"));
 
 
-
-            //动态WebApi + UnifiedApiResultFilter  省掉控制器代码
+            //动态WebApi + UnifiedApiResultFilter  省掉控制器代码
             services.AddDynamicWebApiSetup();
             //AutoMapper
             services.AddAutoMapperSetup();
             //EF ORM  QueryWithNoLock
             services.AddEFSetup(_configuration);
-            //Http 响应压缩
+            //Http 响应压缩
             services.AddResponseCompressionSetup();
-            //Swagger Api 文档
+            //Swagger Api 文档
             services.AddSwaggerSetup();
-            //JWT Token 验证
+            //JWT Token 验证
             services.AddJWTAuthSetup(_configuration);
-            // MediatR 进程内消息 事件解耦  从程序集中 注册命令和handler对应关系
-            services.AddMediatR(typeof(ConsistencyVerificationHandler).Assembly);
-            // EasyCaching 缓存
-            services.AddEasyCachingSetup();
+            // MediatR 进程内消息 事件解耦  从程序集中 注册命令和handler对应关系
+            services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblyContaining<ConsistencyVerificationHandler>());
+            // EasyCaching 缓存
+            services.AddEasyCachingSetup(_configuration);
 
             //services.AddDistributedMemoryCache();
 
-            // hangfire  定时任务框架  有界面，更友好~
+            // hangfire  定时任务框架  有界面，更友好~
             services.AddhangfireSetup(_configuration);
 
-            //  QuartZ 定时任务框架  使用了hangfire 暂时不用，后续需要可以打开，已经配好
+            //  QuartZ 定时任务框架  使用了hangfire 暂时不用，后续需要可以打开，已经配好
             services.AddQuartZSetup(_configuration);
 
-            // 保护上传文件
+            // 保护上传文件
             //services.AddStaticFileAuthorizationSetup();
 
 
-            ////HttpReports 暂时废弃
+            ////HttpReports 暂时废弃
             //services.AddHttpReports().AddHttpTransport();
-            //Serilog 日志可视化 LogDashboard日志
+            //Serilog 日志可视化 LogDashboard日志
             services.AddLogDashboardSetup();
-            //上传限制 配置
+            //上传限制 配置
             services.Configure<FormOptions>(options =>
             {
                 options.MultipartBodyLengthLimit = int.MaxValue;
                 options.ValueCountLimit = int.MaxValue;
                 options.ValueLengthLimit = int.MaxValue;
             });
-            //IP 限流 可设置白名单 或者黑名单
+            //IP 限流 可设置白名单 或者黑名单
             //services.AddIpPolicyRateLimitSetup(_configuration);
-            // 用户类型 策略授权
+            // 用户类型 策略授权
             //services.AddAuthorizationPolicySetup(_configuration);
 
             services.AddJsonConfigSetup(_configuration);
-            //转发头设置  获取真实IP 
+            //转发头设置  获取真实IP 
             services.Configure<ForwardedHeadersOptions>(options =>
             {
                 options.ForwardedHeaders =
                     ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
             });
-            //Dicom影像渲染图片  跨平台
+            //Dicom影像渲染图片  跨平台
             services.AddDicomSetup();
 
-            // 实时应用
+            // 实时应用
             services.AddSignalR();
 
 
@@ -171,17 +175,17 @@ namespace IRaCIS.Core.API
         {
             //app.UsePathBase(PathString.FromUriComponent("/api"));
 
-            //本地化
+            //本地化
             app.UseLocalization();
 
             app.UseForwardedHeaders();
 
-            //响应压缩
+            //响应压缩
             app.UseResponseCompression();
 
             //app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());
 
-            //不需要 token 访问的静态文件  wwwroot css, JavaScript, and images don't require authentication.
+            //不需要 token 访问的静态文件  wwwroot css, JavaScript, and images don't require authentication.
             app.UseStaticFiles();
 
 
@@ -191,10 +195,10 @@ namespace IRaCIS.Core.API
             //hangfire
             app.UseHangfireConfig(env);
 
-            ////暂时废弃
+            ////暂时废弃
             //app.UseHttpReports();
 
-            ////限流 中间件
+            ////限流 中间件
             //app.UseIpRateLimiting();
 
 
@@ -207,18 +211,18 @@ namespace IRaCIS.Core.API
             {
                 //app.UseHsts();
             }
-            Console.WriteLine("当前环境： " + env.EnvironmentName);
+            Console.WriteLine("当前环境： " + env.EnvironmentName);
 
             //app.UseMiddleware<AuthMiddleware>();
 
-            // 特殊异常处理 比如 404 
+            // 特殊异常处理 比如 404 
             app.UseStatusCodePagesWithReExecute("/Error/{0}");
 
             SwaggerSetup.Configure(app, env);
 
 
 
-            ////serilog 记录请求的用户信息
+            ////serilog 记录请求的用户信息
             app.UseSerilogConfig(env);
 
             app.UseRouting();
@@ -233,7 +237,7 @@ namespace IRaCIS.Core.API
             //app.UseJwtBearerQueryString();
             app.UseAuthorization();
 
-            ////文件伺服  必须带Token 访问
+            ////文件伺服  必须带Token 访问
             ////app.UseIRacisHostStaticFileStore(env);
 
             app.UseEndpoints(endpoints =>
@@ -241,13 +245,15 @@ namespace IRaCIS.Core.API
                 endpoints.MapControllers();
 
                 endpoints.MapHub<UploadHub>("/UploadHub");
+
+                endpoints.MapHealthChecks("/health");
             });
 
 
             var hangfireJobService = app.ApplicationServices.GetRequiredService<IIRaCISHangfireJob>();
 
             await hangfireJobService.InitHangfireJobTaskAsync();
-            //有的时候每调用
+            //有的时候每调用
             //HangfireJobHelper.NotImmediatelyOnceOnlyJob<IIRaCISHangfireJob>(t => t.InitHangfireJobTaskAsync(),TimeSpan.FromSeconds(1));
 
 

IRaCIS.Core.API/_ServiceExtensions/AutofacModuleSetup.cs

@@ -1,7 +1,6 @@
 using Autofac;
 using Autofac.Extras.DynamicProxy;
 using IRaCIS.Core.Application;
-using IRaCIS.Core.Application.AOP;
 using IRaCIS.Core.Application.BackGroundJob;
 using IRaCIS.Core.Infra.EFCore;
 using Microsoft.AspNetCore.Http;

IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs

@@ -1,8 +1,12 @@
-using IRaCIS.Core.Application.Triggers;
+using Hangfire.SqlServer;
+using IRaCIS.Core.Application.Triggers;
 using IRaCIS.Core.Infra.EFCore;
+using Medallion.Threading;
+using Medallion.Threading.SqlServer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using StackExchange.Redis;
 
 namespace IRaCIS.Core.API
 {
@@ -52,6 +56,13 @@ namespace IRaCIS.Core.API
 
             });
 
+            //注意区分 easy caching 也有  IDistributedLockProvider
+            services.AddSingleton<IDistributedLockProvider>(sp =>
+            {
+                //var connection = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]!);
+
+                return new SqlDistributedSynchronizationProvider(configuration.GetSection("ConnectionStrings:RemoteNew").Value);
+            });
 
             //services.AddAssemblyTriggers(typeof(SubjectVisitImageDateTrigger).Assembly);
         }

IRaCIS.Core.API/_ServiceExtensions/EasyCachingSetup.cs

@@ -1,17 +1,26 @@
 using EasyCaching.Core;
+using EasyCaching.Core.Configurations;
 using EasyCaching.Interceptor.Castle;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace IRaCIS.Core.API
 {
     public  static class EasyCachingSetup
     {
-        public static void AddEasyCachingSetup(this IServiceCollection services)
+        public static void AddEasyCachingSetup(this IServiceCollection services, IConfiguration configuration)
         {
             services.AddEasyCaching(options =>
             {
                 options.UseInMemory();
+
+                //options.UseRedis(configuration, EasyCachingConstValue.DefaultRedisName).WithMessagePack(EasyCachingConstValue.DefaultRedisName); 
+
+               
             });
+
+            //services.ConfigureCastleInterceptor(options => options.CacheProviderName = EasyCachingConstValue.DefaultRedisName);
+
             services.ConfigureCastleInterceptor(options => options.CacheProviderName = EasyCachingConstValue.DefaultInMemoryName);
         }
     }

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

@@ -21,7 +21,7 @@ namespace IRaCIS.Core.API
                    .MinimumLevel.Override("Hangfire", LogEventLevel.Warning)
                    .MinimumLevel.Override("System.Net.Http.HttpClient.HttpReports", LogEventLevel.Warning)
                    .Enrich.WithClientIp()
-                   .Enrich.WithClientAgent()
+
                    .Enrich.FromLogContext()
                    
                    //控制台 方便调试 问题   我们显示记录日志 时 获取上下文的ip 和用户名 用户类型

IRaCIS.Core.API/_ServiceExtensions/Swagger/JsonPatchDocumentFilter.cs

@@ -1,55 +0,0 @@
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace IRaCIS.Core.API
-{
-    public class JsonPatchDocumentFilter : IDocumentFilter
-    {
-        public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
-        {
-            var schemas = swaggerDoc.Components.Schemas.ToList();
-            foreach (var item in schemas)
-            {
-                if (item.Key.StartsWith("Operation") || item.Key.StartsWith("JsonPatchDocument"))
-                    swaggerDoc.Components.Schemas.Remove(item.Key);
-            }
-
-            swaggerDoc.Components.Schemas.Add("Operation", new OpenApiSchema
-            {
-                Type = "object",
-                Properties = new Dictionary<string, OpenApiSchema>
-                {
-                    { "op", new OpenApiSchema { Type = "string" } },
-                    {"value", new OpenApiSchema{ Type = "object", Nullable = true } },
-                    { "path", new OpenApiSchema { Type = "string" } }
-                }
-            });
-
-            swaggerDoc.Components.Schemas.Add("JsonPatchDocument", new OpenApiSchema
-            {
-                Type = "array",
-                Items = new OpenApiSchema
-                {
-                    Reference = new OpenApiReference { Type = ReferenceType.Schema, Id = "Operation" }
-                },
-                Description = "Array of operations to perform"
-            });
-
-            foreach (var path in swaggerDoc.Paths.SelectMany(p => p.Value.Operations)
-                .Where(p => p.Key == Microsoft.OpenApi.Models.OperationType.Patch))
-            {
-                foreach (var item in path.Value.RequestBody.Content.Where(c => c.Key != "application/json-patch+json"))
-                    path.Value.RequestBody.Content.Remove(item.Key);
-
-                var response = path.Value.RequestBody.Content.SingleOrDefault(c => c.Key == "application/json-patch+json");
-
-                response.Value.Schema = new OpenApiSchema
-                {
-                    Reference = new OpenApiReference { Type = ReferenceType.Schema, Id = "JsonPatchDocument" }
-                };
-            }
-        }
-    }
-}

IRaCIS.Core.API/_ServiceExtensions/Swagger/SwaggerSetup.cs

@@ -18,7 +18,6 @@ namespace IRaCIS.Core.API
     {
         public static void AddSwaggerSetup(this IServiceCollection services)
         {
-            services.AddSwaggerExamplesFromAssemblyOf<JsonPatchUserRequestExample>();
 
             services.AddSwaggerGen(options =>
             {
@@ -63,7 +62,6 @@ namespace IRaCIS.Core.API
                 // 在header中添加token，传递到后台
                 options.OperationFilter<SecurityRequirementsOperationFilter>();
 
-                options.DocumentFilter<JsonPatchDocumentFilter>();
 
                 // 添加登录按钮
                 options.AddSecurityDefinition("bearerAuth", new OpenApiSecurityScheme()

IRaCIS.Core.API/appsettings.Prod_Study.json

@@ -6,30 +6,43 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "AliyunOSS": {
-    "regionId": "cn-shanghai",
-    "region": "oss-cn-shanghai",
-    "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
-    "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
-    "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
-    "bucketName": "zy-sir-store",
-    "viewEndpoint": "https://zy-sir-cache.oss-cn-shanghai.aliyuncs.com"
+  "ObjectStoreService": {
+    "ObjectStoreUse": "AliyunOSS",
+    "AliyunOSS": {
+      "regionId": "cn-shanghai",
+      "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
+      "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
+      "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
+      "bucketName": "zy-sir-store",
+      "roleArn": "acs:ram::1899121822495495:role/oss-upload",
+      "viewEndpoint": "https://zy-sir-cache.oss-cn-shanghai.aliyuncs.com",
+      "region": "oss-cn-shanghai"
+    },
+
+    "MinIO": {
+      "endpoint": "http://192.168.3.68",
+      "port": "8001",
+      "useSSL": false,
+      "accessKey": "IDFkwEpWej0b4DtiuThL",
+      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
+      "bucketName": "test"
+    }
   },
 
   "ConnectionStrings": {
-    "RemoteNew": "Server=47.117.165.18,1434;Database=Prod_Study;User ID=sa;Password=WHxckj@2019;TrustServerCertificate=true",
-    "Hangfire": "Server=47.117.165.18,1434;Database=Prod_Study.hangfire;User ID=sa;Password=WHxckj@2019;TrustServerCertificate=true"
+    "RemoteNew": "Server=101.132.193.237,1434;Database=Prod_Study;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
+    "Hangfire": "Server=101.132.193.237,1434;Database=Prod_Study_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
   },
 
   "BasicSystemConfig": {
 
-    "OpenUserComplexPassword": false,
+    "OpenUserComplexPassword": true,
 
-    "OpenSignDocumentBeforeWork": false,
+    "OpenSignDocumentBeforeWork": true,
 
     "OpenTrialRelationDelete": true,
 
-    "OpenLoginLimit": false,
+    "OpenLoginLimit": true,
     "LoginMaxFailCount": 5,
 
     "LoginFailLockMinutes": 30
@@ -40,7 +53,7 @@
     "Port": 465,
     "Host": "smtp.qiye.aliyun.com",
     "FromEmail": "study@extimaging.com",
-    "FromName": "study.extimaging",
+    "FromName": "研究单位阅片系统",
     "AuthorizationCode": "zhanying123",
     "SiteUrl": "https://study.extimaging.com/login"
   }

IRaCIS.Core.API/appsettings.Test_Study.json

@@ -6,18 +6,32 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "AliyunOSS": {
-    "regionId": "cn-shanghai",
-    "region": "oss-cn-shanghai",
-    "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
-    "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
-    "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
-    "bucketName": "zy-sir-test-store",
-    "viewEndpoint": "https://zy-sir-test-store.oss-cn-shanghai.aliyuncs.com"
+  "ObjectStoreService": {
+    "ObjectStoreUse": "AliyunOSS",
+    "AliyunOSS": {
+      "regionId": "cn-shanghai",
+      "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
+      "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
+      "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
+      "bucketName": "zy-sir-test-store",
+      "roleArn": "acs:ram::1899121822495495:role/oss-upload",
+      "viewEndpoint": "https://zy-sir-test-store.oss-cn-shanghai.aliyuncs.com",
+      "region": "oss-cn-shanghai"
+    },
+
+    "MinIO": {
+      "endpoint": "http://192.168.3.68",
+      "port": "8001",
+      "useSSL": false,
+      "accessKey": "IDFkwEpWej0b4DtiuThL",
+      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
+      "bucketName": "test"
+    }
   },
+
   "ConnectionStrings": {
-    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Test.Study;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true",
-    "Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Test.Study.hangfire;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true"
+    "RemoteNew": "Server=123.56.94.154,1435;Database=Test_Study;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=123.56.94.154,1435;Database=Test_Study_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
   },
   "BasicSystemConfig": {
 

IRaCIS.Core.API/appsettings.Uat_Study.json

@@ -6,14 +6,27 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "AliyunOSS": {
-    "regionId": "cn-shanghai",
-    "region": "oss-cn-shanghai",
-    "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
-    "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
-    "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
-    "bucketName": "zy-sir-uat-store",
-    "viewEndpoint": "https://zy-sir-uat-store.oss-cn-shanghai.aliyuncs.com"
+  "ObjectStoreService": {
+    "ObjectStoreUse": "AliyunOSS",
+    "AliyunOSS": {
+      "regionId": "cn-shanghai",
+      "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
+      "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
+      "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
+      "bucketName": "zy-sir-uat-store",
+      "roleArn": "acs:ram::1899121822495495:role/oss-upload",
+      "viewEndpoint": "https://zy-sir-uat-store.oss-cn-shanghai.aliyuncs.com",
+      "region": "oss-cn-shanghai"
+    },
+
+    "MinIO": {
+      "endpoint": "http://192.168.3.68",
+      "port": "8001",
+      "useSSL": false,
+      "accessKey": "IDFkwEpWej0b4DtiuThL",
+      "secretKey": "Lhuu83yMhVwu7c1SnjvGY6lq74jzpYqifK6Qtj4h",
+      "bucketName": "test"
+    }
   },
   "ConnectionStrings": {
     "RemoteNew": "Server=47.117.164.182,1434;Database=Uat.Study;User ID=sa;Password=xc@123456;TrustServerCertificate=true",

IRaCIS.Core.API/appsettings.json

@@ -57,6 +57,26 @@
         "EnableReadDeepClone": true,
         "EnableWriteDeepClone": false
       }
+    },
+    "redis": {
+      "MaxRdSecond": 120,
+      "EnableLogging": false,
+      "LockMs": 5000,
+      "SleepMs": 300,
+      "dbconfig": {
+        "Password": "xc@123456",
+        "IsSsl": false,
+        "SslHost": null,
+        "ConnectionTimeout": 5000,
+        "AllowAdmin": true,
+        "Endpoints": [
+          {
+            "Host": "47.117.164.182",
+            "Port": 6379
+          }
+        ],
+        "Database": 0
+      }
     }
   },
   "IRaCISImageStore": {

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

@@ -34,7 +34,10 @@
                     角色: {5}
                 </div>
                 <div>
-                    系统登录地址:{6}
+                    系统登录地址:
+                    <a href='{6}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                        点击跳转
+                    </a>
                 </div>
             </div>
 

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

@@ -34,7 +34,10 @@
                     Role: {5}
                 </div>
                 <div>
-                    Login URL: {6}
+                    Login URL:  
+                    <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;'>
+                        click redirect
+                    </a>
                 </div>
             </div>
 

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

@@ -34,7 +34,10 @@
                     角色: {5}
                 </div>
                 <div>
-                    系统登录地址:{6}
+                    系统登录地址:
+                    <a href='{6}' style='margin-left:30px;font-size:14px;text-decoration: none;display: inline-block;color:#00D1B2;border-radius: 5px;line-height: 40px;text-align: center;'>
+                        点击跳转
+                    </a>
                 </div>
             </div>
 

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

@@ -34,7 +34,10 @@
                     Role: {5}
                 </div>
                 <div>
-                    Login URL: {6}
+                    Login URL:
+                    <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;'>
+                        click redirect
+                    </a>
                 </div>
             </div>
 

IRaCIS.Core.Application/AOP/AsyncInterceptor.cs

@@ -1,97 +0,0 @@
-using Castle.DynamicProxy;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IRaCIS.Core.Application.AOP
-{
-    public abstract class AsyncInterceptorBase : IInterceptor
-    {
-        public AsyncInterceptorBase()
-        {
-        }
-
-        public void Intercept(IInvocation invocation)
-        {
-            BeforeProceed(invocation);
-            invocation.Proceed();
-            if (IsAsyncMethod(invocation.MethodInvocationTarget))
-            {
-                invocation.ReturnValue = InterceptAsync((dynamic)invocation.ReturnValue, invocation);
-            }
-            else
-            {
-                AfterProceedSync(invocation);
-            }
-        }
-
-        private bool CheckMethodReturnTypeIsTaskType(MethodInfo method)
-        {
-            var methodReturnType = method.ReturnType;
-            if (methodReturnType.IsGenericType)
-            {
-                if (methodReturnType.GetGenericTypeDefinition() == typeof(Task<>) ||
-                    methodReturnType.GetGenericTypeDefinition() == typeof(ValueTask<>))
-                    return true;
-            }
-            else
-            {
-                if (methodReturnType == typeof(Task) ||
-                    methodReturnType == typeof(ValueTask))
-                    return true;
-            }
-            return false;
-        }
-
-        private bool IsAsyncMethod(MethodInfo method)
-        {
-            bool isDefAsync = Attribute.IsDefined(method, typeof(AsyncStateMachineAttribute), false);
-            bool isTaskType = CheckMethodReturnTypeIsTaskType(method);
-            bool isAsync = isDefAsync && isTaskType;
-
-            return isAsync;
-        }
-
-        protected object ProceedAsyncResult { get; set; }
-
-
-        private async Task InterceptAsync(Task task, IInvocation invocation)
-        {
-            await task.ConfigureAwait(false);
-            await AfterProceedAsync(invocation, false);
-        }
-
-        private async Task<TResult> InterceptAsync<TResult>(Task<TResult> task, IInvocation invocation)
-        {
-            ProceedAsyncResult = await task.ConfigureAwait(false);
-            await AfterProceedAsync(invocation, true);
-            return (TResult)ProceedAsyncResult;
-        }
-
-        private async ValueTask InterceptAsync(ValueTask task, IInvocation invocation)
-        {
-            await task.ConfigureAwait(false);
-            await AfterProceedAsync(invocation, false);
-        }
-
-        private async ValueTask<TResult> InterceptAsync<TResult>(ValueTask<TResult> task, IInvocation invocation)
-        {
-            ProceedAsyncResult = await task.ConfigureAwait(false);
-            await AfterProceedAsync(invocation, true);
-            return (TResult)ProceedAsyncResult;
-        }
-
-        protected virtual void BeforeProceed(IInvocation invocation) { }
-
-        protected virtual void AfterProceedSync(IInvocation invocation) { }
-
-        protected virtual Task AfterProceedAsync(IInvocation invocation, bool hasAsynResult)
-        {
-            return Task.CompletedTask;
-        }
-    }
-}

IRaCIS.Core.Application/AOP/QANoticeAOP.cs

@@ -1,499 +0,0 @@
-//using System;
-//using Castle.DynamicProxy;
-//using IRaCIS.Core.Application.Contracts.Dicom.DTO;
-//using IRaCIS.Core.Infra.EFCore;
-
-//using System.Linq;
-//using IRaCIS.Core.Domain.Models;
-//using IRaCIS.Core.Domain.Share;
-
-//namespace IRaCIS.Core.API.Utility.AOP
-//{
-//#pragma warning disable
-//    public class QANoticeAOP : IInterceptor
-//    {
-//        private readonly IRepository<QANotice> _qaNoticeRepository;
-       
-//        private readonly IRepository<DicomStudy> _studyRepository;
-//        private readonly IRepository<TrialUser> _userTrialRepository;
-//        private readonly IRepository<TrialSiteUser> _userTrialSiteRepository;
-//        private readonly IUserInfo _userInfo;
-
-//        public QANoticeAOP(IRepository<QANotice> qaNoticeRepository, 
-//            IUserInfo userInfo, IRepository<DicomStudy> studyRepository, IRepository<TrialUser> userTrialRepository, IRepository<TrialSiteUser> userTrialSiteRepository)
-//        {
-//            _qaNoticeRepository = qaNoticeRepository;
-            
-//            _studyRepository = studyRepository;
-//            _userTrialRepository = userTrialRepository;
-//            _userTrialSiteRepository = userTrialSiteRepository;
-//            _userInfo = userInfo;
-//        }
-
-//        public void Intercept(IInvocation invocation)
-//        {
-//            //处理拦截的方法
-//            invocation.Proceed();
-
-//            if (invocation.Method.Name == "UpdateStudyStatus")
-//            {
-//                var studyStatus = invocation.Arguments[0] as StudyStatusDetailCommand;
-
-//                var study = _studyRepository.FirstOrDefault(t=>t.Id==studyStatus.StudyId);
-
-
-//                if (study.Status == (int)StudyStatus.Uploaded)
-//                {
-//                    _qaNoticeRepository.Add(new QANotice()
-//                    {
-//                        TrialId = study.TrialId,
-//                        SubjectVisitId = study.Id,
-//                        FromUser = _userInfo.RealName,
-//                        FromUserId = _userInfo.Id,
-//                        FromUserType = _userInfo.UserTypeShortName,
-
-//                        NoticeTypeEnum = NoticeType.NotNeedNotice,
-//                        NeedDeal = false,
-//                        StudyStatusStr = "Uploaded",
-//                        Message = $"CRC : {_userInfo.RealName} has uploaded {study.StudyCode} ",
-//                        SendTime = DateTime.Now,
-//                    });
-//                }
-
-//                #region 处理QA通知模块
-
-//                //查询项目的参与者   和  负责site下CRC用户
-//                var trialUserList = _userTrialRepository.Where(t => t.TrialId == study.TrialId).ToList();
-                      
-//                // 找到该study  关联Site 下的CRC
-
-//                var crcList = _userTrialSiteRepository.Where(t =>
-//                    t.SiteId == study.SiteId && t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator && t.TrialId == study.TrialId).ToList();
-               
-
-//                var qaList = trialUserList.Where(t => t.User.UserTypeEnum == UserTypeEnum.IQC).ToList();
-
-//                var pm = trialUserList.FirstOrDefault(t => t.User.UserTypeEnum == UserTypeEnum.ProjectManager);
-
-
-
-
-//                // CRC =>QA
-//                if (studyStatus.Status == (int)StudyStatus.QARequested)
-//                {
-//                    //找出当前操作的CRC
-//                    //PM 或者admin可以代替CRC角色 不能从CRC列表中查询用户
-//                    //var currentCRC = trialUserList.First(t => t.UserId == _userInfo.Id);
-
-//                    var notice = new QANotice()
-//                    {
-//                        TrialId = study.TrialId,
-//                        SubjectVisitId = study.Id,
-//                        FromUser = _userInfo.RealName,
-//                        FromUserId = _userInfo.Id,
-//                        FromUserType = _userInfo.UserTypeShortName,
-
-//                        //FromUser = currentCRC.UserRealName,
-//                        //FromUserId = _userInfo.Id,
-//                        //FromUserType = currentCRC.UserType,
-//                        NoticeTypeEnum = NoticeType.CRC_RequestToQA_NoticeQA,
-//                        NeedDeal = true,
-//                        StudyStatusStr = "QA Requested",
-//                        Message =
-//                            $"CRC -> QA : {_userInfo.RealName} request  QA {study.StudyCode} , Inquiry can be performed! ",
-//                        SendTime = DateTime.Now,
-//                    };
-
-//                    qaList.ForEach(t => notice.QANoticeUserList.Add(new QANoticeUser()
-//                    {
-//                        QANoticeId = notice.Id,
-//                        SubjectVisitId = study.Id,
-//                        ToUser = t.User.LastName + " / " + t.User.FirstName,
-//                        ToUserId = t.UserId,
-//                        ToUserType = t.User.UserTypeRole.UserTypeShortName
-//                    }));
-
-//                    _qaNoticeRepository.Add(notice);
-
-//                    //DealRequestToQA(study.Id);
-
-//                    var needDealNoticeList = _qaNoticeRepository.AsQueryable()
-//                        .Where(t => t.SubjectVisitId == study.Id && t.NeedDeal && t.NoticeTypeEnum == NoticeType.CRC_RequestToQA_NoticeQA).ToList();
-
-//                    needDealNoticeList.ForEach(t =>
-//                    {
-//                        t.NeedDeal = false;
-//                        t.DealTime = DateTime.Now;
-//                        _qaNoticeRepository.Update(t);
-//                    });
-//                }
-
-//                // QA =>CRC    向CRC推送消息影像有问题  同时作为 requestToQA 的边界
-//                else if (studyStatus.Status == (int)StudyStatus.QAing)
-//                {
-//                    //找出当前操作的QA   如果是pm 或者admin 代替操作 此时会有问题  所以 谁代替，就以谁的名义执行
-//                    //var currentQA = qaList.First(t => t.UserId == _userInfo.Id);
-//                    //var currentQA = trialUserList.First(t => t.UserId == _userInfo.Id);
-
-//                    //在项目CRC列表中筛选出  负责该study关联  site的CRC
-//                    var siteCRCList = _userTrialSiteRepository.Where(t =>
-//                        t.SiteId == study.SiteId && t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator && t.TrialId == study.TrialId).ToList();
-
-//                    //查询项目的参与者   和  负责site下CRC用户
-                 
-
-
-//                    var notice = new QANotice()
-//                    {
-//                        TrialId = study.TrialId,
-//                        SubjectVisitId = study.Id,
-//                        //FromUser = currentQA.UserRealName,
-//                        //FromUserId = _userInfo.Id,
-//                        //FromUserType = currentQA.UserType,
-//                        FromUser = _userInfo.RealName,
-//                        FromUserId = _userInfo.Id,
-//                        FromUserType = _userInfo.UserTypeShortName,
-//                        NoticeTypeEnum = NoticeType.QA_InQA_NoticeCRC,
-//                        NeedDeal = true,
-//                        StudyStatusStr = "In QA",
-//                        Message = $"QA -> CRC : {_userInfo.RealName} inquiry  {study.StudyCode} ",
-//                        SendTime = DateTime.Now,
-//                    };
-
-//                    siteCRCList.ForEach(t => notice.QANoticeUserList.Add(new QANoticeUser()
-//                    {
-//                        QANoticeId = notice.Id,
-//                        SubjectVisitId = study.Id,
-//                        ToUser = t.User.LastName + " / " + t.User.FirstName,
-//                        ToUserId = t.UserId,
-//                        ToUserType = t.UserTypeRole.UserTypeShortName
-//                    }));
-
-//                    //添加 发送给CRC的消息  消息和CRC是 一对多
-//                    _qaNoticeRepository.Add(notice);
-
-
-//                    //处理   消息  标记已处理
-//                    var needDealNoticeList = _qaNoticeRepository.AsQueryable()
-//                        .Where(t => t.SubjectVisitId == study.Id && t.NeedDeal &&
-//                                    (t.NoticeTypeEnum == NoticeType.CRC_RequestToQA_NoticeQA ||
-//                                     t.NoticeTypeEnum == NoticeType.CRC_ReUpload_NoticeQA ||
-//                                     t.NoticeTypeEnum == NoticeType.CRC_QARecordDialogPost_NoticeQA)).ToList();
-
-//                    needDealNoticeList.ForEach(t =>
-//                    {
-//                        t.NeedDeal = false;
-//                        t.DealTime = DateTime.Now;
-//                        _qaNoticeRepository.Update(t);
-//                    });
-
-
-//                }
-//                // QA =>QA    给自己的消息 通知需要匿名化  同时作为 requestToQA 的边界
-//                else if (studyStatus.Status == (int)StudyStatus.QAFinish)
-//                {
-
-//                    //找出当前操作的QA   如果是pm 或者admin 代替操作 此时会有问题  所以 谁代替，就以谁的名义执行
-//                    //var currentQA = qaList.First(t => t.UserId == _userInfo.Id);
-//                    //var currentQA = trialUserList.First(t => t.UserId == _userInfo.Id);
-
-//                    //发送给当前项目QA列表
-
-//                    var notice = new QANotice()
-//                    {
-//                        TrialId = study.TrialId,
-//                        SubjectVisitId = study.Id,
-//                        //FromUser = currentQA.UserRealName,
-//                        //FromUserId = _userInfo.Id,
-//                        //FromUserType = currentQA.UserType,
-//                        FromUser = _userInfo.RealName,
-//                        FromUserId = _userInfo.Id,
-//                        FromUserType = _userInfo.UserTypeShortName,
-//                        NoticeTypeEnum = NoticeType.QA_QAPass_NoticeQA,
-//                        NeedDeal = true,
-//                        StudyStatusStr = "QA-Passed",
-//                        Message =
-//                            $"QA -> QA : {_userInfo.RealName} inquiry {study.StudyCode} finished，Anonymization can be performed！",
-//                        SendTime = DateTime.Now,
-//                    };
-
-//                    qaList.ForEach(t => notice.QANoticeUserList.Add(new QANoticeUser()
-//                    {
-//                        QANoticeId = notice.Id,
-//                        SubjectVisitId = study.Id,
-//                        ToUser = t.User.LastName+" / "+t.User.FirstName,
-//                        ToUserId = t.UserId,
-//                        ToUserType = t.User.UserTypeRole.UserTypeShortName
-//                    }));
-
-//                    _qaNoticeRepository.Add(notice);
-
-//                    //处理   消息  标记已处理  存在意外情况   qa发给CRC的  但是qa里面设置了 通过或者不通过  此时qa发送的消息也设置为已处理
-//                    var needDealNoticeList = _qaNoticeRepository.AsQueryable()
-//                        .Where(t => t.SubjectVisitId == study.Id && t.NeedDeal &&
-//                                    (t.NoticeTypeEnum == NoticeType.CRC_RequestToQA_NoticeQA ||
-//                                     t.NoticeTypeEnum == NoticeType.CRC_ReUpload_NoticeQA ||
-//                                     t.NoticeTypeEnum == NoticeType.CRC_QARecordDialogPost_NoticeQA ||
-
-//                                     t.NoticeTypeEnum == NoticeType.QA_QARecordDialogPost_NoticeCRC ||
-//                                     t.NoticeTypeEnum == NoticeType.QA_InQA_NoticeCRC ||
-//                                     t.NoticeTypeEnum == NoticeType.QA_AddQARecord_NoticeCRC)).ToList();
-
-//                    needDealNoticeList.ForEach(t =>
-//                    {
-//                        t.NeedDeal = false;
-//                        t.DealTime = DateTime.Now;
-//                        _qaNoticeRepository.Update(t);
-//                    });
-
-
-//                }
-//                // QA =>CRC   暂时不用发送消息给CRC  因为CRC 暂时没有入口回复    同时作为 requestToQA 的边界
-//                else if (studyStatus.Status == (int)StudyStatus.QAFInishNotPass)
-//                {
-
-//                    _qaNoticeRepository.Add(new QANotice()
-//                    {
-//                        TrialId = study.TrialId,
-//                        SubjectVisitId = study.Id,
-//                        FromUser = _userInfo.RealName,
-//                        FromUserId = _userInfo.Id,
-//                        FromUserType = _userInfo.UserTypeShortName,
-//                        NoticeTypeEnum = NoticeType.NotNeedNotice,
-//                        NeedDeal = false,
-//                        StudyStatusStr = "QA-Failed",
-//                        Message = $"QA : {_userInfo.RealName} set {study.StudyCode} QA-Failed ！",
-//                        SendTime = DateTime.Now,
-//                    });
-
-//                    //处理   消息  标记已处理
-//                    var needDealNoticeList = _qaNoticeRepository.AsQueryable()
-//                        .Where(t => t.SubjectVisitId == study.Id && t.NeedDeal &&
-//                                    (t.NoticeTypeEnum == NoticeType.CRC_RequestToQA_NoticeQA ||
-//                                     t.NoticeTypeEnum == NoticeType.CRC_ReUpload_NoticeQA ||
-//                                     t.NoticeTypeEnum == NoticeType.CRC_QARecordDialogPost_NoticeQA ||
-
-
-//                                     t.NoticeTypeEnum == NoticeType.QA_QARecordDialogPost_NoticeCRC ||
-//                                     t.NoticeTypeEnum == NoticeType.QA_InQA_NoticeCRC ||
-//                                     t.NoticeTypeEnum == NoticeType.QA_AddQARecord_NoticeCRC)).ToList();
-
-//                    needDealNoticeList.ForEach(t =>
-//                    {
-//                        t.NeedDeal = false;
-//                        t.DealTime = DateTime.Now;
-//                        _qaNoticeRepository.Update(t);
-//                    });
-//                }
-
-//                #endregion
-
-               
-//            }
-
-//            else if (invocation.Method.Name == "ReUploadSameStudy")
-//            {
-//                var studyId = Guid.Parse(invocation.Arguments[0].ToString());
-
-//              var  study = _studyRepository.FirstOrDefault(t => t.Id == studyId);
-//                var status = study.Status;
-
-//                //处理CRC 重传时  QA消息
-
-//                if (status == (int)StudyStatus.QAing)
-//                {
-//                    //查询项目的参与者   和  负责site下CRC用户
-//                    var trialUserList = _userTrialRepository.Where(t => t.TrialId == study.TrialId).ToList();
-
-//                    // 找到该study  关联Site 下的CRC
-
-//                    var crcList = _userTrialSiteRepository.Where(t =>
-//                        t.SiteId == study.SiteId && t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator && t.TrialId == study.TrialId).ToList();
-
-//                    var qaList = trialUserList.Where(t => t.User.UserTypeEnum == UserTypeEnum.IQC).ToList();
-
-//                    //CRC  =>QA  CRC的职能被PM 或者admin代替
-//                    //if (_userInfo.UserTypeEnumInt == (int)UserType.ClinicalResearchCoordinator)
-//                    {
-//                        //PM 或者admin可以代替CRC角色 不能从CRC列表中查询用户
-//                        //var currentCRC = trialUserList.First(t => t.UserId == _userInfo.Id);
-
-//                        var notice = new QANotice()
-//                        {
-//                            TrialId = study.TrialId,
-//                            SubjectVisitId = study.Id,
-//                            //FromUser = currentCRC.UserRealName,
-//                            //FromUserId = _userInfo.Id,
-//                            //FromUserType = currentCRC.UserType,
-//                            FromUser = _userInfo.RealName,
-//                            FromUserId = _userInfo.Id,
-//                            FromUserType = _userInfo.UserTypeShortName,
-//                            NoticeTypeEnum = NoticeType.CRC_ReUpload_NoticeQA,
-//                            NeedDeal = true,
-//                            Message = $"CRC -> QA :{_userInfo.RealName} has reuploaded {study.StudyCode} ,  Need to be inquiry again",
-//                            SendTime = DateTime.Now
-//                        };
-
-//                        qaList.ForEach(t => notice.QANoticeUserList.Add(new QANoticeUser()
-//                        {
-//                            QANoticeId = notice.Id,
-//                            SubjectVisitId = study.Id,
-//                            ToUser = t.User.LastName+" / "+t.User.FirstName,
-//                            ToUserId = t.UserId,
-//                            ToUserType = t.User.UserTypeRole.UserTypeShortName
-//                        }));
-
-//                        _qaNoticeRepository.Add(notice);
-
-//                        //这里作为 QA  设置 Inqa 状态的回复  或者QA和CRC对话的
-//                        var needDealNoticeList = _qaNoticeRepository.Where(t => t.SubjectVisitId == study.Id && t.NeedDeal
-//                        && (t.NoticeTypeEnum == NoticeType.QA_InQA_NoticeCRC || t.NoticeTypeEnum == NoticeType.QA_QARecordDialogPost_NoticeCRC))
-//                            .ToList();
-
-//                        needDealNoticeList.ForEach(t =>
-//                        {
-//                            t.NeedDeal = false;
-//                            t.DealTime = DateTime.Now;
-//                            _qaNoticeRepository.Update(t);
-//                        });
-
-//                    }
-//                }
-//                else
-//                {
-//                    //不是QAing 的重传  不发送qa消息
-//                    return;
-//                }
-
-
-
-//            }
-
-//            else if (invocation.Method.Name == "DicomAnonymize")
-//            {
-//                var studyId = Guid.Parse(invocation.Arguments[0].ToString());
-
-//                var study = _studyRepository.FirstOrDefault(t => t.Id == studyId);
-
-//                #region 处理QA通知  匿名化完毕 通知PM
-
-//                //查询项目的参与者   和  负责site下CRC用户
-//                var trialUserList = _userTrialRepository.Where(t => t.TrialId == study.TrialId).ToList();
-
-//                // 找到该study  关联Site 下的CRC
-
-//                var crcList = _userTrialSiteRepository.Where(t =>
-//                    t.SiteId == study.SiteId && t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator && t.TrialId == study.TrialId).ToList();
-
-//                var qaList = trialUserList.Where(t => t.User.UserTypeEnum == UserTypeEnum.IQC).ToList();
-
-//                // 
-//                var pm = trialUserList.FirstOrDefault(t => t.User.UserTypeEnum == UserTypeEnum.ProjectManager);
-
-
-//                //找出当前操作的QA   如果是pm 或者admin 代替操作 此时会有问题  所以 谁代替，就以谁的名义执行
-//                //var currentQA = trialUserList.First(t =>
-//                //    t.UserTypeEnum == UserType.IQC && t.UserId == _userInfo.Id);
-//                //var currentQA = trialUserList.First(t => t.UserId == _userInfo.Id);
-
-//                var notice = new QANotice()
-//                {
-//                    TrialId = study.TrialId,
-//                    SubjectVisitId = study.Id,
-//                    //FromUser = currentQA.UserRealName,
-//                    //FromUserId = _userInfo.Id,
-//                    //FromUserType = currentQA.UserType,
-//                    FromUser = _userInfo.RealName,
-//                    FromUserId = _userInfo.Id,
-//                    FromUserType = _userInfo.UserTypeShortName,
-//                    NoticeTypeEnum = NoticeType.QA_Anonymized_NoticeQA,
-//                    NeedDeal = true,
-//                    StudyStatusStr = "Anonymized",
-//                    //Message = $"QA -> PM :{_userInfo.RealName} has anonymized {study.StudyCode} ，Forward can be performed！！",
-//                    Message = $"QA -> QA :{_userInfo.RealName} has anonymized {study.StudyCode} ，Forward can be performed！！",
-                   
-//                    SendTime = DateTime.Now,
-
-//                };
-
-//                //notice.QANoticeUserList.Add(new QANoticeUser()
-//                //{
-//                //    QANoticeId = notice.Id,
-//                //    StudyId = study.Id,
-//                //    ToUser = pm.UserRealName,
-//                //    ToUserId = pm.UserId,
-//                //    ToUserType = pm.UserType
-//                //});
-
-//                qaList.ForEach(t => notice.QANoticeUserList.Add(new QANoticeUser()
-//                {
-//                    QANoticeId = notice.Id,
-//                    SubjectVisitId = study.Id,
-//                    ToUser = t.User.LastName+" / "+t.User.FirstName,
-//                    ToUserId = t.UserId,
-//                    ToUserType = t.User.UserTypeRole.UserTypeShortName
-//                }));
-
-//                _qaNoticeRepository.Add(notice);
-
-//                var needDealNoticeList = _qaNoticeRepository.AsQueryable()
-//                          .Where(t => t.SubjectVisitId == study.Id && t.NeedDeal && (t.NoticeTypeEnum == NoticeType.QA_QAPass_NoticeQA)).ToList();
-
-//                needDealNoticeList.ForEach(t =>
-//                {
-//                    t.NeedDeal = false;
-//                    t.DealTime = DateTime.Now;
-//                    _qaNoticeRepository.Update(t);
-//                });
-
-
-//                #endregion
-//            }
-
-//            else if (invocation.Method.Name == "ForwardStudy")
-//            {
-//                var studyId = Guid.Parse(invocation.Arguments[0].ToString());
-
-//                var study = _studyRepository.FirstOrDefault(t => t.Id == studyId);
-
-//                //匿名化操作产生的消息  设置为已经处理
-//                _qaNoticeRepository.Add(new QANotice()
-//                {
-//                    TrialId = study.TrialId,
-//                    SubjectVisitId = study.Id,
-//                    //FromUser = currentQA.UserRealName,
-//                    //FromUserId = _userInfo.Id,
-//                    //FromUserType = currentQA.UserType,
-//                    FromUser = _userInfo.RealName,
-//                    FromUserId = _userInfo.Id,
-//                    FromUserType = _userInfo.UserTypeShortName,
-//                    NoticeTypeEnum = NoticeType.NotNeedNotice,
-//                    NeedDeal = false,
-//                    StudyStatusStr = "Forwarded",
-//                    //Message = $"PM :{_userInfo.RealName} has forwarded {study.StudyCode} ！",
-//                    Message = $"QA :{_userInfo.RealName} has forwarded {study.StudyCode} ！",
-//                    SendTime = DateTime.Now,
-//                });
-
-//                var needDealList = _qaNoticeRepository.Where(t =>
-//                    t.SubjectVisitId == study.Id && t.NeedDeal && t.NoticeTypeEnum == NoticeType.QA_Anonymized_NoticeQA).ToList();
-
-//                needDealList.ForEach(t =>
-//                {
-//                    t.NeedDeal = false;
-//                    t.DealTime = DateTime.Now;
-//                    _qaNoticeRepository.Update(t);
-//                });
-//            }
-
-//            var success = _qaNoticeRepository.SaveChanges();
-
-//            if (!success)
-//            {
-//                throw new Exception("Send QA message failed");
-//            }
-//        }
-
-
-//    }
-//}

IRaCIS.Core.Application/AOP/TrialStatusAutofacAOP.cs

@@ -1,89 +0,0 @@
-using Castle.DynamicProxy;
-using EasyCaching.Core;
-using IRaCIS.Application.Contracts;
-using IRaCIS.Core.Domain.Share;
-
-namespace IRaCIS.Core.Application.AOP
-{
-    public class TrialStatusAutofacAOP : IAsyncInterceptor
-    {
-        private readonly IEasyCachingProvider _provider;
-
-        public TrialStatusAutofacAOP(IEasyCachingProvider provider)
-        {
-            _provider = provider;
-        }
-
-
-
-        public void InterceptAsynchronous(IInvocation invocation)
-        {
-            invocation.Proceed();
-        }
-
-        //这里AOP  处理两个方法 分别是 项目的添加和更新、项目状态的变更
-
-        public void InterceptAsynchronous<TResult>(IInvocation invocation)
-        {
-
-          
-            //处理拦截的方法
-            invocation.Proceed();
-
-
-
-            dynamic result = invocation.ReturnValue;
-
-            //接口成功了，才修改缓存
-            if (!result.IsSuccess)
-            {
-                return;
-            }
-
-            #region 处理项目列表的查询 在前端界面已经在某个界面，但是服务器重置了，此时没有缓存项目信息,接口不能正确返回，因故采用，启动时查询，每天查询一次，缓存一天，然后项目添加、更改状态时，及时更新
-
-            //if (invocation.Method.Name == "GetTrialList")
-            //{
-            //    //在此 将当前查询的项目Id  和对应的项目状态进行缓存
-            //    dynamic result = invocation.ReturnValue;
-            //    foreach (var item in result.CurrentPageData)
-            //    {
-            //        _provider.Remove(item.Id.ToString());
-            //        _provider.Set(item.Id.ToString(), item.TrialStatusStr.ToString(), TimeSpan.FromDays(1));
-            //    }
-            //}
-
-            #endregion
-
-            if (invocation.Method.Name == "AddOrUpdateTrial")
-            {
-                //如果是添加  那么将对应的初始状态加进去  更新状态是单独操作的
-
-                var trialModel = (invocation.Arguments[0] as TrialCommand).IfNullThrowConvertException();
-                if (trialModel.Id == null || trialModel.Id == Guid.Empty)
-                {
-                    _provider.Set(result.Data.Id.ToString(), StaticData.TrialState.TrialOngoing, TimeSpan.FromDays(1));
-                }
-
-
-            }
-            //  更新缓存
-            else if (invocation.Method.Name == "UpdateTrialStatus")
-            {
-                //项目状态更新，也需要及时更新
-                _provider.Set(invocation.Arguments[0].ToString(), invocation.Arguments[1].ToString(), TimeSpan.FromDays(1));
-
-                ////Test参数是否符合要求
-                //var tt = invocation.Arguments[0].ToString();
-                //var cc = _provider.Get<string>(invocation.Arguments[0].ToString());
-
-            }
-
-        }
-
-        public void InterceptSynchronous(IInvocation invocation)
-        {
-            invocation.Proceed();
-        }
-    }
-}

IRaCIS.Core.Application/BusinessFilter/LogActionFilter.cs

@@ -1,81 +0,0 @@
-//using System.Diagnostics;
-//using IRaCIS.Application.Interfaces;
-//using IRaCIS.Application.Contracts;
-//using IRaCIS.Core.Infra.EFCore;
-//using IRaCIS.Core.Infrastructure.Extention;
-//using Microsoft.AspNetCore.Mvc;
-//using Microsoft.AspNetCore.Mvc.Filters;
-//using Microsoft.Extensions.Logging;
-//using Newtonsoft.Json;
-
-//namespace IRaCIS.Core.Application.Filter
-//{
-
-//    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
-//    public class LogFilter : Attribute
-//    {
-//    }
-//    public class LogActionFilter : IAsyncActionFilter
-//    {
-//        private readonly ILogService _logService;
-//        private readonly IUserInfo _userInfo;
-//        private readonly ILogger<LogActionFilter> _logger;
-
-//        public LogActionFilter(ILogService logService, IUserInfo userInfo , ILogger<LogActionFilter> logger)
-//        {
-//            _logService = logService;
-//            _userInfo = userInfo;
-//            _logger = logger;
-//        }
-
-//        public Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
-//        {
-
-//            if (context.ActionDescriptor.EndpointMetadata!=null&& context.ActionDescriptor.EndpointMetadata.Any(m => m.GetType() == typeof(LogFilter)))
-//            {
-//                return LogAsync(context, next);
-//            }
-//            return next();
-//        }
-
-//        public async Task LogAsync(ActionExecutingContext context, ActionExecutionDelegate next)
-//        {
-//            var sw = new Stopwatch();
-//            sw.Start();
-
-//            dynamic actionResult = (await next()).Result;
-//            sw.Stop();
-//            var args = JsonConvert.SerializeObject(context.ActionArguments);
-//            var result = JsonConvert.SerializeObject(actionResult?.Value);
-
-//            var attr = (ApiExplorerSettingsAttribute)context.ActionDescriptor.EndpointMetadata.FirstOrDefault(m => m.GetType() == typeof(ApiExplorerSettingsAttribute));
-//            var groupName = attr?.GroupName;
-//            var res = actionResult?.Value as IResponseOutput;
-//            var input = new SystemLogDTO
-//            {
-//                ClientIP = string.Empty,
-//                OptUserId = _userInfo.Id,
-//                OptUserName = _userInfo.UserName,
-//                ApiPath = context.ActionDescriptor.AttributeRouteInfo.Template.ToLower(),
-//                Params = args,
-//                Result = result,
-//                RequestTime = DateTime.Now,
-//                ElapsedMilliseconds = sw.ElapsedMilliseconds,
-//                Status =res?.IsSuccess?? false,
-//                Message = res?.ErrorMessage,
-//                LogCategory = groupName
-//            };
-
-//            try
-//            {
-//                _logService.SaveLog2Db(input);
-//            }
-//            catch (Exception ex)
-//            {
-
-//                _logger.LogError(ex.Message);
-//            }
-            
-//        }
-//    }
-//}

IRaCIS.Core.Application/Helper/ExcelExportHelper.cs

@@ -12,9 +12,11 @@ using MiniExcelLibs;
 using MiniExcelLibs.OpenXml;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using NPOI.HPSF;
 using NPOI.HSSF.UserModel;
 using NPOI.XSSF.UserModel;
 using SkiaSharp;
+using System.Collections;
 using System.IO;
 
 namespace IRaCIS.Core.Application.Service;
@@ -51,20 +53,24 @@ public static class ExcelExportHelper
             var translateDataList = await _dictionaryService.GetBasicDataSelect(needTranslatePropertyList.Select(t => t.DicParentCode).Distinct().ToArray());
 
 
-            var dic = JsonConvert.DeserializeObject<IDictionary<string, object>>(data.ToJsonNotIgnoreNull());
+            var dic = data.ConvertToDictionary();
+
 
             foreach (var key in dic.Keys)
             {
                 //是数组 那么找到对应的属性 进行翻译
-                if (dic[key].GetType().IsAssignableFrom(typeof(JArray)))
+                if (dic[key].GetType().GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IList<>)))
                 {
 
                     var newObjList = new List<object>();
                     var no = 1;
 
-                    foreach (var item in dic[key] as JArray)
+                    foreach (var item in dic[key] as IList )
                     {
-                        var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
+                        //var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
+
+                        var itemDic = item.ConvertToDictionary();
+
 
 
                         foreach (var needTranslateProperty in needTranslatePropertyList)
@@ -72,7 +78,7 @@ public static class ExcelExportHelper
                             //翻译的属性依赖其他属性
                             if (needTranslateProperty.IsTranslateDenpendOtherProperty)
                             {
-                                if (item[needTranslateProperty.DependPropertyName]?.ToString().ToLower() == needTranslateProperty.DependPropertyValueStr.ToLower())
+                                if (itemDic[needTranslateProperty.DependPropertyName]?.ToString().ToLower() == needTranslateProperty.DependPropertyValueStr.ToLower())
                                 {
                                     var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
 
@@ -145,8 +151,12 @@ public static class ExcelExportHelper
                 workbook.RemoveSheetAt(1);
             }
 
+
+            FileStream fileOut = new FileStream("resultTemplate", FileMode.Create, FileAccess.ReadWrite);
+            workbook.Write(fileOut);
+
             var memoryStream2 = new MemoryStream();
-            workbook.Write(memoryStream2);
+            workbook.Write(memoryStream2,true);
 
             memoryStream2.Seek(0, SeekOrigin.Begin);
 
@@ -226,29 +236,30 @@ public static class ExcelExportHelper
 
             var translateDataList = await _dictionaryService.GetBasicDataSelect(needTranslatePropertyList.Select(t => t.DicParentCode).Distinct().ToArray());
 
-
-            var dic = JsonConvert.DeserializeObject<IDictionary<string, object>>(data.ToJsonNotIgnoreNull());
+            var dic = data.ConvertToDictionary();
+            //var dic = (JsonConvert.DeserializeObject<IDictionary<string, object>>(data.ToJsonNotIgnoreNull())).IfNullThrowException();
 
             foreach (var key in dic.Keys)
             {
                 //是数组 那么找到对应的属性 进行翻译
-                if (dic[key].GetType().IsAssignableFrom(typeof(JArray)))
+                if (dic[key].GetType().GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IList<>)))
+                //if (dic[key].GetType().IsAssignableFrom(typeof(JArray)))
                 {
 
                     var newObjList = new List<object>();
                     var no = 1;
-
-                    foreach (var item in dic[key] as JArray)
+                    foreach (var item in dic[key] as IList)
+                    //foreach (var item in dic[key] as JArray)
                     {
-                        var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
-
+                        //var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
+                        var itemDic = item.ConvertToDictionary();
 
                         foreach (var needTranslateProperty in needTranslatePropertyList)
                         {
                             //翻译的属性依赖其他属性
                             if (needTranslateProperty.IsTranslateDenpendOtherProperty)
                             {
-                                if (item[needTranslateProperty.DependPropertyName]?.ToString().ToLower() == needTranslateProperty.DependPropertyValueStr.ToLower())
+                                if (itemDic[needTranslateProperty.DependPropertyName]?.ToString().ToLower() == needTranslateProperty.DependPropertyValueStr.ToLower())
                                 {
                                     var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
 
@@ -316,7 +327,7 @@ public static class ExcelExportHelper
             }
 
             var memoryStream2 = new MemoryStream();
-            workbook.Write(memoryStream2);
+            workbook.Write(memoryStream2,true);
 
             memoryStream2.Seek(0, SeekOrigin.Begin);
 

IRaCIS.Core.Application/Helper/FileConvertHelper.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Helper
+{
+    public class FileConvertHelper
+    {
+
+
+        static public void ConvertWordToPdf(string inputWordFilePath, string outputPdfDir)
+        {
+            // 设置 libreoffice 命令行参数
+            string arguments = $"--headless --invisible --convert-to pdf \"{inputWordFilePath}\" --outdir \"{outputPdfDir}\"";
+
+            // 启动 libreoffice 进程
+            using (Process process = new Process())
+            {
+                process.StartInfo.FileName = "libreoffice";
+                process.StartInfo.Arguments = arguments;
+                process.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
+                process.StartInfo.RedirectStandardOutput = true;
+                process.StartInfo.RedirectStandardError = true;
+                process.StartInfo.UseShellExecute = false;
+                process.StartInfo.CreateNoWindow = true;
+
+                process.Start();
+
+                // 等待进程结束
+                process.WaitForExit();
+            }
+        }
+
+
+    }
+}

IRaCIS.Core.Application/Helper/FileStoreHelper.cs

@@ -142,8 +142,9 @@ public static class FileStoreHelper
     //API  vue  部署目录
     public static string GetIRaCISRootPath(IWebHostEnvironment _hostEnvironment)
     {
-        var rootPath = (Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\'))).IfNullThrowException().FullName;
-        return rootPath;
+        string parentDirectory = Path.GetFullPath(Path.Combine(_hostEnvironment.ContentRootPath, ".."));     
+
+        return parentDirectory;
 
     }
 
@@ -163,7 +164,7 @@ public static class FileStoreHelper
     {
         var rootPath = GetIRaCISRootPath(_hostEnvironment);
 
-        var physicalFilePath = Path.Combine(rootPath, relativePath.Trim('/'));
+        var physicalFilePath = Path.Combine(rootPath, relativePath.TrimStart('/'));
 
         return physicalFilePath;
     }
@@ -539,7 +540,6 @@ public static class FileStoreHelper
     /// <param name="trialId"></param>
     /// <param name="siteid"></param>
     /// <param name="subjectId"></param>
-    /// <param name="type"></param>
     /// <returns></returns>
     public static (string PhysicalPath, string RelativePath, string FileRealName) GetUploadPrintscreenFilePath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid siteid, Guid subjectId)
     {
@@ -686,7 +686,7 @@ public static class FileStoreHelper
 
         var json = File.ReadAllText( Path.Combine(_hostEnvironment.ContentRootPath, "appsettings.json"));
 
-        JObject jsonObject = JObject.Parse(json, new JsonLoadSettings() { CommentHandling = CommentHandling.Load });
+        JObject jsonObject = (JObject.Parse(json, new JsonLoadSettings() { CommentHandling = CommentHandling.Load })).IfNullThrowException();
 
         int switchingRatio = 80;
 

IRaCIS.Core.Application/Helper/OSSService.cs

@@ -0,0 +1,210 @@
+using Aliyun.OSS;
+using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Infrastructure;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
+using NPOI.HPSF;
+using SharpCompress.Common;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Security.AccessControl;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Application.Helper
+{
+    public class MinIOOptions
+    {
+        public string endpoint { get; set; }
+        public string port { get; set; }
+        public bool useSSL { get; set; }
+        public string accessKey { get; set; }
+        public string secretKey { get; set; }
+        public string bucketName { get; set; }
+    }
+
+    public class AliyunOSSOptions
+    {
+        public string regionId { get; set; }
+        public string accessKeyId { get; set; }
+        public string accessKeySecret { get; set; }
+        public string endPoint { get; set; }
+        public string bucketName { get; set; }
+
+        public string roleArn { get; set; }
+
+        public string region { get; set; }
+
+        public string viewEndpoint { get; set; }
+
+    }
+
+    public class ObjectStoreServiceOptions
+    {
+        public string ObjectStoreUse { get; set; }
+        public AliyunOSSOptions AliyunOSS { get; set; }
+        public MinIOOptions MinIO { get; set; }
+
+    }
+
+    public class ObjectStoreDTO
+    {
+        public string ObjectStoreUse { get; set; }
+
+        public AliyunOSSOptions AliyunOSS { get; set; }
+
+        public MinIOOptions MinIO { get; set; }
+
+    }
+
+    public class AliyunOSSTempToken
+    {
+        public string AccessKeyId { get; set; }
+        public string AccessKeySecret { get; set; }
+        public string SecurityToken { get; set; }
+        public string Expiration { get; set; }
+
+        public string Region { get; set; }
+        public string BucketName { get; set; }
+        public string ViewEndpoint { get; set; }
+    }
+
+
+
+    public enum ObjectStoreUse
+    {
+        AliyunOSS = 0,
+        MinIO = 1,
+        AWS = 2,
+    }
+
+
+
+
+
+
+    public interface IOSSService
+    {
+        public string UploadToOSS(Stream fileStream, string oosFolderPath, string fileRealName);
+        public string UploadToOSS(string localFilePath, string oosFolderPath);
+
+        public void DownLoadFromOSS(string ossRelativePath, string localFilePath);
+
+
+    }
+    public class OSSService : IOSSService
+    {
+
+        public AliyunOSSOptions _OSSConfig { get; set; }
+
+        public OssClient _ossClient { get; set; }
+
+
+
+        public OSSService(IOptionsMonitor<ObjectStoreServiceOptions> options)
+        {
+            var ossOptions = options.CurrentValue;
+
+            _OSSConfig = ossOptions.AliyunOSS;
+
+            _ossClient = new OssClient(_OSSConfig.endPoint, _OSSConfig.accessKeyId, _OSSConfig.accessKeySecret);
+
+        }
+
+        /// <summary>
+        /// oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
+        /// </summary>
+        /// <param name="fileStream"></param>
+        /// <param name="oosFolderPath"></param>
+        /// <param name="fileRealName"></param>
+        /// <returns></returns>
+        /// <exception cref="BusinessValidationFailedException"></exception>
+        public string UploadToOSS(Stream fileStream, string oosFolderPath,string fileRealName)
+        {
+
+            var ossRelativePath = oosFolderPath + "/" + fileRealName;
+
+            try
+            {
+                using (var memoryStream = new MemoryStream())
+                {
+                    fileStream.Seek(0, SeekOrigin.Begin);
+
+                    fileStream.CopyTo(memoryStream);
+
+                    memoryStream.Seek(0, SeekOrigin.Begin);
+
+                    // 上传文件
+                    var result = _ossClient.PutObject(_OSSConfig.bucketName, ossRelativePath, memoryStream);
+                }
+
+
+                return "/" + ossRelativePath;
+            }
+            catch (Exception ex)
+            {
+                throw new BusinessValidationFailedException("oss上传失败" + ex.Message);
+
+            }
+        }
+
+        /// <summary>
+        /// oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
+        /// </summary>
+        /// <param name="localFilePath"></param>
+        /// <param name="oosFolderPath"></param>
+        /// <returns></returns>
+        /// <exception cref="BusinessValidationFailedException"></exception>
+        public string UploadToOSS(string localFilePath, string oosFolderPath)
+        {
+            var localFileName = Path.GetFileName(localFilePath);
+
+            var ossRelativePath = oosFolderPath + "/" + localFileName;
+
+
+            try
+            {
+                // 上传文件
+                var result = _ossClient.PutObject(_OSSConfig.bucketName, ossRelativePath, localFilePath);
+
+                return ossRelativePath;
+            }
+            catch (Exception ex)
+            {
+                throw new BusinessValidationFailedException("oss上传失败" + ex.Message);
+
+            }
+        }
+
+        public void DownLoadFromOSS(string ossRelativePath, string localFilePath)
+        {
+            try
+            {
+                var result = _ossClient.GetObject(_OSSConfig.bucketName, ossRelativePath);
+
+                // 将下载的文件流保存到本地文件
+                using (var fs = File.OpenWrite(localFilePath))
+                {
+                    result.Content.CopyTo(fs);
+                    fs.Close();
+                }
+            }
+            catch (Exception ex)
+            {
+
+                throw new BusinessValidationFailedException("oss下载失败!" + ex.Message);
+            }
+
+
+        }
+
+
+
+
+    }
+
+
+}

IRaCIS.Core.Application/Helper/SendEmailHelper.cs

@@ -40,7 +40,7 @@ public static class SendEmailHelper
 
             }
         }
-        catch (Exception ex)
+        catch (Exception )
         {
 
             //---邮件发送失败，您进行的操作未能成功，请检查邮箱或联系维护人员

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

@@ -15,14 +15,14 @@
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-	  <NoWarn>1701;1702;1591;1587</NoWarn>
+		<NoWarn>1701;1702;1591;1587</NoWarn>
 	</PropertyGroup>
 
 
 
 	<ItemGroup>
 
-    <Using Include="IRaCIS.Core.Application;" />
+		<Using Include="IRaCIS.Core.Application;" />
 		<Using Include="AutoMapper.QueryableExtensions;" />
 		<Using Include="Microsoft.EntityFrameworkCore;" />
 		<Using Include="IRaCIS.Core.Domain.Models;" />
@@ -50,60 +50,56 @@
 
 
 	<ItemGroup>
-	  <Content Include="Resources\zh-CN.json">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	    <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-	    <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-	  </Content>
-	  <Content Include="Resources\en-US.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	    <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-	    <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-	  </Content>
+		<Content Include="Resources\zh-CN.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+		</Content>
+		<Content Include="Resources\en-US.json">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+		</Content>
 	</ItemGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />
-		<PackageReference Include="AutoMapper.Collection.EntityFrameworkCore" Version="9.0.0" />
-		<PackageReference Include="EntityFrameworkCore.Triggered" Version="3.2.1" />
+		<PackageReference Include="DistributedLock.Redis" Version="1.0.2" />
+		<PackageReference Include="DistributedLock.SqlServer" Version="1.0.3" />
+		<PackageReference Include="EasyCaching.InMemory" Version="1.9.1" />
+		<PackageReference Include="EasyCaching.Redis" Version="1.9.1" />
 		<PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
-		<PackageReference Include="EasyCaching.Interceptor.AspectCore" Version="1.7.0" />
+		<PackageReference Include="EasyCaching.Interceptor.AspectCore" Version="1.9.1" />
 		<PackageReference Include="ExcelDataReader" Version="3.6.0" />
 		<PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" />
-		<PackageReference Include="fo-dicom.Codecs" Version="5.1.0">
-		  <TreatAsUsed>true</TreatAsUsed>
-		</PackageReference>
-		<PackageReference Include="fo-dicom.Drawing" Version="4.0.8" />
-		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.0.3" />
-		<PackageReference Include="FreeSpire.Doc" Version="10.8.0" />
+		<PackageReference Include="fo-dicom" Version="5.1.1" />
+		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.0" />
+		<PackageReference Include="fo-dicom.Codecs" Version="5.10.8" />
+		<PackageReference Include="FreeSpire.Doc" Version="11.6.0" />
 		<PackageReference Include="Hangfire.Core" Version="1.8.5" />
-		<PackageReference Include="Magicodes.IE.Core" Version="2.7.4.2" />
-		<PackageReference Include="Magicodes.IE.Csv" Version="2.7.4.2">
-		  <TreatAsUsed>true</TreatAsUsed>
+		<PackageReference Include="Magicodes.IE.Core" Version="2.7.4.5" />
+		<PackageReference Include="Magicodes.IE.Csv" Version="2.7.4.5">
+			<TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
-		<PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.2">
-		  <TreatAsUsed>true</TreatAsUsed>
+		<PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.5">
+			<TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
-		<PackageReference Include="Magicodes.IE.Excel.AspNetCore" Version="2.7.4.2" />
-		<PackageReference Include="MailKit" Version="3.4.2" />
-		<PackageReference Include="MediatR" Version="11.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="6.0.10" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10">
-		  <TreatAsUsed>true</TreatAsUsed>
-		</PackageReference>
-		<PackageReference Include="MimeKit" Version="3.4.2" />
-		<PackageReference Include="MiniExcel" Version="1.30.1" />
-		<PackageReference Include="MiniWord" Version="0.6.1" />
+		<PackageReference Include="Magicodes.IE.Excel.AspNetCore" Version="2.7.4.5" />
+		<PackageReference Include="MailKit" Version="4.2.0" />
+		<PackageReference Include="MediatR" Version="12.1.1" />
+		<PackageReference Include="MimeKit" Version="4.2.0" />
+		<PackageReference Include="MiniExcel" Version="1.31.2" />
+		<PackageReference Include="MiniWord" Version="0.7.0" />
 		<PackageReference Include="My.Extensions.Localization.Json" Version="3.0.0">
-		  <TreatAsUsed>true</TreatAsUsed>
+			<TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
 		<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
-		<PackageReference Include="NPOI" Version="2.6.0" />
-		<PackageReference Include="Panda.DynamicWebApi" Version="1.2.0" />
-		<PackageReference Include="Quartz" Version="3.5.0" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
-		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.5" />
-		<PackageReference Include="WinSCP" Version="5.21.5" />
+		<PackageReference Include="NPOI" Version="2.6.2" />
+		<PackageReference Include="Panda.DynamicWebApi" Version="1.2.1" />
+		<PackageReference Include="Quartz" Version="3.7.0" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.11" />
+		<PackageReference Include="WinSCP" Version="6.1.2" />
 	</ItemGroup>
 
 	<ItemGroup>

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

@@ -81,7 +81,6 @@
             <param name="trialId"></param>
             <param name="siteid"></param>
             <param name="subjectId"></param>
-            <param name="type"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Helper.FileStoreHelper.GetFilePath(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,System.String,System.Guid,System.Guid,System.String)">
@@ -95,17 +94,30 @@
             <param name="type"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Helper.OSSService.UploadToOSS(System.IO.Stream,System.String,System.String)">
+            <summary>
+            oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
+            </summary>
+            <param name="fileStream"></param>
+            <param name="oosFolderPath"></param>
+            <param name="fileRealName"></param>
+            <returns></returns>
+            <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Helper.OSSService.UploadToOSS(System.String,System.String)">
+            <summary>
+            oosFolderPath  不要 "/ "开头   应该： TempFolder/ChildFolder
+            </summary>
+            <param name="localFilePath"></param>
+            <param name="oosFolderPath"></param>
+            <returns></returns>
+            <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.TaskMedicalReviewRuleService">
             <summary>
             医学审核生成规则   废弃
             </summary>	
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TaskMedicalReviewRuleService.GenerateMedicalReviewTask(IRaCIS.Core.Application.ViewModel.GenerateMedicalReviewTaskCommand)">
-            <summary>
-            产生医学审核
-            </summary>
-            <returns></returns>
-        </member>
         <member name="T:IRaCIS.Core.Application.Service.TaskMedicalReviewService">
             <summary>
             任务医学审核
@@ -281,6 +293,7 @@
             </summary>
             <param name="origenalTask"></param>
             <param name="agreeReReadingCommand"></param>
+            <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.SetReReadingOrBackInfluenceAnalysisAsync(System.Guid)">
             <summary>
@@ -490,7 +503,6 @@
             <param name="_commonDocumentRepository"></param>
             <param name="_dictionaryService"></param>
             <param name="_trialRepository"></param>
-            <param name="inQuery"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.Common.ExcelExportService.GetTrialReadingCriterionCanExportDocumentList(System.Guid)">
@@ -937,7 +949,8 @@
             <summary>
             翻译稽查数据
             </summary>
-            <param name="dto">传入Dto</param>
+            <param name="dto"></param>
+            <param name="currentInspectionId"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.SetDataInspectionDateType(System.Collections.Generic.List{System.String},System.String)">
@@ -1131,7 +1144,6 @@
             <summary>
             获取阅片报告
             </summary>
-            <param name="indto"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.ReadingCalculateService.GetDeleteLesionStatrIndex(IRaCIS.Core.Application.Service.Reading.Dto.DeleteReadingRowAnswerInDto)">
@@ -2468,6 +2480,8 @@
             <param name="item"></param>
             <param name="questions"></param>
             <param name="tableQuestions"></param>
+            <param name="answers"></param>
+            <param name="tableAnswers"></param>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.ClinicalQuestionService.GetTrialClinicalQuestionList(IRaCIS.Core.Application.Service.Reading.Dto.TrialClinicalQuestionQuery)">
             <summary>
@@ -9509,11 +9523,6 @@
         <member name="T:IRaCIS.Core.Application.Contracts.TrialSiteUserSurveyAddOrEdit">
             <summary> TrialSiteUserSurveyAddOrEdit  列表查询参数模型</summary>
         </member>
-        <member name="T:IRaCIS.Core.Application.Contracts.JsonPatchUserRequestExample">
-            <summary>
-            实测 标注在服务方法上 没用
-            </summary>
-        </member>
         <member name="T:IRaCIS.Core.Application.Contracts.TrialSiteEquipmentSurveyService">
             <summary>
             TrialSiteEquipmentSurveyService
@@ -10694,6 +10703,7 @@
             </summary>
             <param name="inQuery"></param>
             <param name="_subjectVisitRepository"></param>
+            <param name="_trialRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetImageClinicalDataToBeConfirmList(IRaCIS.Core.Application.Contracts.ImageClinicalDataToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
@@ -10702,6 +10712,7 @@
             </summary>
             <param name="inQuery"></param>
             <param name="_subjectVisitRepository"></param>
+            <param name="_trialRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetCRCImageQuestionToBeDoneList(IRaCIS.Core.Application.Contracts.ImageQuestionToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
@@ -10719,6 +10730,7 @@
             </summary>
             <param name="inQuery"></param>
             <param name="_subjectVisitRepository"></param>
+            <param name="_trialRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetImageReUploadToBeDoneList(IRaCIS.Core.Application.Contracts.ImageReUploadToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
@@ -10727,14 +10739,16 @@
             </summary>
             <param name="inQuery"></param>
             <param name="_subjectVisitRepository"></param>
+            <param name="_trialRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetImageSubmittedToBeDoneList(IRaCIS.Core.Application.Contracts.ImageSubmittedToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
             <summary>
-            加急影像提交   --CRC 待办
+             加急影像提交   --CRC 待办
             </summary>
             <param name="inQuery"></param>
             <param name="_subjectVisitRepository"></param>
+            <param name="_trialRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetImageQualityToBeDoneList(IRaCIS.Core.Application.Contracts.ImageQualityToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
@@ -10743,14 +10757,16 @@
             </summary>
             <param name="inQuery"></param>
             <param name="_subjectVisitRepository"></param>
+            <param name="_trialRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetQCImageQuestionToBeDoneList(IRaCIS.Core.Application.Contracts.ImageQuestionToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
             <summary>
-            QC 质疑
+             QC 质疑
             </summary>
             <param name="inQuery"></param>
             <param name="_subjectVisitRepository"></param>
+            <param name="_trialRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetIRImageReadingToBeDoneList(IRaCIS.Core.Application.Contracts.IRImageReadingToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
@@ -10768,6 +10784,7 @@
             IR医学反馈 
             </summary>
             <param name="inQuery"></param>
+            <param name="_taskMedicalReviewRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetMIMMedicalCommentsToBeDoneList(IRaCIS.Core.Application.Contracts.MedicalCommentsToBeDoneQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskMedicalReview})">
@@ -10776,6 +10793,7 @@
             </summary>
             <param name="inQuery"></param>
             <param name="_taskMedicalReviewRepository"></param>
+            <param name="_trialReadingCriterionRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.PersonalWorkstation.GetMedicalCommentsFirstToBeDone(IRaCIS.Core.Application.Contracts.MedicalCommentsFirstToBeDoneQuery,IRaCIS.Core.Application.Interfaces.ITaskMedicalReviewService)">
@@ -11024,7 +11042,7 @@
             构造函数注入
             </summary>
         </member>
-        <member name="M:IRaCIS.Core.Application.MediatR.Handlers.ConsistencyVerificationHandler.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomStudy},IRaCIS.Core.Domain.Share.IUserInfo,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSite},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},AutoMapper.IMapper)">
+        <member name="M:IRaCIS.Core.Application.MediatR.Handlers.ConsistencyVerificationHandler.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomStudy},IRaCIS.Core.Domain.Share.IUserInfo,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSite},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},AutoMapper.IMapper,Microsoft.Extensions.Localization.IStringLocalizer)">
             <summary>
             构造函数注入
             </summary>
@@ -11561,7 +11579,6 @@
             <summary>
             新增修改系统表格问题
             </summary>
-            <param name="addOrEditReadingTableQuestionSystem"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingQuestionService.DeleteReadingTableQuestionSystem(System.Guid)">
@@ -11586,11 +11603,12 @@
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingQuestionService.VerifyCalculateRelation(System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.CalculateRelationDto},System.Guid,System.Guid,System.Int32)">
             <summary>
-            验证计算关系
+             验证计算关系
             </summary>
             <param name="relationList"></param>
             <param name="QuestionId"></param>
             <param name="originalId"></param>
+            <param name="count"></param>
             <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetQuestionCalculateRelation(IRaCIS.Core.Application.Service.Reading.Dto.GetQuestionCalculateRelationInDto)">
@@ -11856,6 +11874,8 @@
             </summary>
             <param name="trialReadingCriterionId"></param>
             <param name="visitTaskId"></param>
+            <param name="questionClassify"></param>
+            <param name="groupClassifyList"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingReportEvaluation(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingReportEvaluationInDto)">
@@ -11898,11 +11918,18 @@
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.FindChildQuestion(IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData,System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionTrial},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionAnswerInfo},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableAnsweRowInfo},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.OrganInfo},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer},System.Boolean,System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer},System.Nullable{System.Guid})">
             <summary>
-            获取子元素
+             获取子元素
             </summary>
             <param name="item"></param>
             <param name="questionlists"></param>
             <param name="tableQuestionLists"></param>
+            <param name="tableAnswers"></param>
+            <param name="tableAnsweRowInfos"></param>
+            <param name="organInfos"></param>
+            <param name="baseLineTableAnswer"></param>
+            <param name="isFirstChangeTask"></param>
+            <param name="lastTaskTableAnswer"></param>
+            <param name="TaskId"></param>
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SplitLesion(IRaCIS.Core.Application.Service.Reading.Dto.SplitLesionInDto)">
             <summary>

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

@@ -479,9 +479,17 @@ namespace IRaCIS.Core.Application.ViewModel
     }
 
 
-    public class PIAuditDialogListView : PIAuditTaskCommand
+    public class PIAuditDialogListView 
     {
 
+        public Guid VisitTaskId { get; set; }
+        public string NotAgreeReason { get; set; }
+        public string PIAuditNote { get; set; } = string.Empty;
+
+        public List<string> PIAuditImagePathList { get; set; }
+
+        public PIAuditState? PIAuditState { get; set; }
+
         public string ReplyContent { get; set; } = string.Empty;
 
         public bool? IsEnrollment { get; set; }

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

@@ -78,120 +78,7 @@ namespace IRaCIS.Core.Application.Service
             return ResponseOutput.Ok();
         }
 
-        /// <summary>
-        /// 产生医学审核
-        /// </summary>
-        /// <returns></returns>
-        [Obsolete]
-        public async Task<IResponseOutput> GenerateMedicalReviewTask(GenerateMedicalReviewTaskCommand generateCommand)
-        {
-            var trialId = generateCommand.TrialId;
 
-            //var mimUserList = await _trialUserRepository.Where(t => t.User.UserTypeEnum == Domain.Share.UserTypeEnum.MIM && t.TrialId == trialId).Select(t => t.User).ProjectTo<UserSimpleInfo>(_mapper.ConfigurationProvider).ToListAsync();
-
-
-
-            Guid? defalutMIMUserId = null /*mimUserList.FirstOrDefault()?.UserId*/;
-
-            //获取当前医生数据  已经生成的，和配置的数量
-            var taskTaskMedicalReviewRuleList = await _taskMedicalReviewRuleRepository.Where(t => t.TrialId == trialId).ProjectTo<TaskMedicalReviewRuleView>(_mapper.ConfigurationProvider).ToListAsync();
-
-            foreach (var item in taskTaskMedicalReviewRuleList)
-            {
-
-                if (item.IsEnable)
-                {
-
-                    if (item.PlanGlobalCount > item.GeneratedGlobalCount)
-                    {
-                        var needGenerateCount = item.PlanGlobalCount - item.GeneratedGlobalCount;
-
-                        var canGenerateCount = item.ActualGlobalCount - item.GeneratedGlobalCount;
-
-                        var toGenerateCount = canGenerateCount > needGenerateCount ? needGenerateCount : canGenerateCount;
-
-                        //分配给MIM  
-
-                        if (toGenerateCount > 0)
-                        {
-                            var toGenerateTaskList = item.ActualGlobalTaskList.ExceptBy(item.GeneratedGlobalTaskList.Select(t => t.TaskId), t => t.TaskId).Take(toGenerateCount).ToList();
-
-                            foreach (var toGenerateTask in toGenerateTaskList)
-                            {
-                                await _taskMedicalReviewRepository.AddAsync(new TaskMedicalReview() { DoctorUserId = toGenerateTask.DoctorUserId!.Value, TrialId = toGenerateTask.TrialId, VisitTaskId = toGenerateTask.TaskId, MedicalManagerUserId = defalutMIMUserId });
-                            }
-                        }
-
-
-                    }
-                    if (item.PlanJudgeCount > item.GeneratedJudgeCount)
-                    {
-                        var needGenerateCount = item.PlanJudgeCount - item.GeneratedJudgeCount;
-
-                        var canGenerateCount = item.ActualJudgeCount - item.GeneratedGlobalCount;
-
-                        var toGenerateCount = canGenerateCount > needGenerateCount ? needGenerateCount : canGenerateCount;
-
-                        if (toGenerateCount > 0)
-                        {
-                            var toGenerateTaskList = item.ActualJudgeTaskList.ExceptBy(item.GeneratedJudgeTaskList.Select(t => t.TaskId), t => t.TaskId).Take(toGenerateCount).ToList();
-
-                            foreach (var toGenerateTask in toGenerateTaskList)
-                            {
-                                await _taskMedicalReviewRepository.AddAsync(new TaskMedicalReview() { DoctorUserId = toGenerateTask.DoctorUserId!.Value, TrialId = toGenerateTask.TrialId, VisitTaskId = toGenerateTask.TaskId, MedicalManagerUserId = defalutMIMUserId });
-                            }
-                        }
-
-                    }
-                    if (item.PlanTumorCount > item.GeneratedTumorCount)
-                    {
-                        var needGenerateCount = item.PlanTumorCount - item.GeneratedTumorCount;
-
-                        var canGenerateCount = item.ActualTumorCount - item.GeneratedGlobalCount;
-
-                        var toGenerateCount = canGenerateCount > needGenerateCount ? needGenerateCount : canGenerateCount;
-
-                        if (toGenerateCount > 0)
-                        {
-                            var toGenerateTaskList = item.ActualTumorTaskList.ExceptBy(item.GeneratedTumorTaskList.Select(t => t.TaskId), t => t.TaskId).Take(toGenerateCount).ToList();
-
-                            foreach (var toGenerateTask in toGenerateTaskList)
-                            {
-                                await _taskMedicalReviewRepository.AddAsync(new TaskMedicalReview() { DoctorUserId = toGenerateTask.DoctorUserId!.Value, TrialId = toGenerateTask.TrialId, VisitTaskId = toGenerateTask.TaskId, MedicalManagerUserId = defalutMIMUserId });
-                            }
-                        }
-
-                    }
-                    if (item.PlanVisitCount > item.GeneratedVisitCount)
-                    {
-                        var needGenerateCount = item.PlanVisitCount - item.GeneratedVisitCount;
-
-                        var canGenerateCount = item.ActualVisitCount - item.GeneratedGlobalCount;
-
-                        var toGenerateCount = canGenerateCount > needGenerateCount ? needGenerateCount : canGenerateCount;
-
-                        if (toGenerateCount > 0)
-                        {
-
-                            var toGenerateTaskList = item.ActualVisitTaskList.ExceptBy(item.GeneratedVisitTaskList.Select(t => t.TaskId), t => t.TaskId).Take(toGenerateCount).ToList();
-
-                            foreach (var toGenerateTask in toGenerateTaskList)
-                            {
-                                await _taskMedicalReviewRepository.AddAsync(new TaskMedicalReview() { DoctorUserId = toGenerateTask.DoctorUserId!.Value, TrialId = toGenerateTask.TrialId, VisitTaskId = toGenerateTask.TaskId, MedicalManagerUserId = defalutMIMUserId });
-                            }
-                        }
-
-                    }
-
-                }
-
-            }
-
-
-            await _taskMedicalReviewRepository.SaveChangesAsync();
-            return ResponseOutput.Ok();
-
-        }
 
 
     }

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

@@ -233,83 +233,8 @@ namespace IRaCIS.Core.Application.Service
                                 && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.TaskState == TaskState.Effect
                                  && t.SourceSubjectVisitId == subjectVisit.Id).ToList();
 
-                    if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Double)
-                    {
-
-
-                        VisitTask? task1 = existCurrentVisitTaskList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm1);
-                        VisitTask? task2 = existCurrentVisitTaskList.FirstOrDefault(t => t.ArmEnum == Arm.DoubleReadingArm2);
-
-                        if (!existCurrentVisitTaskList.Any(t => t.ArmEnum == Arm.DoubleReadingArm1))
-                        {
-                            currentMaxCodeInt = currentMaxCodeInt + 1;
-
-
-
-
-                            task1 = await _visitTaskRepository.AddAsync(new VisitTask()
-                            {
-                                TrialId = trialId,
-                                SubjectId = subjectVisit.SubjectId,
-                                IsUrgent = subjectVisit.IsUrgent,
-                                TaskBlindName = blindTaskName,
-                                TaskName = subjectVisit.VisitName,
-                                VisitTaskNum = subjectVisit.VisitNum,
-                                TaskUrgentType = taskUrgentType,
-                                IsCanEditUrgentState = isCanEditUrgentState,
-                                //CheckPassedTime = subjectVisit.CheckPassedTime,
-                                ArmEnum = Arm.DoubleReadingArm1,//特殊
-                                Code = currentMaxCodeInt,
-                                SourceSubjectVisitId = subjectVisit.Id,
-                                TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt, nameof(VisitTask)),
-                                ReadingCategory = ReadingCategory.Visit,
-
-                                TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
-                                IsNeedClinicalDataSign = isNeedClinicalDataSign,
-                                IsClinicalDataSign = isClinicalDataSign
-                            });
-
-                        }
-
-                        if (!existCurrentVisitTaskList.Any(t => t.ArmEnum == Arm.DoubleReadingArm2))
-                        {
-                            currentMaxCodeInt = currentMaxCodeInt + 1;
-
-
-                            task2 = await _visitTaskRepository.AddAsync(new VisitTask()
-                            {
-                                TrialId = trialId,
-                                SubjectId = subjectVisit.SubjectId,
-                                IsUrgent = subjectVisit.IsUrgent,
-                                TaskBlindName = blindTaskName,
-                                TaskName = subjectVisit.VisitName,
-                                TaskUrgentType = taskUrgentType,
-                                IsCanEditUrgentState = isCanEditUrgentState,
-                                VisitTaskNum = subjectVisit.VisitNum,
-                                //CheckPassedTime = subjectVisit.CheckPassedTime,
-                                ArmEnum = Arm.DoubleReadingArm2,//特殊
-                                Code = currentMaxCodeInt,
-                                SourceSubjectVisitId = subjectVisit.Id,
-                                TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt, nameof(VisitTask)),
-                                ReadingCategory = ReadingCategory.Visit,
-
-                                TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
-                                IsNeedClinicalDataSign = isNeedClinicalDataSign,
-                                IsClinicalDataSign = isClinicalDataSign
-                            });
-
-
-                        }
-
-                        _provider.Set<int>($"{trialId}_{StaticData.CacheKey.TaskMaxCode}", currentMaxCodeInt, TimeSpan.FromMinutes(30));
-
-
-
-
-                        var defaultState = trialReadingCriterionConfig.FollowVisitAutoAssignDefaultState == TaskAllocateDefaultState.InitAllocated ? TaskAllocationState.InitAllocated : TaskAllocationState.Allocated;
-
-                    }
-                    else if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Single)
+                    //只有单重阅片
+                     if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Single)
                     {
 
                         VisitTask? singleTask = existCurrentVisitTaskList.FirstOrDefault(t => t.ArmEnum == Arm.SingleReadingArm);
@@ -336,8 +261,12 @@ namespace IRaCIS.Core.Application.Service
                                 ReadingCategory = ReadingCategory.Visit,
                                 TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
                                 IsNeedClinicalDataSign = isNeedClinicalDataSign,
-                                IsClinicalDataSign = isClinicalDataSign
-                            });
+                                IsClinicalDataSign = isClinicalDataSign,
+                               
+                                SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget)
+
+
+                        });
                         }
 
 
@@ -620,6 +549,7 @@ namespace IRaCIS.Core.Application.Service
                                     var isNeedClinicalDataSign = IsNeedClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionId, clinicalDataConfirmList);
                                     var isClinicalDataSign = IsClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionId, clinicalDataConfirmList, subjectVisit.Id, trialId);
 
+                                    var isFrontTaskNeedSignButNotSign = await _visitTaskRepository.AnyAsync(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.TaskState == TaskState.Effect && t.VisitTaskNum < subjectVisit.VisitNum && t.IsNeedClinicalDataSign == true && t.IsClinicalDataSign == false);
 
                                     if (visitNumList.IndexOf(subjectVisit.VisitNum) == 0)
                                     {
@@ -661,7 +591,8 @@ namespace IRaCIS.Core.Application.Service
 
                                             TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
                                             IsNeedClinicalDataSign = isNeedClinicalDataSign,
-                                            IsClinicalDataSign = isClinicalDataSign
+                                            IsClinicalDataSign = isClinicalDataSign,
+                                            IsFrontTaskNeedSignButNotSign= isFrontTaskNeedSignButNotSign
                                         });
 
 
@@ -681,11 +612,11 @@ namespace IRaCIS.Core.Application.Service
                                             //之前有回退到影像上传的访视 那么当前访视一致性核查通过的时候，当前访视生成但是不分配出去(排除失访的)
                                             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();
 
+                                            singleTask.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
 
                                             if (beforeBackVisitTask == null)
                                             {
 
-                                                singleTask.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
 
 
                                                 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();
@@ -765,7 +696,11 @@ namespace IRaCIS.Core.Application.Service
 
 
                                         }
+                                        else
+                                        {
+                                            singleTask.SuggesteFinishedTime = GetSuggessFinishTime(true, UrgentType.NotUrget);
 
+                                        }
 
                                         #endregion
 
@@ -876,6 +811,8 @@ namespace IRaCIS.Core.Application.Service
                         // AllocateTime = DateTime.Now,
                         //DoctorUserId = reReadingVisitTask.DoctorUserId,
 
+                        SuggesteFinishedTime= reReadingVisitTask.SuggesteFinishedTime,
+
                     });
 
                     generateTaskCommand.Action(newTask);

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

@@ -25,6 +25,7 @@ using Quartz;
 using IRaCIS.Application.Services.BackGroundJob;
 using Magicodes.ExporterAndImporter.Core.Extension;
 using Hangfire;
+using MassTransit;
 
 namespace IRaCIS.Core.Application.Service.Allocation
 {
@@ -275,6 +276,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
             //发送对话
             var addDialig = _mapper.Map<PIAudit>(incommand);
 
+            addDialig.PIAuditState = incommand.PIAuditState;
+
             addDialig.PIAuditImagePath = visitTask.PIAuditImagePath;
 
             await _PIAuditRepository.AddAsync(addDialig);
@@ -639,13 +642,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
         /// 获取有序阅片IQuery对象
         /// </summary>
         /// <param name="inDto"></param>
-
         /// <returns></returns>
         public async Task<(int, List<IRUnReadSubjectView>)> GetOrderReadingIQueryable(GetOrderReadingIQueryableInDto inDto)
         {
             var trialReadingCriterionId = inDto.TrialReadingCriterionId;
 
-            //Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.DoctorUserId == _userInfo.Id && x.TaskState == TaskState.Effect && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId;
 
             var critrion = await _trialReadingCriterionRepository.FindAsync(trialReadingCriterionId);
 
@@ -841,7 +842,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             var requestRecordList = await _visitTaskReReadingRepository.Where(t => baseLineTaskIdList.Contains(t.OriginalReReadingTaskId) && t.RequestReReadingUserId == _userInfo.Id && t.RequestReReadingReason == "AIR自动重阅基线").ToListAsync();
 
-            if (requestRecordList.Count() != baseLineTaskIdList.Count())
+            if (requestRecordList.Count != baseLineTaskIdList.Count)
             {
                 //---后台数据有错误
                 return ResponseOutput.NotOk(_localizer["VisitTask_DoctorConfiguration"]);
@@ -964,6 +965,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
         /// </summary>
         /// <param name="origenalTask"></param>
         /// <param name="agreeReReadingCommand"></param>
+        /// <exception cref="BusinessValidationFailedException"></exception>
         private void ReReadingTaskTrackingDeal(VisitTask origenalTask, ConfirmReReadingCommand agreeReReadingCommand)
         {
             if (origenalTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || origenalTask.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
@@ -1227,18 +1229,9 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                             {
                                                 if (origenalTask.ReadingCategory == ReadingCategory.Visit)
                                                 {
-                                                    var list = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
-
-                                                    foreach (var item in list)
-                                                    {
-                                                        item.Id = Guid.Empty;
-                                                        item.VisitTaskId = newTask.Id;
-                                                    }
-
-                                                    _ = _readingTaskQuestionAnswerRepository.AddRangeAsync(list).Result;
+                                                    CopyForms(newTask, origenalTask);
                                                 }
 
-
                                             }
 
                                             //拷贝后续表单
@@ -1246,15 +1239,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                             {
                                                 if (origenalTask.ReadingCategory == ReadingCategory.Visit)
                                                 {
-                                                    var list = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
-
-                                                    foreach (var item in list)
-                                                    {
-                                                        item.Id = Guid.Empty;
-                                                        item.VisitTaskId = newTask.Id;
-                                                    }
-
-                                                    _ = _readingTaskQuestionAnswerRepository.AddRangeAsync(list).Result;
+                                                    CopyForms(newTask, origenalTask);
                                                 }
 
                                             }
@@ -1350,15 +1335,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                             {
                                                 if (origenalTask.ReadingCategory == ReadingCategory.Visit)
                                                 {
-                                                    var list = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
-
-                                                    foreach (var item in list)
-                                                    {
-                                                        item.Id = Guid.Empty;
-                                                        item.VisitTaskId = newTask.Id;
-                                                    }
-
-                                                    _ = _readingTaskQuestionAnswerRepository.AddRangeAsync(list).Result;
+                                                    CopyForms(newTask, origenalTask);
                                                 }
 
                                             }
@@ -1368,15 +1345,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                             {
                                                 if (origenalTask.ReadingCategory == ReadingCategory.Visit)
                                                 {
-                                                    var list = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
-
-                                                    foreach (var item in list)
-                                                    {
-                                                        item.Id = Guid.Empty;
-                                                        item.VisitTaskId = newTask.Id;
-                                                    }
-
-                                                    _ = _readingTaskQuestionAnswerRepository.AddRangeAsync(list).Result;
+                                                    CopyForms(newTask, origenalTask);
                                                 }
                                             }
 
@@ -1435,7 +1404,69 @@ namespace IRaCIS.Core.Application.Service.Allocation
             return ResponseOutput.Ok();
         }
 
+        private void CopyForms(VisitTask newTask, VisitTask origenalTask)
+        {
 
+            //自定义
+            var readingCustomTagList = _repository.Where<ReadingCustomTag>(t => t.VisitTaskId == origenalTask.Id).ToList();
+
+            foreach (var item in readingCustomTagList)
+            {
+                item.Id = Guid.Empty;
+                item.VisitTaskId = newTask.Id;
+            }
+
+            _ = _repository.AddRangeAsync(readingCustomTagList).Result;
+
+
+            //var readingTaskQuestionMarkList = _repository.Where<ReadingTaskQuestionMark>(t => t.VisitTaskId == origenalTask.Id).ToList();
+
+            //foreach (var item in readingTaskQuestionMarkList)
+            //{
+            //    item.Id = Guid.Empty;
+            //    item.VisitTaskId = newTask.Id;
+            //}
+
+            //_ = _repository.AddRangeAsync(readingTaskQuestionMarkList).Result;
+
+            var readingTaskQuestionAnswerList = _repository.Where<ReadingTaskQuestionAnswer>(t => t.VisitTaskId == origenalTask.Id).ToList();
+
+            foreach (var item in readingTaskQuestionAnswerList)
+            {
+                item.Id = Guid.Empty;
+                item.VisitTaskId = newTask.Id;
+            }
+            _ = _repository.AddRangeAsync(readingTaskQuestionAnswerList).Result;
+
+
+
+            //ReadingTableAnswerRowInfo  ReadingTableQuestionAnswer 一起加
+            var readingTableAnswerRowInfoList = _repository.Where<ReadingTableAnswerRowInfo>(t => t.VisitTaskId == origenalTask.Id).Include(t => t.LesionAnswerList).ToList();
+
+            foreach (var item in readingTableAnswerRowInfoList)
+            {
+                var originalVisitTaskId = item.VisitTaskId;
+                var originalFristAddTaskId = item.FristAddTaskId;
+
+                item.Id = NewId.NextSequentialGuid();
+                item.VisitTaskId = newTask.Id;
+                item.FristAddTaskId = originalVisitTaskId == originalFristAddTaskId ? newTask.Id : item.FristAddTaskId;
+
+                foreach (var item2 in item.LesionAnswerList)
+                {
+                    item2.Id = Guid.Empty;
+                    item2.RowId = item.Id;
+                    item2.VisitTaskId = newTask.Id;
+                }
+            }
+
+            _ = _repository.AddRangeAsync(readingTableAnswerRowInfoList).Result;
+
+
+
+
+
+        }
         /// <summary>
         /// PM  设置任务 退回
         /// </summary>

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

@@ -251,7 +251,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<PIAudit, PIAuditDialogListView>()
                   .ForMember(o => o.CreateUserName, t => t.MapFrom(u => u.CreateUser.UserName))
                   .ForMember(o => o.UserTypeEnum, t => t.MapFrom(u => u.CreateUser.UserTypeEnum))
-                   .ForMember(o => o.PIAuditState, t => t.MapFrom(u => u.VisitTask.PIAuditState))
+                   //.ForMember(o => o.PIAuditState, t => t.MapFrom(u => u.VisitTask.PIAuditState))
                   ;
 
             

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

@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Application.Helper;
+using IRaCIS.Application.Contracts;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -99,15 +100,58 @@ namespace IRaCIS.Core.Application.Service
                         //---读取模板内容失败, 请将文件另存为docx格式尝试!
                         return ResponseOutput.NotOk(_localizer["Document_ TemplateRead"]);
                     }
-
-
                 }
             }
 
-            var entity = await _commonDocumentRepository.InsertOrUpdateAsync(addOrEditCommonDocument, true, verifyExp1, verifyExp2);
+           
+            if (addOrEditCommonDocument.Id == null) //insert
+            {
 
-            return ResponseOutput.Ok(entity.Id.ToString());
 
+                var entity = await _commonDocumentRepository.InsertFromDTOAsync(addOrEditCommonDocument, true, verifyExp1, verifyExp2);
+
+                return ResponseOutput.Ok(entity.Id.ToString());
+            }
+            else //update
+            {
+
+                var dbbeforeEntity = await _commonDocumentRepository.UpdateFromDTOAsync(addOrEditCommonDocument, true, true, verifyExp1, verifyExp2);
+
+                var filePath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, dbbeforeEntity.Path);
+
+                if (File.Exists(filePath))
+                {
+                    File.Delete(filePath);
+                }
+
+                return ResponseOutput.Ok();
+
+            }
+
+
+           
+
+        }
+
+
+        [HttpDelete("{commonDocumentId:guid}")]
+        public async Task<IResponseOutput> DeleteCommonDocument(Guid commonDocumentId)
+        {
+           var find= await _commonDocumentRepository.FirstOrDefaultNoTrackingAsync(t=>t.Id== commonDocumentId);
+      
+            var success = await _commonDocumentRepository.DeleteFromQueryAsync(t => t.Id == commonDocumentId, true,true);
+
+            if (find != null)
+            {
+                var filePath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, find.Path);
+
+                if (File.Exists(filePath))
+                {
+                    File.Delete(filePath);
+                }
+            }
+
+            return ResponseOutput.Ok();
         }
 
     }

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

@@ -25,7 +25,6 @@ namespace IRaCIS.Application.Services
 		private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
 		private readonly IRepository<ReadingQuestionCriterionSystem> _readingQuestionCriterionSystem;
         private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrial;
-        private readonly IReadingQuestionService _readingQuestionService;
 
         public DictionaryService(IRepository<Dictionary> sysDicRepository, IRepository<TrialDictionary> trialDictionaryRepository,
            IRepository<Trial> trialRepository,
@@ -35,8 +34,7 @@ namespace IRaCIS.Application.Services
 						 IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository,
 			 IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
                  IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystem,
-                   IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrial,
-            IReadingQuestionService readingQuestionService
+                   IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrial
 
 
             )
@@ -52,7 +50,6 @@ namespace IRaCIS.Application.Services
 			this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository;
             this._readingQuestionCriterionSystem = readingQuestionCriterionSystem;
             this._readingQuestionCriterionTrial = readingQuestionCriterionTrial;
-            this._readingQuestionService = readingQuestionService;
         }
 
         /// <summary>
@@ -249,7 +246,7 @@ namespace IRaCIS.Application.Services
         public async Task<Dictionary<string, List<BasicDicSelectCopy>>> GetBasicDataSelect(string[] searchArray)
         {
 
-            var searchList = await _dicRepository.Where(t => searchArray.Contains(t.Parent.Code) && t.ParentId != null && t.IsEnable).ProjectTo<BasicDicSelectCopy>(_mapper.ConfigurationProvider).ToListAsync();
+            var searchList = await _dicRepository.Where(t => searchArray.Contains(t.Parent.Code) && t.ParentId != null && t.IsEnable).ProjectTo<BasicDicSelectCopy>(_mapper.ConfigurationProvider,new { isEn_Us = _userInfo.IsEn_Us}).ToListAsync();
 
             return searchList.GroupBy(t => t.ParentCode).ToDictionary(g => g.Key, g => g.OrderBy(t => t.ShowOrder).ToList());
 

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

@@ -490,7 +490,7 @@ namespace IRaCIS.Core.Application.Service.Common
             }
 
             var memoryStream2 = new MemoryStream();
-            wb.Write(memoryStream2);
+            wb.Write(memoryStream2,true);
             memoryStream2.Seek(0, SeekOrigin.Begin);
 
             return new FileStreamResult(memoryStream2, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
@@ -970,7 +970,6 @@ namespace IRaCIS.Core.Application.Service.Common
         /// <param name="_commonDocumentRepository"></param>
         /// <param name="_dictionaryService"></param>
         /// <param name="_trialRepository"></param>
-        /// <param name="inQuery"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IActionResult> GetGroupAnalysisTaskList_Export(VisitTaskQuery queryVisitTask,

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

@@ -6,7 +6,6 @@ using Microsoft.AspNetCore.Hosting;
 using IRaCIS.Core.Application.Auth;
 using AutoMapper;
 using IRaCIS.Application.Contracts;
-using Nito.AsyncEx;
 using Microsoft.Extensions.Options;
 
 namespace IRaCIS.Application.Services
@@ -43,19 +42,16 @@ namespace IRaCIS.Application.Services
 
         private readonly IRepository<SystemBasicData> _systemBasicDatarepository;
 
-        private readonly IWebHostEnvironment _hostEnvironment;
         private readonly IRepository<User> _userRepository;
 
         private readonly ITokenService _tokenService;
 
-        private readonly IMapper _mapper;
 
         private readonly IRepository<Trial> _trialRepository;
         private readonly IRepository<UserType> _userTypeRepository;
 
 
 
-        private readonly AsyncLock _mutex = new AsyncLock();
 
         private readonly SystemEmailSendConfig _systemEmailConfig;
 
@@ -63,7 +59,6 @@ namespace IRaCIS.Application.Services
 
         public MailVerificationService(IRepository<VerificationCode> verificationCodeRepository,
             IRepository<SystemBasicData> systemBasicDatarepository,
-            IWebHostEnvironment hostEnvironment,
             IRepository<User> userRepository,
             ITokenService tokenService,
             IRepository<Trial> trialRepository,
@@ -74,9 +69,7 @@ namespace IRaCIS.Application.Services
             _verificationCodeRepository = verificationCodeRepository;
             _systemBasicDatarepository = systemBasicDatarepository;
 
-            _hostEnvironment = hostEnvironment;
 
-            _mapper = mapper;
 
             _tokenService = tokenService;
             _userRepository = userRepository;
@@ -165,7 +158,7 @@ namespace IRaCIS.Application.Services
             messageToSend.To.Add(new MailboxAddress(String.Empty, emailAddress));
             //主题
                 //---[来自展影IRC] 关于重置密码的提醒
-            messageToSend.Subject = _localizer["Mail_IRCResettingPassword "];
+            messageToSend.Subject = _localizer["Mail_IRCResettingPassword"];
 
 
 
@@ -185,7 +178,7 @@ namespace IRaCIS.Application.Services
 
                 builder.HtmlBody = string.Format(templateInfo,
                 //---您正在进行邮箱重置密码操作
-                   _localizer["Mail_ResettingPassword "],
+                   _localizer["Mail_ResettingPassword"],
                     verificationCode
                     );
             }

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

@@ -58,7 +58,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<Dictionary, BasicDicSelectCopy>()
                  .ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum))
-                 .ForMember(o => o.Value, t => t.MapFrom(u => u.MappedValue))
+                 .ForMember(o => o.Value, t => t.MapFrom(u => isEn_Us? u.Value : u.ValueCN ))
                  .ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code));
 
             CreateMap<Dictionary, BasicDicSelect>()

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

@@ -31,6 +31,8 @@ namespace IRaCIS.Core.Application.Service
         Task SendTrialQCQuestionEmailAsync(Guid trialId);
         Task SendTrialImageQuestionAsync(Guid trialId);
         Task SendPIAuditResultAsync(Guid visitTaskId);
+
+        Task<(TrialEmailNoticeConfig?, SMTPEmailConfig?)> BuildEmailConfig(Guid trialId, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, Guid? siteId = null, Guid? trialReadingCriterionId = null);
     }
 
     public class EmailSendService : BaseService, IEmailSendService
@@ -41,18 +43,19 @@ namespace IRaCIS.Core.Application.Service
 
         private readonly IRepository<Trial> _trialRepository;
 
-        private readonly IDictionaryService _dictionaryService;
         private readonly IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig;
 
         public readonly static string EmailNamePlaceholder = "EmailNamePlaceholder";
 
-        public EmailSendService(IRepository<TrialEmailNoticeConfig> trialEmailNoticeConfigRepository, IRepository<EmailNoticeConfig> emailNoticeConfigRepository, IRepository<Trial> trialRepository, IOptionsMonitor<SystemEmailSendConfig> systemEmailSendConfig, IDictionaryService dictionaryService)
+        private readonly IRepository<Dictionary> _dictionaryRepository;
+
+        public EmailSendService(IRepository<TrialEmailNoticeConfig> trialEmailNoticeConfigRepository, IRepository<EmailNoticeConfig> emailNoticeConfigRepository, IRepository<Trial> trialRepository, IOptionsMonitor<SystemEmailSendConfig> systemEmailSendConfig,IRepository<Dictionary> dictionaryRepository)
         {
             _trialEmailNoticeConfigRepository = trialEmailNoticeConfigRepository;
             _emailNoticeConfigRepository = emailNoticeConfigRepository;
             _trialRepository = trialRepository;
             _SystemEmailSendConfig = systemEmailSendConfig;
-            _dictionaryService = dictionaryService;
+            _dictionaryRepository=dictionaryRepository;
         }
 
         //入组确认/PD确认
@@ -309,7 +312,11 @@ namespace IRaCIS.Core.Application.Service
 
             var needTranslateDicNameList = answerList.Where(t => !string.IsNullOrEmpty(t.DictionaryCode)).Select(t => t.DictionaryCode).ToList();
 
-            var translateDataList = await _dictionaryService.GetBasicDataSelect(needTranslateDicNameList.ToArray());
+
+            var searchList = await _dictionaryRepository.Where(t => needTranslateDicNameList.ToArray().Contains(t.Parent.Code) && t.ParentId != null && t.IsEnable).ProjectTo<BasicDicSelectCopy>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us }).ToListAsync();
+
+            var translateDataList = searchList.GroupBy(t => t.ParentCode).ToDictionary(g => g.Key, g => g.OrderBy(t => t.ShowOrder).ToList());
+
 
 
             Func<bool, string, string, string> transFunc = (bool isNeedTranslate, string dicCode, string answer) =>
@@ -414,7 +421,7 @@ namespace IRaCIS.Core.Application.Service
                     sendEmailConfig.HtmlBodyStr = htmlBodyStr.Replace(EmailNamePlaceholder, string.Join(isEn_us ? ", " : "、", toUserList.Select(t => t.FullName).ToList()));
                 }
 
-                if (toUserList.Count() == 0)
+                if (toUserList.Count == 0)
                 {
                     //---没有收件人，无法发送邮件
                     throw new BusinessValidationFailedException(_localizer["TrialEmailN_NoRecipient"]);
@@ -463,6 +470,142 @@ namespace IRaCIS.Core.Application.Service
             }
         }
 
+        public async Task<(TrialEmailNoticeConfig?, SMTPEmailConfig?)> BuildEmailConfig(Guid trialId, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, Guid? siteId = null, Guid? trialReadingCriterionId = null)
+        {
+            //找到配置
+            var trialEmailConfig = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionId && t.BusinessScenarioEnum == businessScenario, ignoreQueryFilters: true)
+           .Include(t => t.TrialEmailNoticeUserList).Include(t => t.TrialEmailBlackUserList).FirstOrDefaultAsync();
+
+
+            if (trialEmailConfig == null || trialEmailConfig.IsAutoSend == false)
+            {
+                return (null, null);
+            }
+            else
+            {
+                var sendEmailConfig = new SMTPEmailConfig();
+
+                var (topicStr, htmlBodyStr, isEn_us, onlyToUserId) = topicAndHtmlFunc(trialEmailConfig);
+
+
+                sendEmailConfig.TopicDescription = topicStr;
+                sendEmailConfig.HtmlBodyStr = htmlBodyStr;
+
+
+                var blackUserIdList = trialEmailConfig.TrialEmailBlackUserList.Select(t => t.UserId).ToList();
+
+
+                var toUserTypeEnumList = trialEmailConfig.TrialEmailNoticeUserList.Where(t => t.EmailUserType == EmailUserType.To).Select(c => c.UserType).ToList();
+
+                var copyUserTypeEnumList = trialEmailConfig.TrialEmailNoticeUserList.Where(t => t.EmailUserType == EmailUserType.Copy).Select(c => c.UserType).ToList();
+
+                var allUserTypeEnumList = toUserTypeEnumList.Union(copyUserTypeEnumList).Distinct().ToList();
+
+                var allUserList = await _repository.Where<TrialUser>(t => t.TrialId == trialId && allUserTypeEnumList.Contains(t.User.UserTypeEnum)).Select(t => new { t.UserId, t.User.EMail, t.User.FullName, t.User.UserTypeEnum }).ToListAsync();
+
+
+                var toUserList = allUserList.Where(t => toUserTypeEnumList.Contains(t.UserTypeEnum))
+                   .ToList();
+
+                //收件人 有CRC  CRA  ， CRC  CRA的账户要按照中心发送
+                if (siteId == null && toUserTypeEnumList.Any(t => t == UserTypeEnum.ClinicalResearchCoordinator || t == UserTypeEnum.CRA) && onlyToUserId == null)
+                {
+                    throw new BusinessValidationFailedException("当前场景收件人包含CRC CRA,但是没有siteId,请联系后端开发");
+                }
+                if (siteId != null && toUserTypeEnumList.Any(t => t == UserTypeEnum.ClinicalResearchCoordinator || t == UserTypeEnum.CRA))
+                {
+                    var curentSiteUserIdList = _repository.Where<TrialSiteUser>(t => t.TrialId == trialId && t.SiteId == siteId).Select(t => t.UserId).ToList();
+
+                    toUserList = toUserList.Where(t => (t.UserTypeEnum != UserTypeEnum.CRA && t.UserTypeEnum != UserTypeEnum.ClinicalResearchCoordinator) || curentSiteUserIdList.Contains(t.UserId)).ToList();
+                }
+
+
+                //去除黑名单
+                toUserList = toUserList.Where(t => !blackUserIdList.Contains(t.UserId)).ToList();
+
+                var copyUserList = allUserList.Where(t => copyUserTypeEnumList.Contains(t.UserTypeEnum))
+                    .Where(t => !blackUserIdList.Contains(t.UserId)).ToList();
+
+                if (siteId != null && copyUserTypeEnumList.Any(t => t == UserTypeEnum.ClinicalResearchCoordinator || t == UserTypeEnum.CRA))
+                {
+                    var curentSiteUserIdList = _repository.Where<TrialSiteUser>(t => t.TrialId == trialId && t.SiteId == siteId).Select(t => t.UserId).ToList();
+
+                    copyUserList = copyUserList.Where(t => (t.UserTypeEnum != UserTypeEnum.CRA && t.UserTypeEnum != UserTypeEnum.ClinicalResearchCoordinator) || curentSiteUserIdList.Contains(t.UserId)).ToList();
+                }
+
+                if (onlyToUserId != null)
+                {
+                    toUserList = toUserList.Where(t => t.UserId == onlyToUserId).ToList();
+                }
+                else
+                {
+                    sendEmailConfig.HtmlBodyStr = htmlBodyStr.Replace(EmailNamePlaceholder, string.Join(isEn_us ? ", " : "、", toUserList.Select(t => t.FullName).ToList()));
+                }
+
+                if (toUserList.Count == 0)
+                {
+                    //---没有收件人，无法发送邮件
+                    throw new BusinessValidationFailedException(_localizer["TrialEmailN_NoRecipient"]);
+                }
+
+
+                if (trialEmailConfig.FromEmail.Contains("@") && !string.IsNullOrEmpty(trialEmailConfig.FromEmail))
+                {
+
+                    sendEmailConfig.FromEmailAddress = new MimeKit.MailboxAddress(trialEmailConfig.FromName, trialEmailConfig.FromEmail);
+                    sendEmailConfig.AuthorizationCode = trialEmailConfig.AuthorizationCode;
+                    sendEmailConfig.UserName = trialEmailConfig.FromEmail;
+
+                    sendEmailConfig.Host = trialEmailConfig.SMTPServerAddress;
+                    sendEmailConfig.Port = trialEmailConfig.SMTPServerPort;
+                }
+                else
+                {
+                    //---项目发件邮箱配置有误，请核实
+                    throw new BusinessValidationFailedException(_localizer["TrialEmailN_InvalidEmailConfig"]);
+                }
+
+                foreach (var item in toUserList)
+                {
+
+                    if (item.EMail.Contains("@") && !string.IsNullOrEmpty(item.EMail))
+                    {
+
+                        sendEmailConfig.ToMailAddressList.Add(new MimeKit.MailboxAddress(item.FullName, item.EMail));
+
+                    }
+                }
+                foreach (var item in copyUserList)
+                {
+
+                    if (item.EMail.Contains("@") && !string.IsNullOrEmpty(item.EMail))
+                    {
+
+                        sendEmailConfig.CopyToMailAddressList.Add(new MimeKit.MailboxAddress(item.FullName, item.EMail));
+
+                    }
+                }
+
+                //邮件附件  这里是原格式发送，不是PDF
+
+                //if (trialEmailConfig.AttachCNPath != string.Empty && trialEmailConfig.AttachPath != string.Empty)
+                //{
+                //    var phyPath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, isEn_us? trialEmailConfig.AttachName: trialEmailConfig.AttachNameCN);
+
+                //    //先预先生成了邮件，发送预先生成的邮件
+                //    sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
+                //    {
+                //        FileName = $"{attachPrefix}_{Path.GetFileName(_userInfo.IsEn_Us ? trialEmailConfig.AttachName : trialEmailConfig.AttachNameCN)}",
+
+                //        FileStream = File.OpenRead(phyPath),
+                //    });
+                //}
+
+                return (trialEmailConfig, sendEmailConfig);
+
+
+            }
+        }
 
     }
 }

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

@@ -170,7 +170,7 @@ namespace IRaCIS.Core.Application.Services
                             SignViewMinimumMinutes = sysDoc.SignViewMinimumMinutes,
                             Name = sysDoc.Name,
                             Path = sysDoc.Path,
-                            FileType = sysDoc.FileType.MappedValue,
+                            FileType = _userInfo.IsEn_Us? sysDoc.FileType.Value: sysDoc.FileType.ValueCN,
                             UpdateTime = sysDoc.UpdateTime,
 
                             FullFilePath = sysDoc.Path ,

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

@@ -57,7 +57,7 @@ namespace IRaCIS.Core.Application.Services
             var trialDocumentQueryable = _trialDocumentRepository.AsQueryable(true).Where(t => t.TrialId == queryTrialDocument.TrialId)
             .WhereIf(!string.IsNullOrEmpty(queryTrialDocument.Name), t => t.Name.Contains(queryTrialDocument.Name))
             .WhereIf(queryTrialDocument.FileTypeId != null, t => t.FileTypeId == queryTrialDocument.FileTypeId)
-            .ProjectTo<TrialDocumentView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken });
+            .ProjectTo<TrialDocumentView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, isEn_Us=_userInfo.IsEn_Us });
 
             return await trialDocumentQueryable.ToPagedListAsync(queryTrialDocument.PageIndex, queryTrialDocument.PageSize, queryTrialDocument.SortField, queryTrialDocument.Asc);
         }
@@ -157,7 +157,7 @@ namespace IRaCIS.Core.Application.Services
                                               Name = needConfirmedUserType.SystemDocument.Name,
                                               Path = needConfirmedUserType.SystemDocument.Path,
                                               FileTypeId = needConfirmedUserType.SystemDocument.FileTypeId,
-                                              FileType = needConfirmedUserType.SystemDocument.FileType.MappedValue,
+                                              FileType =  _userInfo.IsEn_Us? needConfirmedUserType.SystemDocument.FileType.Value: needConfirmedUserType.SystemDocument.FileType.ValueCN,
                                               UpdateTime = needConfirmedUserType.SystemDocument.UpdateTime,
 
                                               FullFilePath = needConfirmedUserType.SystemDocument.Path ,
@@ -189,7 +189,7 @@ namespace IRaCIS.Core.Application.Services
                                         Name = trialDoc.Name,
                                         Path = trialDoc.Path,
                                         FileTypeId = trialDoc.FileTypeId,
-                                        FileType = trialDoc.FileType.MappedValue,
+                                        FileType = _userInfo.IsEn_Us ? trialDoc.FileType.Value: trialDoc.FileType.ValueCN,
                                         UpdateTime = trialDoc.UpdateTime,
                                         SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
 
@@ -203,13 +203,35 @@ namespace IRaCIS.Core.Application.Services
                                     };
 
 
+            #region 报错  奇怪的bug
             var unionQuery = systemDocumentQueryable.Union(trialDocQueryable)
-                 .WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name))
-                 .WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId)
-                 .WhereIf(querySystemDocument.IsSign == true, t => t.ConfirmTime != null)
-                 .WhereIf(querySystemDocument.IsSign == false, t => t.ConfirmTime == null);
+                .WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name))
+                .WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId)
+                .WhereIf(querySystemDocument.IsSign == true, t => t.ConfirmTime != null)
+                .WhereIf(querySystemDocument.IsSign == false, t => t.ConfirmTime == null);
 
             var result = await unionQuery.ToPagedListAsync(querySystemDocument.PageIndex, querySystemDocument.PageSize, querySystemDocument.SortField, querySystemDocument.Asc);
+            #endregion
+
+            #region 临时方案
+
+            //var list1 = systemDocumentQueryable
+            //   .WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name))
+            //  .WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId)
+            //  .WhereIf(querySystemDocument.IsSign == true, t => t.ConfirmTime != null)
+            //  .WhereIf(querySystemDocument.IsSign == false, t => t.ConfirmTime == null).ToList();
+
+            //var list2 = trialDocQueryable
+            // .WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name))
+            //.WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId)
+            //.WhereIf(querySystemDocument.IsSign == true, t => t.ConfirmTime != null)
+            //.WhereIf(querySystemDocument.IsSign == false, t => t.ConfirmTime == null).ToList();
+
+            //var list3 = list1.Union(list2).ToList();
+
+            //var result = list3.ToPagedList(querySystemDocument.PageIndex, querySystemDocument.PageSize, querySystemDocument.SortField, querySystemDocument.Asc);
+
+            #endregion
 
             var needSignTrialDocCount = await _trialDocumentRepository.AsQueryable(true).Where(t => t.TrialId== querySystemDocument.TrialId && t.Trial.TrialStatusStr != StaticData.TrialState.TrialStopped)
                        .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -311,7 +333,7 @@ namespace IRaCIS.Core.Application.Services
                                     Name = trialDocumentNeedConfirmedUserType.TrialDocument.Name,
                                     Path = trialDocumentNeedConfirmedUserType.TrialDocument.Path,
                                     FileTypeId = trialDocumentNeedConfirmedUserType.TrialDocument.FileTypeId,
-                                    FileType = trialDocumentNeedConfirmedUserType.TrialDocument.FileType.MappedValue,
+                                    FileType = _userInfo.IsEn_Us ? trialDocumentNeedConfirmedUserType.TrialDocument.FileType.Value : trialDocumentNeedConfirmedUserType.TrialDocument.FileType.ValueCN,
                                     UpdateTime = trialDocumentNeedConfirmedUserType.TrialDocument.UpdateTime,
 
 
@@ -345,7 +367,7 @@ namespace IRaCIS.Core.Application.Services
                                      SignViewMinimumMinutes = needConfirmEdUserType.SystemDocument.SignViewMinimumMinutes,
                                      Name = needConfirmEdUserType.SystemDocument.Name,
                                      Path = needConfirmEdUserType.SystemDocument.Path,
-                                     FileType = needConfirmEdUserType.SystemDocument.FileType.MappedValue,
+                                     FileType = _userInfo.IsEn_Us ? needConfirmEdUserType.SystemDocument.FileType.Value : needConfirmEdUserType.SystemDocument.FileType.ValueCN,
                                      FileTypeId = needConfirmEdUserType.SystemDocument.FileTypeId,
                                      UpdateTime = needConfirmEdUserType.SystemDocument.UpdateTime,
 
@@ -636,7 +658,7 @@ namespace IRaCIS.Core.Application.Services
         /// <param name="isSystemDoc"></param>
         /// <returns></returns>
         [HttpPut("{documentId:guid}/{isSystemDoc:bool}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt", "SignSystemDocNoTrialId" })]
         public async Task<IResponseOutput> UserAbandonDoc(Guid documentId, bool isSystemDoc)
         {
             if (isSystemDoc)

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

@@ -21,6 +21,11 @@ using IRaCIS.Core.Domain.Share.Common;
 using System.IO;
 using System.Linq;
 using Spire.Doc;
+using Microsoft.AspNetCore.Http;
+using System;
+using System.Runtime.InteropServices;
+using SharpCompress.Common;
+using SkiaSharp;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -42,7 +47,7 @@ namespace IRaCIS.Core.Application.Service
         private readonly IRepository<TrialUser> _trialUserRepository;
         private readonly IRepository<Subject> _subjectRepository;
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
-
+        private readonly IEmailSendService _emailSendService;
 
 
 
@@ -56,6 +61,7 @@ namespace IRaCIS.Core.Application.Service
             IRepository<SubjectVisit> subjectVisitRepository, 
             IRepository<TrialEmailBlackUser> trialEmailBlackUserRepository, 
             IRepository<EmailNoticeConfig> emailNoticeConfigRepository
+, IEmailSendService emailSendService
             )
         {
             _trialEmailNoticeConfigRepository = trialEmailNoticeConfigRepository;
@@ -67,6 +73,7 @@ namespace IRaCIS.Core.Application.Service
             _subjectVisitRepository = subjectVisitRepository;
             _trialEmailBlackUserRepository = trialEmailBlackUserRepository;
             _emailNoticeConfigRepository = emailNoticeConfigRepository;
+            _emailSendService = emailSendService;
         }
 
         /// <summary>
@@ -255,8 +262,8 @@ namespace IRaCIS.Core.Application.Service
         /// <exception cref="BusinessValidationFailedException"></exception>
         public async Task<string> BaseBusinessScenarioSendEmailAsync(Guid visitTaskId, bool? isHandSend, EmailStoreSendMode emailStoreMode, string sendFileRelativePath)
         {
-
-            EmailBusinessScenario? businessScenarioEnum = null;
+            var isEn_us = _userInfo.IsEn_Us;
+            EmailBusinessScenario businessScenarioEnum = EmailBusinessScenario.None;
 
             #region 任务关联的项目配置  标准信息及配置，subject 信息
             var taskInfo = await _visitTaskRepository.Where(t => t.Id == visitTaskId).Select(t => new
@@ -352,286 +359,119 @@ namespace IRaCIS.Core.Application.Service
             #endregion
 
 
-            #region 发收件人配置 确保无误
+            #region 邮件内容装配
 
-
-            var emailConfig = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId == taskInfo.TrialId && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.BusinessScenarioEnum == businessScenarioEnum)
-                .Include(t => t.TrialEmailNoticeUserList).FirstOrDefaultAsync();
-
-
-            if (emailConfig == null || (emailConfig.IsAutoSend == false && isHandSend == null))
+            Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc = trialEmailConfig =>
             {
-                //throw new BusinessValidationFailedException("找不到该项目标准场景下邮件的配置");
+                var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, taskInfo.ResearchProgramNo, taskInfo.SubjectCode);
 
-                return string.Empty;
-            }
+                var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
+                   StaticData.EmailSend.EmailNamePlaceholder, taskInfo.ResearchProgramNo, taskInfo.SubjectCode);
 
 
-            var sendEmailConfig = new SMTPEmailConfig();
-
-            //收件人 如果是CRC  CRA  要按照中心发送
-            var toUserTypeEnumList = emailConfig.TrialEmailNoticeUserList.Where(t => t.EmailUserType == EmailUserType.To).Select(c => c.UserType).ToList();
+                return (topicStr, htmlBodyStr, isEn_us, null);
+            };
 
 
-
-            var toUserList = _repository.Where<TrialSiteUser>(t => t.TrialId == taskInfo.TrialId && toUserTypeEnumList.Contains(t.User.UserTypeEnum) && t.SiteId == taskInfo.SiteId).Select(t => new { t.User.EMail, t.User.FullName }).ToList();
-
-            var copyUserTypeEnumList = emailConfig.TrialEmailNoticeUserList.Where(t => t.EmailUserType == EmailUserType.Copy).Select(c => c.UserType).ToList();
-            var copyUserList = _repository.Where<TrialUser>(t => t.TrialId == taskInfo.TrialId && copyUserTypeEnumList.Contains(t.User.UserTypeEnum)).Select(t => new { t.User.EMail, t.User.FullName }).ToList();
-
-
-            if (toUserList.Count() == 0)
-            {
-                //---没有收件人，无法发送邮件
-                throw new BusinessValidationFailedException(_localizer["TrialEmailN_NoRecipient"]);
-            }
-
-
-            if (emailConfig.FromEmail.Contains("@") && !string.IsNullOrEmpty(emailConfig.FromEmail))
-            {
-
-                sendEmailConfig.FromEmailAddress = new MimeKit.MailboxAddress(emailConfig.FromName, emailConfig.FromEmail);
-                sendEmailConfig.AuthorizationCode = emailConfig.AuthorizationCode;
-                sendEmailConfig.UserName = emailConfig.FromEmail;
-
-                sendEmailConfig.Host = emailConfig.SMTPServerAddress;
-                sendEmailConfig.Port = emailConfig.SMTPServerPort;
-
-
-                //测试
-                //sendEmailConfig.ToMailAddressList.Add(new MimeKit.MailboxAddress("ddd", "872297557@qq.com"));
-
-            }
-            else
-            {
-                //---项目发件邮箱配置有误，请核实
-                throw new BusinessValidationFailedException(_localizer["TrialEmailN_InvalidEmailConfig"]);
-            }
-
-            foreach (var item in toUserList)
-            {
-
-                if (item.EMail.Contains("@") && !string.IsNullOrEmpty(item.EMail))
-                {
-
-                    sendEmailConfig.ToMailAddressList.Add(new MimeKit.MailboxAddress(item.FullName, item.EMail));
-
-                }
-            }
-            foreach (var item in copyUserList)
-            {
-
-                if (item.EMail.Contains("@") && !string.IsNullOrEmpty(item.EMail))
-                {
-
-                    sendEmailConfig.CopyToMailAddressList.Add(new MimeKit.MailboxAddress(item.FullName, item.EMail));
-
-                }
-            }
-            #endregion
-
-            #region 确保 邮件Html存在 
-
-            //邮件附件
-            var path = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, _userInfo.IsEn_Us ? emailConfig.AttachPath : emailConfig.AttachCNPath);
-
-            if (!File.Exists(path))
-            {
-                //---找不到该项目标准场景下邮件模板
-                throw new BusinessValidationFailedException(_localizer["TrialEmailN_EmailTemplateNotFound"]);
-            }
-
-
-            var pathToFile = _hostEnvironment.WebRootPath
-                      + Path.DirectorySeparatorChar.ToString()
-                      + "EmailTemplate"
-                      + Path.DirectorySeparatorChar.ToString()
-                     //+ "SubjectEnrollConfirmOrPDProgress.html";
-                     + (_userInfo.IsEn_Us ? "SubjectEnrollConfirmOrPDProgress_US.html" : "SubjectEnrollConfirmOrPDProgress.html");
+            var (trialEmailConfig, sendEmailConfig) = await _emailSendService.BuildEmailConfig(taskInfo.TrialId, businessScenarioEnum, topicAndHtmlFunc, taskInfo.SiteId);
 
             #endregion
 
 
-            #region 不同场景 Tile 设置
 
-            if (businessScenarioEnum == EmailBusinessScenario.EnrollConfirmed)
+            //自动发送
+            if (sendEmailConfig != null && trialEmailConfig !=null)
             {
-                sendEmailConfig.TopicDescription = _localizer["TrialEmailN_EnrollmentConfirmation", taskInfo.ResearchProgramNo, taskInfo.SubjectCode];
+                #region 不同标准 不同项目配置 发送邮件的时机 处理具体逻辑
 
-                using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile))
+                var answer = "否";
+                var isNeedSend = true;
+                var minUserIdList = _trialUserRepository.Where(t => t.User.UserTypeEnum == Domain.Share.UserTypeEnum.MIM && t.TrialId == taskInfo.TrialId).Select(t => t.UserId).ToList();
+
+
+
+                //入组确认  根据每个标准配置的是否自动发送，发送邮件与否
+                if (businessScenarioEnum == EmailBusinessScenario.EnrollConfirmed)
                 {
-                    var templateInfo = SourceReader.ReadToEnd();
-
-
-                    sendEmailConfig.HtmlBodyStr = string.Format(templateInfo,
-                        //--- 附件为疾病进展确认报告，请查收 
-                        _localizer["TrialEmailN_SubjectDiseaseProgression"]
-                        );
-                }
-            }
-            else if (businessScenarioEnum == EmailBusinessScenario.PDConfirmed)
-            {
-                sendEmailConfig.TopicDescription = _localizer["TrialEmailN_PDReport", taskInfo.ResearchProgramNo, taskInfo.SubjectCode];
-
-                using (StreamReader SourceReader = System.IO.File.OpenText(pathToFile))
-                {
-                    var templateInfo = SourceReader.ReadToEnd();
-
-
-                    sendEmailConfig.HtmlBodyStr = string.Format(templateInfo,
-                        //--- 附件为疾病进展确认报告，请查收 
-                        _localizer["TrialEmailN_SubjectDiseaseProgression"]
-                        );
-                }
-            }
-            else
-            {
-                //
-            }
-
-            #endregion
-
-
-            #region 不同标准 不同项目配置 发送邮件的时机 处理具体逻辑
-
-            var answer = "否";
-            var isNeedSend = true;
-            var minUserIdList = _trialUserRepository.Where(t => t.User.UserTypeEnum == Domain.Share.UserTypeEnum.MIM && t.TrialId == taskInfo.TrialId).Select(t => t.UserId).ToList();
-
-
-
-            //入组确认  根据每个标准配置的是否自动发送，发送邮件与否
-            if (businessScenarioEnum == EmailBusinessScenario.EnrollConfirmed)
-            {
-                if (await _repository.Where<ReadingTableQuestionAnswer>().AnyAsync(x => x.VisitTaskId == visitTaskId && x.Answer == TargetState.Exist.GetEnumInt() &&
-             x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State && x.ReadingQuestionTrial.LesionType == LesionType.TargetLesion))
-                {
-                    answer = "是";
-                }
-
-
-                //如果其他阅片人已经做了，说明发送了入组确认报告，第二个人做完就不发送了
-
-                //入组确认一直交给第一个人，如果第一个人重阅 还未做完，第二个人先做完了，此时不发
-
-                var existFirstEnrollTask = await _visitTaskRepository.Where(t => t.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && t.IsAnalysisCreate == false
-                && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId).OrderBy(t => t.SignTime).FirstOrDefaultAsync();
-
-                //入组确认的医生已确定
-                if ((existFirstEnrollTask != null) && (taskInfo.DoctorUserId != existFirstEnrollTask.DoctorUserId))
-                {
-                    isNeedSend = false;
-                }
-                else
-                {
-                    isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, new List<Guid>() { visitTaskId }, minUserIdList);
-
-
-                    if (answer == "是")
+                    if (await _repository.Where<ReadingTableQuestionAnswer>().AnyAsync(x => x.VisitTaskId == visitTaskId && x.Answer == TargetState.Exist.GetEnumInt() &&
+                 x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State && x.ReadingQuestionTrial.LesionType == LesionType.TargetLesion))
                     {
-                        //把另外一个人的任务设置为不加急（如果项目加急是否  subject 加急是否）
-                        var urgent = _repository.Where<SubjectVisit>(t => t.Id == taskInfo.SourceSubjectVisitId).Select(t => new { IsSubjectUrgent = t.Subject.IsUrgent, t.Trial.IsUrgent }).FirstOrDefault();
-
-                        if (urgent?.IsUrgent == false || urgent?.IsSubjectUrgent == false)
-                        {
-                            await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false &&
-                    t.Id != visitTaskId && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId, u => new VisitTask() { IsUrgent = false });
-                        }
+                        answer = "是";
                     }
 
 
+                    //如果其他阅片人已经做了，说明发送了入组确认报告，第二个人做完就不发送了
+
+                    //入组确认一直交给第一个人，如果第一个人重阅 还未做完，第二个人先做完了，此时不发
+
+                    var existFirstEnrollTask = await _visitTaskRepository.Where(t => t.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && t.IsAnalysisCreate == false
+                    && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId).OrderBy(t => t.SignTime).FirstOrDefaultAsync();
+
+                    //入组确认的医生已确定
+                    if ((existFirstEnrollTask != null) && (taskInfo.DoctorUserId != existFirstEnrollTask.DoctorUserId))
+                    {
+                        isNeedSend = false;
+                    }
+                    else
+                    {
+                        isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, new List<Guid>() { visitTaskId }, minUserIdList);
+
+
+                        if (answer == "是")
+                        {
+                            //把另外一个人的任务设置为不加急（如果项目加急是否  subject 加急是否）
+                            var urgent = _repository.Where<SubjectVisit>(t => t.Id == taskInfo.SourceSubjectVisitId).Select(t => new { IsSubjectUrgent = t.Subject.IsUrgent, t.Trial.IsUrgent }).FirstOrDefault();
+
+                            if (urgent?.IsUrgent == false || urgent?.IsSubjectUrgent == false)
+                            {
+                                await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false &&
+                        t.Id != visitTaskId && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId, u => new VisitTask() { IsUrgent = false });
+                            }
+                        }
+
+
+                    }
                 }
-
-
-
-
-            }
-            else if (businessScenarioEnum == EmailBusinessScenario.PDConfirmed)
-            {
-
-
-                //有序
-
-                if (taskInfo.IsReadingTaskViewInOrder)
+                else if (businessScenarioEnum == EmailBusinessScenario.PDConfirmed)
                 {
 
 
+                    //有序
 
-                    //双重
-                    if (taskInfo.ReadingType == ReadingMethod.Double)
+                    if (taskInfo.IsReadingTaskViewInOrder)
                     {
 
 
-                        //仲裁在访视上   就没有全局阅片 没有阅片期
-                        if (taskInfo.ArbitrationRule == ArbitrationRule.Visit)
+
+                        //双重
+                        if (taskInfo.ReadingType == ReadingMethod.Double)
                         {
-                            //找到 访视，裁判 所有有效任务(不可能有全局的)   访视和裁判任务的SourceSubjectVisitId 一样
-                            var taskList = await _visitTaskRepository.Where(t => t.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect &&
-                            (t.ReadingCategory == ReadingCategory.Visit || t.ReadingCategory == ReadingCategory.Judge)).ToListAsync();
 
 
-                            //这里要求 到这里已经如果有裁判  已经生成裁判了保存数据库
-                            //双人阅片，没有产生裁判 第二个人读完发
-                            if (taskList.Count == 2 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit) == 2)
+                            //仲裁在访视上   就没有全局阅片 没有阅片期
+                            if (taskInfo.ArbitrationRule == ArbitrationRule.Visit)
                             {
-
-                                answer = await TranslatePdStateAsync(visitTaskId, taskInfo.ReadingCategory, taskInfo.CriterionType);
+                                //找到 访视，裁判 所有有效任务(不可能有全局的)   访视和裁判任务的SourceSubjectVisitId 一样
+                                var taskList = await _visitTaskRepository.Where(t => t.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect &&
+                                (t.ReadingCategory == ReadingCategory.Visit || t.ReadingCategory == ReadingCategory.Judge)).ToListAsync();
 
 
-                                isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Select(t => t.Id).ToList(), minUserIdList);
-
-                            }
-                            //双人  产生裁判，并且裁判完成 发
-                            else if (taskList.Count == 3 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned) == 3 && taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Count() == 1)
-                            {
-                                var judgeResultId = taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).First().JudgeResultTaskId.Value;
-                                answer = await TranslatePdStateAsync(judgeResultId, ReadingCategory.Visit, taskInfo.CriterionType);
-
-                                isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Select(t => t.Id).ToList(), minUserIdList);
-
-                            }
-                            else
-                            {
-                                isNeedSend = false;
-
-                            }
-
-
-
-
-                        }
-                        //仲裁在阅片期   
-                        else if (taskInfo.ArbitrationRule == ArbitrationRule.Reading)
-                        {
-                            //是访视任务  不可能是裁判任务（访视上不会生成裁判），也不会是全局任务（全局任务 SourceSubjectVisitId=null ）
-                            if (taskInfo.SourceSubjectVisitId != null)
-                            {
-
-                                //访视类型的任务  根本就不需要发送邮件
-
-                                isNeedSend = false;
-
-                            }
-                            //是全局任务 或者全局的裁判任务   (如果是全局任务，那么此时裁判任务已经生成)
-                            else if (taskInfo.SouceReadModuleId != null)
-                            {
-                                var taskList = await _visitTaskRepository.Where(t => t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect && t.SouceReadModuleId == taskInfo.SouceReadModuleId
-                                && (t.ReadingCategory == ReadingCategory.Global || t.ReadingCategory == ReadingCategory.Judge)).ToListAsync();
-
-                                //两个全局没有裁判
-                                if (taskList.Count == 2 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Global) == 2)
+                                //这里要求 到这里已经如果有裁判  已经生成裁判了保存数据库
+                                //双人阅片，没有产生裁判 第二个人读完发
+                                if (taskList.Count == 2 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit) == 2)
                                 {
 
                                     answer = await TranslatePdStateAsync(visitTaskId, taskInfo.ReadingCategory, taskInfo.CriterionType);
 
-                                    isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Select(t => t.Id).ToList(), minUserIdList);
-                                }
-                                //双人全局产生裁判
-                                else if (taskList.Count == 3 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned) == 3 && taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Count() == 1 && taskList.Where(t => t.ReadingCategory == ReadingCategory.Global).Count() == 2)
-                                {
 
-                                    var judgeResultId = taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).First().JudgeResultTaskId.Value;
-                                    answer = await TranslatePdStateAsync(judgeResultId, ReadingCategory.Global, taskInfo.CriterionType);
+                                    isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Select(t => t.Id).ToList(), minUserIdList);
+
+                                }
+                                //双人  产生裁判，并且裁判完成 发
+                                else if (taskList.Count == 3 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned) == 3 && taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Count() == 1)
+                                {
+                                    var judgeResultId = taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).First()!.JudgeResultTaskId!.Value;
+                                    answer = await TranslatePdStateAsync(judgeResultId, ReadingCategory.Visit, taskInfo.CriterionType);
 
                                     isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Select(t => t.Id).ToList(), minUserIdList);
 
@@ -641,256 +481,350 @@ namespace IRaCIS.Core.Application.Service
                                     isNeedSend = false;
 
                                 }
+
+
+
+
+                            }
+                            //仲裁在阅片期   
+                            else if (taskInfo.ArbitrationRule == ArbitrationRule.Reading)
+                            {
+                                //是访视任务  不可能是裁判任务（访视上不会生成裁判），也不会是全局任务（全局任务 SourceSubjectVisitId=null ）
+                                if (taskInfo.SourceSubjectVisitId != null)
+                                {
+
+                                    //访视类型的任务  根本就不需要发送邮件
+
+                                    isNeedSend = false;
+
+                                }
+                                //是全局任务 或者全局的裁判任务   (如果是全局任务，那么此时裁判任务已经生成)
+                                else if (taskInfo.SouceReadModuleId != null)
+                                {
+                                    var taskList = await _visitTaskRepository.Where(t => t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect && t.SouceReadModuleId == taskInfo.SouceReadModuleId
+                                    && (t.ReadingCategory == ReadingCategory.Global || t.ReadingCategory == ReadingCategory.Judge)).ToListAsync();
+
+                                    //两个全局没有裁判
+                                    if (taskList.Count == 2 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Global) == 2)
+                                    {
+
+                                        answer = await TranslatePdStateAsync(visitTaskId, taskInfo.ReadingCategory, taskInfo.CriterionType);
+
+                                        isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Select(t => t.Id).ToList(), minUserIdList);
+                                    }
+                                    //双人全局产生裁判
+                                    else if (taskList.Count == 3 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned) == 3 && taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Count() == 1 && taskList.Where(t => t.ReadingCategory == ReadingCategory.Global).Count() == 2)
+                                    {
+
+                                        var judgeResultId = taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).First().JudgeResultTaskId!.Value;
+                                        answer = await TranslatePdStateAsync(judgeResultId, ReadingCategory.Global, taskInfo.CriterionType);
+
+                                        isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Select(t => t.Id).ToList(), minUserIdList);
+
+                                    }
+                                    else
+                                    {
+                                        isNeedSend = false;
+
+                                    }
+                                }
+                                else
+                                {
+                                    //---发送PD 进展邮件中发现任务数据有问题！
+                                    throw new BusinessValidationFailedException(_localizer["TrialEmailN_PDProgressEmailTask"]);
+                                }
+
+
+
                             }
                             else
                             {
-                                //---发送PD 进展邮件中发现任务数据有问题！
-                                throw new BusinessValidationFailedException(_localizer["TrialEmailN_PDProgressEmailTask"]);
+
+                                //---双重有序阅片 没有定义该仲裁规则处理逻辑，请联系业务和后台开发核查！
+                                throw new BusinessValidationFailedException(_localizer["TrialEmailN_DoubleBlindedError"]);
                             }
 
 
-
                         }
+
+                        //屏蔽单重阅片添加
                         else
                         {
-
-                            //---双重有序阅片 没有定义该仲裁规则处理逻辑，请联系业务和后台开发核查！
-                            throw new BusinessValidationFailedException(_localizer["TrialEmailN_DoubleBlindedError"]);
+                            isNeedSend = false;
+                            return string.Empty;
                         }
 
+                        #region 发邮件屏蔽单重的
+                        ////单重
+                        //else if (taskInfo.ReadingType == ReadingMethod.Single)
+                        //{
+                        //    //仲裁在访视上   或者在阅片期
+                        //    if (taskInfo.ArbitrationRule != ArbitrationRule.None)
+                        //    {
+
+                        //---单重有序阅片配置有误(不应该有仲裁对象配置)，请核查！
+                        //        throw new BusinessValidationFailedException(_localizer["TrialEmailN_SingleBlindedSet"]);
+                        //    }
+
+
+                        //    //要求PD 确认的访视  是截止访视 还是非截止访视(根据该访视有没有配置阅片期来判断)
+
+                        //    if (taskInfo.ReadingCategory == ReadingCategory.Visit)
+                        //    {
+                        //        //存在阅片期  那么就是截止访视
+                        //        if (await _repository.Where<ReadModule>(t => t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.SubjectVisitId == taskInfo.SourceSubjectVisitId && t.ReadingSetType == ReadingSetType.ImageReading).AnyAsync())
+                        //        {
+                        //            isNeedSend = false;
+                        //        }
+                        //        else//非截止访视 在访视读完后，发送
+                        //        {
+                        //            answer = await TranslatePdStateAsync(visitTaskId, ReadingCategory.Visit, taskInfo.CriterionType);
+                        //        }
+                        //    }
+                        //    //截止访视  在访视读完，并完成全局阅片后发送全局的结果
+                        //    else if (taskInfo.ReadingCategory == ReadingCategory.Global)
+                        //    {
+                        //        answer = await TranslatePdStateAsync(visitTaskId, ReadingCategory.Global, taskInfo.CriterionType);
+                        //    }
+                        //    else
+                        //    {
+                        //---单重有序阅片 该类型的任务不应进入此处逻辑，请联系后台开发核查！
+                        //        throw new BusinessValidationFailedException(_localizer["TrialEmailN_SingleBlindedSequenced"]);
+                        //    }
+
+                        //    isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, new List<Guid>() { visitTaskId }, minUserIdList);
+
+
+                        //}
+                        //else
+                        //{
+                        //---有序阅片配置有误(应为单重或者双重阅片)，请核查！
+                        //    throw new BusinessValidationFailedException(_localizer["TrialEmailN_BlindedSequencedReading"]);
+                        //}
+
+                        #endregion
+
+
+
 
                     }
-
-                    //屏蔽单重阅片添加
+                    //屏蔽无序阅片添加
                     else
                     {
                         isNeedSend = false;
                         return string.Empty;
                     }
 
-                    #region 发邮件屏蔽单重的
-                    ////单重
-                    //else if (taskInfo.ReadingType == ReadingMethod.Single)
+                    #region 发送邮件屏蔽无序的
+                    //    //无序
+                    //else
                     //{
-                    //    //仲裁在访视上   或者在阅片期
-                    //    if (taskInfo.ArbitrationRule != ArbitrationRule.None)
-                    //    {
+                    //    //单重
 
-                    //---单重有序阅片配置有误(不应该有仲裁对象配置)，请核查！
-                    //        throw new BusinessValidationFailedException(_localizer["TrialEmailN_SingleBlindedSet"]);
+
+                    //    if (taskInfo.ReadingType == ReadingMethod.Single && taskInfo.ArbitrationRule == ArbitrationRule.None)
+                    //    {
+                    //        answer = await TranslatePdStateAsync(visitTaskId, taskInfo.ReadingCategory, taskInfo.CriterionType);
+
+                    //        isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, new List<Guid>() { visitTaskId }, minUserIdList);
                     //    }
-
-
-                    //    //要求PD 确认的访视  是截止访视 还是非截止访视(根据该访视有没有配置阅片期来判断)
-
-                    //    if (taskInfo.ReadingCategory == ReadingCategory.Visit)
+                    //    //双重  截止访视只在阅片期的时候存在  要求PD确认的访视 肯定是非截止访视
+                    //    else if (taskInfo.ReadingType == ReadingMethod.Double && taskInfo.ArbitrationRule == ArbitrationRule.Visit)
                     //    {
-                    //        //存在阅片期  那么就是截止访视
-                    //        if (await _repository.Where<ReadModule>(t => t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.SubjectVisitId == taskInfo.SourceSubjectVisitId && t.ReadingSetType == ReadingSetType.ImageReading).AnyAsync())
+                    //        //在两位阅片人读完访视后，如果有裁判者等裁判读完，如果无裁判则等第二个人的读完
+
+                    //        var taskList = await _visitTaskRepository.Where(t => t.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect
+                    //        && (t.ReadingCategory == ReadingCategory.Visit || t.ReadingCategory == ReadingCategory.Judge)).ToListAsync();
+
+                    //        //这里要求 到这里已经如果有裁判  已经生成裁判了保存数据库
+                    //        if (taskList.Count == 2 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit) == 2)
+                    //        {
+
+                    //            answer = await TranslatePdStateAsync(visitTaskId, taskInfo.ReadingCategory, taskInfo.CriterionType);
+
+                    //            isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Select(t => t.Id).ToList(), minUserIdList);
+                    //        }
+                    //        else if (taskList.Count == 3 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned) == 3 && taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Count() == 1)
+                    //        {
+                    //            var judgeResultId = taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).First().JudgeResultTaskId.Value;
+                    //            answer = await TranslatePdStateAsync(judgeResultId, ReadingCategory.Visit, taskInfo.CriterionType);
+
+                    //            isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Select(t => t.Id).ToList(), minUserIdList);
+
+
+                    //        }
+                    //        else
                     //        {
                     //            isNeedSend = false;
                     //        }
-                    //        else//非截止访视 在访视读完后，发送
-                    //        {
-                    //            answer = await TranslatePdStateAsync(visitTaskId, ReadingCategory.Visit, taskInfo.CriterionType);
-                    //        }
-                    //    }
-                    //    //截止访视  在访视读完，并完成全局阅片后发送全局的结果
-                    //    else if (taskInfo.ReadingCategory == ReadingCategory.Global)
-                    //    {
-                    //        answer = await TranslatePdStateAsync(visitTaskId, ReadingCategory.Global, taskInfo.CriterionType);
+
                     //    }
                     //    else
                     //    {
-                    //---单重有序阅片 该类型的任务不应进入此处逻辑，请联系后台开发核查！
-                    //        throw new BusinessValidationFailedException(_localizer["TrialEmailN_SingleBlindedSequenced"]);
+                    //---无序阅片配置有误(应为单重无仲裁对象，双重针对访视仲裁)，请核查！
+                    //        throw new BusinessValidationFailedException(_localizer["TrialEmailN_UnblindedSequencedReading"]);
                     //    }
 
-                    //    isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, new List<Guid>() { visitTaskId }, minUserIdList);
-
-
-                    //}
-                    //else
-                    //{
-                    //---有序阅片配置有误(应为单重或者双重阅片)，请核查！
-                    //    throw new BusinessValidationFailedException(_localizer["TrialEmailN_BlindedSequencedReading"]);
                     //}
 
                     #endregion
-
-
-
-
                 }
-                //屏蔽无序阅片添加
                 else
                 {
                     isNeedSend = false;
+                }
+
+                #endregion
+
+
+                #region MiniWord 组织字典 发送
+
+
+                if (emailStoreMode == EmailStoreSendMode.NotStoreLocalOnlySentEmail)
+                {
+
+                    var phyPath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, sendFileRelativePath);
+
+                    var attachPrefix = $"{taskInfo.SubjectCode}";
+
+                    //先预先生成了邮件，发送预先生成的邮件
+                    sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
+                    {
+                        FileName = $"{attachPrefix}_{Path.GetFileNameWithoutExtension(_userInfo.IsEn_Us ? trialEmailConfig.AttachName : trialEmailConfig!.AttachNameCN)}.pdf",
+
+                        FileStream = File.OpenRead(phyPath),
+                    });
+
+
+                    await SendEmailHelper.SendEmailAsync(sendEmailConfig);
+
                     return string.Empty;
                 }
 
-                #region 发送邮件屏蔽无序的
-                //    //无序
-                //else
-                //{
-                //    //单重
+                var value = new Dictionary<string, object>()
+                {
+                    ["SponsorName"] = taskInfo.SponsorName,
+                    ["ResearchProgramNo"] = taskInfo.ResearchProgramNo,
+                    ["TrialSiteCode"] = taskInfo.TrialSiteCode,
+                    ["SubjectCode"] = taskInfo.SubjectCode,
+                    ["VisitName"] = taskInfo.SourceSubjectVisitId != null ? taskInfo.VisitName : taskInfo.ModuleVisitName,
+                    ["EarliestScanDate"] = taskInfo.SourceSubjectVisitId != null ? taskInfo.VisitEarliestScanDate?.ToString("yyyy-MM-dd") : taskInfo.ModuleEarliestScanDate?.ToString("yyyy-MM-dd"),
+                    ["SignTime"] = taskInfo.SignTime?.ToString("yyyy-MM-dd"),
+                    ["Result"] = answer
+
+                };
+
+                var path = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, _userInfo.IsEn_Us ? trialEmailConfig.AttachPath : trialEmailConfig.AttachCNPath);
+
+                var (serverFilePath, relativePath, fileRealName) = FileStoreHelper.GetSubjectEnrollConfirmOrPDEmailPath(_hostEnvironment, Path.GetFileName(path), taskInfo.TrialId, taskInfo.SiteId, taskInfo.SubjectId, true);
+
+                if (emailStoreMode == EmailStoreSendMode.StoreLocalSend || emailStoreMode == EmailStoreSendMode.OnlyStoreLocalNotSentEmail)
+                {
+
+                    MemoryStream wordMemoryStream = new MemoryStream();
 
 
-                //    if (taskInfo.ReadingType == ReadingMethod.Single && taskInfo.ArbitrationRule == ArbitrationRule.None)
-                //    {
-                //        answer = await TranslatePdStateAsync(visitTaskId, taskInfo.ReadingCategory, taskInfo.CriterionType);
-
-                //        isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, new List<Guid>() { visitTaskId }, minUserIdList);
-                //    }
-                //    //双重  截止访视只在阅片期的时候存在  要求PD确认的访视 肯定是非截止访视
-                //    else if (taskInfo.ReadingType == ReadingMethod.Double && taskInfo.ArbitrationRule == ArbitrationRule.Visit)
-                //    {
-                //        //在两位阅片人读完访视后，如果有裁判者等裁判读完，如果无裁判则等第二个人的读完
-
-                //        var taskList = await _visitTaskRepository.Where(t => t.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect
-                //        && (t.ReadingCategory == ReadingCategory.Visit || t.ReadingCategory == ReadingCategory.Judge)).ToListAsync();
-
-                //        //这里要求 到这里已经如果有裁判  已经生成裁判了保存数据库
-                //        if (taskList.Count == 2 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned && t.ReadingCategory == ReadingCategory.Visit) == 2)
-                //        {
-
-                //            answer = await TranslatePdStateAsync(visitTaskId, taskInfo.ReadingCategory, taskInfo.CriterionType);
-
-                //            isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Select(t => t.Id).ToList(), minUserIdList);
-                //        }
-                //        else if (taskList.Count == 3 && taskList.Count(t => t.ReadingTaskState == ReadingTaskState.HaveSigned) == 3 && taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Count() == 1)
-                //        {
-                //            var judgeResultId = taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).First().JudgeResultTaskId.Value;
-                //            answer = await TranslatePdStateAsync(judgeResultId, ReadingCategory.Visit, taskInfo.CriterionType);
-
-                //            isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, taskList.Where(t => t.ReadingCategory == ReadingCategory.Judge).Select(t => t.Id).ToList(), minUserIdList);
+                    MiniSoftware.MiniWord.SaveAsByTemplate(wordMemoryStream, path, value);
+
+
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                    {
+                        Document document = new Document();
+
+                        document.LoadFromStream(wordMemoryStream, FileFormat.Docx);
+
+                        document.SaveToFile(serverFilePath, FileFormat.PDF);
+                    }
+                    else
+                    {
+                        var wordStoreServerPath = Path.Combine(Path.GetDirectoryName(serverFilePath), Path.GetFileNameWithoutExtension(serverFilePath) + ".docx");
+
+                        using (FileStream fileStream = new FileStream(wordStoreServerPath, FileMode.Create, FileAccess.Write))
+                        {
+                            wordMemoryStream.WriteTo(fileStream);
+                        }
+                        FileConvertHelper.ConvertWordToPdf(wordStoreServerPath, Path.GetDirectoryName(serverFilePath));
+
+                        File.Delete(wordStoreServerPath);
+                    }
+
+
+
+                }
+                //手动生成发送的邮件内容，但是并不发送
+                if (emailStoreMode == EmailStoreSendMode.OnlyStoreLocalNotSentEmail)
+                {
+                    isNeedSend = false;
+
+                    return relativePath;
+                }
+
+
+                //正常的即时生成邮件  并发送邮件
+                if (isNeedSend)
+                {
+
+
+                    MemoryStream wordMemoryStream = new MemoryStream();
+                    MemoryStream pdfMemoryStream = new MemoryStream();
+
+
+                    MiniSoftware.MiniWord.SaveAsByTemplate(wordMemoryStream, path, value);
+
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                    {
+                        Document document = new Document();
+                        document.LoadFromStream(wordMemoryStream, FileFormat.Docx);
+                        document.SaveToStream(pdfMemoryStream, FileFormat.PDF);
+
+                    }
+                    else
+                    {
+                        var wordStoreServerPath = Path.Combine(Path.GetDirectoryName(serverFilePath), Path.GetFileNameWithoutExtension(serverFilePath) + ".docx");
+
+                        using (FileStream fileStream = new FileStream(wordStoreServerPath, FileMode.Create, FileAccess.Write))
+                        {
+                            wordMemoryStream.WriteTo(fileStream);
+                        }
+                        FileConvertHelper.ConvertWordToPdf(wordStoreServerPath, Path.GetDirectoryName(serverFilePath));
+
+                        File.Delete(wordStoreServerPath);
+
+                        using (FileStream fileStream = new FileStream(serverFilePath, FileMode.Open, FileAccess.Read))
+                        {
+                            fileStream.CopyTo(pdfMemoryStream);
+                        }
+
+                    }
+
+                    pdfMemoryStream.Seek(0, SeekOrigin.Begin);
+                    sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
+                    {
+                        FileName = $"{taskInfo.SubjectCode}_{Path.GetFileNameWithoutExtension(_userInfo.IsEn_Us ? trialEmailConfig.AttachName : trialEmailConfig.AttachNameCN)}.pdf",
+
+                        FileStream = pdfMemoryStream
+                    });
+
+
+                    await SendEmailHelper.SendEmailAsync(sendEmailConfig);
+
+                }
+
+
+
+                return string.Empty;
 
 
-                //        }
-                //        else
-                //        {
-                //            isNeedSend = false;
-                //        }
 
-                //    }
-                //    else
-                //    {
-                //---无序阅片配置有误(应为单重无仲裁对象，双重针对访视仲裁)，请核查！
-                //        throw new BusinessValidationFailedException(_localizer["TrialEmailN_UnblindedSequencedReading"]);
-                //    }
 
-                //}
 
                 #endregion
             }
             else
             {
-                isNeedSend = false;
-            }
-
-            #endregion
-
-
-            #region MiniWord 组织字典 发送
-
-
-            if (emailStoreMode == EmailStoreSendMode.NotStoreLocalOnlySentEmail)
-            {
-
-                var phyPath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, sendFileRelativePath);
-
-
-                //先预先生成了邮件，发送预先生成的邮件
-                sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
-                {
-                    FileName = $"{taskInfo.SubjectCode}_{Path.GetFileNameWithoutExtension(_userInfo.IsEn_Us ? emailConfig.AttachName : emailConfig.AttachNameCN)}.pdf",
-
-                    FileStream = File.OpenRead(phyPath),
-                });
-
-
-                await SendEmailHelper.SendEmailAsync(sendEmailConfig);
-
                 return string.Empty;
             }
 
-            var value = new Dictionary<string, object>()
-            {
-                ["SponsorName"] = taskInfo.SponsorName,
-                ["ResearchProgramNo"] = taskInfo.ResearchProgramNo,
-                ["TrialSiteCode"] = taskInfo.TrialSiteCode,
-                ["SubjectCode"] = taskInfo.SubjectCode,
-                ["VisitName"] = taskInfo.SourceSubjectVisitId != null ? taskInfo.VisitName : taskInfo.ModuleVisitName,
-                ["EarliestScanDate"] = taskInfo.SourceSubjectVisitId != null ? taskInfo.VisitEarliestScanDate?.ToString("yyyy-MM-dd") : taskInfo.ModuleEarliestScanDate?.ToString("yyyy-MM-dd"),
-                ["SignTime"] = taskInfo.SignTime?.ToString("yyyy-MM-dd"),
-                ["Result"] = answer
-
-            };
-
-            var (serverFilePath, relativePath, fileRealName) = FileStoreHelper.GetSubjectEnrollConfirmOrPDEmailPath(_hostEnvironment, Path.GetFileName(path), taskInfo.TrialId, taskInfo.SiteId, taskInfo.SubjectId, true);
-
-            if (emailStoreMode == EmailStoreSendMode.StoreLocalSend || emailStoreMode == EmailStoreSendMode.OnlyStoreLocalNotSentEmail)
-            {
-
-                MemoryStream wordMemoryStream = new MemoryStream();
-
-                Document document = new Document();
-
-                MiniSoftware.MiniWord.SaveAsByTemplate(wordMemoryStream, path, value);
-
-                document.LoadFromStream(wordMemoryStream, FileFormat.Docx);
-
-                document.SaveToFile(serverFilePath, FileFormat.PDF);
-
-
-            }
-            //手动生成发送的邮件内容，但是并不发送
-            if (emailStoreMode == EmailStoreSendMode.OnlyStoreLocalNotSentEmail)
-            {
-                isNeedSend = false;
-
-                return relativePath;
-            }
-
-
-            //正常的即时生成邮件  并发送邮件
-            if (isNeedSend)
-            {
-
-
-                MemoryStream memoryStream = new MemoryStream();
-                MemoryStream pdfMemoryStream = new MemoryStream();
-
-
-                MiniSoftware.MiniWord.SaveAsByTemplate(memoryStream, path, value);
-                Document document = new Document();
-
-                document.LoadFromStream(memoryStream, FileFormat.Docx);
-                document.SaveToStream(pdfMemoryStream, FileFormat.PDF);
-                pdfMemoryStream.Seek(0, SeekOrigin.Begin);
-
-                sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
-                {
-                    FileName = $"{taskInfo.SubjectCode}_{Path.GetFileNameWithoutExtension(_userInfo.IsEn_Us ? emailConfig.AttachName : emailConfig.AttachNameCN)}.pdf",
-
-                    FileStream = pdfMemoryStream
-                });
-
-
-                await SendEmailHelper.SendEmailAsync(sendEmailConfig);
-
-            }
-
-
-
-            return string.Empty;
-
-
-
-
-
-            #endregion
-
 
         }
 
@@ -1027,7 +961,7 @@ namespace IRaCIS.Core.Application.Service
                         {
                             var task = taskList.FirstOrDefault(t => t.ReadingCategory == ReadingCategory.Visit);
 
-                            var filePath = await BaseBusinessScenarioSendEmailAsync(task.Id, true, EmailStoreSendMode.OnlyStoreLocalNotSentEmail, string.Empty);
+                            var filePath = await BaseBusinessScenarioSendEmailAsync(task!.Id, true, EmailStoreSendMode.OnlyStoreLocalNotSentEmail, string.Empty);
 
                             return ResponseOutput.Ok(new { RelativePath = filePath, TaskName = task.TaskName, VisitTaskId = task.Id });
                         }
@@ -1036,7 +970,7 @@ namespace IRaCIS.Core.Application.Service
                         {
                             var task = taskList.FirstOrDefault(t => t.ReadingCategory == ReadingCategory.Judge);
 
-                            var filePath = await BaseBusinessScenarioSendEmailAsync(task.Id, true, EmailStoreSendMode.OnlyStoreLocalNotSentEmail, string.Empty);
+                            var filePath = await BaseBusinessScenarioSendEmailAsync(task!.Id, true, EmailStoreSendMode.OnlyStoreLocalNotSentEmail, string.Empty);
 
                             return ResponseOutput.Ok(new { RelativePath = filePath, TaskName = task.TaskName, VisitTaskId = task.Id });
                         }
@@ -1073,7 +1007,7 @@ namespace IRaCIS.Core.Application.Service
                             {
                                 var task = taskList.FirstOrDefault(t => t.ReadingCategory == ReadingCategory.Global);
 
-                                var filePath = await BaseBusinessScenarioSendEmailAsync(task.Id, true, EmailStoreSendMode.OnlyStoreLocalNotSentEmail, string.Empty);
+                                var filePath = await BaseBusinessScenarioSendEmailAsync(task!.Id, true, EmailStoreSendMode.OnlyStoreLocalNotSentEmail, string.Empty);
 
                                 return ResponseOutput.Ok(new { RelativePath = filePath, TaskName = task.TaskName, VisitTaskId = task.Id });
                             }
@@ -1082,7 +1016,7 @@ namespace IRaCIS.Core.Application.Service
                             {
                                 var task = taskList.FirstOrDefault(t => t.ReadingCategory == ReadingCategory.Judge);
 
-                                var filePath = await BaseBusinessScenarioSendEmailAsync(task.Id, true, EmailStoreSendMode.OnlyStoreLocalNotSentEmail, string.Empty);
+                                var filePath = await BaseBusinessScenarioSendEmailAsync(task!.Id, true, EmailStoreSendMode.OnlyStoreLocalNotSentEmail, string.Empty);
 
                                 return ResponseOutput.Ok(new { RelativePath = filePath, TaskName = task.TaskName, VisitTaskId = task.Id });
                             }

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

@@ -14,12 +14,13 @@ namespace IRaCIS.Core.Application.Service
 
             var userId = Guid.Empty;
             var token = string.Empty;
+            var isEn_Us = false;
             CreateMap<SystemDocument, SystemDocumentView>()
                  .ForMember(d => d.FileType, u => u.MapFrom(s => s.FileType.Value))
                  .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path)); 
 
             CreateMap<TrialDocument, TrialDocumentView>()
-                .ForMember(d => d.FileType, u => u.MapFrom(s => s.FileType.MappedValue))
+                .ForMember(d => d.FileType, u => u.MapFrom(s => isEn_Us ? s.FileType.Value : s.FileType.ValueCN  ))
                 .ForMember(d => d.IsSomeUserSigned, u => u.MapFrom(s => s.TrialDocConfirmedUserList.Any(t=>t.ConfirmTime!=null)))
                 .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path ));
 

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

@@ -1,5 +1,4 @@
-using Dicom;
-using Dicom.Imaging.Codec;
+
 using EasyCaching.Core;
 using IRaCIS.Core.Application.Contracts.Dicom;
 using IRaCIS.Core.Domain.Share;
@@ -8,10 +7,13 @@ using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Helper;
 using Microsoft.AspNetCore.Hosting;
 using IRaCIS.Core.Infrastructure;
+using FellowOakDicom;
+using FellowOakDicom.Imaging.Codec;
+using Medallion.Threading;
 
 namespace IRaCIS.Core.Application.Services
 {
-    public class DicomArchiveService :BaseService, IDicomArchiveService
+    public class DicomArchiveService : BaseService, IDicomArchiveService
     {
         private readonly IRepository<DicomStudy> _studyRepository;
         private readonly IRepository<DicomSeries> _seriesRepository;
@@ -19,9 +21,8 @@ namespace IRaCIS.Core.Application.Services
         private readonly IRepository<Dictionary> _dictionaryRepository;
         private readonly IEasyCachingProvider _provider;
 
-        private readonly IWebHostEnvironment _hostEnvironment;
 
-        private static object lockCodeGenerate = new object();
+        private readonly IDistributedLockProvider _distributedLockProvider;
 
 
         private List<Guid> _instanceIdList = new List<Guid>();
@@ -29,11 +30,10 @@ namespace IRaCIS.Core.Application.Services
         public DicomArchiveService(IRepository<DicomStudy> studyRepository,
             IRepository<DicomSeries> seriesRepository,
             IRepository<DicomInstance> instanceRepository,
-            IWebHostEnvironment hostEnvironment,
             IRepository<Dictionary> dictionaryRepository,
-            IEasyCachingProvider provider)
+            IEasyCachingProvider provider, IDistributedLockProvider distributedLockProvider)
         {
-            _hostEnvironment = hostEnvironment;
+            _distributedLockProvider = distributedLockProvider;
             _studyRepository = studyRepository;
 
             _seriesRepository = seriesRepository;
@@ -50,7 +50,7 @@ namespace IRaCIS.Core.Application.Services
             return success;
         }
 
-      
+
 
 
         public async Task<(Guid StudyId, string StudyCode)> ArchiveDicomStreamAsync(Stream dicomStream,
@@ -129,7 +129,7 @@ namespace IRaCIS.Core.Application.Services
 
             DicomStudy dicomStudy = CreateDicomStudy(dataset, addtionalInfo, out bool isStudyNeedAdd);
             DicomSeries dicomSeries = CreateDicomSeries(dataset, dicomStudy, out bool isSeriesNeedAdd);
-            DicomInstance dicomInstance = CreateDicomInstance(dataset, dicomStudy, dicomSeries,out bool isInstanceNeedAdd);
+            DicomInstance dicomInstance = CreateDicomInstance(dataset, dicomStudy, dicomSeries, out bool isInstanceNeedAdd);
 
             dicomSeries.DicomStudy = dicomStudy;
 
@@ -183,7 +183,7 @@ namespace IRaCIS.Core.Application.Services
                     //正常保存  不做处理
                     await dicomFile.SaveAsync(physicalPath);
                 }
-                else 
+                else
                 {
                     //RLELossless 保存
                     await dicomFile.Clone(DicomTransferSyntax.RLELossless).SaveAsync(physicalPath); //RLELossless
@@ -235,7 +235,7 @@ namespace IRaCIS.Core.Application.Services
             {
                 modalityForEdit = "PET";
             }
-            if(modality== "PT、CT")
+            if (modality == "PT、CT")
             {
                 modalityForEdit = "PET-CT";
             }
@@ -282,9 +282,10 @@ namespace IRaCIS.Core.Application.Services
                 dicomStudy.PatientBirthDate = $"{dicomStudy.PatientBirthDate[0]}{dicomStudy.PatientBirthDate[1]}{dicomStudy.PatientBirthDate[2]}{dicomStudy.PatientBirthDate[3]}-{dicomStudy.PatientBirthDate[4]}{dicomStudy.PatientBirthDate[5]}-{dicomStudy.PatientBirthDate[6]}{dicomStudy.PatientBirthDate[7]}";
             }
 
-            lock (lockCodeGenerate)
-            {
+            var @lock = _distributedLockProvider.CreateLock($"StudyCode");
 
+            using (@lock.Acquire())
+            {
                 //查询数据库获取最大的Code 没有记录则为0
                 var dbStudyCodeIntMax = _studyRepository.Where(s => s.TrialId == addtionalInfo.TrialId).Select(t => t.Code).DefaultIfEmpty().Max();
 
@@ -298,9 +299,9 @@ namespace IRaCIS.Core.Application.Services
                 dicomStudy.StudyCode = AppSettings.GetCodeStr(currentNextCodeInt, nameof(DicomStudy));
 
                 _provider.Set<int>($"{addtionalInfo.TrialId}_{StaticData.CacheKey.StudyMaxCode}", dicomStudy.Code, TimeSpan.FromMinutes(30));
-
             }
 
+
             #region Setting Code old
 
             //var studyCode = _studyRepository.Where(s => s.TrialId == addtionalInfo.TrialId).Select(t => t.StudyCode).OrderByDescending(c => c).FirstOrDefault();
@@ -468,7 +469,7 @@ namespace IRaCIS.Core.Application.Services
 
                 _instanceIdList.Add(instanceId);
             }
-       
+
             return dicomInstance;
 
         }

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

@@ -14,16 +14,13 @@ using IRaCIS.Core.Application.MediatR.Handlers;
 using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
 using System.Threading;
-using Nito.AsyncEx;
+using Medallion.Threading;
 
 namespace IRaCIS.Core.Application.Service.ImageAndDoc
 {
     [ApiExplorerSettings(GroupName = "Image")]
     public class StudyService : BaseService, IStudyService
     {
-        private static object lockObj = new object();
-        private static readonly AsyncLock _mutex = new AsyncLock();
-        private static readonly AsyncLock _mutex2 = new AsyncLock();
 
         private readonly IEasyCachingProvider _provider;
 
@@ -35,12 +32,12 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         private readonly IRepository<Dictionary> _dictionaryRepository;
 
         private readonly IRepository<StudyMonitor> _studyMonitorRepository;
-
+        private readonly IDistributedLockProvider _distributedLockProvider;
 
         public StudyService(IEasyCachingProvider provider
             , IRepository<SubjectVisit> subjectVisitRepository,
             IRepository<DicomInstance> dicomInstanceRepository,
-            IRepository<DicomSeries> dicomSeriesRepository, IRepository<DicomStudy> dicomstudyRepository, IRepository<Dictionary> dictionaryRepository, IRepository<StudyMonitor> studyMonitorRepository)
+            IRepository<DicomSeries> dicomSeriesRepository, IRepository<DicomStudy> dicomstudyRepository, IRepository<Dictionary> dictionaryRepository, IRepository<StudyMonitor> studyMonitorRepository, IDistributedLockProvider distributedLockProvider)
         {
             _provider = provider;
             _subjectVisitRepository = subjectVisitRepository;
@@ -49,6 +46,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             _dicomstudyRepository = dicomstudyRepository;
             _dictionaryRepository = dictionaryRepository;
             _studyMonitorRepository = studyMonitorRepository;
+            _distributedLockProvider = distributedLockProvider;
         }
 
 
@@ -160,7 +158,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 {
                     var study = _mapper.Map<DicomStudy>(incommand.Study);
 
-                    using (await _mutex.LockAsync())
+                    var @lock = _distributedLockProvider.CreateLock($"StudyCode");
+
+                    using (await @lock.AcquireAsync())
                     {
                         //查询数据库获取最大的Code 没有记录则为0
                         var dbStudyCodeIntMax = _dicomstudyRepository.Where(s => s.TrialId == trialId).Select(t => t.Code).DefaultIfEmpty().Max();
@@ -306,11 +306,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                 }
 
-                using (await _mutex2.LockAsync())
+                var @lock2 = _distributedLockProvider.CreateLock($"StudyCommit");
+
+                using (await @lock2.AcquireAsync())
                 {
                     await _dicomInstanceRepository.SaveChangesAsync();
-
-
                 }
             }
             catch (Exception ex)
@@ -723,7 +723,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                     {
 
                         // $"当前访视检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能早于前序访视检查时间{before?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误",
-                        result.Add(new VerifyStudyUploadResult() { ErrorMesseage = _localizer["Study_VisitBeforePrevError", waitUploadItem.StudyDate?.ToString("yyyy-MM-dd"), before?.ToString("yyyy-MM-dd")], StudyInstanceUid = waitUploadItem.StudyInstanceUid });
+                        result.Add(new VerifyStudyUploadResult() { ErrorMesseage = _localizer["Study_VisitBeforePrevError", waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")!, before?.ToString("yyyy-MM-dd")!], StudyInstanceUid = waitUploadItem.StudyInstanceUid });
                         return;
                     }
 
@@ -733,7 +733,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                     if (after != null && waitUploadItem.StudyDate != null && after < waitUploadItem.StudyDate)
                     {
                         // $"当前访视检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能晚于该访视之后的检查时间{after?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误"
-                        result.Add(new VerifyStudyUploadResult() { ErrorMesseage = _localizer["Study_VisitAfterSubseqError", waitUploadItem.StudyDate?.ToString("yyyy-MM-dd"), after?.ToString("yyyy-MM-dd")], StudyInstanceUid = waitUploadItem.StudyInstanceUid });
+                        result.Add(new VerifyStudyUploadResult() { ErrorMesseage = _localizer["Study_VisitAfterSubseqError", waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")!, after?.ToString("yyyy-MM-dd")!], StudyInstanceUid = waitUploadItem.StudyInstanceUid });
                         return;
                     }
                 }
@@ -765,7 +765,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             if (_provider.Exists($"StudyUid_{trialId}_{studyInstanceUid}"))
             {
-                
+
                 result.AllowUpload = false;
 
                 result.AllowReUpload = false;
@@ -826,22 +826,22 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             }
             result.StudyInstanceUid = studyInstanceUid;
 
+            var @lock = _distributedLockProvider.CreateLock($"StudyUpload");
 
-            if (result.AllowReUpload || result.AllowUpload)
+            using (@lock.Acquire())
             {
-                lock (lockObj)
+                if (result.AllowReUpload || result.AllowUpload)
                 {
                     _provider.Set($"StudyUid_{trialId}_{studyInstanceUid}", _userInfo.Id, TimeSpan.FromSeconds(30));
                 }
-            }
-            else
-            {
-                lock (lockObj)
+                else
                 {
                     _provider.Remove($"StudyUid_{trialId}_{studyInstanceUid}");
                 }
             }
 
+
+
             return result;
         }
 

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

@@ -298,7 +298,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
         public T Data { get; set; }
 
        
-        public SignDTO SignInfo { get; set; }
+        public SignDTO? SignInfo { get; set; }
 
       
     }

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

@@ -197,7 +197,7 @@ namespace IRaCIS.Core.Application.Service
             //找到上一条Id
 
 
-            var currentInspection = await _dataInspectionRepository.Where(t => t.Id == id).Select(t => new { t.GeneralId, t.ObjectRelationParentId, t.CreateTime }).FirstOrDefaultAsync();
+            var currentInspection = await _dataInspectionRepository.Where(t => t.Id == id).Select(t => new { t.GeneralId, t.ObjectRelationParentId, t.CreateTime }).FirstNotNullAsync();
 
             var beforeId = await _dataInspectionRepository.Where(x => x.GeneralId == currentInspection.GeneralId && x.CreateTime <= currentInspection.CreateTime && x.Id != id).OrderByDescending(x => x.CreateTime).Select(t => t.Id)
                 .FirstOrDefaultAsync();
@@ -214,11 +214,11 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-
         /// <summary>
         /// 翻译稽查数据
         /// </summary>
-        /// <param name="dto">传入Dto</param>
+        /// <param name="dto"></param>
+        /// <param name="currentInspectionId"></param>
         /// <returns></returns>
         private async Task<List<string>> SetInspectionEnumValueDataList(SetInspectionEnumValueDto dto, Guid currentInspectionId)
         {
@@ -241,7 +241,7 @@ namespace IRaCIS.Core.Application.Service
             var listIdentification = auditDatas.Select(x => x.Identification).Distinct().ToList();
             foreach (var item in auditDatas)
             {
-                Dictionary<string, object> jsonDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(item.JsonStr);
+                Dictionary<string, object> jsonDict = (JsonConvert.DeserializeObject<Dictionary<string, object>>(item.JsonStr)).IfNullThrowException();
 
                 if (!jsonDict.ContainsKey(nameof(InspectionJsonDetail.CommonData)))
                 {
@@ -366,7 +366,7 @@ namespace IRaCIS.Core.Application.Service
                 resultJsonStrList.Add(auditData?.JsonStr);
             });
 
-            if (resultJsonStrList.Count() < 2)
+            if (resultJsonStrList.Count < 2)
             {
                 resultJsonStrList.Add(String.Empty);
             }
@@ -386,7 +386,7 @@ namespace IRaCIS.Core.Application.Service
                 if (relationParentInspection != null)
                 {
 
-                    Dictionary<string, object> jsonDic = JsonConvert.DeserializeObject<Dictionary<string, object>>(relationParentInspection.JsonDetail);
+                    Dictionary<string, object> jsonDic = (JsonConvert.DeserializeObject<Dictionary<string, object>>(relationParentInspection.JsonDetail)).IfNullThrowConvertException();
 
 
                     //避免对象信息记录 把  Data里面的信息也取过去 但是加上稽查对象的前缀
@@ -539,7 +539,7 @@ namespace IRaCIS.Core.Application.Service
 
             }).ToList();
 
-            var jsonDataValueDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(jsonStr);
+            var jsonDataValueDic = (JsonConvert.DeserializeObject<IDictionary<string, object>>(jsonStr)).IfNullThrowConvertException();
             foreach (var item in list)
             {
                 if (!jsonDataValueDic.ContainsKey(item.Key))
@@ -881,7 +881,7 @@ namespace IRaCIS.Core.Application.Service
                                   DateType = child.DateType,
                               }).ToListAsync();
 
-            var JsonData = JsonConvert.DeserializeObject<IDictionary<string, object>>(Data.JsonDetail);
+            var JsonData = (JsonConvert.DeserializeObject<IDictionary<string, object>>(Data.JsonDetail)).IfNullThrowException();
 
             foreach (var item in JsonData.Keys)
             {
@@ -892,12 +892,12 @@ namespace IRaCIS.Core.Application.Service
                     {
                         if (datefirst.DateType == FrontAuditDateType.Date.GetDescription())
                         {
-                            JsonData[item] = DateTime.Parse(JsonData[item].ToString()).ToString("yyyy-MM-dd");
+                            JsonData[item] = DateTime.Parse(JsonData[item].ToString()!).ToString("yyyy-MM-dd");
                         }
 
                         if (datefirst.DateType == FrontAuditDateType.DateTime.GetDescription())
                         {
-                            JsonData[item] = DateTime.Parse(JsonData[item].ToString()).ToString("yyyy-MM-dd HH:mm:ss");
+                            JsonData[item] = DateTime.Parse(JsonData[item].ToString()!).ToString("yyyy-MM-dd HH:mm:ss");
                         }
                     }
                     catch (Exception)

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

@@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
         {
             //_repository.GetQueryable.GetQueryable < DataInspection >
 
-            var trialData = await _repository.GetQueryable<Trial>().Where(x => x.Id == dto.TrialId).AsNoTracking().FirstOrDefaultAsync();
+            var trialData = await _repository.GetQueryable<Trial>().Where(x => x.Id == dto.TrialId).AsNoTracking().FirstNotNullAsync();
 
 
             trialData.TrialFinishTime = trialData.TrialFinishTime == null ? DateTime.Now : trialData.TrialFinishTime;
@@ -84,9 +84,9 @@ namespace IRaCIS.Core.Application.Service.Inspection
                             data.Identification.ToLower()
                          equals
                             leftfrontAuditConfig.Identification.ToLower()
-                        join moduleTypec in _repository.GetQueryable<Dictionary>() on new { ModuleType = leftfrontAuditConfig.ModuleTypeId.Value } equals new { ModuleType = moduleTypec.Id } into moduleTypectemp
+                        join moduleTypec in _repository.GetQueryable<Dictionary>() on new { ModuleType = leftfrontAuditConfig.ModuleTypeId!.Value } equals new { ModuleType = moduleTypec.Id } into moduleTypectemp
                         from leftmoduleTypec in moduleTypectemp.DefaultIfEmpty()
-                        join OptTypec in _repository.GetQueryable<Dictionary>() on new { ModuleType = leftfrontAuditConfig.OptTypeId.Value } equals new { ModuleType = OptTypec.Id } into optTypetemp
+                        join OptTypec in _repository.GetQueryable<Dictionary>() on new { ModuleType = leftfrontAuditConfig.OptTypeId!.Value } equals new { ModuleType = OptTypec.Id } into optTypetemp
                         from leftOptType in optTypetemp.DefaultIfEmpty()
 
                         select new GetDataInspectionOutDto()

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

@@ -3,7 +3,7 @@ using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Infra.EFCore;
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Domain.Share;
-using Nito.AsyncEx;
+using Medallion.Threading;
 
 namespace IRaCIS.Application.Services
 {
@@ -12,13 +12,13 @@ namespace IRaCIS.Application.Services
     {
         private readonly IRepository<Site> _siteRepository;
         private readonly IRepository<TrialSiteUser> _trialSiteUserRepository;
+        private readonly IDistributedLockProvider _distributedLockProvider;
 
-        private readonly AsyncLock _mutex = new AsyncLock();
-
-        public SiteService(IRepository<Site> siteRepository, IRepository<TrialSiteUser> trialSiteUserRepository)
+        public SiteService(IRepository<Site> siteRepository, IRepository<TrialSiteUser> trialSiteUserRepository, IDistributedLockProvider distributedLockProvider)
         {
             _siteRepository = siteRepository;
-            this._trialSiteUserRepository = trialSiteUserRepository;
+            _trialSiteUserRepository = trialSiteUserRepository;
+            _distributedLockProvider = distributedLockProvider;
         }
 
         /// <summary> 分页获取研究中心列表 </summary>
@@ -27,12 +27,12 @@ namespace IRaCIS.Application.Services
         {
 
             var siteQueryable = _siteRepository
-                   .WhereIf(!string.IsNullOrWhiteSpace(searchModel.SiteName), t => t.SiteName.Contains(searchModel.SiteName)||t.SiteNameCN.Contains(searchModel.SiteName))
+                   .WhereIf(!string.IsNullOrWhiteSpace(searchModel.SiteName), t => t.SiteName.Contains(searchModel.SiteName) || t.SiteNameCN.Contains(searchModel.SiteName))
                    .WhereIf(!string.IsNullOrWhiteSpace(searchModel.AliasName), t => t.AliasName.Contains(searchModel.AliasName))
                    .WhereIf(!string.IsNullOrWhiteSpace(searchModel.City), t => t.City.Contains(searchModel.City))
                    .WhereIf(!string.IsNullOrWhiteSpace(searchModel.Country), t => t.Country.Contains(searchModel.Country))
-                   .WhereIf(!string.IsNullOrWhiteSpace(searchModel.Province), t => t.Country.Contains(searchModel.Province))
-                   .ProjectTo<SiteSelectDTO>(_mapper.ConfigurationProvider);
+                   .WhereIf(!string.IsNullOrWhiteSpace(searchModel.Province), t => t.Province.Contains(searchModel.Province))
+                   .ProjectTo<SiteSelectDTO>(_mapper.ConfigurationProvider, new {  isEn_Us = _userInfo.IsEn_Us });
 
 
             return await siteQueryable.ToPagedListAsync(searchModel.PageIndex, searchModel.PageSize, string.IsNullOrWhiteSpace(searchModel.SortField) ? "SiteName" : searchModel.SortField, searchModel.Asc);
@@ -58,7 +58,9 @@ namespace IRaCIS.Application.Services
                 VerifyMsg = _localizer["Site_DupName"]
             };
 
-            using (await _mutex.LockAsync())
+            var @lock = _distributedLockProvider.CreateLock($"SiteAdd");
+
+            using (await @lock.AcquireAsync())
             {
                 if (siteCommand.Id == null)
                 {
@@ -74,11 +76,6 @@ namespace IRaCIS.Application.Services
 
             }
 
-
-
-
-
-
         }
 
         /// <summary> 删除研究中心 </summary>

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

@@ -8,10 +8,10 @@ using Panda.DynamicWebApi.Attributes;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Options;
 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;
+using Medallion.Threading;
 
 namespace IRaCIS.Application.Services
 {
@@ -24,7 +24,7 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<TrialUser> _userTrialRepository;
         private readonly IRepository<UserLog> _userLogRepository;
 
-
+        private readonly IDistributedLockProvider _distributedLockProvider;
         private readonly IMemoryCache _cache;
 
         private readonly IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig;
@@ -38,7 +38,8 @@ namespace IRaCIS.Application.Services
             IRepository<TrialUser> userTrialRepository,
             IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig,
             IRepository<UserLog> userLogRepository
-         )
+,
+            IDistributedLockProvider distributedLockProvider)
         {
             _userLogRepository = userLogRepository;
 
@@ -47,9 +48,10 @@ namespace IRaCIS.Application.Services
             _userRepository = userRepository;
             _mailVerificationService = mailVerificationService;
             _verificationCodeRepository = verificationCodeRepository;
-          
+
             _userTrialRepository = userTrialRepository;
             _userLogRepository = userLogRepository;
+            _distributedLockProvider = distributedLockProvider;
         }
 
 
@@ -502,29 +504,32 @@ namespace IRaCIS.Application.Services
 
             var saveItem = _mapper.Map<User>(userAddModel);
 
-            saveItem.Code = await _userRepository.Select(t => t.Code).DefaultIfEmpty().MaxAsync() + 1;
+            var @lock = _distributedLockProvider.CreateLock($"UserAccount");
 
-            saveItem.UserCode = AppSettings.GetCodeStr(saveItem.Code, nameof(User));
-
-            if (saveItem.IsZhiZhun)
+            using (await @lock.AcquireAsync())
             {
-                saveItem.OrganizationName = AppSettings.DefaultInternalOrganizationName;
+                saveItem.Code = await _userRepository.Select(t => t.Code).DefaultIfEmpty().MaxAsync() + 1;
+
+                saveItem.UserCode = AppSettings.GetCodeStr(saveItem.Code, nameof(User));
+
+                if (saveItem.IsZhiZhun)
+                {
+                    saveItem.OrganizationName = AppSettings.DefaultInternalOrganizationName;
+                }
+
+
+                saveItem.Password = MD5Helper.Md5("123456");
+
+                await _userRepository.AddAsync(saveItem);
+
+                var success = await _userRepository.SaveChangesAsync();
             }
 
-
-            saveItem.Password = MD5Helper.Md5("123456");
-
-            await _userRepository.AddAsync(saveItem);
-
-            var success = await _userRepository.SaveChangesAsync();
-
-
+          
             await _mailVerificationService.AddUserSendEmailAsync(saveItem.Id, userAddModel.BaseUrl, userAddModel.RouteUrl);
 
 
-
-
-            return ResponseOutput.Result(success, new UserAddedReturnDTO { Id = saveItem.Id, UserCode = saveItem.UserCode });
+            return ResponseOutput.Ok( new UserAddedReturnDTO { Id = saveItem.Id, UserCode = saveItem.UserCode });
 
         }
 
@@ -639,7 +644,8 @@ namespace IRaCIS.Application.Services
             {
                 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} 分钟后再试。");
+                //$"密码连续错误{maxFailures}次,当前账号已被限制登录，请等待 {lockoutMinutes} 分钟后再试。"
+                throw new BusinessValidationFailedException(_localizer["User_ErrorLimit", maxFailures, lockoutMinutes]);
             }
 
             var userLoginReturnModel = new LoginReturnDTO();
@@ -694,8 +700,8 @@ namespace IRaCIS.Application.Services
                .WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType)
                .WhereIf(inQuery.BeginDate != null, t => t.CreateTime >= inQuery.BeginDate)
                .WhereIf(inQuery.EndDate != null, t => t.CreateTime <= inQuery.EndDate)
-               .WhereIf(!string.IsNullOrEmpty(inQuery.LoginFaildName), t => t.LoginFaildName.Contains(inQuery.LoginFaildName))
-               .WhereIf(!string.IsNullOrEmpty(inQuery.IP), t => t.IP.Contains(inQuery.IP))
+               .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);

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

@@ -547,7 +547,7 @@ namespace IRaCIS.Core.Application.Contracts
         [DictionaryTranslateAttribute("YesOrNo")]
         public bool IsSuccess { get; set; } 
 
-        public string Note = string.Empty;
+        public string Note { get; set; }
 
     }
 
@@ -1383,6 +1383,10 @@ namespace IRaCIS.Core.Application.Contracts
 
         public DateTime? SubmitTime { get; set; }
 
+        public string SubmitUserName { get; set; } = String.Empty;
+
+        public string SubmitUserRealName { get; set; } = String.Empty;
+
         public string CurrentActionUserName { get; set; } = String.Empty;
         public string PreliminaryAuditUserName { get; set; } = String.Empty;
 

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

@@ -5,10 +5,10 @@
 //--------------------------------------------------------------------
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Filter;
-using Nito.AsyncEx;
 using System.ComponentModel.DataAnnotations;
 using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Domain.Share;
+using Medallion.Threading;
 
 namespace IRaCIS.Core.Application.Contracts
 {
@@ -20,19 +20,19 @@ namespace IRaCIS.Core.Application.Contracts
     {
         private readonly IRepository<NoneDicomStudy> _noneDicomStudyRepository;
         private readonly IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository;
-        private readonly AsyncLock _mutex = new AsyncLock();
+        private readonly IDistributedLockProvider _distributedLockProvider;
         private readonly QCCommon _qCCommon;
 
 
         public NoneDicomStudyService(IRepository<NoneDicomStudy> noneDicomStudyRepository,
              QCCommon qCCommon,
-            IRepository<NoneDicomStudyFile> noneDicomStudyFileRepository)
+            IRepository<NoneDicomStudyFile> noneDicomStudyFileRepository, IDistributedLockProvider distributedLockProvider)
         {
             _qCCommon = qCCommon;
             _noneDicomStudyRepository = noneDicomStudyRepository;
 
             _noneDicomStudyFileRepository = noneDicomStudyFileRepository;
-
+            _distributedLockProvider = distributedLockProvider;
         }
 
 
@@ -62,7 +62,9 @@ namespace IRaCIS.Core.Application.Contracts
             }
 
             NoneDicomStudy? optEntity = null;
-            using (await _mutex.LockAsync())
+            var @lock = _distributedLockProvider.CreateLock($"NoneDicomCode");
+
+            using (await @lock.AcquireAsync())
             {
                 if (addOrEditNoneDicomStudy.Id == Guid.Empty || addOrEditNoneDicomStudy.Id == null)
                 {

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

@@ -19,7 +19,7 @@ namespace IRaCIS.Core.Application.Image.QA
         private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSet;
         private readonly IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository;
         private readonly IRepository<TrialQCQuestion> _trialQCQuestionRepository;
-        private readonly IRepository<UserUploadFile> _UserUploadFileRepository;
+        private readonly IRepository<InspectionFile> _consistencyCheckFileRepository;
 
         private IReadingImageTaskService _IReadingImageTaskService;
 
@@ -30,14 +30,14 @@ namespace IRaCIS.Core.Application.Image.QA
               IRepository<TrialQCQuestionAnswer> trialQCQuestionAnswerRepository,
               IRepository<TrialQCQuestion> trialQCQuestionRepository,
               IReadingImageTaskService IReadingImageTaskService,
-             IRepository<UserUploadFile> UserUploadFileRepository
+             IRepository<InspectionFile> consistencyCheckFileRepository
             )
         {
             this._IReadingImageTaskService = IReadingImageTaskService;
             _subjectVisitRepository = subjectVisitRepository;
             this._trialQCQuestionAnswerRepository = trialQCQuestionAnswerRepository;
             this._trialQCQuestionRepository = trialQCQuestionRepository;
-            this._UserUploadFileRepository = UserUploadFileRepository;
+            this._consistencyCheckFileRepository = consistencyCheckFileRepository;
             _trialRepository = trialRepository;
             this._clinicalDataTrialSet = clinicalDataTrialSet;
         }
@@ -851,7 +851,7 @@ namespace IRaCIS.Core.Application.Image.QA
         [HttpPost]
         public async Task<PageOutput<GetUserUploadFileDto>> GetUserUploadFile(GetUserUploadFileInDto indto)
         {
-            var query = _repository.Where<UserUploadFile>(t => t.TrialId == indto.TrialId)
+            var query = _repository.Where<InspectionFile>(t => t.TrialId == indto.TrialId)
              .ProjectTo<GetUserUploadFileDto>(_mapper.ConfigurationProvider);
 
             return await query.ToPagedListAsync(indto.PageIndex, indto.PageSize, "CreateTime", false);

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

@@ -10,13 +10,13 @@ using WinSCP;
 using Newtonsoft.Json;
 using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Application.Service.Inspection.DTO;
-using Nito.AsyncEx;
 using System.ComponentModel.DataAnnotations;
 using IRaCIS.Core.Application.Auth;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Application.Service;
+using Medallion.Threading;
 
 namespace IRaCIS.Core.Application.Image.QA
 {
@@ -35,8 +35,7 @@ namespace IRaCIS.Core.Application.Image.QA
         private readonly IRepository<Trial> _trialRepository;
         private readonly IRepository<VisitTask> _visitTaskRepository;
         private readonly IVisitTaskHelpeService _IVisitTaskHelpeService;
-
-        private readonly AsyncLock _mutex = new AsyncLock();
+        private readonly IDistributedLockProvider _distributedLockProvider;
 
         public QCOperationService(IRepository<SubjectVisit> subjectVisitRepository,
             IRepository<QCChallenge> qcChallengeRepository,
@@ -48,7 +47,8 @@ namespace IRaCIS.Core.Application.Image.QA
             IRepository<ReadingClinicalData> readingClinicalDataRepository,
              IRepository<QCChallengeDialog> qCChallengeDialogrepository,
               IRepository<CheckChallengeDialog> checkChallengeDialogrepository,
-            IVisitTaskHelpeService visitTaskHelpeService
+            IVisitTaskHelpeService visitTaskHelpeService,
+            IDistributedLockProvider distributedLockProvider
             )
         {
             _subjectVisitRepository = subjectVisitRepository;
@@ -62,6 +62,7 @@ namespace IRaCIS.Core.Application.Image.QA
             _trialRepository = trialRepository;
             this._visitTaskRepository = visitTaskRepository;
             _IVisitTaskHelpeService = visitTaskHelpeService;
+            _distributedLockProvider = distributedLockProvider;
         }
 
         #region QC质疑 以及回复 关闭
@@ -108,9 +109,9 @@ namespace IRaCIS.Core.Application.Image.QA
 
                 var trialConfig = (await _trialRepository.Where(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.QCProcessEnum, t.IsImageConsistencyVerification }).FirstOrDefaultAsync()).IfNullThrowException();
 
+                var @lock = _distributedLockProvider.CreateLock($"QCChallengeCode");
 
-
-                using (await _mutex.LockAsync())
+                using (await @lock.AcquireAsync())
                 {
                     //获取编号
                     var code = _qcChallengeRepository.Where(t => t.TrialId == trialId).Select(t => t.Code).DefaultIfEmpty().Max();
@@ -890,7 +891,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
             if (nextIQCQuality.VisitId != null)
             {
-                var visit = await _subjectVisitRepository.Where(x => x.Id == nextIQCQuality.VisitId).FirstOrDefaultAsync();
+                var visit = await _subjectVisitRepository.Where(x => x.Id == nextIQCQuality.VisitId).FirstNotNullAsync();
                 if (!visit.IsTake)
                 {
                     await ObtainOrCancelQCTask(inDto.TrialId, nextIQCQuality.VisitId.Value, true);
@@ -924,7 +925,7 @@ namespace IRaCIS.Core.Application.Image.QA
                     return new GetNextIQCQualityOutDto() { };
                     break;
                 case TrialQCProcess.SingleAudit:
-                    visitList = await _subjectVisitRepository.Where(x => x.SubmitState != SubmitStateEnum.None && x.TrialId == inDto.TrialId && (x.CurrentActionUserId == _userInfo.Id || (x.AuditState != AuditStateEnum.PrimaryQCPassed && !x.IsTake))).Include(x => x.Subject).ToListAsync();
+                    visitList = await _subjectVisitRepository.Where(x => x.SubmitState != SubmitStateEnum.None && x.TrialId == inDto.TrialId && x.PreliminaryAuditUserId != _userInfo.Id && (x.CurrentActionUserId == _userInfo.Id || (x.AuditState != AuditStateEnum.PrimaryQCPassed && !x.IsTake))).Include(x => x.Subject).ToListAsync();
 
                     subjectVisit = visitList.Where(x => x.SubjectId == inDto.SubjectId).OrderBy(x => x.VisitNum).FirstOrDefault();
                     if (subjectVisit != null)
@@ -952,7 +953,9 @@ namespace IRaCIS.Core.Application.Image.QA
                     break;
                 case TrialQCProcess.DoubleAudit:
 
-                    visitList = await _subjectVisitRepository.Where(x => x.SubmitState != SubmitStateEnum.None && x.TrialId == inDto.TrialId && x.PreliminaryAuditUserId != _userInfo.Id && (x.CurrentActionUserId == _userInfo.Id || (x.AuditState != AuditStateEnum.QCPassed))).Include(x => x.Subject).ToListAsync();
+                    visitList = await _subjectVisitRepository.Where(x => x.SubmitState != SubmitStateEnum.None && x.TrialId == inDto.TrialId &&
+                    ((x.CurrentActionUserId == _userInfo.Id)||(!x.IsTake&& x.AuditState != AuditStateEnum.QCPassed&& (x.PreliminaryAuditUserId != _userInfo.Id)))
+                    ).Include(x => x.Subject).ToListAsync();
                     if (subjectVisit != null)
                     {
                         return new GetNextIQCQualityOutDto()
@@ -1171,7 +1174,7 @@ namespace IRaCIS.Core.Application.Image.QA
             var dbSubjectVisitList = await _subjectVisitRepository.Where(t => cRCRequestToQCCommand.SubjectVisitIds.Contains(t.Id), true).ProjectTo<QCCRCVisitViewModel>(_mapper.ConfigurationProvider).ToListAsync();
 
             //普通提交
-            if (dbSubjectVisitList.Count() == 1)
+            if (dbSubjectVisitList.Count == 1)
             {
                 var sv = dbSubjectVisitList[0];
 
@@ -1180,7 +1183,7 @@ namespace IRaCIS.Core.Application.Image.QA
                 if (sv.PDState == PDStateEnum.PDProgress)
                 {
 
-                    if (nameList.Count() > 0)
+                    if (nameList.Count > 0)
                     {
                         //$"当前访视要求进行疾病进展确认。请在提交当前访视前，先处理未提交的前序访视：{string.Join('、', nameList)}。"
                         return ResponseOutput.NotOk(_localizer["QCOperation_DiseaseProgressConfirmation", string.Join('、', nameList)], 1, ApiResponseCodeEnum.NeedTips);
@@ -1188,7 +1191,7 @@ namespace IRaCIS.Core.Application.Image.QA
                 }
                 else
                 {
-                    if (nameList.Count() > 0)
+                    if (nameList.Count > 0)
                     {
                         //$"在提交当前访视后，请尽快处理尚未提交的前序访视：{string.Join('、', nameList)}。"
                         return ResponseOutput.NotOk(_localizer["QCOperation_UnsubmittedVisits", string.Join('、', nameList)], 0, ApiResponseCodeEnum.NeedTips);
@@ -1244,7 +1247,7 @@ namespace IRaCIS.Core.Application.Image.QA
             }
 
             //单个提交提示信息
-            if (dbSubjectVisitList.Count() == 1 && dbSubjectVisitList.First().SubmitState == SubmitStateEnum.Submitted)
+            if (dbSubjectVisitList.Count == 1 && dbSubjectVisitList.First().SubmitState == SubmitStateEnum.Submitted)
             {
                 //---当前访视的影像数据，已经由其他CRC提交。
                 return ResponseOutput.NotOk(_localizer["QCOperation_ImagesSubmitted"], 3, ApiResponseCodeEnum.NeedTips);

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

@@ -364,6 +364,10 @@ namespace IRaCIS.Core.Application.Service
                   .ForMember(d => d.QCProcessEnum, u => u.MapFrom(s => s.Trial.QCProcessEnum))
                   .ForMember(d => d.SubjectStatus, u => u.MapFrom(s => s.Subject.Status))
                   .ForMember(d => d.StudyCount, u => u.MapFrom(s => s.StudyList.Count()))
+                  
+                 .ForMember(d => d.SubmitUserName, u => u.MapFrom(s => s.SubmitUser.UserName))
+                  .ForMember(d => d.SubmitUserRealName, u => u.MapFrom(s => s.SubmitUser.FullName))
+                 
                   .ForMember(d => d.CurrentActionUserName, u => u.MapFrom(s => s.CurrentActionUser.UserName))
                   .ForMember(d => d.PreliminaryAuditUserName, u => u.MapFrom(s => s.PreliminaryAuditUser.UserName))
                   .ForMember(d => d.ReviewAuditUserName, u => u.MapFrom(s => s.ReviewAuditUser.UserName))
@@ -494,7 +498,7 @@ namespace IRaCIS.Core.Application.Service
                  ;
 
             // 一致性核查文件
-            CreateMap<UserUploadFile, GetUserUploadFileDto>()
+            CreateMap<InspectionFile, GetUserUploadFileDto>()
              .ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.User.FirstName + "/" + t.User.LastName));
 
 

IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs

@@ -523,7 +523,28 @@ namespace IRaCIS.Core.Application.Service
                 var readModule = await _readModuleRepository.Where(x => x.Id == inDto.ReadModuleId).FirstNotNullAsync();
                 inDto.TrialReadingCriterionId = readModule.TrialReadingCriterionId;
             }
+
+            // 有全局就查全局 有肿瘤学就查肿瘤学
+
+            var clinicalDataLevelList = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm && x.UploadRole == UploadRole.CRC && x.ClinicalUploadType == ClinicalUploadType.Structuring).Select(x => x.ClinicalDataLevel).Distinct().ToListAsync();
+
+            var existsCRCStructuring = clinicalDataLevelList.Any(x=>x== ClinicalLevel.OncologyRead|| x == ClinicalLevel.ImageRead);
+
+
+            ReadingSetType? readingSetType = null;
+            if (clinicalDataLevelList.Contains(ClinicalLevel.ImageRead) && !clinicalDataLevelList.Contains(ClinicalLevel.OncologyRead))
+            {
+                readingSetType = ReadingSetType.ImageReading;
+            }
+            else if (clinicalDataLevelList.Contains(ClinicalLevel.OncologyRead) && !clinicalDataLevelList.Contains(ClinicalLevel.ImageRead))
+            {
+                readingSetType = ReadingSetType.TumorReading;
+            }
+
+
             var query = _readModuleRepository.Where(x => x.TrialId == inDto.TrialId)
+                .Where(x=> existsCRCStructuring)
+                .WhereIf(inDto.ReadModuleId==null,x=>x.TrialReadingCriterion.IsConfirm)
                 .WhereIf(inDto.ReadModuleId != null, x => x.Id == inDto.ReadModuleId)
                 .WhereIf(inDto.IsCRCConfirm != null, x => x.IsCRCConfirm == inDto.IsCRCConfirm)
                  .WhereIf(inDto.IsPMConfirm != null, x => x.IsPMConfirm == inDto.IsPMConfirm)
@@ -532,6 +553,7 @@ namespace IRaCIS.Core.Application.Service
 				.WhereIf(inDto.SubjectId != null, x => x.SubjectId == inDto.SubjectId)
                 .WhereIf(inDto.StartTime != null, x => x.SubjectVisit.LatestScanDate >= inDto.StartTime)
                 .WhereIf(inDto.EndTime != null, x => x.SubjectVisit.LatestScanDate <= inDto.EndTime)
+                .WhereIf(readingSetType != null, x => x.ReadingSetType== readingSetType)
                 .Select(x => new GetCRCConfirmListOutDto()
                 {
                  

IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs

@@ -169,6 +169,8 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="item"></param>
         /// <param name="questions"></param>
         /// <param name="tableQuestions"></param>
+        /// <param name="answers"></param>
+        /// <param name="tableAnswers"></param>
         public void FindChildQuestion(ClinicalQuestionPreviewDto item, List<ClinicalQuestionPreviewDto> questions, List<ClinicalTablePreviewDto> tableQuestions,List<ClinicalFormQuestionAnswer> answers, List<ClinicalFormTableQuestionAnswer> tableAnswers)
         {
             item.Childrens = questions.Where(x => (x.ParentId == item.Id)||(x.GroupId== item.Id&&x.ParentId==null)).OrderBy(x => x.ShowOrder).ToList();

IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs

@@ -111,7 +111,7 @@ namespace IRaCIS.Application.Services
                 entity.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded;
                 entity.IsBlind = null;
                 entity.IsComplete = null;
-                entity.FileCount = entity.ReadingClinicalDataPDFList.Count();
+                entity.FileCount = entity.ReadingClinicalDataPDFList.Count;
                 await _readingClinicalDataRepository.AddAsync(entity, true);
                 var success = await _readingClinicalDataRepository.SaveChangesAsync();
                 return ResponseOutput.Ok(entity.Id);
@@ -366,7 +366,7 @@ namespace IRaCIS.Application.Services
                 //影像学
                 if (readModule.ReadingSetType == ReadingSetType.ImageReading)
                 {
-                    needSignCount = trialClinicalDataSetList.Where(t => t.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCritrialId) && t.ClinicalDataLevel == ClinicalLevel.ImageRead).Count();
+                    needSignCount = trialClinicalDataSetList.Where(t => t.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCritrialId) && t.ClinicalDataLevel == ClinicalLevel.ImageRead && t.UploadRole == UploadRole.PM).Count();
 
                     // 不存在需要CRC上传的临床数据 或者 PM已确认
                     crcReadModuleSign =
@@ -376,12 +376,11 @@ namespace IRaCIS.Application.Services
                     && x.ClinicalUploadType == ClinicalUploadType.Structuring
                     && x.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCritrialId)) || readModule.IsPMConfirm;
 
-
                 }
                 //肿瘤学
                 else
                 {
-                    needSignCount = trialClinicalDataSetList.Where(t => t.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCritrialId) && t.ClinicalDataLevel == ClinicalLevel.OncologyRead).Count();
+                    needSignCount = trialClinicalDataSetList.Where(t => t.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCritrialId) && t.ClinicalDataLevel == ClinicalLevel.OncologyRead && t.UploadRole == UploadRole.PM).Count();
 
                     // 不存在需要CRC上传的临床数据 或者 PM已确认
                     crcReadModuleSign =
@@ -512,7 +511,7 @@ namespace IRaCIS.Application.Services
                 inDto.UploadRole = UploadRole.PM;
             }
 
-            ReadModule readModule = null;
+            ReadModule? readModule = null;
             if (inDto.IsVisit == false)
             {
                 readModule = await _readModuleRepository.Where(x => x.Id == inDto.ReadingId).FirstOrDefaultAsync();
@@ -537,7 +536,7 @@ namespace IRaCIS.Application.Services
                 .WhereIf(inDto.IsVisit && inDto.IsBaseLine, x => x.ClinicalDataLevel == ClinicalLevel.Subject || x.ClinicalDataLevel == ClinicalLevel.SubjectVisit)
                 .WhereIf(inDto.IsVisit && !inDto.IsBaseLine, x => x.ClinicalDataLevel == ClinicalLevel.SubjectVisit)
                 .WhereIf(!inDto.IsVisit, x => x.ClinicalDataLevel == ClinicalLevel.ImageRead || x.ClinicalDataLevel == ClinicalLevel.OncologyRead)
-                .WhereIf(readModule != null, x => x.ClinicalDataLevel == keyValuePairs[readModule.ModuleType])
+                .WhereIf(readModule != null, x => x.ClinicalDataLevel == keyValuePairs[readModule!.ModuleType])
                 .WhereIf(inDto.TrialReadingCriterionId!=null,x=>x.TrialClinicalDataSetCriteriaList.Any(y=>y.TrialReadingCriterionId== inDto.TrialReadingCriterionId))
                 //.WhereIf(criterion!=null,x=>x.CriterionEnumListStr.Contains($"|{(int)criterion.CriterionType}|"))
                 .Select(x => new GetTrialClinicalDataSelectOutDto()
@@ -659,7 +658,7 @@ namespace IRaCIS.Application.Services
 
             return (result, new
             {
-                IsCanAddClinicalData = clinicalDataList.Count() > 0,
+                IsCanAddClinicalData = clinicalDataList.Count > 0,
             });
         }
 
@@ -718,7 +717,7 @@ namespace IRaCIS.Application.Services
                     CheckDate = y.CheckDate,
                     ClinicalFormId = y.Id
                 }).ToList();
-                x.FileCount = x.ClinicalFromList.Count();
+                x.FileCount = x.ClinicalFromList.Count;
             });
 
 
@@ -763,6 +762,7 @@ namespace IRaCIS.Application.Services
                       IsCRCUpload = x.UploadRole == UploadRole.CRC,
                       IsNeedMerge = true,
                       ReadModuleId = readModule.Id,
+                      TrialClinicalDataSetCriteriaList=x.TrialClinicalDataSetCriteriaList,
                       //FileCount = x.FileCount,
 
                       //ReadingClinicalDataState = x.ReadingClinicalDataState,
@@ -891,7 +891,7 @@ namespace IRaCIS.Application.Services
                     CheckDate = y.CheckDate,
                     ClinicalFormId = y.Id
                 }).ToList();
-                x.FileCount = x.ClinicalFromList.Count();
+                x.FileCount = x.ClinicalFromList.Count;
             });
 
             // 这里处理CRC上传 阅片期的临床数据

IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs

@@ -266,7 +266,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public string ImagePath { get; set; } = string.Empty;
 
 
-        public List<ImageInfo> FileList { get; set; } = new List<ImageInfo>();
+        public List<OSSImageInfo> FileList { get; set; } = new List<OSSImageInfo>();
 
 
     }
@@ -314,7 +314,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 
 
-        public List<ImageInfo> FileList { get; set; } = new List<ImageInfo>();
+        public List<OSSImageInfo> FileList { get; set; } = new List<OSSImageInfo>();
 
        
 
@@ -395,6 +395,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Arm ArmEnum { get; set; }
 
+        public bool IsExistsClinicalData { get; set; }
+
+
 
         public MedicalReviewAuditState AuditState { get; set; }
 
@@ -455,7 +458,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid TaskMedicalReviewId { get; set; }
 
 
-        public List<ImageInfo> FileList { get; set; } = new List<ImageInfo>();
+        public List<OSSImageInfo> FileList { get; set; } = new List<OSSImageInfo>();
 
 
         /// <summary>
@@ -502,7 +505,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public string Questioning { get; set; } = string.Empty;
 
 
-        public List<ImageInfo> FileList { get; set; } = new List<ImageInfo>();
+        public List<OSSImageInfo> FileList { get; set; } = new List<OSSImageInfo>();
 
         /// <summary>
         /// 审核建议

IRaCIS.Core.Application/Service/Reading/Interface/IClinicalAnswerService.cs

@@ -21,5 +21,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Interface
 
         Task<IResponseOutput> CRCCancelConfirmClinical(CRCCancelConfirmClinicalInDto inDto);
 
+        Task<PageOutput<GetCRCConfirmListOutDto>> GetCRCConfirmList(GetCRCConfirmListInDto inDto);
+
     }
 }

IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs

@@ -33,6 +33,7 @@ namespace IRaCIS.Core.Application.Service
         private readonly IReadingImageTaskService _iReadingImageTaskService;
         private readonly IRepository<User> _userTaskRepository;
         private readonly IVisitTaskService _visitTaskService;
+        private readonly IReadingClinicalDataService _readingClinicalDataService;
         private readonly IRepository<TaskMedicalReview> _taskMedicalReviewRepository;
         private readonly IRepository<ReadingMedicalReviewDialog> _readingMedicalReviewDialogRepository;
         private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrial;
@@ -52,6 +53,7 @@ namespace IRaCIS.Core.Application.Service
               IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
             IRepository<User> userTaskRepository,
             IVisitTaskService visitTaskService,
+                  IReadingClinicalDataService readingClinicalDataService,
             IRepository<TaskMedicalReview> taskMedicalReviewRepository,
             IRepository<ReadingMedicalReviewDialog> readingMedicalReviewDialogRepository,
             IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrial,
@@ -71,6 +73,7 @@ namespace IRaCIS.Core.Application.Service
             this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository;
             this._userTaskRepository = userTaskRepository;
             this._visitTaskService = visitTaskService;
+            this._readingClinicalDataService = readingClinicalDataService;
             this._taskMedicalReviewRepository = taskMedicalReviewRepository;
             this._readingMedicalReviewDialogRepository = readingMedicalReviewDialogRepository;
             this._readingQuestionCriterionTrial = readingQuestionCriterionTrial;
@@ -109,6 +112,17 @@ namespace IRaCIS.Core.Application.Service
          
 
             medicalReviewInfo.VisitTaskId = taskInfo.Id;
+
+            var clinicalDataList = await _readingClinicalDataService.GetClinicalDataList(new GetReadingOrTaskClinicalDataListInDto()
+            {
+
+                SubjectId = taskInfo.SubjectId,
+                TrialId = taskInfo.TrialId,
+                VisitTaskId = taskInfo.Id,
+            });
+
+            medicalReviewInfo.IsExistsClinicalData = clinicalDataList.Count > 0;
+
             medicalReviewInfo.ArmEnum = taskInfo.ArmEnum;
             medicalReviewInfo.SubjectCode = taskInfo.IsAnalysisCreate?taskInfo.BlindSubjectCode: taskInfo.Subject.Code;
             medicalReviewInfo.TaskBlindName = taskInfo.TaskBlindName;
@@ -466,8 +480,12 @@ namespace IRaCIS.Core.Application.Service
             {
                 throw new BusinessValidationFailedException(_localizer["MedicalReview_SaveQuestion"]);
             }
+            var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
+
             await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
             {
+
+                LatestReplyUserId = (inDto.IsSendDialog && !medicalReview.IsSendMessage && inDto.IsHaveQuestion) ? _userInfo.Id : null,
                 IsHaveQuestion = inDto.IsHaveQuestion,
                 Questioning = inDto.Questioning,
                 IsSendMessage = inDto.IsSendDialog && inDto.IsHaveQuestion,
@@ -476,9 +494,8 @@ namespace IRaCIS.Core.Application.Service
                 AuditAdviceEnum = inDto.AuditAdviceEnum,
                 SaveConclusionTime = DateTime.Now,
 
-            }); 
+            }); ; 
 
-            var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
             if (inDto.IsSendDialog&& !medicalReview.IsSendMessage && inDto.IsHaveQuestion)
             {
               
@@ -511,6 +528,7 @@ namespace IRaCIS.Core.Application.Service
         {
             await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
             {
+                LatestReplyUserId=_userInfo.Id,
                 IsClosedDialog = inDto.IsClosedDialog,
                 MedicalDialogCloseEnum=inDto.MedicalDialogCloseEnum,
                 DialogCloseReason=inDto.DialogCloseReason,
@@ -547,6 +565,11 @@ namespace IRaCIS.Core.Application.Service
                 throw new BusinessValidationFailedException(_localizer["MedicalReview_invalid"]);
             }
 
+            await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
+            {
+                LatestReplyUserId = _userInfo.Id,
+            });
+
             var visitTaskId = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).Select(x => x.VisitTaskId).FirstOrDefaultAsync();
             ReadingMedicalReviewDialog dialog = new ReadingMedicalReviewDialog()
             {
@@ -600,6 +623,7 @@ namespace IRaCIS.Core.Application.Service
 
                 await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(x => !x.IsClosedDialog && x.Id == inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
                 {
+                    LatestReplyUserId=_userInfo.Id,
                     IsClosedDialog = true,
                     MedicalDialogCloseEnum = MedicalDialogClose.IRApplyReReading,
 
@@ -613,6 +637,7 @@ namespace IRaCIS.Core.Application.Service
 
             await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
             {
+                LatestReplyUserId=_userInfo.Id,
                 DoctorUserIdeaEnum = inDto.DoctorUserIdeaEnum,
             });
             ReadingMedicalReviewDialog dialog = new ReadingMedicalReviewDialog()
@@ -740,10 +765,11 @@ namespace IRaCIS.Core.Application.Service
 
             await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
             {
+                LatestReplyUserId = _userInfo.Id,
                 DoctorUserIdeaEnum = inDto.DoctorUserIdeaEnum,
                 DisagreeReason = inDto.DisagreeReason,
-                IsApplyHeavyReading=inDto.IsApplyHeavyReading,
-            });
+                IsApplyHeavyReading = inDto.IsApplyHeavyReading,
+            }); ;
 
             var visitTaskId = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).Select(x => x.VisitTaskId).FirstOrDefaultAsync();
             await _readingMedicalReviewDialogRepository.AddAsync(new ReadingMedicalReviewDialog()

IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs

@@ -59,7 +59,7 @@ namespace IRaCIS.Core.Application.Service
 				  .WhereIf(inDto.CriterionTypeEnum != null, x => x.CriterionTypeEnum==inDto.CriterionTypeEnum)
 				  .WhereIf(inDto.TrialReadingCriterionId != null, x => x.CriterionTypeEnum== criterionEnum || x.IsGeneral==true)
 				  .WhereIf(inDto.IsGeneral != null, x => x.IsGeneral == inDto.IsGeneral)
-				.WhereIf(inDto.LanguageType != null, x => x.LanguageType == inDto.LanguageType.Value)
+				.WhereIf(inDto.LanguageType != null, x => x.LanguageType == inDto.LanguageType!.Value)
 				  .ProjectTo<ReadingMedicineSystemQuestionView>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder);
 
 			return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, new string[2] { "LanguageType desc", "ShowOrder asc" });
@@ -516,7 +516,7 @@ namespace IRaCIS.Core.Application.Service
 				}
 			}
 
-			await _readingMedicineTrialQuestionRepository.AddRangeAsync(needList);
+			await _readingMedicineTrialQuestionRepository.AddRangeAsync(_mapper.Map<List<ReadingMedicineTrialQuestion>>(needList));
 			 var result = await _readingMedicineTrialQuestionRepository.SaveChangesAsync();
 			 return ResponseOutput.Ok();
 		}

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs

@@ -368,7 +368,6 @@ namespace IRaCIS.Application.Services
         /// <summary>
         /// 新增修改系统表格问题
         /// </summary>
-        /// <param name="addOrEditReadingTableQuestionSystem"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput> AddOrUpdateReadingTableQuestionSystem(ReadingTableQuestionSystemAddOrEdit addOrEditReadingTableQuestionSystem)
@@ -481,11 +480,12 @@ namespace IRaCIS.Application.Services
         }
 
         /// <summary>
-        /// 验证计算关系
+        ///  验证计算关系
         /// </summary>
         /// <param name="relationList"></param>
         /// <param name="QuestionId"></param>
         /// <param name="originalId"></param>
+        /// <param name="count"></param>
         /// <exception cref="BusinessValidationFailedException"></exception>
         private void VerifyCalculateRelation(List<CalculateRelationDto> relationList,Guid QuestionId,Guid originalId,int count=1)
         {
@@ -877,7 +877,7 @@ namespace IRaCIS.Application.Services
             {
                 var question = x.Clone();
                 question.ReadingQuestionCriterionSystemId = inDto.ToSystemCriterionId;
-                question.Id = questionRelation[question.Id.Value];
+                question.Id = questionRelation[question.Id!.Value];
                 if (question.ParentId != null)
                 {
                     question.ParentId = questionRelation[question.ParentId ?? default(Guid)];

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -15,6 +15,7 @@ using Newtonsoft.Json.Linq;
 using Microsoft.Extensions.Caching.Memory;
 using IRaCIS.Core.Application.Filter;
 using DocumentFormat.OpenXml.Drawing;
+using EasyCaching.Core;
 using Quartz;
 using IRaCIS.Application.Services.BackGroundJob;
 
@@ -47,6 +48,7 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<OrganInfo> _organInfoRepository;
         private readonly IRepository<TrialDocument> _trialDocumentRepository;
         private readonly IRepository<User> _userRepository;
+        private readonly IEasyCachingProvider _provider;
         private readonly IRepository<ReadingCustomTag> _readingCustomTagRepository;
         private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
         private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository;
@@ -61,12 +63,10 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<NoneDicomStudyFile> _noneDicomStudyFileSystem;
         private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
         private readonly ISchedulerFactory _schedulerFactory;
-        private readonly IMemoryCache _cache;
         private readonly ITrialEmailNoticeConfigService _trialEmailNoticeConfigService;
 
 
         public ReadingImageTaskService(
-                  IMapper mapper,
                   IRepository<NoneDicomStudy> noneDicomStudyRepository,
                   IRepository<VisitTask> visitTaskRepository,
                   IRepository<Trial> TrialRepository,
@@ -87,6 +87,7 @@ namespace IRaCIS.Application.Services
                   IRepository<OrganInfo> organInfoRepository,
                   IRepository<TrialDocument> trialDocumentRepository,
                   IRepository<User> userRepository,
+                  IEasyCachingProvider provider,
                   IRepository<ReadingCustomTag> readingCustomTagRepository,
                   IMemoryCache cache,
                   IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
@@ -106,7 +107,6 @@ namespace IRaCIS.Application.Services
           )
         {
             _schedulerFactory = schedulerFactory;
-            base._mapper = mapper;
             this._noneDicomStudyRepository = noneDicomStudyRepository;
             this._visitTaskRepository = visitTaskRepository;
             this._trialRepository = TrialRepository;
@@ -127,6 +127,7 @@ namespace IRaCIS.Application.Services
             this._organInfoRepository = organInfoRepository;
             this._trialDocumentRepository = trialDocumentRepository;
             this._userRepository = userRepository;
+            this._provider = provider;
             this._readingCustomTagRepository = readingCustomTagRepository;
             this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository;
             this._tumorAssessmentRepository = tumorAssessmentRepository;
@@ -141,7 +142,6 @@ namespace IRaCIS.Application.Services
             this._readingQuestionSystem = ReadingQuestionSystem;
             this._noneDicomStudyFileSystem = noneDicomStudyFileSystem;
             this._readingQuestionTrialRepository = readingQuestionTrialRepository;
-            this._cache = cache;
             this._trialEmailNoticeConfigService = trialEmailNoticeConfigService;
         }
 
@@ -704,9 +704,9 @@ namespace IRaCIS.Application.Services
         {
             //await AddDefaultValueToTask(inDto.VisitTaskId);
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
-            var result = await GetReadingQuestion(taskInfo.TrialReadingCriterionId, taskInfo.Id);
+			var result = await GetReadingQuestion(taskInfo.TrialReadingCriterionId, taskInfo.Id);
 
-            return (result, new
+			return (result, new
             {
 
                 ReadingTaskState = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.ReadingTaskState).FirstOrDefaultAsync()
@@ -718,6 +718,8 @@ namespace IRaCIS.Application.Services
         /// </summary>
         /// <param name="trialReadingCriterionId"></param>
         /// <param name="visitTaskId"></param>
+        /// <param name="questionClassify"></param>
+        /// <param name="groupClassifyList"></param>
         /// <returns></returns>
         [NonDynamicMethod]
         public async Task<List<DicomReadingQuestionAnswer>> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId)
@@ -822,10 +824,7 @@ namespace IRaCIS.Application.Services
         [HttpGet]
         public async Task<List<GetTableAnswerRowInfoOutDto>> GetTableAnswerRowInfoList(GetTableAnswerRowInfoInDto inDto)
         {
-            await _readingCalculateService.AddTaskLesionAnswerFromLastTask(new AddTaskLesionAnswerFromLastTaskInDto()
-            {
-                VisitTaskId = inDto.VisitTaskId
-            });
+
             var result = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId)
                 .WhereIf(inDto.QuestionId != null, x => x.QuestionId == inDto.QuestionId)
                 .ProjectTo<GetTableAnswerRowInfoOutDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex)
@@ -1107,7 +1106,7 @@ namespace IRaCIS.Application.Services
                     var firstData = newPageQusetionList.FirstOrDefault();
                     var page = new TrialReadQuestionData()
                     {
-                        PageName = firstData.PageName,
+                        PageName = firstData!.PageName,
                         IsPage = true,
                         IsPublicPage = firstData.IsPublicPage,
                     };
@@ -1122,8 +1121,8 @@ namespace IRaCIS.Application.Services
                     groupList.Add(page);
                 }
 
-                result.PublicPage = groupList.Where(x => x.IsPublicPage.Value).ToList();
-                result.MultiPage = groupList.Where(x => !x.IsPublicPage.Value).ToList();
+                result.PublicPage = groupList.Where(x => x.IsPublicPage!.Value).ToList();
+                result.MultiPage = groupList.Where(x => !x.IsPublicPage!.Value).ToList();
             }
             else
             {
@@ -1147,12 +1146,19 @@ namespace IRaCIS.Application.Services
         }
 
         /// <summary>
-        /// 获取子元素
+        ///  获取子元素
         /// </summary>
         /// <param name="item"></param>
         /// <param name="questionlists"></param>
         /// <param name="tableQuestionLists"></param>
-        private async void FindChildQuestion(TrialReadQuestionData item, List<TrialReadQuestionData> questionlists, List<TableQuestionTrial> tableQuestionLists, List<ReadingTableQuestionAnswerInfo> tableAnswers, List<TableAnsweRowInfo> tableAnsweRowInfos, List<OrganInfo> organInfos, List<ReadingTableQuestionAnswer> baseLineTableAnswer, bool isFirstChangeTask, List<ReadingTableQuestionAnswer> lastTaskTableAnswer, Guid? TaskId)
+        /// <param name="tableAnswers"></param>
+        /// <param name="tableAnsweRowInfos"></param>
+        /// <param name="organInfos"></param>
+        /// <param name="baseLineTableAnswer"></param>
+        /// <param name="isFirstChangeTask"></param>
+        /// <param name="lastTaskTableAnswer"></param>
+        /// <param name="TaskId"></param>
+        private async void FindChildQuestion(TrialReadQuestionData item, List<TrialReadQuestionData> questionlists, List<TableQuestionTrial> tableQuestionLists, List<ReadingTableQuestionAnswerInfo> tableAnswers, List<TableAnsweRowInfo> tableAnsweRowInfos, List<OrganInfo> organInfos, List<ReadingTableQuestionAnswer> baseLineTableAnswer,bool isFirstChangeTask, List<ReadingTableQuestionAnswer> lastTaskTableAnswer,Guid? TaskId)
         {
             item.Childrens = questionlists.Where(x => x.ParentId == item.Id || (x.GroupId == item.Id && x.ParentId == null)).ToList();
             item.TableQuestions = new TrialReadTableQuestion();
@@ -2083,11 +2089,6 @@ namespace IRaCIS.Application.Services
 
             }
 
-            await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask()
-            {
-                ReadingTaskState = ReadingTaskState.Reading,
-
-            });
             await _readingTableAnswerRowInfoRepository.SaveChangesAsync();
             await this._readingCalculateService.CalculateTask(new CalculateTaskInDto()
             {
@@ -2287,7 +2288,7 @@ namespace IRaCIS.Application.Services
                     VisitNum = x.VisitTaskNum,
                     TrialReadingCriterionId = x.TrialReadingCriterionId,
 
-                }).FirstOrDefaultAsync();
+                }).FirstNotNullAsync();
 
             }
             else if (inDto.SubjectId != null && trialReadingCriterion.IsReadingTaskViewInOrder)
@@ -2295,7 +2296,7 @@ namespace IRaCIS.Application.Services
                 var subjectTaskList = (await _visitTaskService.GetOrderReadingIQueryable(new GetOrderReadingIQueryableInDto()
                 {
                     TrialId = inDto.TrialId,
-                    TrialReadingCriterionId = trialReadingCriterionId.Value,
+                    TrialReadingCriterionId = trialReadingCriterionId!.Value,
                     Page = new PageInput()
                     {
                         PageIndex = 1,
@@ -2448,6 +2449,15 @@ namespace IRaCIS.Application.Services
                 task.IsNeedReadClinicalData = clinicalDataList.Where(x => x.ClinicalDataLevel != ClinicalLevel.Subject).Count() > 0;
             }
 
+            if (visitTaskInfo.ReadingTaskState == ReadingTaskState.WaitReading)
+            {
+				await _readingCalculateService.AddTaskLesionAnswerFromLastTask(new AddTaskLesionAnswerFromLastTaskInDto()
+				{
+					VisitTaskId = task.VisitTaskId
+				});
+			}
+
+
             // 如果已经签名 就不需要再读了
             task.IsNeedReadClinicalData = visitTaskInfo.ReadingTaskState == ReadingTaskState.HaveSigned ? false : task.IsNeedReadClinicalData;
             task.DigitPlaces = criterionInfo.DigitPlaces;
@@ -2469,11 +2479,14 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task VerifyReadingRestTime()
         {
-            var cacheKey = _userInfo.Id.ToString();
-            var value = _cache.Get(cacheKey);
+            var cacheKey = _userInfo.Id.ToString() + "RestTime";
+
+          
+            var value = _provider.Get<string>(cacheKey).Value;
             if (value == null)
             {
-                _cache.Set(cacheKey, DateTime.Now.ToString(), TimeSpan.FromHours(5));
+                _provider.Set(cacheKey, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), TimeSpan.FromHours(5));
+              //  _cache.Set(cacheKey, DateTime.Now.ToString(), TimeSpan.FromHours(5));
 
             }
             else
@@ -2488,7 +2501,8 @@ namespace IRaCIS.Application.Services
                 else if (timespanMin > 140)
                 {
                     cacheDate = cacheDate.AddMinutes((Math.Floor((double)(timespanMin / 140))) * 140);
-                    _cache.Set(cacheKey, cacheDate.ToString(), TimeSpan.FromHours(5));
+                    _provider.Set(cacheKey, cacheDate.ToString(), TimeSpan.FromHours(5));
+                   // _cache.Set(cacheKey, cacheDate.ToString(), TimeSpan.FromHours(5));
 
                 }
                 #endregion

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs

@@ -55,11 +55,6 @@ namespace IRaCIS.Application.Services
                 TrialId = inDto.TrialId
             }).ToList();
 
-            await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask()
-            {
-                ReadingTaskState = ReadingTaskState.Reading,
-
-            });
             await _readingTaskQuestionAnswerRepository.AddRangeAsync(readingTaskAnswerList);
             var result = await _visitTaskRepository.SaveChangesAsync();
             return ResponseOutput.Ok(result);

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs

@@ -191,7 +191,6 @@ namespace IRaCIS.Application.Services
 
             await _readingOncologyTaskInfoRepository.AddRangeAsync(readingOncologies);
 
-            await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == inDto.OncologyTaskId, u => new VisitTask() { ReadingTaskState = ReadingTaskState.Reading });
 
             var result = await _readingOncologyTaskInfoRepository.SaveChangesAsync();
 

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs

@@ -85,7 +85,7 @@ namespace IRaCIS.Application.Services
                     var firstData = newPageQusetionList.FirstOrDefault();
                     var page = new GetTrialReadingQuestionOutDto()
                     {
-                        PageName = firstData.PageName,
+                        PageName = firstData!.PageName,
                         IsPage = true,
                         IsPublicPage = firstData.IsPublicPage,
                     };
@@ -100,8 +100,8 @@ namespace IRaCIS.Application.Services
                     groupList.Add(page);
                 }
 
-                result.PublicPage = groupList.Where(x => x.IsPublicPage.Value).ToList();
-                result.MultiPage = groupList.Where(x => !x.IsPublicPage.Value).ToList();
+                result.PublicPage = groupList.Where(x => x.IsPublicPage!.Value).ToList();
+                result.MultiPage = groupList.Where(x => !x.IsPublicPage!.Value).ToList();
             }
             else
             {

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

@@ -57,7 +57,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<VisitTask, VisitTaskDto>();
             CreateMap<ShortcutKey, DefaultShortcutKeyView>();
-
+            CreateMap<TrialDataFromSystem, ReadingMedicineTrialQuestion>();
 
             CreateMap<ReadingCustomTag, ReadingCustomTagDto>();
             CreateMap<ReadingCustomTagDto, ReadingCustomTag>();

IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs

@@ -126,36 +126,35 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         {
             var service = await this.GetService(inDto.VisitTaskId);
             var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
-            if (service != null && visitTaskInfo.SourceSubjectVisitId != null)
+			var result = new AddTaskLesionAnswerFromLastTaskOutDto();
+			var readingTaskState = visitTaskInfo.ReadingTaskState;
+			if (service != null && visitTaskInfo.SourceSubjectVisitId != null)
             {
-                var readingTaskState = visitTaskInfo.ReadingTaskState;
-                var result = new AddTaskLesionAnswerFromLastTaskOutDto();
-
                 if (readingTaskState == ReadingTaskState.WaitReading)
                 {
-                    result = await service.AddTaskLesionAnswerFromLastTask(inDto);
-                    await service.CalculateTask(new CalculateTaskInDto()
+                    if (visitTaskInfo.ReadingCategory == ReadingCategory.Visit)
                     {
-                        IsChangeOtherTask = false,
-                        VisitTaskId = inDto.VisitTaskId,
-                    });
-
-                    await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask()
-                    {
-                        ReadingTaskState = ReadingTaskState.Reading,
-
-                    });
-
+						result = await service.AddTaskLesionAnswerFromLastTask(inDto);
+						await service.CalculateTask(new CalculateTaskInDto()
+						{
+							IsChangeOtherTask = false,
+							VisitTaskId = inDto.VisitTaskId,
+						});
+					}
                 }
-
-                return result;
-            }
-            else
-            {
-                return new AddTaskLesionAnswerFromLastTaskOutDto();
             }
+			if (readingTaskState == ReadingTaskState.WaitReading)
+			{
+				await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask()
+				{
+					ReadingTaskState = ReadingTaskState.Reading,
+				},true);
+			}
 
-        }
+			return result;
+
+
+		}
 
         /// <summary>
         /// 获取报告验证的信息(这里每个标准可能不一样 返回用object)
@@ -181,7 +180,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// <summary>
         /// 获取阅片报告
         /// </summary>
-        /// <param name="indto"></param>
         /// <returns></returns>
         public async Task<GetReadingReportEvaluationOutDto> GetReadingReportEvaluation(GetReadingReportEvaluationInDto inDto)
         {

IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs

@@ -149,7 +149,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             result.LesionCountList = tableAnsweRowInfos.GroupBy(x => x.LesionType).Select(x => new LesionDto
             {
-                LesionType = x.Key.Value,
+                LesionType = x.Key!.Value,
                 Count = x.ToList().Count()
             }).ToList();
 
@@ -711,7 +711,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                 if (valueOfTypes.Contains(item.ValueType))
                                 {
-                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString();
+                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
                                 }
                             }
                             catch (Exception)
@@ -1775,7 +1775,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 {
                     VisitTaskId = x.VisitTaskId,
                     Answer = x.Answer,
-                    QuestionType = x.ReadingQuestionTrial.QuestionType.Value
+                    QuestionType = x.ReadingQuestionTrial.QuestionType!.Value
                 }).ToListAsync();
 
                 compareTaskList.ForEach(y =>

IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs

@@ -2,7 +2,6 @@
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Domain.Models;
-using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using Panda.DynamicWebApi.Attributes;
@@ -650,7 +649,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                             if (valueOfTypes.Contains(item.ValueType))
                             {
-                                item.Answer = decimal.Round(decimal.Parse(item.Answer.IsNullOrEmpty() ? "0": item.Answer), inDto.DigitPlaces).ToString();
+                                item.Answer = decimal.Round(decimal.Parse(item.Answer.IsNullOrEmpty() ? "0": item.Answer), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
                             }
                         }
                         catch (Exception)

IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs

@@ -2,7 +2,6 @@
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Domain.Models;
-using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using Panda.DynamicWebApi.Attributes;
@@ -550,7 +549,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                 if (valueOfTypes.Contains(item.ValueType))
                                 {
-                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString();
+                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
                                 }
                             }
                             catch (Exception)

IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs

@@ -2,7 +2,6 @@
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Domain.Models;
-using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using Panda.DynamicWebApi.Attributes;
@@ -546,7 +545,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                 if (valueOfTypes.Contains(item.ValueType))
                                 {
-                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString();
+                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
                                 }
                             }
                             catch (Exception)

IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs

@@ -2,7 +2,6 @@
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Domain.Models;
-using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using Panda.DynamicWebApi.Attributes;

IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteUserSurveyViewModel.cs

@@ -104,6 +104,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         [DictionaryTranslateAttribute("YesOrNo")]
         public bool IsGenerateAccount { get; set; }
+
+        [DictionaryTranslateAttribute("SiteSurvey_UserRoles")]
         public int TrialRoleCode { get; set; }
 
         public string OrganizationName { get; set; } = string.Empty;

IRaCIS.Core.Application/Service/SiteSurvey/Interface/JsonPatchUserRequestExample.cs

@@ -1,51 +0,0 @@
-using Microsoft.AspNetCore.JsonPatch.Operations;
-using Swashbuckle.AspNetCore.Filters;
-
-namespace IRaCIS.Core.Application.Contracts
-{
-    /// <summary>
-    /// 实测 标注在服务方法上 没用
-    /// </summary>
-    public class JsonPatchUserRequestExample : IExamplesProvider<object>
-    {
-        public Operation[] GetExamples()
-        {
-            return new[]
-           {
-                new Operation
-                {
-                    op = "replace",
-                    path = "/name",
-                        value = "Gordon"
-                },
-                new Operation
-                {
-                    op = "replace",
-                    path = "/surname",
-                        value = "Freeman"
-                }
-            };
-        }
-
-        object IExamplesProvider<object>.GetExamples()
-        {
-            return new[]
-          {
-                new Operation
-                {
-                    op = "replace",
-                    path = "/name",
-                        value = "Gordon"
-                },
-                new Operation
-                {
-                    op = "replace",
-                    path = "/surname",
-                        value = "Freeman"
-                }
-            };
-        }
-    }
-
-   
-}

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -20,7 +20,7 @@ using Microsoft.VisualBasic;
 using DocumentFormat.OpenXml.Spreadsheet;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Application.ViewModel;
-using Dicom;
+using Medallion.Threading;
 
 namespace IRaCIS.Core.Application.Contracts
 {
@@ -36,13 +36,14 @@ namespace IRaCIS.Core.Application.Contracts
         private readonly IRepository<TrialSite> _trialSiteRepository;
         private readonly IRepository<TrialUser> _trialUserRepository;
         private readonly IRepository<TrialSiteUser> _trialSiteUserRepository;
+        private readonly IDistributedLockProvider _distributedLockProvider;
         private readonly ITokenService _tokenService;
         private readonly IMailVerificationService _mailVerificationService;
 
         public TrialSiteSurveyService(IRepository<TrialSiteSurvey> trialSiteSurveyRepository, IRepository<TrialUser> trialUserRepository, IRepository<TrialSiteUserSurvey> trialSiteUserSurveyRepository,
             IRepository<User> userRepository, IRepository<TrialSite> trialSiteRepository,
             ITokenService tokenService,
-           IMailVerificationService mailVerificationService, IRepository<TrialSiteUser> trialSiteUserRepository)
+           IMailVerificationService mailVerificationService, IRepository<TrialSiteUser> trialSiteUserRepository, IDistributedLockProvider distributedLockProvider)
         {
             _trialSiteSurveyRepository = trialSiteSurveyRepository;
             _trialSiteUserSurveyRepository = trialSiteUserSurveyRepository;
@@ -52,9 +53,9 @@ namespace IRaCIS.Core.Application.Contracts
             _tokenService = tokenService;
             _mailVerificationService = mailVerificationService;
             _trialSiteUserRepository = trialSiteUserRepository;
+            _distributedLockProvider = distributedLockProvider;
         }
 
-        private object lockObj { get; set; } = new object();
 
         /// <summary>
         /// 发送验证码
@@ -792,7 +793,9 @@ namespace IRaCIS.Core.Application.Contracts
                 if (sysUserInfo == null)
                 {
 
-                    lock (lockObj)
+                    var @lock = _distributedLockProvider.CreateLock($"UserCode");
+
+                    using (await @lock.AcquireAsync())
                     {
                         var saveItem = _mapper.Map<User>(item);
 
@@ -972,7 +975,9 @@ namespace IRaCIS.Core.Application.Contracts
                 if (sysUserInfo == null)
                 {
 
-                    lock (lockObj)
+                    var @lock = _distributedLockProvider.CreateLock($"UserCode");
+
+                    using (await @lock.AcquireAsync())
                     {
                         var saveItem = _mapper.Map<User>(item);
 

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs

@@ -22,14 +22,14 @@ namespace IRaCIS.Application.Contracts
         [DictionaryTranslateAttribute("IsUserExitTrial")]
         public bool IsDeleted { get; set; }
 
-        [ExcelFormat("yyyy-MM-dd hh:mm:ss")]
+        [ExcelFormat("yyyy-MM-dd HH:mm:ss")]
         public DateTime? DeletedTime { get; set; }
 
         public Guid? SiteId { get; set; }
         public string Phone { get; set; } = String.Empty;
         public DateTime UpdateTime { get; set; }
 
-        [ExcelFormat("yyyy-MM-dd hh:mm:ss")]
+        [ExcelFormat("yyyy-MM-dd HH:mm:ss")]
         public DateTime CreateTime { get; set; }
 
 
@@ -84,7 +84,7 @@ namespace IRaCIS.Application.Contracts
 
 
         [ExporterHeader(Format = "yyyy-mm-DD hh:mm:ss")]
-        [ExcelFormat("yyyy-MM-dd hh:mm:ss")]
+        [ExcelFormat("yyyy-MM-dd HH:mm:ss")]
         public DateTime CreateTime { get; set; }
 
 
@@ -118,7 +118,8 @@ namespace IRaCIS.Application.Contracts
 
     public class ExcelExportInfo : TrialSelectDTO
     {
-        public DateTime CurrentTime { get; set; } = DateTime.Now;
+       
+        public string CurrentTime { get; set; } = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
 
         public bool IsEn_US { get; set; }
 

IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs

@@ -1,6 +1,7 @@
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Interfaces;
+using IRaCIS.Core.Application.Service.Reading.Interface;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
@@ -21,11 +22,13 @@ namespace IRaCIS.Core.Application
         private readonly IRepository<TrialDocument> _trialDocumentRepository;
         private readonly IRepository<SystemDocument> _systemDocumentRepository;
         private readonly IRepository<ReadModule> _readModuleRepository;
+        private readonly IClinicalAnswerService _clinicalAnswerService;
         private readonly IRepository<SystemNotice> _systemNoticeRepository;
 
         public PersonalWorkstation(IRepository<Trial> trialRepository, IRepository<TrialUser> trialUserRepository, IRepository<TrialDocument> trialDocumentRepository,
             IRepository<SystemDocument> systemDocumentRepository,
              IRepository<ReadModule> readModuleRepository,
+             IClinicalAnswerService clinicalAnswerService,
             IRepository<SystemNotice> systemNoticeRepository)
         {
             _trialRepository = trialRepository;
@@ -33,6 +36,7 @@ namespace IRaCIS.Core.Application
             _trialDocumentRepository = trialDocumentRepository;
             _systemDocumentRepository = systemDocumentRepository;
             this._readModuleRepository = readModuleRepository;
+            this._clinicalAnswerService = clinicalAnswerService;
             _systemNoticeRepository = systemNoticeRepository;
         }
 
@@ -48,11 +52,11 @@ namespace IRaCIS.Core.Application
                 //正参与的数量
                 TrialCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
                     ? await _trialRepository.CountAsync()
-                    : await _trialUserRepository.Where(t => t.UserId == _userInfo.Id).CountAsync(),
+                    : await _trialUserRepository.Where(t => t.UserId == _userInfo.Id && t.Trial.IsDeleted == false).CountAsync(),
 
                 DeletedCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
                     ? await _trialRepository.AsQueryable(true).CountAsync(t => t.IsDeleted)
-                    : await _trialUserRepository.AsQueryable(true).Where(t => t.UserId == _userInfo.Id && t.IsDeleted)
+                    : await _trialUserRepository.AsQueryable(true).Where(t => t.UserId == _userInfo.Id && t.Trial.IsDeleted)
                         .CountAsync(),
 
 
@@ -204,11 +208,12 @@ namespace IRaCIS.Core.Application
 
                     ToBeRepliedCount = t.SubjectVisitList.Where(u => u.CheckState == CheckStateEnum.CVIng &&
                     u.CheckChallengeDialogList.OrderByDescending(t => t.CreateTime).First().UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Count(),
-                }).Where(x => x.ToBeRepliedCount > 0); 
+                }).Where(x => x.ToBeRepliedCount > 0);
 
 
+            var defalutSortArray = new string[] { nameof(CheckToBeDoneDto.UrgentCount) + " desc", nameof(CheckToBeDoneDto.ToBeCheckedCount) + " desc" };
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(CheckToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
 
             var totalToBeCheckedCount = await _subjectVisitRepository.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                 .Where(u => u.CheckState == CheckStateEnum.ToCheck).CountAsync();
@@ -250,7 +255,9 @@ namespace IRaCIS.Core.Application
                  }).Where(x => x.ToBeApprovalCount > 0);
 
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ReReadingApplyToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
+            var defalutSortArray = new string[] { nameof(ReReadingApplyToBeDoneDto.UrgentCount) + " desc", nameof(ReReadingApplyToBeDoneDto.ToBeApprovalCount) + " desc" };
+
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
 
 
             var toBeApprovalCount = _visitTaskReReadingRepository
@@ -271,7 +278,7 @@ namespace IRaCIS.Core.Application
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<GetPMClinicalDataToBeDoneListOutDto>>> GetPMClinicalDataToBeDoneList(ReviewerSelectToBeDoneQuery inQuery)
         {
-            
+
             var query = _trialRepository
                 .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                 .Select(t => new GetPMClinicalDataToBeDoneListOutDto()
@@ -281,14 +288,18 @@ namespace IRaCIS.Core.Application
                     ExperimentName = t.ExperimentName,
                     TrialCode = t.TrialCode,
 
-                 
-                    ToBeApprovalCount = t.ReadModuleList.Where(u => u.IsCRCConfirm&&!u.IsPMConfirm).Count()
+
+                    ToBeApprovalCount = t.ReadModuleList.Where(u => u.IsCRCConfirm && !u.IsPMConfirm).Count()
                 }).Where(x => x.ToBeApprovalCount > 0);
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ReviewerSelectToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
-       
 
-            var all =await _trialRepository
+            var defalutSortArray = new string[] { nameof(GetPMClinicalDataToBeDoneListOutDto.ToBeApprovalCount) + " desc" };
+
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
+
+
+
+            var all = await _trialRepository
                 .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                 .Select(t => new GetPMClinicalDataToBeDoneListOutDto()
                 {
@@ -297,7 +308,7 @@ namespace IRaCIS.Core.Application
                     ToBeApprovalCount = t.ReadModuleList.Where(u => u.IsCRCConfirm && !u.IsPMConfirm).Count()
                 }).ToListAsync();
 
-            return ResponseOutput.Ok(result, new { ToBeApprovalCount = all.Sum(x=>x.ToBeApprovalCount) }); ;
+            return ResponseOutput.Ok(result, new { ToBeApprovalCount = all.Sum(x => x.ToBeApprovalCount) }); ;
         }
 
         #endregion
@@ -335,7 +346,10 @@ namespace IRaCIS.Core.Application
                 }).Where(x => x.ToBeApprovalCount > 0);
 
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ReReadingApprovalToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
+            var defalutSortArray = new string[] { nameof(ReReadingApprovalToBeDoneDto.UrgentCount) + " desc", nameof(ReReadingApprovalToBeDoneDto.ToBeApprovalCount) + " desc" };
+
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
+
 
             var toBeApprovalCount = _visitTaskReReadingRepository
                  .Where(t => t.OriginalReReadingTask.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -356,6 +370,7 @@ namespace IRaCIS.Core.Application
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_subjectVisitRepository"></param>
+        /// <param name="_trialRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<ImageClinicalDataToBeDoneDto>>> GetImageClinicalDataToBeDoneList(ImageClinicalDataToBeDoneQuery inQuery,
@@ -373,13 +388,15 @@ namespace IRaCIS.Core.Application
                     ExperimentName = t.ExperimentName,
                     TrialCode = t.TrialCode,
                     UrgentCount = t.SubjectVisitList.Where(u => u.IsBaseLine && u.SubmitState != SubmitStateEnum.Submitted && u.IsUrgent).Count(),
-                    ToBeDealedCount = t.ReadingClinicalDataList.Where(x=>!x.IsSign&& x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.SubjectVisit&& x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.Subject).Count(),
-                    ToBeVisitCount= t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit).Count(),
-                    ToAllCount= t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC ).Count(),
-                    ReadModuleCount =t.ReadModuleList.Where(x=>!x.IsPMConfirm).Count(),
-                }).Where(x=>x.ToBeDealedCount > 0);
+                    ToBeDealedCount = t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.SubjectVisit && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.Subject).Count(),
+                    ToBeVisitCount = t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit).Count(),
+                    ToAllCount = t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC).Count(),
+                    ReadModuleCount = t.ReadModuleList.Where(x => !x.IsPMConfirm).Count(),
+                }).Where(x => x.ToBeDealedCount > 0);
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageClinicalDataToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
+            var defalutSortArray = new string[] { nameof(ImageClinicalDataToBeDoneDto.UrgentCount) + " desc", nameof(ImageClinicalDataToBeDoneDto.ReadModuleCount) + " desc" };
+
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
 
             var toBeDealedCount = _subjectVisitRepository
                  //.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.Trial.clinicalDataTrialSets.Any(t => t.ClinicalDataLevel == ClinicalLevel.Subject && t.IsConfirm))
@@ -395,6 +412,7 @@ namespace IRaCIS.Core.Application
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_subjectVisitRepository"></param>
+        /// <param name="_trialRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<ImageClinicalDataToBeDoneDto>>> GetImageClinicalDataToBeConfirmList(ImageClinicalDataToBeDoneQuery inQuery,
@@ -415,10 +433,29 @@ namespace IRaCIS.Core.Application
                     ToBeDealedCount = t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.SubjectVisit && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.Subject).Count(),
                     ToBeVisitCount = t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit).Count(),
                     ToAllCount = t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC).Count(),
-                    ReadModuleCount = t.ReadModuleList.Where(x => !x.IsPMConfirm).Count(),
+                    ReadModuleCount = t.ReadModuleList.Where(x => !x.IsCRCConfirm).Count(),
                 }).Where(x => x.ReadModuleCount > 0);
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageClinicalDataToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
+            var defalutSortArray = new string[] { nameof(ImageClinicalDataToBeDoneDto.UrgentCount) + " desc", nameof(ImageClinicalDataToBeDoneDto.ToBeDealedCount) + " desc" };
+
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
+
+
+            // ReadModuleCount情况太多了 暂时用之前的方法
+            foreach (var item in result.CurrentPageData)
+            {
+                item.ReadModuleCount = (await _clinicalAnswerService.GetCRCConfirmList(new Service.Reading.Dto.GetCRCConfirmListInDto()
+                {
+                    TrialId = item.TrialId,
+                    IsPMConfirm = false,
+                    PageIndex = 1,
+                    PageSize = 9999,
+
+                })).CurrentPageData.Count();
+            }
+
+
+            result.CurrentPageData = result.CurrentPageData.Where(x => x.ReadModuleCount != 0).ToList();
 
             var toBeDealedCount = _subjectVisitRepository
                  //.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.Trial.clinicalDataTrialSets.Any(t => t.ClinicalDataLevel == ClinicalLevel.Subject && t.IsConfirm))
@@ -461,11 +498,14 @@ namespace IRaCIS.Core.Application
                     ToBeDealedCount = t.SubjectVisitList.Where(c => c.TrialSite.CRCUserList.Any(u => u.UserId == _userInfo.Id))
                     .SelectMany(c => c.QCChallengeList)
 
-                    .Where(u => u.IsClosed == false && u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IQC).Count(),
+                    .Where(u => u.IsClosed == false && (u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IQC || u.LatestReplyUserId == null)).Count(),
 
                 }).Where(x => x.ToBeDealedCount > 0); ;
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageQuestionToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
+            var defalutSortArray = new string[] { nameof(ImageQuestionToBeDoneDto.UrgentCount) + " desc", nameof(ImageQuestionToBeDoneDto.ToBeDealedCount) + " desc" };
+
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
+
 
             var toBeDealedCount = _subjectVisitRepository
                   .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -482,6 +522,7 @@ namespace IRaCIS.Core.Application
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_subjectVisitRepository"></param>
+        /// <param name="_trialRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<ImageCheckQuestionToBeDoneDto>>> GetImageCheckQuestionToBeDoneList(ImageCheckQuestionToBeDoneQuery inQuery,
@@ -507,9 +548,10 @@ namespace IRaCIS.Core.Application
                 }).Where(x => x.ToBeReplyedCount > 0);
 
 
+            var defalutSortArray = new string[] { nameof(ImageCheckQuestionToBeDoneDto.UrgentCount) + " desc", nameof(ImageCheckQuestionToBeDoneDto.ToBeReplyedCount) + " desc" };
 
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageCheckQuestionToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
 
             var toBeDealedCount = _subjectVisitRepository
                   .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -521,12 +563,12 @@ namespace IRaCIS.Core.Application
 
         }
 
-
         /// <summary>
         /// 影像重传  --CRC 待办
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_subjectVisitRepository"></param>
+        /// <param name="_trialRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<ImageReUploadToBeDoneDto>>> GetImageReUploadToBeDoneList(ImageReUploadToBeDoneQuery inQuery,
@@ -544,19 +586,22 @@ namespace IRaCIS.Core.Application
                     TrialCode = t.TrialCode,
                     UrgentCount = t.SubjectVisitList
                     .Where(c => c.TrialSite.CRCUserList.Any(u => u.UserId == _userInfo.Id))
-                    .Where(u => u.SubmitState == SubmitStateEnum.ToSubmit && u.IsUrgent && u.IsPMBackOrReReading).Count(),
+                    .Where(u => u.IsUrgent && ((u.SubmitState == SubmitStateEnum.ToSubmit && u.IsPMBackOrReReading) || u.IsQCConfirmedReupload)).Count(),
 
                     ToBeReUploadCount = t.SubjectVisitList
                     .Where(c => c.TrialSite.CRCUserList.Any(u => u.UserId == _userInfo.Id))
-                    .Where(u => u.SubmitState == SubmitStateEnum.ToSubmit && u.IsPMBackOrReReading).Count(),
+                    .Where(u => (u.SubmitState == SubmitStateEnum.ToSubmit && u.IsPMBackOrReReading) || (u.IsQCConfirmedReupload)).Count(),
 
                 }).Where(x => x.ToBeReUploadCount > 0);
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageReUploadToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
+
+            var defalutSortArray = new string[] { nameof(ImageReUploadToBeDoneDto.UrgentCount) + " desc", nameof(ImageReUploadToBeDoneDto.ToBeReUploadCount) + " desc" };
+
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
 
             var toBeDealedCount = _subjectVisitRepository
                   .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
-                  .Where(u => u.SubmitState == SubmitStateEnum.ToSubmit && u.IsPMBackOrReReading).Count();
+                  .Where(u => (u.SubmitState == SubmitStateEnum.ToSubmit && u.IsPMBackOrReReading) || (u.IsQCConfirmedReupload)).Count();
 
             return ResponseOutput.Ok(result, new { TotalToBeReUploadCount = toBeDealedCount });
 
@@ -566,10 +611,11 @@ namespace IRaCIS.Core.Application
 
 
         /// <summary>
-        /// 加急影像提交   --CRC 待办
+        ///  加急影像提交   --CRC 待办
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_subjectVisitRepository"></param>
+        /// <param name="_trialRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<ImageSubmittedToBeDoneDto>>> GetImageSubmittedToBeDoneList(ImageSubmittedToBeDoneQuery inQuery,
@@ -587,7 +633,7 @@ namespace IRaCIS.Core.Application
                     TrialCode = t.TrialCode,
                     UrgentCount = t.SubjectVisitList
                     .Where(c => c.TrialSite.CRCUserList.Any(u => u.UserId == _userInfo.Id))
-                    .Where(u => u.SubmitState == SubmitStateEnum.ToSubmit && u.IsUrgent).Count(),
+                    .Where(u => u.SubmitState == SubmitStateEnum.ToSubmit && (u.IsEnrollmentConfirm || u.PDState == PDStateEnum.PDProgress || u.Trial.IsUrgent || u.Subject.IsUrgent)/*u.IsUrgent*/).Count(),
 
 
                     ToBeDealedCount = t.SubjectVisitList
@@ -596,7 +642,12 @@ namespace IRaCIS.Core.Application
 
                 }).Where(x => x.ToBeDealedCount > 0); ;
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageSubmittedToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
+
+
+            var defalutSortArray = new string[] { nameof(ImageSubmittedToBeDoneDto.UrgentCount) + " desc", nameof(ImageSubmittedToBeDoneDto.ToBeDealedCount) + " desc" };
+
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
+
 
             var toBeDealedCount = _subjectVisitRepository
                   .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -620,6 +671,7 @@ namespace IRaCIS.Core.Application
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_subjectVisitRepository"></param>
+        /// <param name="_trialRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<ImageQualityToBeDoneDto>>> GetImageQualityToBeDoneList(ImageQualityToBeDoneQuery inQuery,
@@ -642,18 +694,23 @@ namespace IRaCIS.Core.Application
 
 
                     //待领取量
-                    ToBeClaimedCount = t.SubjectVisitList.Where(u => u.CurrentActionUserId == null && (u.PreliminaryAuditUserId == null || (u.PreliminaryAuditUserId != _userInfo.Id && u.ReviewAuditUserId == null))).Count(),
+                    ToBeClaimedCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted && t.AuditState!=AuditStateEnum.QCPassed)
+                    .Where(u => u.CurrentActionUserId == null && (u.PreliminaryAuditUserId == null || (u.PreliminaryAuditUserId != _userInfo.Id && u.ReviewAuditUserId == null))).Count(),
 
                     //待审核通过，统计从已领取到QC提交之间的      已领取 待审核 审核中   (审核完成  领取人就会清理 所以只用查询当前领取人是自己的就好了)
                     ToBeReviewedCount = t.SubjectVisitList.Where(u => u.CurrentActionUserId == _userInfo.Id).Count()
 
-                }).Where(x => x.UrgentCount > 0); 
+                }).Where(x => x.ToBeClaimedCount + x.ToBeReviewedCount > 0);
+
+
+            var defalutSortArray = new string[] { nameof(ImageQualityToBeDoneDto.UrgentCount) + " desc", nameof(ImageQualityToBeDoneDto.ToBeClaimedCount) + " desc" };
+
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageQualityToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
 
 
             var toBeClaimedCount = _subjectVisitRepository
-                .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
+                .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id)&& t.SubmitState == SubmitStateEnum.Submitted  && t.AuditState != AuditStateEnum.QCPassed)
                 .Where(u => u.CurrentActionUserId == null && (u.PreliminaryAuditUserId == null || (u.PreliminaryAuditUserId != _userInfo.Id && u.ReviewAuditUserId == null))).Count();
 
 
@@ -667,10 +724,11 @@ namespace IRaCIS.Core.Application
 
 
         /// <summary>
-        /// QC 质疑
+        ///  QC 质疑
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_subjectVisitRepository"></param>
+        /// <param name="_trialRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<ImageQuestionToBeDoneDto>>> GetQCImageQuestionToBeDoneList(ImageQuestionToBeDoneQuery inQuery,
@@ -694,7 +752,10 @@ namespace IRaCIS.Core.Application
 
                 }).Where(x => x.ToBeDealedCount > 0); ;
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageQuestionToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
+            var defalutSortArray = new string[] { nameof(ImageQuestionToBeDoneDto.UrgentCount) + " desc", nameof(ImageQuestionToBeDoneDto.ToBeDealedCount) + " desc" };
+
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
+
 
             var toBeDealedCount = _subjectVisitRepository
                   .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -835,8 +896,9 @@ namespace IRaCIS.Core.Application
             #endregion
 
 
+            var defalutSortArray = new string[] { nameof(IRImageReadingToBeDoneDto.UrgentCount) + " desc", nameof(IRImageReadingToBeDoneDto.UnReadCount) + " desc" };
 
-            var result = await newQuery.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(IRImageReadingToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
+            var result = await newQuery.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
 
             var toBeDealedCount = _trialRepository
                    .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -857,7 +919,7 @@ namespace IRaCIS.Core.Application
         /// IR医学反馈 
         /// </summary>
         /// <param name="inQuery"></param>
-
+        /// <param name="_taskMedicalReviewRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<MedicalCommentsToBeDoneDto>>> GetIRMedicalCommentsToBeDoneList(MedicalCommentsToBeDoneQuery inQuery,
@@ -885,20 +947,35 @@ namespace IRaCIS.Core.Application
                     CriterionName = g.Key.CriterionName,
                     TrialReadingCriterionId = g.Key.TrialReadingCriterionId,
 
+                    #region 不能对包含聚合或子查询的表达式执行聚合函数
+                    
+
+                    UrgentCount = g.Where(u => u.VisitTask.IsUrgent && u.LatestReplyUser.UserTypeEnum== UserTypeEnum.MIM).Count(),
+
+                    ToBeReplyedCount = g.Where(u => u.LatestReplyUser.UserTypeEnum == UserTypeEnum.MIM).Count(),
+
+                    #endregion
                     //UrgentCount = g.Where(u => u.VisitTask.IsUrgent
                     //&& u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM).Count(),
 
                     //ToBeReplyedCount = g.Where(u =>
                     // u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM).Count(),
 
-                });
+                }).Where(t => t.ToBeReplyedCount > 0);
+
+
+            var defalutSortArray = new string[] { nameof(MedicalCommentsToBeDoneDto.UrgentCount) + " desc", nameof(MedicalCommentsToBeDoneDto.ToBeReplyedCount) + " desc" };
+
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
+
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(MedicalCommentsToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
 
             var toBeDealedCount = _taskMedicalReviewRepository
                 .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                 .Where(t => t.IsClosedDialog == false && t.VisitTask.DoctorUserId == _userInfo.Id)
-                .Where(u => u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM).Count();
+                .Where(u => u.LatestReplyUser.UserTypeEnum == UserTypeEnum.MIM)
+                //.Where(u => u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM)
+                .Count();
 
             return ResponseOutput.Ok(result, new { TotalToBeReplyedCount = toBeDealedCount });
 
@@ -916,7 +993,7 @@ namespace IRaCIS.Core.Application
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_taskMedicalReviewRepository"></param>
-
+        /// <param name="_trialReadingCriterionRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<MedicalCommentsToBeDoneDto>>> GetMIMMedicalCommentsToBeDoneList(MedicalCommentsToBeDoneQuery inQuery,
@@ -945,24 +1022,33 @@ namespace IRaCIS.Core.Application
                        TrialCode = g.Key.TrialCode,
                        CriterionName = g.Key.CriterionName,
 
+                       UrgentCount = g.Where(u => u.VisitTask.IsUrgent).Select(u => u.VisitTask.IsUrgent && u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IndependentReviewer).Count(),
+
+                       ToBeReplyedCount = g.Select(u => u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IndependentReviewer).Count(),
+
                        //UrgentCount = g.Where(u => u.VisitTask.IsUrgent).Select(u => u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First()).Count(t => t.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer),
 
                        //ToBeReplyedCount = g.Select(t => t.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First()).Count(t => t.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer),
 
                        ToBeReviewedCount = g.Where(u => !u.IsInvalid && u.AuditState != MedicalReviewAuditState.HaveSigned).Count()
 
-                   });
+                   }).Where(t => t.ToBeReplyedCount > 0);
 
             #endregion
 
 
+            var defalutSortArray = new string[] { nameof(MedicalCommentsToBeDoneDto.UrgentCount) + " desc", nameof(MedicalCommentsToBeDoneDto.ToBeReplyedCount) + " desc" };
+
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
+
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(MedicalCommentsToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
 
             var toBeReplyedQuery = _taskMedicalReviewRepository
                   .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                   .Where(t => t.IsClosedDialog == false)
-                  .Where(u => u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer);
+                  .Where(u => u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IndependentReviewer);
+
+            //.Where(u => u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer);
 
             var toBeReplyedCount = toBeReplyedQuery.Count();
 
@@ -1031,7 +1117,7 @@ namespace IRaCIS.Core.Application
              .WhereIf(!string.IsNullOrEmpty(inQuery.Code), o => o.TrialCode.Contains(inQuery.Code))
              .WhereIf(!string.IsNullOrEmpty(inQuery.ResearchProgramNo), o => o.ResearchProgramNo.Contains(inQuery.ResearchProgramNo))
              .WhereIf(!string.IsNullOrWhiteSpace(inQuery.ExperimentName), o => o.ExperimentName.Contains(inQuery.ExperimentName))
-             .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id && t.IsDeleted == false) && t.IsDeleted == false)
+             .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.Admin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.OP, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id && t.IsDeleted == false) && t.IsDeleted == false)
              .Select(t => new TrialToBeDoneDto()
              {
                  TrialId = t.Id,

IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -18,7 +18,6 @@ using IRaCIS.Core.Application.Filter;
 using static IRaCIS.Core.Domain.Share.StaticData;
 using IRaCIS.Core.Application.Service;
 using DocumentFormat.OpenXml.Office.CustomUI;
-using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Domain.Models;
 
 namespace IRaCIS.Core.Application
@@ -105,7 +104,7 @@ namespace IRaCIS.Core.Application
         [HttpPost]
         public async Task<IResponseOutput> TrialReadingInfoSignVerify(TrialReadingInfoSignInDto inDto)
         {
-            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstOrDefaultAsync();
+            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
             var existsJudge = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialCriterion.Id && x.IsJudgeQuestion && x.JudgeType == JudgeTypeEnum.None)
                 .WhereIf(trialCriterion.FormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null)
                 .WhereIf(trialCriterion.FormType == FormType.MultiplePage, x => x.ReadingCriterionPageId != null)
@@ -145,7 +144,7 @@ namespace IRaCIS.Core.Application
         [NonDynamicMethod]
         public async Task<IResponseOutput> TrialReadingInfoSign(TrialReadingInfoSignInDto inDto)
         {
-            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstOrDefaultAsync();
+            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
 
             var existsJudge = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialCriterion.Id && x.IsJudgeQuestion && x.JudgeType == JudgeTypeEnum.None)
                   .WhereIf(trialCriterion.FormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null)
@@ -437,7 +436,7 @@ namespace IRaCIS.Core.Application
         [HttpPost]
         public async Task<(List<TrialJudgeQuestion>, object)> GetTrialReadingJudgeList(GetTrialReadingInfoInDto inDto)
         {
-            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstOrDefaultAsync();
+            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
 
             var judgeQuestionList = await _readingQuestionTrialRepository
                 .WhereIf(trialCriterion.FormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null)
@@ -485,7 +484,7 @@ namespace IRaCIS.Core.Application
         {
             GetTrialReadingCriterionInfoOutDto result = new GetTrialReadingCriterionInfoOutDto();
             result.ReadingCriterionPageList = await _readingCriterionPageRepository.Where(x => x.TrialId == inDto.TrialId).ProjectTo<ReadingCriterionPageDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
-            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstOrDefaultAsync();
+            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
             result.ReadingInfoSignTime = trialCriterion.ReadingInfoSignTime;
 
             result.DigitPlaces = trialCriterion.DigitPlaces;
@@ -662,7 +661,7 @@ namespace IRaCIS.Core.Application
                 }
             }
 
-            if (showOrderList.Count() != showOrderList.Select(t => t.ShowOrder).Distinct().Count())
+            if (showOrderList.Count != showOrderList.Select(t => t.ShowOrder).Distinct().Count())
             {
                 //---影像质控审核问题显示序号不能重复。
                 throw new BusinessValidationFailedException(_localizer["TrialConfig_DuplicateAuditQuestionId"]);
@@ -732,7 +731,7 @@ namespace IRaCIS.Core.Application
                     }
                 }
 
-                if (showOrderList.Count() != showOrderList.Select(t => t.ShowOrder).Distinct().Count())
+                if (showOrderList.Count != showOrderList.Select(t => t.ShowOrder).Distinct().Count())
                 {
                     //---影像质控审核问题显示序号不能重复。
                     throw new BusinessValidationFailedException(_localizer["TrialConfig_DuplicateAuditQuestionId"]);

IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs

@@ -16,6 +16,7 @@ using Panda.DynamicWebApi.Attributes;
 using IRaCIS.Core.Application.Auth;
 using IRaCIS.Application.Services;
 using IRaCIS.Core.Application.Filter;
+using Medallion.Threading;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -31,10 +32,11 @@ namespace IRaCIS.Core.Application.Service
         private readonly IRepository<TrialSiteUserSurvey> _trialSiteSurveyUserRepository;
         private readonly IRepository<TrialSiteUser> _trialSiteUserRepository;
         private readonly IMailVerificationService _mailVerificationService;
+        private readonly IDistributedLockProvider _distributedLockProvider;
 
         public TrialExternalUserService(IRepository<TrialExternalUser> trialExternalUseRepository, IRepository<User> userRepository, IRepository<TrialUser> trialUserRepository,
             IRepository<TrialSiteUserSurvey> trialSiteSurveyUserRepository, IRepository<TrialSiteUser> trialSiteUserRepository,
-          IMailVerificationService mailVerificationService)
+          IMailVerificationService mailVerificationService, IDistributedLockProvider distributedLockProvider)
         {
             _trialExternalUseRepository = trialExternalUseRepository;
             _userRepository = userRepository;
@@ -43,6 +45,7 @@ namespace IRaCIS.Core.Application.Service
             _trialSiteUserRepository = trialSiteUserRepository;
 
             _mailVerificationService = mailVerificationService;
+            _distributedLockProvider = distributedLockProvider;
         }
 
 
@@ -75,121 +78,125 @@ namespace IRaCIS.Core.Application.Service
 
             if (addOrEditTrialExternalUser.Id == null)
             {
-                var existSysUser = await _userRepository.FirstOrDefaultAsync(t => t.EMail == addOrEditTrialExternalUser.Email && t.UserTypeId == addOrEditTrialExternalUser.UserTypeId);
+                var @lock = _distributedLockProvider.CreateLock($"UserCode");
 
-                if (existSysUser != null)
+                using (await @lock.AcquireAsync())
                 {
-                    if (existSysUser.LastName != addOrEditTrialExternalUser.LastName || existSysUser.FirstName != addOrEditTrialExternalUser.FirstName)
+                    var existSysUser = await _userRepository.FirstOrDefaultAsync(t => t.EMail == addOrEditTrialExternalUser.Email && t.UserTypeId == addOrEditTrialExternalUser.UserTypeId);
+
+                    if (existSysUser != null)
                     {
-                        //$"该用户在系统中的用户名为：{existSysUser.LastName + " / " + existSysUser.FirstName} 电话：{existSysUser.Phone}，与填写信息存在不一致项, 请将界面信息修改为与系统一致，再进行保存",
-                        return ResponseOutput.NotOk(_localizer["TrialExternalUser_Inconsistency", existSysUser.LastName + " / " + existSysUser.FirstName, existSysUser.Phone], new { existSysUser.LastName, existSysUser.FirstName, existSysUser.Phone, existSysUser.IsZhiZhun, existSysUser.IsTestUser }, ApiResponseCodeEnum.NeedTips);
+                        if (existSysUser.LastName != addOrEditTrialExternalUser.LastName || existSysUser.FirstName != addOrEditTrialExternalUser.FirstName)
+                        {
+                            //$"该用户在系统中的用户名为：{existSysUser.LastName + " / " + existSysUser.FirstName} 电话：{existSysUser.Phone}，与填写信息存在不一致项, 请将界面信息修改为与系统一致，再进行保存",
+                            return ResponseOutput.NotOk(_localizer["TrialExternalUser_Inconsistency", existSysUser.LastName + " / " + existSysUser.FirstName, existSysUser.Phone], new { existSysUser.LastName, existSysUser.FirstName, existSysUser.Phone, existSysUser.IsZhiZhun, existSysUser.IsTestUser }, ApiResponseCodeEnum.NeedTips);
+                        }
+
                     }
 
-                }
+                    //处理  生成账户
 
-                //处理  生成账户
-
-                if (await _trialExternalUseRepository.AnyAsync(t =>
-                        t.Email == addOrEditTrialExternalUser.Email &&
-                        t.UserTypeId == addOrEditTrialExternalUser.UserTypeId && t.TrialId == addOrEditTrialExternalUser.TrialId))
-                {
-                //---系统已经存在与列表中填写的邮箱和用户类型相同的账户，请确认。
-                    return ResponseOutput.NotOk(_localizer["TrialExternalUser_EmailTypeDuplicate"]);
-                }
+                    if (await _trialExternalUseRepository.AnyAsync(t =>
+                            t.Email == addOrEditTrialExternalUser.Email &&
+                            t.UserTypeId == addOrEditTrialExternalUser.UserTypeId && t.TrialId == addOrEditTrialExternalUser.TrialId))
+                    {
+                        //---系统已经存在与列表中填写的邮箱和用户类型相同的账户，请确认。
+                        return ResponseOutput.NotOk(_localizer["TrialExternalUser_EmailTypeDuplicate"]);
+                    }
 
 
 
-                var addEntity = _mapper.Map<TrialExternalUser>(addOrEditTrialExternalUser);
+                    var addEntity = _mapper.Map<TrialExternalUser>(addOrEditTrialExternalUser);
 
-                await _trialExternalUseRepository.AddAsync(addEntity);
+                    await _trialExternalUseRepository.AddAsync(addEntity);
 
 
-                var existUser = await _userRepository.FirstOrDefaultAsync(t => t.EMail == addOrEditTrialExternalUser.Email && t.UserTypeId == addOrEditTrialExternalUser.UserTypeId);
-                var trialType = await _repository.Where<Trial>(t => t.Id == addOrEditTrialExternalUser.TrialId).Select(t => t.TrialType).FirstOrDefaultAsync();
+                    var existUser = await _userRepository.FirstOrDefaultAsync(t => t.EMail == addOrEditTrialExternalUser.Email && t.UserTypeId == addOrEditTrialExternalUser.UserTypeId);
+                    var trialType = await _repository.Where<Trial>(t => t.Id == addOrEditTrialExternalUser.TrialId).Select(t => t.TrialType).FirstOrDefaultAsync();
 
-                if (existUser != null)
-                {
-                    addEntity.IsSystemUser = true;
-                    addEntity.SystemUserId = existUser.Id;
+                    if (existUser != null)
+                    {
+                        addEntity.IsSystemUser = true;
+                        addEntity.SystemUserId = existUser.Id;
 
-                }
-                else
-                {
+                    }
+                    else
+                    {
 
-                    //生成账户  并插入
+                        //生成账户  并插入
 
-                    var generateUser = _mapper.Map<User>(addOrEditTrialExternalUser);
+                        var generateUser = _mapper.Map<User>(addOrEditTrialExternalUser);
+
+                        if (trialType == TrialType.NoneOfficial)
+                        {
+                            generateUser.IsTestUser = true;
+                        }
+
+                        // 外部人员生成账号 都是外部的
+                        generateUser.IsZhiZhun = false;
+
+                        generateUser.Code = _userRepository.Select(t => t.Code).DefaultIfEmpty().Max() + 1;
+
+
+                        generateUser.UserCode = AppSettings.GetCodeStr(generateUser.Code, nameof(User));
+
+                        generateUser.UserName = generateUser.UserCode;
+
+                        generateUser.UserTypeEnum = _repository.Where<UserType>(t => t.Id == generateUser.UserTypeId).Select(t => t.UserTypeEnum).First();
+
+                        generateUser.Password = MD5Helper.Md5("123456");
+
+                        generateUser.Status = UserStateEnum.Disable;
+
+                        var newAddUser = await _repository.AddAsync(generateUser);
+
+
+                        addEntity.IsSystemUser = false;
+                        addEntity.SystemUserId = newAddUser.Id;
+
+
+                        existUser = newAddUser;
+
+                    }
+
+                    #region 验证用户 能否加入
+
+                    if (trialType == TrialType.OfficialTrial || trialType == TrialType.Training)
+                    {
+
+                        if (existUser.IsTestUser)
+                        {
+                            //---正式类型 、培训类型的项目 不允许加入测试用户 
+                            throw new BusinessValidationFailedException(_localizer["TrialExternalUser_TestUserNotAllowed"]);
+
+                        }
+                    }
 
                     if (trialType == TrialType.NoneOfficial)
                     {
-                        generateUser.IsTestUser = true;                   
+
+                        if (existUser.IsTestUser == false)
+                        {
+                            //---测试项目  不允许加入正式用户 
+                            throw new BusinessValidationFailedException(_localizer["TrialExternalUser_FormalUserNotAllowed"]);
+                        }
                     }
 
-                    // 外部人员生成账号 都是外部的
-                    generateUser.IsZhiZhun = false;
-
-                    generateUser.Code = _userRepository.Select(t => t.Code).DefaultIfEmpty().Max() + 1;
+                    #endregion
 
 
-                    generateUser.UserCode = AppSettings.GetCodeStr(generateUser.Code, nameof(User));
-
-                    generateUser.UserName = generateUser.UserCode;
-
-                    generateUser.UserTypeEnum = _repository.Where<UserType>(t => t.Id == generateUser.UserTypeId).Select(t => t.UserTypeEnum).First();
-
-                    generateUser.Password = MD5Helper.Md5("123456");
-
-                    generateUser.Status = UserStateEnum.Disable;
-
-                    var newAddUser = await _repository.AddAsync(generateUser);
+                    await _trialExternalUseRepository.SaveChangesAsync();
 
 
-                    addEntity.IsSystemUser = false;
-                    addEntity.SystemUserId = newAddUser.Id;
-
-
-                    existUser = newAddUser;
-
-                }
-
-                #region 验证用户 能否加入
-
-                if (trialType == TrialType.OfficialTrial || trialType == TrialType.Training)
-                {
-
-                    if (existUser.IsTestUser)
+                    //添加的时候就发邮件  现在省略
+                    if (addOrEditTrialExternalUser.IsSendEmail)
                     {
-                //---正式类型 、培训类型的项目 不允许加入测试用户 
-                        throw new BusinessValidationFailedException(_localizer["TrialExternalUser_TestUserNotAllowed"]);
-
-                    }
-                }
-
-                if (trialType == TrialType.NoneOfficial)
-                {
-
-                    if (existUser.IsTestUser == false )
-                    {
-                //---测试项目  不允许加入正式用户 
-                        throw new BusinessValidationFailedException(_localizer["TrialExternalUser_FormalUserNotAllowed"]);
-                    }
-                }
-
-                #endregion
-
-
-                await _trialExternalUseRepository.SaveChangesAsync();
-
-
-                //添加的时候就发邮件  现在省略
-                if (addOrEditTrialExternalUser.IsSendEmail)
-                {
-                    await SendExternalUserJoinEmail(new TrialExternalUserSendEmail()
-                    {
-                        BaseUrl = addOrEditTrialExternalUser.BaseUrl,
-                        RouteUrl = addOrEditTrialExternalUser.RouteUrl,
-                        TrialId = addOrEditTrialExternalUser.TrialId,
-                        SendUsers = new List<UserEmail>()
+                        await SendExternalUserJoinEmail(new TrialExternalUserSendEmail()
+                        {
+                            BaseUrl = addOrEditTrialExternalUser.BaseUrl,
+                            RouteUrl = addOrEditTrialExternalUser.RouteUrl,
+                            TrialId = addOrEditTrialExternalUser.TrialId,
+                            SendUsers = new List<UserEmail>()
                         {
                             new UserEmail()
                             {
@@ -199,12 +206,13 @@ namespace IRaCIS.Core.Application.Service
                                 SystemUserId=addEntity.SystemUserId
                             }
                         }
-                    });
+                        });
+                    }
+
+
+                    return ResponseOutput.Ok(addEntity.Id.ToString());
                 }
 
-
-                return ResponseOutput.Ok(addEntity.Id.ToString());
-
             }
             else
             {

IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs

@@ -25,13 +25,17 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<TrialUser> _trialUserRepository;
         private readonly IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig;
 
+        private readonly IOptionsMonitor<SystemEmailSendConfig> _systemEmailSendConfig;
+
         public bool TrialExpeditedChange { get; set; } = false;
 
 
         public TrialService(IEasyCachingProvider provider, IRepository<Trial> trialRepository,
             IRepository<TrialUser> trialUserRepository, IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig
+            , IOptionsMonitor<SystemEmailSendConfig> systemEmailSendConfig
             )
         {
+            _systemEmailSendConfig = systemEmailSendConfig;
             _verifyConfig = verifyConfig;
             _provider = provider;
             _trialRepository = trialRepository;
@@ -91,8 +95,9 @@ namespace IRaCIS.Application.Services
                 .WhereIf(multiModalityIdSelectCount > 0, t => t.TrialDicList.Count(t => t.KeyName == StaticData.Modality) == multiModalityIdSelectCount)
                 .WhereIf(multiCriteriaSelectCount > 0, t => t.TrialDicList.Count(t => t.KeyName == StaticData.Criterion) == multiCriteriaSelectCount)
                 .WhereIf(multiReviewTypeSelectCount > 0, t => t.TrialDicList.Count(t => t.KeyName == StaticData.ReviewType) == multiReviewTypeSelectCount)
-                .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id && t.IsDeleted == false) && t.IsDeleted == false)
-                .ProjectTo<TrialDetailDTO>(_mapper.ConfigurationProvider, new { userTypeEnumInt = _userInfo.UserTypeEnumInt, userId = _userInfo.Id });
+                .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.Admin 
+                && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.OP, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id && t.IsDeleted == false) && t.IsDeleted == false)
+                .ProjectTo<TrialDetailDTO>(_mapper.ConfigurationProvider, new { userTypeEnumInt = _userInfo.UserTypeEnumInt, userId = _userInfo.Id , isEn_Us= _userInfo.IsEn_Us });
 
             return await query.ToPagedListAsync(searchParam.PageIndex, searchParam.PageSize, string.IsNullOrWhiteSpace(searchParam.SortField) ? "CreateTime" : searchParam.SortField, searchParam.Asc);
 
@@ -103,7 +108,8 @@ namespace IRaCIS.Application.Services
         public async Task<List<TrialSelectDTO>> GetTrialSelect()
         {
             return await _trialRepository.AsQueryable().IgnoreQueryFilters()
-                .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.IsDeleted == false)
+                .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt  !=(int)UserTypeEnum.Admin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.OP
+                , t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.IsDeleted == false)
 
                 .ProjectTo<TrialSelectDTO>(_mapper.ConfigurationProvider).ToListAsync();
         }
@@ -118,7 +124,7 @@ namespace IRaCIS.Application.Services
         [HttpGet("{projectId:guid}")]
         public async Task<TrialDetailDTO> GetTrialInfoAndLockState(Guid projectId)
         {
-            return (await _trialRepository.Where(o => o.Id == projectId).IgnoreQueryFilters().ProjectTo<TrialDetailDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
+            return (await _trialRepository.Where(o => o.Id == projectId).IgnoreQueryFilters().ProjectTo<TrialDetailDTO>(_mapper.ConfigurationProvider, new {isEn_Us = _userInfo.IsEn_Us }).FirstOrDefaultAsync()).IfNullThrowException();
 
         }
 
@@ -213,6 +219,15 @@ namespace IRaCIS.Application.Services
                 await _repository.AddAsync(new VisitStage { TrialId = trial.Id, VisitNum = 0, BlindName = "B" + 0.ToString("D3"), VisitDay = 0, VisitName = "Baseline", IsBaseLine = true });
                 await _repository.AddAsync(new VisitStage { TrialId = trial.Id, VisitNum = 1, BlindName = "B" + 10.ToString("D3"), VisitDay = 30, VisitName = "Visit 1" });
 
+                //默认采用系统邮件
+
+                trial.EmailAuthorizationCode = _systemEmailSendConfig.CurrentValue.AuthorizationCode;
+                trial.EmailFromEmail = _systemEmailSendConfig.CurrentValue.FromEmail;
+                trial.EmailFromName = _systemEmailSendConfig.CurrentValue.FromName;
+                trial.EmailSMTPServerAddress = _systemEmailSendConfig.CurrentValue.Host;
+                trial.EmailSMTPServerPort = _systemEmailSendConfig.CurrentValue.Port;
+                trial.IsConfigureEmail = true;
+
 
                 var success = await _repository.SaveChangesAsync();
 
@@ -291,11 +306,15 @@ namespace IRaCIS.Application.Services
                 await _repository.BatchDeleteAsync<ClinicalQuestionAnswer>(o => o.ClinicalForm.TrialId == trialId);
                 await _repository.BatchDeleteAsync<ClinicalForm>(o => o.TrialId == trialId);
 
-                await _repository.BatchDeleteAsync<UserUploadFile>(o => o.TrialId == trialId);
+              
                 await _repository.BatchDeleteAsync<CriterionNidusSystem>(o => o.TrialReadingCriterion.TrialId == trialId);
 
                 await _repository.BatchDeleteAsync<CriterionNidusTrial>(o => o.TrialReadingCriterion.TrialId == trialId);
 
+                await _repository.BatchDeleteAsync<CheckChallengeDialog>(o => o.SubjectVisit.TrialId == trialId);
+                await _repository.BatchDeleteAsync<ClinicalDataTrialSet>(o => o.TrialId == trialId);
+                await _repository.BatchDeleteAsync<InspectionFile>(o => o.TrialId == trialId);
+                await _repository.BatchDeleteAsync<CriterionNidusSystem>(o => o.TrialReadingCriterion.TrialId == trialId);
                 await _repository.BatchDeleteAsync<DataInspection>(o => o.TrialId == trialId);
                 await _repository.BatchDeleteAsync<DicomStudy>(t => t.TrialId == trialId);
                 await _repository.BatchDeleteAsync<StudyMonitor>(t => t.TrialId == trialId);

IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs

@@ -323,7 +323,7 @@ namespace IRaCIS.Core.Application.Services
         {
             //CRC只看到他负责的    
 
-            var list = await _trialSiteRepository.Where(t => t.TrialId == trialId)
+            var list = await _trialSiteRepository.Where(t => t.TrialId == trialId).IgnoreQueryFilters()
                           .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.CRCUserList.Any(t => t.UserId == _userInfo.Id))
                           .ProjectTo<TrialSiteForSelect>(_mapper.ConfigurationProvider).OrderBy(t => t.TrialSiteCode).ToListAsync();
 
@@ -348,7 +348,6 @@ namespace IRaCIS.Core.Application.Services
 
         /// <summary>删除  项目  下某一site </summary>
         [HttpDelete("{id:guid}/{trialId:guid}")]
-        [TrialAudit(AuditType.TrialAudit, AuditOptType.DeleteTrialSite)]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         [Obsolete]
         public async Task<IResponseOutput> DeleteTrialSite(Guid id)

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

@@ -65,16 +65,17 @@ namespace IRaCIS.Core.Application.Service
 
             var userId = Guid.Empty;
             var userTypeEnumInt = 0;
+            var isEn_Us = false;
             CreateMap<Trial, TrialDetailDTO>()
                 .ForMember(x=>x.CriterionList,y=>y.MapFrom(z=>z.ReadingQuestionCriterionTrialList.Where(n=>n.IsConfirm).Select(m=>m.CriterionName)))
                 .ForMember(d => d.DictionaryList, u => u.MapFrom(s => s.TrialDicList.Select(t => t.Dictionary).OrderBy(t => t.ShowOrder)))
                 //.ForMember(d => d.Code, u => u.MapFrom(s => s.TrialCode))
                 .ForMember(d => d.Sponsor, u => u.MapFrom(s => s.Sponsor.SponsorName))
-                .ForMember(d => d.Phase, u => u.MapFrom(s => s.Phase.MappedValue))
+                .ForMember(d => d.Phase, u => u.MapFrom(s => isEn_Us? s.Phase.Value: s.Phase.ValueCN))
                 //.ForMember(d => d.DeclarationType, u => u.MapFrom(s => s.DeclarationType.MappedValue))
-                .ForMember(d => d.IndicationType, u => u.MapFrom(s => s.IndicationType.MappedValue))
+                .ForMember(d => d.IndicationType, u => u.MapFrom(s => isEn_Us ? s.IndicationType.Value:s.IndicationType.ValueCN))
                 .ForMember(d => d.CRO, u => u.MapFrom(s => s.CRO.CROName))
-                .ForMember(d => d.ReviewMode, u => u.MapFrom(s => s.ReviewMode.MappedValue))
+                .ForMember(d => d.ReviewMode, u => u.MapFrom(s => isEn_Us ? s.ReviewMode.Value:s.ReviewMode.ValueCN))
                 //.ForMember(d => d.ReviewType, u => u.MapFrom(s => s.ReviewType.Value))
              
                 //.ForMember(d => d.SiteCount, u => u.MapFrom(s => userTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator ? s.TrialSiteUserList.Count(k => k.UserId == userId) : s.TrialSiteList.Count()))
@@ -106,9 +107,8 @@ namespace IRaCIS.Core.Application.Service
               .ForMember(d => d.TrialId, u => u.MapFrom(s => trialId))
               .ForMember(d => d.IsSelect, u => u.MapFrom(t => t.UserTrials.Any(t => t.TrialId == trialId)));
 
-            var isEn_Us = false;
             CreateMap<Site, SiteSelectDTO>()
-          .ForMember(d => d.HospitalName, u => u.MapFrom(s => s.Hospital.HospitalName));
+          .ForMember(d => d.HospitalName, u => u.MapFrom(s =>  isEn_Us? s.Hospital.HospitalName:s.Hospital.HospitalNameCN));
 
             //trial site 选择列表  subjectVisit pannel 模式添加的时候
 

IRaCIS.Core.Application/Service/Visit/SubjectService.cs

@@ -26,7 +26,6 @@ namespace IRaCIS.Application.Services
         /// <param name="subjectCommand">state:1-访视中，2-出组。0-全部</param>
         /// <returns></returns>
 
-        [TrialAudit(AuditType.SubjectAudit, AuditOptType.AddOrUpdateSubject)]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         //[Authorize(Policy = IRaCISPolicy.PM_APM_CRC_QC)]
         public async Task<IResponseOutput<string>> AddOrUpdateSubject([FromBody] SubjectCommand subjectCommand)

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -295,7 +295,7 @@ namespace IRaCIS.Core.Application.Services
                 );
 
                 //设置为阅片与否 不更改数据库检查  的instance数量 和 SeriesCount  所以这里要实时统计
-                t.SeriesCount = t.SeriesList.Count();
+                t.SeriesCount = t.SeriesList.Count;
                 t.InstanceCount = t.SeriesList.SelectMany(t => t.InstanceList).Count();
             }
 
@@ -370,7 +370,7 @@ namespace IRaCIS.Core.Application.Services
                         {
                             item.SeriesInstanceUid = string.Empty;
 
-                            item.InstanceList = thisRowinfo.Where(y => y.InstanceId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(y => y.InstanceId.Value).Distinct().ToList();
+                            item.InstanceList = thisRowinfo.Where(y => y.InstanceId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(y => y.InstanceId!.Value).Distinct().ToList();
 
                             var tempInstanceList = await _repository.Where<DicomInstance>(t => item.InstanceList.Contains(t.Id)).OrderBy(t => t.InstanceNumber)
                                 .Select(t => new TempInstance
@@ -417,7 +417,7 @@ namespace IRaCIS.Core.Application.Services
                         })
                         .ToList();
 
-                            item.InstanceCount = item.InstanceList.Count();
+                            item.InstanceCount = item.InstanceList.Count;
 
                             item.Description = "Key Series";
 
@@ -425,7 +425,7 @@ namespace IRaCIS.Core.Application.Services
                             ThenBy(s => s.SeriesTime).Select(x => x.Modality).Distinct().ToListAsync(); ;
                             item.Modality = string.Join(",", modalityList);
                             thisVisitTaskStudy.SeriesList.Add(item);
-                            thisVisitTaskStudy.SeriesCount = thisVisitTaskStudy.SeriesList.Count();
+                            thisVisitTaskStudy.SeriesCount = thisVisitTaskStudy.SeriesList.Count;
 
 
 
@@ -502,12 +502,12 @@ namespace IRaCIS.Core.Application.Services
                         })
                         .ToList();
 
-                    series.WindowWidth = instanceList.FirstOrDefault()?.WindowWidth;
-                    series.WindowCenter = instanceList.FirstOrDefault()?.WindowCenter;
+                    series.WindowWidth = instanceList.FirstOrDefault()!.WindowWidth;
+                    series.WindowCenter = instanceList.FirstOrDefault()!.WindowCenter;
                 });
 
                 //设置为阅片与否 不更改数据库检查  的instance数量 和 SeriesCount  所以这里要实时统计
-                t.SeriesCount = t.SeriesList.Count();
+                t.SeriesCount = t.SeriesList.Count;
                 t.InstanceCount = t.SeriesList.SelectMany(t => t.InstanceList).Count();
             }
 
@@ -530,7 +530,7 @@ namespace IRaCIS.Core.Application.Services
 
             foreach (var item in noDicomStudyList)
             {
-                var nodicom = noDicomList.Where(x => x.Id == item.StudyId).FirstOrDefault();
+                var nodicom = noDicomList.Where(x => x.Id == item.StudyId).First();
                 item.SeriesList = new List<DicomSeriesDTO>()
                 {
                     new DicomSeriesDTO (){

IRaCIS.Core.Application/TestService.cs

@@ -1,15 +1,19 @@
-using IRaCIS.Core.Application.Service;
+using DocumentFormat.OpenXml.Office2010.Excel;
+using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
 using MassTransit;
+using Medallion.Threading;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using MiniExcelLibs;
 using System.Linq.Expressions;
+using System.Reflection.Metadata;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -20,6 +24,8 @@ namespace IRaCIS.Application.Services
     [ApiExplorerSettings(GroupName = "Institution")]
     public class TestService : BaseService
     {
+
+        public  static int IntValue = 100;
         private readonly IRepository<Dictionary> _dicRepository;
         private readonly IRepository<Trial> _trialRepository;
 
@@ -30,10 +36,13 @@ namespace IRaCIS.Application.Services
         private readonly IOptionsMonitor<ServiceVerifyConfigOption> _basicConfig;
         private readonly IRepository<VisitTask> _visitTaskRepositoryy;
 
+        private readonly IDistributedLockProvider _distributedLockProvider;
 
-        public TestService(IRepository<Dictionary> dicRepository, IRepository<Trial> trialRepository/*, IDistributedCache cache*/
+        private readonly ILogger<TestService> _logger;
 
-            , IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig, IOptionsMonitor<ServiceVerifyConfigOption> basicConfig, IRepository<VisitTask> visitTaskRepository)
+        public TestService(IRepository<Dictionary> dicRepository, IRepository<Trial> trialRepository,ILogger<TestService> logger
+
+            , IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig, IOptionsMonitor<ServiceVerifyConfigOption> basicConfig, IRepository<VisitTask> visitTaskRepository, IDistributedLockProvider distributedLockProvider)
         {
             _visitTaskRepositoryy = visitTaskRepository;
 
@@ -42,10 +51,39 @@ namespace IRaCIS.Application.Services
 
             _dicRepository = dicRepository;
             _trialRepository = trialRepository;
+
+            _distributedLockProvider= distributedLockProvider;
+
+            _logger= logger;
             //_cache = cache;
         }
 
 
+
+        [AllowAnonymous]
+        public async Task<IResponseOutput> TestDistributedLock( )
+        {
+
+         await   _repository.Where<User>().Select(t => t.FullName).FirstNotNullAsync();
+
+            Console.WriteLine($"我进来了当前值是：" + IntValue);
+            _logger.LogWarning($"我进来了当前值是：" + IntValue);
+
+            var @lock = _distributedLockProvider.CreateLock($"UserAccount");
+
+            using (await  @lock.AcquireAsync())
+            {
+                await Task.Delay(4);
+                IntValue--;
+
+                _logger.LogWarning( IntValue.ToString());
+                Console.WriteLine(IntValue);
+            }
+
+            return ResponseOutput.Ok(IntValue);
+        }
+
+
         [AllowAnonymous]
         public async Task<IResponseOutput> GetMemoryStoreData()
         {

IRaCIS.Core.Application/Triggers/AddlTrialUserTrigger.cs

@@ -1,6 +1,7 @@
 using EntityFrameworkCore.Triggered;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
+using Microsoft.Extensions.Localization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,18 +12,19 @@ namespace IRaCIS.Core.Application.Triggers
 {
 
     // 统一处理  外部用户、中心调研(先添加 再发送邮件)、参与医生加入到项目  ----废弃
-    public class AddlTrialUserTrigger :BaseService, IBeforeSaveTrigger<TrialUser>
+    public class AddlTrialUserTrigger :IBeforeSaveTrigger<TrialUser>
 
     {
+        public IStringLocalizer _localizer;
         private readonly IRepository<Trial> _trialRepository;
         private readonly IRepository<User> _userRepository;
 
-        public AddlTrialUserTrigger(IRepository<Trial> trialRepository, IRepository<User> userRepository)
+        public AddlTrialUserTrigger(IRepository<Trial> trialRepository, IRepository<User> userRepository, IStringLocalizer localizer)
         {
             _trialRepository = trialRepository;
 
             _userRepository = userRepository;
-
+            _localizer = localizer;
         }
         public async Task BeforeSave(ITriggerContext<TrialUser> context, CancellationToken cancellationToken)
         {

IRaCIS.Core.Application/Triggers/SubjectStateTrigger.cs

@@ -1,25 +1,27 @@
 using AutoMapper;
 using EntityFrameworkCore.Triggered;
 using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Infrastructure;
 using MassTransit;
+using Microsoft.Extensions.Localization;
 
 namespace IRaCIS.Core.Application.Triggers
 {
     /// <summary>
     /// 
     /// </summary>
-    public class SubjectStateTrigger :BaseService, IAfterSaveTrigger<Subject>
+    public class SubjectStateTrigger : IAfterSaveTrigger<Subject>
     {
-        private readonly IRepository<SubjectVisit> _subjectVisitRepository;
+        public IStringLocalizer _localizer;
         private readonly IRepository _repository;
-        private readonly IMapper _mapper;
+        private readonly IRepository<SubjectVisit> _subjectVisitRepository;
 
-        public SubjectStateTrigger(IRepository<SubjectVisit> subjectVisitRepository, IRepository repository, IMapper mapper)
+        public SubjectStateTrigger(IRepository<SubjectVisit> subjectVisitRepository, IStringLocalizer localizer, IRepository repository)
         {
-            _subjectVisitRepository = subjectVisitRepository;
             _repository = repository;
-            _mapper = mapper;
+            _localizer = localizer;
+            _subjectVisitRepository = subjectVisitRepository;
         }
 
         public async Task AfterSave(ITriggerContext<Subject> context, CancellationToken cancellationToken)

IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs

@@ -2,15 +2,17 @@
 using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Infrastructure;
 using MassTransit;
+using Microsoft.Extensions.Localization;
 
 namespace IRaCIS.Core.Application.Triggers
 {
     /// <summary>
     ///  处理  访视   末次评估  会影响Subject 状态
     /// </summary>
-    public class SubjectVisitFinalVisitTrigger :BaseService, IAfterSaveTrigger<SubjectVisit>
+    public class SubjectVisitFinalVisitTrigger :IAfterSaveTrigger<SubjectVisit>
     {
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
         private readonly IRepository<ReadingPeriodSet> _readingPeriodSetRepository;
@@ -19,8 +21,8 @@ namespace IRaCIS.Core.Application.Triggers
         private readonly IRepository<Subject> _subjectRepository;
         private readonly IRepository<VisitTask> _visitTaskRepository;
         private readonly IVisitTaskHelpeService _ivisitTaskHelpeService;
+        public IStringLocalizer _localizer;
         private readonly IRepository _repository;
-
         public SubjectVisitFinalVisitTrigger(IRepository<SubjectVisit> subjectVisitRepository,
 
             IRepository<ReadingPeriodSet> readingPeriodSetRepository,
@@ -28,7 +30,9 @@ namespace IRaCIS.Core.Application.Triggers
                 IRepository<VisitTask> visitTaskRepository,
                 IVisitTaskHelpeService visitTaskHelpeService,
                  IRepository<ReadModule> readModuleRepository,
-            IRepository<Subject> subjectRepository, IRepository repository)
+            IRepository<Subject> subjectRepository,
+            IStringLocalizer localizer,
+            IRepository repository)
         {
             _subjectVisitRepository = subjectVisitRepository;
             this._readingPeriodSetRepository = readingPeriodSetRepository;
@@ -38,6 +42,7 @@ namespace IRaCIS.Core.Application.Triggers
             this._readModuleRepository = readModuleRepository;
             _subjectRepository = subjectRepository;
             _repository = repository;
+            _localizer = localizer;
         }
 
         public async Task AfterSave(ITriggerContext<SubjectVisit> context, CancellationToken cancellationToken)