Merge branch 'Test.IRC' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.IRC

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,6 +38,7 @@ using Microsoft.Net.Http.Headers;
 using MiniExcelLibs;
 using Newtonsoft.Json;
 using SharpCompress.Archives;
+using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -133,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 +308,6 @@ namespace IRaCIS.Core.API.Controllers
 
 
 
-
-
-
             if (!HttpContext.Request.HasFormContentType ||
                 !MediaTypeHeaderValue.TryParse(HttpContext.Request.ContentType, out var mediaTypeHeader) ||
                 string.IsNullOrEmpty(mediaTypeHeader.Boundary.Value))
@@ -518,11 +543,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);
+            var fileName = string.Empty;
-            await FileUploadAsync(async (realFileName) =>
+            var templateFileStream = new MemoryStream();
+
+            await FileUploadToOSSAsync(async (realFileName, fileStream) =>
             {
                 fileName = realFileName;
 
@@ -532,19 +559,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 ConsistencyCheckFile()
-                {
-                    TrialId = trialId,
-                    CreateTime = DateTime.Now,
-                    FileName = fileName,
-                    FilePath = relativePath,
-                    RelativePath = relativePath,
-                    CreateUserId = _userInfo.Id
-                });
 
-                return serverFilePath;
+                var ossRelativePath = oSSService.UploadToOSS(fileStream, "InspectionUpload/SiteSurvey", realFileName);
+
+                await _repository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId });
+
+                return ossRelativePath;
+
             });
 
 
@@ -576,7 +600,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());
 
@@ -591,7 +615,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();
@@ -636,12 +660,12 @@ 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(stream))
+                using (var reader = ExcelReaderFactory.CreateReader(templateFileStream))
                 {
 
                     // 2. Use the AsDataSet extension method
@@ -664,7 +688,7 @@ namespace IRaCIS.Core.API.Controllers
 
                     // The result of each spreadsheet is in result.Tables
                 }
-                }
+
             }
 
             if (etcCheckList == null || etcCheckList.Count == 0)
@@ -952,28 +976,36 @@ namespace IRaCIS.Core.API.Controllers
         public async Task<IResponseOutput> UploadTrialSiteSurveyUser(Guid trialId, string baseUrl, string routeUrl,
     [FromServices] IRepository<TrialSite> _trialSiteRepository,
      [FromServices] IRepository<UserType> _usertypeRepository,
-     [FromServices] ITrialSiteSurveyService _trialSiteSurveyService)
+     [FromServices] ITrialSiteSurveyService _trialSiteSurveyService,
+     [FromServices] IOSSService oSSService,
+     [FromServices] IRepository<InspectionFile> _inspectionFileRepository)
         {
-            var (serverFilePath, relativePath, fileName) = (string.Empty, string.Empty, string.Empty);
+            var templateFileStream = new MemoryStream();
-            await FileUploadAsync(async (realFileName) =>
-            {
-                fileName = realFileName;
 
-                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", 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();
 

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

@@ -275,7 +275,7 @@
             <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>

IRaCIS.Core.Application/Helper/OSSService.cs

@@ -1,4 +1,5 @@
 using Aliyun.OSS;
+using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Infrastructure;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
@@ -7,6 +8,7 @@ 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;
@@ -85,9 +87,13 @@ namespace IRaCIS.Core.Application.Helper
 
     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
     {
 
@@ -107,6 +113,34 @@ namespace IRaCIS.Core.Application.Helper
 
         }
 
+        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);
+
+            }
+        }
 
         public string UploadToOSS(string localFilePath, string oosFolderPath)
         {

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

@@ -10176,37 +10176,37 @@
             受试者ID
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.FileName">
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.FileName">
             <summary>
             文件名称
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.FilePath">
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.FilePath">
             <summary>
             文件路径
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.RelativePath">
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.RelativePath">
             <summary>
             相对路径
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.CreateUserId">
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.CreateUserId">
             <summary>
             创建人
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.CreateTime">
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.CreateTime">
             <summary>
             创建时间
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.TrialId">
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.TrialId">
             <summary>
             项目ID
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.CreateUserName">
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.CreateUserName">
             <summary>
             创建者名称
             </summary>

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

@@ -129,7 +129,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO
     }
 
 
-    public class GetConsistencyCheckFileDto/*: ConsistencyCheckFile*/
+    public class GetUserUploadFileDto/*: ConsistencyCheckFile*/
     {
         /// <summary>
 		/// 文件名称

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<ConsistencyCheckFile> _consistencyCheckFileRepository;
+        private readonly IRepository<InspectionFile> _consistencyCheckFileRepository;
 
         private IReadingImageTaskService _IReadingImageTaskService;
 
@@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Image.QA
               IRepository<TrialQCQuestionAnswer> trialQCQuestionAnswerRepository,
               IRepository<TrialQCQuestion> trialQCQuestionRepository,
               IReadingImageTaskService IReadingImageTaskService,
-             IRepository<ConsistencyCheckFile> consistencyCheckFileRepository
+             IRepository<InspectionFile> consistencyCheckFileRepository
             )
         {
             this._IReadingImageTaskService = IReadingImageTaskService;
@@ -849,10 +849,10 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<PageOutput<GetConsistencyCheckFileDto>> GetConsistencyCheckFile(GetConsistencyCheckFileInDto indto)
+        public async Task<PageOutput<GetUserUploadFileDto>> GetConsistencyCheckFile(GetConsistencyCheckFileInDto indto)
         {
-            var query = _repository.Where<ConsistencyCheckFile>(t => t.TrialId == indto.TrialId)
+            var query = _repository.Where<InspectionFile>(t => t.TrialId == indto.TrialId)
-             .ProjectTo<GetConsistencyCheckFileDto>(_mapper.ConfigurationProvider);
+             .ProjectTo<GetUserUploadFileDto>(_mapper.ConfigurationProvider);
 
             return await query.ToPagedListAsync(indto.PageIndex, indto.PageSize, "CreateTime", false);
         }

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

@@ -494,7 +494,7 @@ namespace IRaCIS.Core.Application.Service
                  ;
 
             // 一致性核查文件
-            CreateMap<ConsistencyCheckFile, GetConsistencyCheckFileDto>()
+            CreateMap<InspectionFile, GetUserUploadFileDto>()
              .ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.User.FirstName + "/" + t.User.LastName));
 
 

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

@@ -208,8 +208,9 @@ namespace IRaCIS.Core.Application
                 }).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();
@@ -251,7 +252,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
@@ -288,7 +291,10 @@ namespace IRaCIS.Core.Application
                         ToBeApprovalCount = t.EnrollList.Where(u => u.EnrollStatus == EnrollStatus.InviteIntoGroup).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 defalutSortArray = new string[] { nameof(ReviewerSelectToBeDoneDto.IsUrgent) + " 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 = await _enrollRepository.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                 .Where(u => u.EnrollStatus == EnrollStatus.HasCommittedToCRO).CountAsync();
@@ -320,7 +326,11 @@ namespace IRaCIS.Core.Application
                     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 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
@@ -365,7 +375,11 @@ namespace IRaCIS.Core.Application
                         ToBeApprovalCount = t.EnrollList.Where(u => u.EnrollStatus == EnrollStatus.HasCommittedToCRO).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 defalutSortArray = new string[] { nameof(ReviewerSelectToBeDoneDto.IsUrgent) + " desc", nameof(ReviewerSelectToBeDoneDto.ToBeApprovalCount) + " desc" };
+
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
+
 
             var toBeApprovalCount = await _enrollRepository.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                 .Where(u => u.EnrollStatus == EnrollStatus.HasCommittedToCRO).CountAsync();
@@ -403,7 +417,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))
@@ -447,7 +464,9 @@ namespace IRaCIS.Core.Application
                     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))
@@ -486,7 +505,10 @@ namespace IRaCIS.Core.Application
                     ReadModuleCount = t.ReadModuleList.Where(x => !x.IsPMConfirm).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);
+
 
             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))
@@ -533,7 +555,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))
@@ -575,9 +600,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))
@@ -620,7 +646,10 @@ namespace IRaCIS.Core.Application
 
                 }).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))
@@ -664,7 +693,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))
@@ -717,7 +751,11 @@ namespace IRaCIS.Core.Application
 
                 }).Where(x => x.ToBeClaimedCount + x.ToBeReviewedCount > 0);
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageQualityToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
+
+            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 toBeClaimedCount = _subjectVisitRepository
@@ -762,7 +800,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))
@@ -903,8 +944,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))
@@ -969,9 +1011,14 @@ namespace IRaCIS.Core.Application
                     //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))
@@ -1036,13 +1083,16 @@ namespace IRaCIS.Core.Application
 
                        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))

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

@@ -431,7 +431,7 @@ namespace IRaCIS.Application.Services
 
                 await _repository.BatchDeleteAsync<CheckChallengeDialog>(o => o.SubjectVisit.TrialId == trialId);
                 await _repository.BatchDeleteAsync<ClinicalDataTrialSet>(o => o.TrialId == trialId);
-                await _repository.BatchDeleteAsync<ConsistencyCheckFile>(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);

IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs

@@ -7,18 +7,15 @@ namespace IRaCIS.Core.Domain.Models
 	 ///<summary>
 	 /// 一致性核查文件
 	 ///</summary>
-	 [Table("ConsistencyCheckFile")]	
+	 [Table("InspectionFile")]	
-	 public class ConsistencyCheckFile : Entity, IAuditAdd
+	 public class InspectionFile : Entity, IAuditAdd
 	 {
 		/// <summary>
 		/// 文件名称
 		/// </summary>
 		public string FileName { get; set; }
 
-		/// <summary>
+
-		/// 文件路径
-		/// </summary>
-		public string FilePath { get; set; }
 
 		/// <summary>
 		/// 相对路径

IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -1479,11 +1479,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
 
             // 一致性核查文件  是否需要单独一个表记录？
-            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ConsistencyCheckFile)))
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(InspectionFile)))
             {
                 var type = GetEntityAuditOpt(item);
 
-                await InsertInspection<ConsistencyCheckFile>(item.Entity as ConsistencyCheckFile, type, x => new InspectionConvertDTO()
+                await InsertInspection<InspectionFile>(item.Entity as InspectionFile, type, x => new InspectionConvertDTO()
                 {
                     ObjectRelationParentId = x.TrialId
 
@@ -1534,6 +1534,30 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 });
             }
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialSiteUserSurvey)))
+            {
+                var type = GetEntityAuditOpt(item);
+
+                var entity = item.Entity as TrialSiteUserSurvey;
+
+                await InsertInspection<TrialSiteUserSurvey>(entity, type, x => new InspectionConvertDTO()
+                {
+                    IsDistinctionInterface = false
+
+                });
+            }
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialSiteEquipmentSurvey)))
+            {
+                var type = GetEntityAuditOpt(item);
+
+                var entity = item.Entity as TrialSiteEquipmentSurvey;
+
+                await InsertInspection<TrialSiteEquipmentSurvey>(entity, type, x => new InspectionConvertDTO()
+                {
+                    IsDistinctionInterface = false
+
+                });
+            }
 
             #endregion
 

IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs

@@ -495,7 +495,7 @@ namespace IRaCIS.Core.Infra.EFCore
 
         public virtual DbSet<FrontAuditConfig> FrontAuditConfig { get; set; }
 
-        public virtual DbSet<ConsistencyCheckFile> ConsistencyCheckFile { get; set; }
+        public virtual DbSet<InspectionFile> InspectionFile { get; set; }
 
         public virtual DbSet<CommonDocument> CommonDocument { get; set; }