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

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

@@ -8,6 +8,7 @@ namespace IRaCIS.Core.Application.Contracts
     /// <summary> NoneDicomStudyView  列表视图模型 </summary>
     public class NoneDicomStudyView : NoneDicomStudyAddOrEdit
     {
+        public DateTime CreateTime { get; set; }
         public DateTime UpdateTime { get; set; }
         public string CodeView { get; set; }
 
@@ -21,7 +22,6 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class TaskDicomStudyView : NoneDicomStudyView
     {
-
     }
 
     ///<summary>NoneDicomStudyQuery  列表查询参数模型</summary>

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

@@ -389,6 +389,9 @@ namespace IRaCIS.Core.Application.Contracts.DTO
         public DateTime? StudyTime { get; set; }
 
         public DateTime? UploadedTime { get; set; }
+
+        public DateTime UpdateTime { get; set; }
+
         public string BodyPartExamined { get; set; } = String.Empty;
 
         public string BodyPartForEdit { get; set; } = String.Empty;

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

@@ -5,6 +5,7 @@ using IRaCIS.Core.Domain.Share;
 using MassTransit;
 using Microsoft.AspNetCore.Mvc;
 using Panda.DynamicWebApi.Attributes;
+using System.Linq.Dynamic.Core;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -103,7 +104,7 @@ namespace IRaCIS.Core.Application.Service
                      .ProjectTo<TaskDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = true, visiTaskId = inDto.VisistTaskId });
             }
 
-            List<NoneDicomStudyView> result = await noneDicomStudyQueryable.ToListAsync();
+            List<NoneDicomStudyView> result = await noneDicomStudyQueryable.OrderBy(x=>x.ImageDate).ThenBy(x=>x.CreateTime).ToListAsync();
 
 
             var trialInfo = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => new

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

@@ -1057,7 +1057,7 @@ namespace IRaCIS.Core.Application.Contracts
         [Comment("SPM 参与重阅审批")]
         public bool IsSPMJoinReReadingApproval { get; set; }
 
-
+        public List<string> ImageFormatList { get; set; }
 
         public List<Guid> TrialCriterionIds { get; set; } = new List<Guid>();
 

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -170,7 +170,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
     [Comment("阅片方式")]
     public int ReadingMode { get; set; } = 1;
 
-    public int ChangeDefalutDays { get; set; } = 5;
+    public int ChangeDefalutDays { get; set; } = 7;
 
     [Comment("跨项目复制")]
     public bool IsImageReplicationAcrossTrial { get; set; } = false;