From 78532803bc386891d77ca0830377e13f594a4938 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 27 Feb 2025 17:11:59 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=B4=A8=E7=96=91?= =?UTF-8?q?=E8=B6=85=E9=99=90=E5=A4=A9=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Domain/Trial/Trial.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From bf62ee92dd17e422593636253779961a53ec1753 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 27 Feb 2025 17:19:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20ImageFormatList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); From 10b0bde1d04beb3edda564b4f66c52c75b372f5a Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 4 Mar 2025 11:20:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/QC/DTO/NoneDicomStudyViewModel.cs | 1 + IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs | 3 +++ 2 files changed, 4 insertions(+) diff --git a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs index 27061e524..2ef4f593c 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 CreatTime { get; set; } public DateTime UpdateTime { get; set; } public string CodeView { get; set; } diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs index 0b834efa9..72c906f67 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs @@ -382,6 +382,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; From 336e7768b830ee2d97eb0b300ab261179cce27e2 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 4 Mar 2025 15:20:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8B=BC=E5=86=99?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/QC/DTO/NoneDicomStudyViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs index daed12f4d..27aadb68c 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs @@ -8,7 +8,7 @@ namespace IRaCIS.Core.Application.Contracts /// NoneDicomStudyView 列表视图模型 public class NoneDicomStudyView : NoneDicomStudyAddOrEdit { - public DateTime CreatTime { get; set; } + public DateTime CreateTime { get; set; } public DateTime UpdateTime { get; set; } public string CodeView { get; set; } From fae86f08368f0c648b39c28375c9fd9dec49b8fd Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 5 Mar 2025 09:31:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=9Edicom=20?= =?UTF-8?q?=E5=BD=B1=E5=83=8F=20=E6=8E=92=E5=BA=8F=20=20=E5=85=88=E6=8C=89?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=97=B6=E9=97=B4=EF=BC=8C=E5=86=8D=E6=8C=89?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/QC/DTO/NoneDicomStudyViewModel.cs | 1 - .../Reading/ReadingImageTask/ReadingNoDicomTaskService.cs | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs index 2a31bb5bc..9bbb9c0fe 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs @@ -21,7 +21,6 @@ namespace IRaCIS.Core.Application.Contracts public class TaskDicomStudyView : NoneDicomStudyView { - } ///NoneDicomStudyQuery 列表查询参数模型 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