修改医学审核统计和发送报告bug

2023-12-08 10:42:46 +08:00
parent 6edacd4fd4
commit db0d90c0f0
2 changed files with 4 additions and 4 deletions
@@ -1084,7 +1084,7 @@ namespace IRaCIS.Core.Application

                       ToBeReplyedCount = g.Where(u => u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IndependentReviewer && u.AuditState == MedicalReviewAuditState.Auditing ).Count(),

-                       ToBeReviewedCount = g.Where(u =>  u.AuditState != MedicalReviewAuditState.HaveSigned ).Count()
+                       ToBeReviewedCount = g.Where(u =>  u.AuditState != MedicalReviewAuditState.HaveSigned  && u.LatestReplyUser.UserTypeEnum != UserTypeEnum.IndependentReviewer).Count()

                   }).Where(t => t.ToBeReviewedCount > 0);

@@ -1100,7 +1100,7 @@ namespace IRaCIS.Core.Application
            var toBeReplyedQuery = _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)
-                  .Where(u => u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IndependentReviewer);
+                  .Where(u => u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IndependentReviewer && u.AuditState == MedicalReviewAuditState.Auditing);


            var toBeReplyedCount = toBeReplyedQuery.Count();
@@ -1108,7 +1108,7 @@ namespace IRaCIS.Core.Application
            var tobeReviewedCount = _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)
-                  .Where(u =>  u.AuditState != MedicalReviewAuditState.HaveSigned).Count();
+                  .Where(u =>  u.AuditState != MedicalReviewAuditState.HaveSigned && u.LatestReplyUser.UserTypeEnum != UserTypeEnum.IndependentReviewer).Count();


            return ResponseOutput.Ok(result, new { TotalToBeReplyedCount = toBeReplyedCount, TotalTobeReviewedCount = tobeReviewedCount });