diff --git a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs index 24f251137..90c3c8428 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs @@ -8,6 +8,7 @@ namespace IRaCIS.Core.Application.Contracts /// NoneDicomStudyView 列表视图模型 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 { - } ///NoneDicomStudyQuery 列表查询参数模型 diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs index 9bf2f1f48..5a8b5f93c 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs +++ b/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; diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs index fce2b2294..940ed37ac 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs +++ b/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(_mapper.ConfigurationProvider, new { isFilterZip = true, visiTaskId = inDto.VisistTaskId }); } - List result = await noneDicomStudyQueryable.ToListAsync(); + List 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 diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index f7b8efba1..f9c1fa014 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/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 ImageFormatList { get; set; } public List TrialCriterionIds { get; set; } = new List(); diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 8abb34608..c1687b161 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/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;