XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改阅片期导表
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-12-04 15:33:40 +08:00
parent a2cfec6553
commit 137f77cdc5
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
View File

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