修改全局导表

2024-08-08 13:24:17 +08:00
parent b832a66abf
commit 7894a4991c
3 changed files with 21 additions and 8 deletions
@@ -1476,19 +1476,29 @@ namespace IRaCIS.Core.Application.Service.Common
                   ).OrderByDescending(t => t.VisitTaskNum).FirstOrDefault()?.JudgeArmEnum == item.ArmEnum ? true : false;

                }
-                //全局裁判了，选择了那个全局，那么对应全局下面的访视 设置裁判标记
+               
+                //访视、全局列表中过滤出访视进行处理
                foreach (var item in resultList.Where(t => t.ReadingCategory == ReadingCategory.Visit))
                {
+                    //全局裁判了，选择了那个全局，那么对应全局下面的访视 设置裁判标记

                    var selectJudegeGlobalList = resultList.Where(t => t.ReadingCategory == ReadingCategory.Global && t.IsGenerateJudge == true).ToList();

-                    //全局修改了答案，那么给访视上赋值全局的结果  并且取的是最后的全局
-                    var existGlobalAnswer = selectJudegeGlobalList.Where(t => t.SubjectCode == item.SubjectCode).SelectMany(t => t.GlobalTaskAnswerList).Where(t => t.VisitTaskId == item.Id)
-                        .OrderByDescending(t => t.GlobalTaskVisitNum).FirstOrDefault()?.Answer;
+                    if (selectJudegeGlobalList.Count == 0)
+                    {
+                        //生成了裁判，但是裁判没有做

-                    item.OverallTumorEvaluationResult = string.IsNullOrEmpty(existGlobalAnswer) ? item.OverallTumorEvaluationResult : existGlobalAnswer;
+                        item.IsGenerateJudge = null;
+                    }
+                    else
+                    {

-                    item.IsGenerateJudge = true;
+                        if(selectJudegeGlobalList.Where(t => t.SubjectCode == item.SubjectCode).SelectMany(t => t.GlobalTaskAnswerList).Any(t => t.VisitTaskId == item.Id))
+                        {
+                            item.IsGenerateJudge = true;
+                        }
+
+                    }                  
                }