diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs index d907fc036..bc57f1274 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs @@ -41,14 +41,14 @@ namespace IRaCIS.Core.Application.Contracts //质控过程中,因为会修改统计数字,但是此时其他人看,应该看到完整的影像 var isQCFinished = qcAuditState == AuditStateEnum.QCPassed; - //质控过程中并且不是IQC时, 不需要忽略过滤器+质控设置删除的 - var isIgnoreDelete = !(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished); + //质控过程中并且不是IQC时,可以看到删除的(不需要忽略过滤器) 质控中iqc 也需要看到删除的 + var isViewDelete = !isQCFinished; IQueryable noneDicomStudyQueryable = default; if (visitTaskId == null) { //质控过程中,需要忽略过滤质控设置删除的检查,以及设置删除的文件,质控通过后才 - noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId, ignoreQueryFilters: isIgnoreDelete) + noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId, ignoreQueryFilters: isViewDelete) .WhereIf(nonedicomStudyId != null, t => t.Id == nonedicomStudyId) .WhereIf(isReading, t => t.IsReading && t.IsDeleted==false) @@ -60,7 +60,7 @@ namespace IRaCIS.Core.Application.Contracts var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Select(t => new { t.BlindSubjectCode, t.TrialReadingCriterionId, t.TrialReadingCriterion.IsImageFilter, t.TrialReadingCriterion.CriterionModalitys }).FirstNotNullAsync(); - noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.TaskNoneDicomFileList.Any(t => t.VisitTaskId == visitTaskId), ignoreQueryFilters: isIgnoreDelete) + noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.TaskNoneDicomFileList.Any(t => t.VisitTaskId == visitTaskId), ignoreQueryFilters: isViewDelete) .WhereIf(isReading, t => t.IsReading && t.IsDeleted == false) .Where(t => taskinfo.IsImageFilter ? ("|" + taskinfo.CriterionModalitys + "|").Contains("|" + t.Modality + "|") : true) .WhereIf(nonedicomStudyId != null, t => t.Id == nonedicomStudyId) @@ -182,10 +182,10 @@ namespace IRaCIS.Core.Application.Contracts //质控过程中,因为会修改统计数字,但是此时其他人看,应该看到完整的影像 var isQCFinished = qcAuditState == AuditStateEnum.QCPassed; - //质控过程中并且不是IQC时, 不需要忽略过滤器+质控设置删除的 - var isIgnoreDelete = !(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished); + //质控过程中并且不是IQC时,可以看到删除的(不需要忽略过滤器) + var isViewDelete = !isQCFinished; - return await _noneDicomStudyFileRepository.Where(t => t.NoneDicomStudyId == noneDicomStudyId, ignoreQueryFilters: isIgnoreDelete) + return await _noneDicomStudyFileRepository.Where(t => t.NoneDicomStudyId == noneDicomStudyId, ignoreQueryFilters: isViewDelete) .ProjectTo(_mapper.ConfigurationProvider).OrderBy(t => t.CreateTime).ToListAsync(); } @@ -198,9 +198,9 @@ namespace IRaCIS.Core.Application.Contracts var isQCFinished = qcAuditState == AuditStateEnum.QCPassed; //质控过程中并且不是IQC时, 不需要忽略过滤器+质控设置删除的 - var isIgnoreDelete = !(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished); + var isViewDelete = !isQCFinished; - return await _noneDicomStudyFileRepository.Where(t => t.NoneDicomStudy.SubjectVisitId == subjectVisitId, ignoreQueryFilters: isIgnoreDelete) + return await _noneDicomStudyFileRepository.Where(t => t.NoneDicomStudy.SubjectVisitId == subjectVisitId, ignoreQueryFilters: isViewDelete) .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); }