修改统计完成

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

@@ -2475,17 +2475,33 @@ namespace IRaCIS.Core.Application.Service.Common
                           t.DoctorUserId,
                           t.DoctorUser.UserName,
                           t.DoctorUser.FullName,
-                          t.JudgeVisitTask.JudgeResultTaskId
+                          t.JudgeVisitTaskId,
+                          t.ReadingTaskState,
+                          t.JudgeVisitTask.JudgeResultTaskId,
+                           JudgeTaskState = (ReadingTaskState?)t.JudgeVisitTask.ReadingTaskState
                       }).ToList()
                   })
                   .ToList();
 
+                var cc = subjectReadingPeriodDoctorList.GroupBy(x => x.SubjectId) // 按 SubjectId 分组
+                                                                                 
+                                         .Where(g => g.OrderByDescending(x => x.VisitTaskNum).First().GlobalList.Any(c => c.JudgeVisitTaskId != null))
+
+                                         .ToList();
+
+                var kk = subjectReadingPeriodDoctorList.GroupBy(x => x.SubjectId) // 按 SubjectId 分组
+
+                                         .Where(g => g.OrderByDescending(x => x.VisitTaskNum).First().GlobalList.Any(c => c.JudgeVisitTaskId != null))
+                                         .Select(g => g.Where(c => c.GlobalList.Any(k => k.JudgeTaskState == ReadingTaskState.HaveSigned)).OrderByDescending(c=>c.VisitTaskNum).FirstOrDefault())
+
+                                         .ToList();                                      //找到最大完成裁判的阅片期
 
                 // 每个subject 仅仅留最后一个全局
                 var filteredList = subjectReadingPeriodDoctorList.GroupBy(x => x.SubjectId) // 按 SubjectId 分组
-                                        .Select(g => g.OrderByDescending(x => x.VisitTaskNum).First()) // 每组取 VisitTaskNum 最大的记录
                                          //最后一个全局没有产生裁判的subject要过滤掉 过滤后
-                                       .Where(t => t.JudgeVisitTaskId != null)
+                                         .Where(g=>g.OrderByDescending(x=>x.VisitTaskNum).First().GlobalList.Any(c=>c.JudgeVisitTaskId != null))
+                                         //找到最大完成裁判的阅片期
+                                         .Select(g => g.Where(c => c.GlobalList.Any(k => k.JudgeTaskState == ReadingTaskState.HaveSigned)).OrderByDescending(c => c.VisitTaskNum).First())
                                          .SelectMany(t => t.GlobalList.Select(u => new
                                             {
                                                 t.SubjectId,