From 4b3e1ba5c09a2ec081fe1e502388ba50f21c1a8e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 10 Dec 2024 10:48:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=81=E5=88=A4=E4=B8=80=E8=87=B4=E7=8E=87?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Common/ExcelExportService.cs              | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
index 001c01716..a8fa7d3e3 100644
--- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
@@ -2358,6 +2358,7 @@ namespace IRaCIS.Core.Application.Service.Common
                     .GroupBy(t => new { t.SubjectId, t.SourceSubjectVisitId })
                     .Where(g => g.Count() == 2).Select(g => g.Key.SourceSubjectVisitId).Distinct().Count();
 
+                //裁判不需要完成阅片
                 exportInfo.JudgeVisitCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Judge).Count();
 
                 //3、裁判认同数M：触发裁判的受试者访视中，阅片人被裁判认同的访视数量；
@@ -2371,10 +2372,10 @@ namespace IRaCIS.Core.Application.Service.Common
                         UserName = g.Key.UserName,
                         FullName = g.Key.FullName,
 
-                        //访视产生裁判的访视数量
+                        //一致率这边裁判需要完成阅片
                         TotalJudgeCount = g.Where(t => t.JudgeVisitTaskId != null && t.JudgeVisitTask.ReadingTaskState == ReadingTaskState.HaveSigned).Count(),
 
-                        JudgeAgreeCount = g.Where(t => t.JudgeVisitTaskId != null && t.JudgeVisitTask.JudgeResultTaskId == t.Id).Count(),
+                        JudgeAgreeCount = g.Where(t => t.JudgeVisitTaskId != null && t.JudgeVisitTask.JudgeResultTaskId == t.Id && t.JudgeVisitTask.ReadingTaskState == ReadingTaskState.HaveSigned).Count(),
 
 
                     }).ToList();
@@ -2436,6 +2437,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
                 exportInfo.judgeReadingPeriodCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Global && t.ReadingTaskState == ReadingTaskState.HaveSigned)
                    .GroupBy(t => new { t.SubjectId, t.SouceReadModuleId })
+                   //裁判不要求做完
                    .Where(g => g.Count() == 2 && g.Any(c => c.JudgeVisitTaskId != null)).Select(g => g.Key.SouceReadModuleId).Distinct().Count();
 
                 //3、裁判认同数J：触发裁判的阅片期中，阅片人被裁判认同的阅片期数量；
@@ -2451,10 +2453,11 @@ namespace IRaCIS.Core.Application.Service.Common
                       UserName = g.Key.UserName,
                       FullName = g.Key.FullName,
 
-                      //触发裁判的阅片期的数量
+                      //触发裁判的阅片期的数量  并且裁判要求做完
                       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)
+                      JudgeAgreeCount = g.Where(t => t.ReadingCategory == ReadingCategory.Global && t.JudgeVisitTaskId != null
+                      && t.JudgeVisitTask.JudgeResultTaskId == t.Id && t.JudgeVisitTask.ReadingTaskState == ReadingTaskState.HaveSigned)
                       .Select(t => t.SouceReadModuleId).Distinct().Count(),
 
                   }).ToList();