From 81b56c03b7be467fbc12fd298ab61acb0e22cd4f Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 10 Dec 2024 18:16:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=98=85=E7=89=87=E6=9C=9F?=
 =?UTF-8?q?=E5=AF=BC=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
index 4a957b756..4e48f05b5 100644
--- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
@@ -2467,7 +2467,7 @@ namespace IRaCIS.Core.Application.Service.Common
                     .Where(t => t.Subject.ReadModuleList.Any(c => c.SubjectVisit.VisitNum == (t.VisitTaskNum - addReadingPeriodNum) && c.TrialReadingCriterionId == trialReadingCriterionId))
                     .GroupBy(t => new { t.SubjectId, t.VisitTaskNum })
                     .Where(g => g.Count() == 2)
-                    .Select(g => new { g.Key.SubjectId, g.Key.VisitTaskNum } ).Distinct().Count();
+                    .Select(g => new { g.Key.SubjectId, g.Key.VisitTaskNum }).Distinct().Count();
 
                 exportInfo.judgeReadingPeriodCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned)
                     //找到阅片期已阅片完
@@ -2495,15 +2495,16 @@ namespace IRaCIS.Core.Application.Service.Common
                       //触发裁判的阅片期的数量  并且裁判要求做完
                       TotalJudgeCount = g
                       .Where(t => t.JudgeVisitTaskId != null && t.JudgeVisitTask.ReadingTaskState == ReadingTaskState.HaveSigned)
-                      .Select(t => t.VisitTaskNum).Distinct().Count(),
+                      .Select(t => new { t.SubjectId, t.VisitTaskNum }).Distinct().Count(),
 
                       JudgeAgreeCount = g
                       .Where(t => t.JudgeVisitTaskId != null && t.JudgeVisitTask.ReadingTaskState == ReadingTaskState.HaveSigned)
                       .Where(t => t.JudgeVisitTask.JudgeResultTaskId == t.Id)
-                      .Select(t => t.VisitTaskNum).Distinct().Count(),
+                      .Select(t => new { t.SubjectId, t.VisitTaskNum }).Distinct().Count(),
 
                   }).ToList();
 
+
                 #endregion
 
                 return await ExcelExportHelper.DataExportAsync(StaticData.Export.ReadingPeriodJudgeRatio_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment);