uat-ivus-oct-再次修改11

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

@@ -47,6 +47,8 @@ namespace IRaCIS.Core.Application.Contracts
             //质控过程中并且不是IQC时，可以看到删除的（不需要忽略过滤器） 质控中iqc 也需要看到删除的
             var isViewDelete = !isQCFinished;
 
+            var isFilterIVUSNoneDicom = false;
+
             IQueryable<NoneDicomStudyView> noneDicomStudyQueryable = default;
             if (visitTaskId == null || visitTaskId == Guid.Empty)
             {
@@ -71,6 +73,12 @@ namespace IRaCIS.Core.Application.Contracts
                 }
 
 
+                if (_subjectVisitRepository.Where(t => t.Id == subjectVisitId).SelectMany(t => t.Trial.TrialReadingCriterionList)
+                    .Where(t => t.CriterionType == CriterionType.IVUS || t.CriterionType == CriterionType.OCT).Distinct().Count() == 2
+                  )
+                {
+                    isFilterIVUSNoneDicom = true;
+                }
             }
             else
             {
@@ -97,13 +105,7 @@ namespace IRaCIS.Core.Application.Contracts
 
             }
 
-            var isFilterIVUSNoneDicom = false;
-            if (_subjectVisitRepository.Where(t => t.Id == subjectVisitId).SelectMany(t => t.Trial.TrialReadingCriterionList)
-                .Where(t => t.CriterionType == CriterionType.IVUS || t.CriterionType == CriterionType.OCT).Distinct().Count() == 2
-              )
-            {
-                isFilterIVUSNoneDicom = true;
-            }
+
 
             var list = await noneDicomStudyQueryable.Where(t => isFilterIVUSNoneDicom ? t.Modality != "IVUS" : true)
                 .OrderBy(x => x.ImageDate).ThenBy(x => x.CreateTime).ToListAsync();