From 451ffec65bcf68ca190fdff901fadc1a49a6349a Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 25 Aug 2023 18:36:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9--028?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Document/EmailSendService.cs                  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs
index d4819b91a..d5fa11a2f 100644
--- a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs
+++ b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs
@@ -163,6 +163,7 @@ namespace IRaCIS.Core.Application.Service
 
                 //过滤项目  并且 将 _userInfo.Id 换位 当前发送邮件的Id
                 var query = _trialRepository
+                    .Where(t => t.Id == trialId)
                  .Select(t => new
                  {
                      ReUploadTobeDealedCount = t.SubjectVisitList.SelectMany(c => c.QCChallengeList)
@@ -210,12 +211,13 @@ namespace IRaCIS.Core.Application.Service
             {
                 var userId = user.UserId;
                 //过滤项目  并且 将 _userInfo.Id 换位 当前发送邮件的Id
-                var query = _trialRepository
+                var query = _trialRepository.Where(t=>t.Id==trialId)
+                   
                  .Select(t => new
                  {
                      //质疑待处理
-                     ToBeDealedCount = t.SubjectVisitList.SelectMany(c => c.QCChallengeList)
-                     .Where(u => u.DialogList.Any(t=>t.CreateUserId== userId)   && u.IsClosed == false && u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IQC).Count(),
+                     ToBeDealedCount = t.SubjectVisitList.Where(t=>t.TrialSite.CRCUserList.Any(t=>t.UserId==userId)).SelectMany(c => c.QCChallengeList)
+                     .Where(u =>     u.IsClosed == false &&  (u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IQC || u.LatestReplyUserId==null)).Count(),
 
                  });