From 3a2c78fe37f7bb9e046234209d548969308e741e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Sun, 4 Jan 2026 16:46:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1=E8=B4=A8?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/DTO/TrialStatViewModel.cs         | 2 ++
 .../Service/TrialSiteUser/TrialStatService.cs               | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialStatViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialStatViewModel.cs
index b0df38be2..cc48a775c 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialStatViewModel.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialStatViewModel.cs
@@ -46,6 +46,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public Guid? TrialSiteId { get; set; }
 
+        public Guid? TrialReadingCriterionId { get; set; }
+
     }
 
     public class VisitQuestionViewModel
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialStatService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialStatService.cs
index 3662b3b53..62ffbf8ba 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialStatService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialStatService.cs
@@ -95,10 +95,12 @@ public class TrialStatService(
 
 
             MedicalReviewQuestion_ClosedCount = t.TaskMedicalReviewList.Where(t => inQuery.TrialSiteId != null ? t.VisitTask.Subject.TrialSiteId == inQuery.TrialSiteId : true)
+            .Where(t => inQuery.TrialReadingCriterionId != null ? t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId : true)
             .Where(t => t.VisitTask.IsAnalysisCreate == false && t.IsClosedDialog).Count(),
 
             MedicalReviewQuestion_IngCount = t.TaskMedicalReviewList.Where(t => inQuery.TrialSiteId != null ? t.VisitTask.Subject.TrialSiteId == inQuery.TrialSiteId : true)
-            .Where(t => t.VisitTask.IsAnalysisCreate == false && t.IsClosedDialog == false).Count(),
+            .Where(t => inQuery.TrialReadingCriterionId != null ? t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId : true)
+            .Where(t => t.VisitTask.IsAnalysisCreate == false && t.IsClosedDialog == false && t.IsHaveQuestion == true).Count(),
 
 
         }).FirstOrDefaultAsync();
@@ -218,7 +220,7 @@ public class TrialStatService(
             );
 
         //找到裁判选择了的，否则就不算,并且排除基线   按照每个subject分组，取最后一次访视
-        list = list.Where(t => t.IsJudgeSelect == true && t.VisitTaskNum != 0 && t.ReadingCategory==ReadingCategory.Visit)//全局的答案已经放在对应访视上了
+        list = list.Where(t => t.IsJudgeSelect == true && t.VisitTaskNum != 0 && t.ReadingCategory == ReadingCategory.Visit)//全局的答案已经放在对应访视上了
             .GroupBy(t => t.SubjectCode).Select(g => g.OrderByDescending(t => t.VisitTaskNum).First()).ToList();