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

@@ -1626,30 +1626,22 @@ namespace IRaCIS.Core.Application.Service.Common
 
                 foreach (var item in resultExceptJudgeList)
                 {
-                    var findJudge = judegeList.FirstOrDefault(t => t.SubjectCode == item.SubjectCode
+                    item.IsJudgeSelect = judegeList.FirstOrDefault(t => t.SubjectCode == item.SubjectCode
-                    && (t.VisitTaskNum - ReadingCommon.TaskNumDic[ReadingCategory.Judge]) == item.VisitTaskNum);
+                    && (t.VisitTaskNum - ReadingCommon.TaskNumDic[ReadingCategory.Judge]) == item.VisitTaskNum)?.JudgeArmEnum == item.ArmEnum ? true : false;
+                }
 
-                    if (findJudge != null)
-                    {
-                        if (findJudge.ReadingTaskState == ReadingTaskState.HaveSigned)
-                        {
-                            item.IsJudgeSelect = findJudge.JudgeArmEnum == item.ArmEnum ? true : false;
-                        }
-                        else
-                        {
-                            //默认也是null 其实不用赋值
-                            item.IsJudgeSelect = null;
-                        }
-                    }
-                    else
-                    {
                 //如果没有产生裁判，默认选择R1
-                        if (item.ArmEnum== Arm.DoubleReadingArm1)
+
+                //找到没有裁判的访视任务
+                var notJudgeList = resultExceptJudgeList.GroupBy(t => new { t.SubjectCode, t.VisitTaskNum }).Where(g => g.All(t => t.IsJudgeSelect == false)).Select(g => new { g.Key.SubjectCode, g.Key.VisitTaskNum }).ToList();
+
+                foreach (var item in resultExceptJudgeList)
+                {
+                    if (notJudgeList.Any(t => t.SubjectCode == item.SubjectCode && t.VisitTaskNum == item.VisitTaskNum) && item.ArmEnum == Arm.DoubleReadingArm1)
                     {
                         item.IsJudgeSelect = true;
                     }
                 }
-                }
 
             }
             if (arbitrationRule == ArbitrationRule.Reading)

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -1107,7 +1107,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         //裁判选择标记
         //根据裁判的任务结果 设置访视任务的这个字段  该字段表示  裁判认同该任务的结果
-        [DictionaryTranslateAttribute("YesOrNoAudit")]
+        [DictionaryTranslateAttribute("YesOrNo")]
         public bool? IsJudgeSelect { get; set; }