diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 1d2705c0f..7f623e5d4 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -1504,26 +1504,18 @@ namespace IRaCIS.Core.Application.Service.Common } else { - //产生了阅片期 - if (resultExceptJudgeList.Any(t => t.IsSubjectHaveReadingPeriod)) + + //两个人都做了 + if (resultExceptJudgeList.Count(t => t.VisitTaskNum == item.VisitTaskNum && t.SubjectCode == item.SubjectCode) == 2) { - //两个人都做了 - if (resultExceptJudgeList.Count(t => t.VisitTaskNum == item.VisitTaskNum && t.SubjectCode == item.SubjectCode) == 2) + //如果没有产生裁判,默认选择R1 + if (item.ArmEnum == Arm.DoubleReadingArm1) { - //如果没有产生裁判,默认选择R1 - if (item.ArmEnum == Arm.DoubleReadingArm1) - { - item.IsJudgeSelect = true; - } - else - { - item.IsJudgeSelect = false; - } + item.IsJudgeSelect = true; } else { - item.IsJudgeSelect = null; - item.IsTrigerJudge = null; + item.IsJudgeSelect = false; } } else @@ -1533,6 +1525,7 @@ namespace IRaCIS.Core.Application.Service.Common } + } } @@ -1619,18 +1612,27 @@ namespace IRaCIS.Core.Application.Service.Common } else { - //没有产生裁判 有可能一个人没做完,也有可能做完了没产生裁判 - //两个人都做了 - if (resultExceptJudgeList.Count(t => t.VisitTaskNum == visitItem.VisitTaskNum && t.SubjectCode == visitItem.SubjectCode) == 2) + //产生了阅片期 + if (resultExceptJudgeList.Any(t => t.IsSubjectHaveReadingPeriod)) { - //不存在裁判 将R1设置 - if (visitItem.ArmEnum == Arm.DoubleReadingArm1) + //没有产生裁判 有可能一个人没做完,也有可能做完了没产生裁判 + //两个人都做了 + if (resultExceptJudgeList.Count(t => t.VisitTaskNum == visitItem.VisitTaskNum && t.SubjectCode == visitItem.SubjectCode) == 2) { - visitItem.IsJudgeSelect = true; + //不存在裁判 将R1设置 + if (visitItem.ArmEnum == Arm.DoubleReadingArm1) + { + visitItem.IsJudgeSelect = true; + } + else + { + visitItem.IsJudgeSelect = false; + } } else { - visitItem.IsJudgeSelect = false; + visitItem.IsJudgeSelect = null; + visitItem.IsTrigerJudge = null; } } else @@ -1640,6 +1642,7 @@ namespace IRaCIS.Core.Application.Service.Common } + } } }