IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs

@@ -976,9 +976,7 @@ namespace IRaCIS.Core.Application
             var toBeDealedCount = _taskMedicalReviewRepository
                 .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                 .Where(t => t.IsClosedDialog == false && t.VisitTask.DoctorUserId == _userInfo.Id)
-                .Where(u => u.LatestReplyUser.UserTypeEnum == UserTypeEnum.MIM)
+                .Where(u => u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM).Count();
-                //.Where(u => u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM)
-                .Count();
 
             return ResponseOutput.Ok(result, new { TotalToBeReplyedCount = toBeDealedCount });
 
@@ -1047,9 +1045,7 @@ namespace IRaCIS.Core.Application
             var toBeReplyedQuery = _taskMedicalReviewRepository
                   .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                   .Where(t => t.IsClosedDialog == false)
-                  .Where(u => u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IndependentReviewer);
+                  .Where(u => u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer);
-                 
-                  //.Where(u => u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer);
 
             var toBeReplyedCount = toBeReplyedQuery.Count();