修改裁判阅片明细表过滤

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -2224,12 +2224,6 @@ namespace IRaCIS.Core.Application.Service.Common
 
             if (inQuery.ReadingExportType == ExportResult.DetailedTableOfAdjudicationResults)
             {
-                //R1 R2 两个人的访视都阅片完成了才可以，去除只有一个人阅片完成的访视
-
-                //找到只有一个人阅片的受试者 和访视
-                var exceptVisit = list.GroupBy(t => new { t.SubjectCode, t.TaskName }).Where(g => g.Count() == 1).Select(g => new { g.Key.SubjectCode, g.Key.TaskName }).ToList();
-                list = list.Where(t => !exceptVisit.Any(ev => ev.SubjectCode == t.SubjectCode && ev.TaskName == t.TaskName)).ToList();
-
                 //裁判明表
                 export_Template = StaticData.Export.CommonJudgeReadingDetail_Export;
             }
@@ -2704,12 +2698,23 @@ namespace IRaCIS.Core.Application.Service.Common
 
             #region 最终导出参数处理
 
+            if (inQuery.ReadingExportType == ExportResult.DetailedTableOfAdjudicationResults)
+            {
+                //R1 R2 两个人的访视都阅片完成了才可以，去除只有一个人阅片完成的访视
+                //找到只有一个人阅片的受试者 和访视
+                var exceptVisit = list.Where(t => t.ReadingCategory == ReadingCategory.Visit)
+                    .GroupBy(t => new { t.SubjectCode, t.TaskName}).Where(g => g.Count() == 1).Select(g => new { g.Key.SubjectCode, g.Key.TaskName }).ToList();
+
+                list = list.Where(t => !exceptVisit.Any(ev => ev.SubjectCode == t.SubjectCode && ev.TaskName == t.TaskName)).ToList();
+
+            }
+
             list = list.OrderBy(t => t.SubjectCode).ThenBy(t => t.ArmEnum).ThenBy(t => t.VisitTaskNum).ToList();
 
             //处理裁判标记
             list = DealJudgeMark(criterion.ArbitrationRule, criterion.IsGlobalReading, list);
 
-
+            //裁判阅片明细表
             if (export_Template == StaticData.Export.CommonJudgeReadingDetail_Export)
             {
                 //裁判产生标记为空的数据过滤掉