diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 625646d3f..d01667f7b 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -1657,8 +1657,8 @@ namespace IRaCIS.Core.Application.Service.Common //处理访视裁判标记 foreach (var visitItem in resultExceptJudgeList.Where(t => t.ReadingCategory == ReadingCategory.Visit)) { - //默认设置为false 只处理为true 和 空的情况 - visitItem.IsJudgeSelect = false; + ////默认设置为false 只处理为true 和 空的情况 + //visitItem.IsJudgeSelect = false; if (judegeList.Count > 0) { @@ -1667,23 +1667,27 @@ namespace IRaCIS.Core.Application.Service.Common var maxNotFinishedJudge = judegeList.Where(t => t.ReadingTaskState != ReadingTaskState.HaveSigned).FirstOrDefault(); + //仅有一个未完成的全局裁判,那么都是null if (maxFinishedJudge == null && maxNotFinishedJudge != null) { - //仅有一个未完成的全局裁判,那么都是null if (visitItem.VisitTaskNum < maxNotFinishedJudge.VisitTaskNum) { visitItem.IsJudgeSelect = null; } } + //全局裁判都完成了,那么以最后一次裁判选择的为准 else if (maxFinishedJudge != null && maxNotFinishedJudge == null) { - //全局裁判都完成了,那么以最后一次裁判选择的为准 - if (visitItem.ArmEnum == maxFinishedJudge.JudgeArmEnum && visitItem.VisitTaskNum < maxFinishedJudge.VisitTaskNum) { visitItem.IsJudgeSelect = true; visitItem.JudgeNote = maxFinishedJudge.JudgeNote; } + //裁判没选择的人设置为false + else if (visitItem.VisitTaskNum < maxFinishedJudge.VisitTaskNum) + { + visitItem.IsJudgeSelect = false; + } } else { @@ -1699,7 +1703,10 @@ namespace IRaCIS.Core.Application.Service.Common visitItem.IsJudgeSelect = true; visitItem.JudgeNote = maxFinishedJudge.JudgeNote; } - + else if (visitItem.VisitTaskNum < maxFinishedJudge.VisitTaskNum) + { + visitItem.IsJudgeSelect = false; + } } } @@ -2195,7 +2202,7 @@ namespace IRaCIS.Core.Application.Service.Common TempalteLastColumnIndex = 8, DynamicItemDicName = "TranslateDicName", DynamicItemValueName = "QuestionValue", - DynamicItemTitleName= "QuestionName", + DynamicItemTitleName = "QuestionName", DynamicListName = "QuestionAnswerList", RemoveColunmIndexList = new List() { }, ColumnNameList = columNameList ?? new List(),