修改
This commit is contained in:
@@ -447,6 +447,7 @@ namespace IRaCIS.Application.Services
|
||||
{
|
||||
ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
|
||||
SubjectId = x.SubjectId,
|
||||
ReadingId= x.ReadingId,
|
||||
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
|
||||
ClinicalDataTrialSetId = x.ClinicalDataTrialSetId,
|
||||
IsSign = x.IsSign,
|
||||
@@ -477,9 +478,12 @@ namespace IRaCIS.Application.Services
|
||||
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());
|
||||
|
||||
var readingIds = result.Select(x => x.ReadingId).ToList();
|
||||
|
||||
var tablecount = (await _previousHistoryRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).CountAsync()) +
|
||||
(await _previousOtherRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).CountAsync()) +
|
||||
(await _previousSurgeryRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).CountAsync());
|
||||
|
||||
if (tablecount == 0)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user