修改导表

2024-10-29 17:37:20 +08:00
parent 2a1047f319
commit 67667f6438
5 changed files with 311 additions and 2 deletions
@@ -2345,7 +2345,7 @@ namespace IRaCIS.Core.Application.Service.Common

                var doctor2List = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned)
                  .GroupBy(t => new { t.DoctorUserId, t.DoctorUser.UserName, t.DoctorUser.FullName })
-                  //有全局裁判
+                  //有全局裁判  
                  //.Where(g => g.Any(t => t.ReadingCategory == ReadingCategory.Global && t.JudgeVisitTaskId != null))
                  .Select(g => new DoctorJudgeRatio()
                  {
@@ -2354,7 +2354,7 @@ namespace IRaCIS.Core.Application.Service.Common
                      FullName = g.Key.FullName,

                      //触发裁判的阅片期的数量
-                      TotalJudgeCount = g.Where(t => t.ReadingCategory == ReadingCategory.Global && t.SouceReadModuleId != null && t.JudgeVisitTaskId != null).Select(t => t.SouceReadModuleId).Distinct().Count(),
+                      TotalJudgeCount = g.Where(t => t.ReadingCategory == ReadingCategory.Global && t.SouceReadModuleId != null && t.JudgeVisitTaskId != null && t.JudgeVisitTask.ReadingTaskState==ReadingTaskState.HaveSigned).Select(t => t.SouceReadModuleId).Distinct().Count(),

                      JudgeAgreeCount = g.Where(t => t.ReadingCategory == ReadingCategory.Global && t.JudgeVisitTaskId != null && t.JudgeVisitTask.JudgeResultTaskId == t.Id)
                      .Select(t => t.SouceReadModuleId).Distinct().Count(),