From ccaecf072685baf6759b954be1fd3eb4ef80ddc2 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 25 Nov 2022 16:54:09 +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 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs index b201d9e9..a94ade19 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs @@ -456,6 +456,17 @@ namespace IRaCIS.Application.Services var result = await resultQuery.ToListAsync(); result = result.Where(x => !(x.ClinicalUploadType == ClinicalUploadType.PDF && x.FileList.Count() == 0)).ToList(); + // 需要排除表格为空的数据 + + var tablecount = (await _previousHistoryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).CountAsync()) + + (await _previousOtherRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).CountAsync()) + + (await _previousSurgeryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).CountAsync()); + + if (tablecount == 0) + { + result = result.Where(x => x.ClinicalUploadType != ClinicalUploadType.Table).ToList(); + } + return result; }