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 1/3] =?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 From 1867277e1b1419db54f7d1cfaacc2acee391a34d Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 5 Mar 2025 09:44:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=9Edicom=20?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=BC=96=E5=8F=B7=E9=87=8D=E5=A4=8D=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/NoneDicomStudyService.cs | 4 +++- .../Service/QC/DTO/NoneDicomStudyViewModel.cs | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs index f82a373c9..b0fa5ddc2 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs @@ -86,10 +86,12 @@ namespace IRaCIS.Core.Application.Contracts //默认会是0 var code = await _noneDicomStudyRepository.Where(t => t.TrialId == addOrEditNoneDicomStudy.TrialId).Select(x => x.Code).DefaultIfEmpty().MaxAsync(); - addOrEditNoneDicomStudy.Code = code + 1; optEntity = await _noneDicomStudyRepository.InsertFromDTOAsync(addOrEditNoneDicomStudy); + optEntity.Code = code + 1; + + optEntity.StudyCode = AppSettings.GetCodeStr(optEntity.Code, nameof(NoneDicomStudy)); } diff --git a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs index 2a31bb5bc..24f251137 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs @@ -52,8 +52,6 @@ namespace IRaCIS.Core.Application.Contracts public DateTime ImageDate { get; set; } public string Description { get; set; } = string.Empty; - public int Code { get; set; } - public string StudyName { get; set; } public string VideoName { get; set; } = string.Empty; From f89b3daf506a2124763dc62a59f02b76fabdbe77 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 5 Mar 2025 10:42:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?qc=20=E5=BA=8F=E5=88=97=E5=B1=82=E7=BA=A7?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs index 5a8b5f93c..0d341df57 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs @@ -434,6 +434,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO //public Guid[] InstanceList = new Guid[0]; //public List InstancePathList = new List(); + public DateTime UpdateTime { get; set; } + }