From dd22b206dc72bb9833c752389e5db57bd5b0707c Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 4 Mar 2024 10:06:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?spm=20=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/PersonalWorkstation.cs            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
index 1b8923d27..45de410e6 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
@@ -1081,7 +1081,7 @@ namespace IRaCIS.Core.Application
 
             #region 废弃不能对包含聚合或子查询的表达式执行聚合函数
             var query = _taskMedicalReviewRepository
-                    .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
+                   .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                    .Where(t => t.IsClosedDialog == false && t.VisitTask.TaskState == TaskState.Effect && t.IsInvalid == false && t.MedicalManagerUserId == _userInfo.Id)
                    .GroupBy(t => new
                    {
@@ -1107,7 +1107,7 @@ namespace IRaCIS.Core.Application
 
                        ToBeReviewedCount = g.Where(u => u.AuditState != MedicalReviewAuditState.HaveSigned && u.LatestReplyUser.UserTypeEnum != UserTypeEnum.IndependentReviewer).Count()
 
-                   }).Where(t => t.ToBeReviewedCount > 0);
+                   }).Where(t => t.ToBeReviewedCount +t.ToBeReplyedCount > 0);
 
             #endregion
 
@@ -1407,7 +1407,7 @@ namespace IRaCIS.Core.Application
                 MIM_MedicalReviewCount = isMIM ? await _taskMedicalReviewRepository
                     .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                    .Where(t => t.IsClosedDialog == false && t.VisitTask.TaskState == TaskState.Effect && t.IsInvalid == false && t.MedicalManagerUserId == _userInfo.Id)
-                   .GroupBy(t => t.TrialId)
+                   .GroupBy(t => new { t.TrialId ,t.VisitTask.TrialReadingCriterionId} )
                    .Select(g => new
                    {
                        TrialId = g.Key,

From c78b80c679f1e4be9fc766753228cfec1982d680 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 4 Mar 2024 11:47:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=BE=E5=9B=9E=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E6=B2=A1=E6=9C=89=E5=90=AF=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E8=B4=A6=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/Management/UserService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index 259080a76..9c64aa81d 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -383,7 +383,7 @@ namespace IRaCIS.Application.Services
                 }
             }
 
-            var list = await _userRepository.Where(t => t.EMail == email).Select(t => new UserAccountDto() { UserId = t.Id, UserName = t.UserName, UserRealName = t.FullName, UserType = t.UserTypeRole.UserTypeShortName }).ToListAsync();
+            var list = await _userRepository.Where(t => t.EMail == email && t.Status== UserStateEnum.Enable).Select(t => new UserAccountDto() { UserId = t.Id, UserName = t.UserName, UserRealName = t.FullName, UserType = t.UserTypeRole.UserTypeShortName }).ToListAsync();