From 72e54fe0d9ea0767db0c278ceeb5d0a15aa6a7c8 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 5 Sep 2024 11:27:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9Edicom=20=E6=A3=80=E6=9F=A5=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=BF=94=E5=9B=9E=E4=BB=BB=E5=8A=A1Id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs | 2 +- .../Service/ImageAndDoc/DownloadAndUploadService.cs | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs index d627136b1..150d90103 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs @@ -453,7 +453,7 @@ namespace IRaCIS.Core.Application.Contracts public class TaskNoneDicomStudyDTO : NoneDicomStudyBasicInfo { - + public Guid VisitTaskId { get; set; } public int UploadedFileCount { get; set; } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index 4a56736c3..2838c683a 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -1016,6 +1016,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc TaskBlindName = u.TaskBlindName, TaskName = u.TaskName, SourceSubjectVisitId = u.SourceSubjectVisitId, + VisitTaskId=u.Id, Id = ns.Id, Description = ns.Description, @@ -1037,16 +1038,16 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc var list = await query.Where(t => t.SubjectCode == inQuery.SubjectCode).SortToListAsync(inQuery); - var noneDicomStudyIdList = list.Select(t => t.Id).ToList(); + var noneDicomStudyTaskIdList = list.Select(t => t.VisitTaskId).ToList(); - var taskNoneDicomStudyList = _visitTaskRepository.Where(t => noneDicomStudyIdList.Contains(t.Id)) - .SelectMany(t => t.TaskNoneDicomStudyFileList).Where(t => noneDicomStudyIdList.Contains((Guid)t.VisitTaskId)) + var taskNoneDicomStudyList = _visitTaskRepository.Where(t => noneDicomStudyTaskIdList.Contains(t.Id)) + .SelectMany(t => t.TaskNoneDicomStudyFileList).Where(t => noneDicomStudyTaskIdList.Contains((Guid)t.VisitTaskId)) .Select(u => new NoneDicomFileInfo { OriginNoneDicomStudyId = u.OriginNoneDicomStudyId, - FileType=u.FileType + FileType=u.FileType, FileName = u.FileName, FileSize = u.FileSize, Path = u.Path