From 2b532e640f38314b1244c9a7f12ef698218d6da3 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 23 Dec 2022 12:37:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClinicalData/ReadingClinicalDataService.cs | 11 +++++++++-- .../Reading/Interface/IReadingClinicalDataService.cs | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs index 796e97d2f..c52642b9f 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs @@ -173,7 +173,14 @@ namespace IRaCIS.Application.Services UploadRole = x.ClinicalDataTrialSet.UploadRole, Path = x.ClinicalDataTrialSet.Path, IsBlind = x.IsBlind, - IsComplete = x.IsComplete + IsComplete = x.IsComplete, + PDFFileList = x.ReadingClinicalDataPDFList.Select(y => new GetFileDto() + { + Id = y.Id, + FileName = y.FileName, + Path = y.Path, + CreateTime = y.CreateTime, + }).ToList() }).ToListAsync(); List clinicalData = (await this.GetReadingClinicalDataList(new GetReadingClinicalDataListIndto() @@ -189,7 +196,7 @@ namespace IRaCIS.Application.Services foreach (var item in cRCClinicalDataList) { - item.PDFFileList = clinicalData.Where(y => y.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).SelectMany(x => x.FileList).ToList(); + //item.PDFFileList = clinicalData.Where(y => y.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).SelectMany(x => x.FileList).ToList(); item.ClinicalTableData = new ClinicalDataTable() { PreviousHistoryList = previousHistoryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(), diff --git a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingClinicalDataService.cs index 21d0a8d0b..1d1f3f62d 100644 --- a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingClinicalDataService.cs @@ -20,7 +20,7 @@ namespace IRaCIS.Core.Application.Contracts Task> GetClinicalDataList(GetReadingOrTaskClinicalDataListInDto inDto); - Task<(List, object)> GetReadingClinicalDataList(GetReadingClinicalDataListIndto inDto); + // Task<(List, object)> GetReadingClinicalDataList(GetReadingClinicalDataListIndto inDto); Task> GetReadingClinicalList(GetReadingClinicalDataListIndto inDto); }