修改影像筛选过滤

IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs

@@ -9,6 +9,7 @@ using System.ComponentModel.DataAnnotations;
 using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Domain.Share;
 using Medallion.Threading;
+using IRaCIS.Core.Application.Service.Reading.Dto;
 
 namespace IRaCIS.Core.Application.Contracts
 {
@@ -22,6 +23,7 @@ namespace IRaCIS.Core.Application.Contracts
         IRepository<Trial> _trialRepository,
         IDistributedLockProvider _distributedLockProvider,
         IRepository<SubjectVisit> _subjectVisitRepository,
+        IRepository<VisitTask> _visitTaskRepository,
         QCCommon _qCCommon) : BaseService, INoneDicomStudyService
     {
 
@@ -40,12 +42,16 @@ namespace IRaCIS.Core.Application.Contracts
             {
                 noneDicomStudyQueryable = _noneDicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId).WhereIf(nonedicomStudyId != null, t => t.Id == nonedicomStudyId)
 
-             .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = isFilterZip});
+             .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = isFilterZip });
             }
             else
             {
+                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))
-                      .WhereIf(nonedicomStudyId != null, t => t.Id == nonedicomStudyId)
+                .Where(t => taskinfo.IsImageFilter ? ("|" + taskinfo.CriterionModalitys + "|").Contains("|" + t.Modality + "|") : true)
+                .WhereIf(nonedicomStudyId != null, t => t.Id == nonedicomStudyId)
                      .ProjectTo<TaskDicomStudyView>(_mapper.ConfigurationProvider, new { isFilterZip = isFilterZip, visiTaskId = visitTaskId });
             }