spm 统计修改

IRC_NewDev
hang 2024-03-04 10:06:38 +08:00
parent 05dcbfed2e
commit dd22b206dc
1 changed files with 3 additions and 3 deletions

View File

@ -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,