diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index fdaaa3040..f0383b59c 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -14217,6 +14217,11 @@ PublishLogAddOrEdit 列表查询参数模型 + + + 显示顺序 + + TrialEmailNoticeConfigView 列表视图模型 @@ -15399,15 +15404,6 @@ NoneDicomStudyFileView 列表视图模型 - - NoneDicomStudyFileQuery 列表查询参数模型 - - - Path - - - FileName - NoneDicomStudyFileAddOrEdit 列表查询参数模型 diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs index c415c2c06..8e28ae4f4 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs @@ -231,8 +231,9 @@ namespace IRaCIS.Core.Application.Services - var studyList = await _dicomStudyRepository.Where(t => t.TrialId == trialId && t.SubjectVisitId == sujectVisitId) + var studyList = await _dicomStudyRepository.Where(t => t.TrialId == trialId && t.SubjectVisitId == sujectVisitId).IgnoreQueryFilters() .Where(t => isImageFilter ? ("|" + criterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|") : true) + .WhereIf(isReading == 1 || isQCFinished, s=> s.IsDeleted == false) .Select(k => new VisitStudyDTO() { InstanceCount = k.InstanceCount, @@ -241,6 +242,7 @@ namespace IRaCIS.Core.Application.Services StudyCode = k.StudyCode, StudyId = k.Id }).ToListAsync(); + var studyIds = studyList.Select(t => t.StudyId).ToList(); var instanceList = await _dicomInstanceRepository.Where(t => studyIds.Contains(t.StudyId)).IgnoreQueryFilters()