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; }