From e32b4d4010dfbaeb57a5d67b756e47d45a493e68 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 22 Jul 2022 10:49:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/VisitTaskService.cs                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 09ffc17d9..a1a80008f 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -909,8 +909,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                 var visitTaskQuery = GetOrderReadingIQueryable(trialId);
 
-                var totalCount = visitGroupQuery.Count();
-                var currentPageData = await visitTaskQuery.Skip((iRUnReadSubjectQuery.PageIndex - 1) * iRUnReadSubjectQuery.PageSize)
+                var totalCount = visitTaskQuery.Item1.Count();
+                var currentPageData = await visitTaskQuery.Item2.Skip((iRUnReadSubjectQuery.PageIndex - 1) * iRUnReadSubjectQuery.PageSize)
                     .Take(iRUnReadSubjectQuery.PageSize).ToListAsync();
 
                 var result = new PageOutput<IRUnReadSubjectView>()
@@ -965,7 +965,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
         /// </summary>
         /// <param name="trialId"></param>
         /// <returns></returns>
-        public IOrderedQueryable<IRUnReadSubjectView>? GetOrderReadingIQueryable(Guid trialId)
+        public (IQueryable<IGrouping<object,VisitTask>>?,IOrderedQueryable<IRUnReadSubjectView>?) GetOrderReadingIQueryable(Guid trialId)
         {
             var visitGroupQuery = _visitTaskRepository.Where(x => x.TrialId == trialId && x.DoctorUserId == _userInfo.Id)
                   .Where(x => !x.Subject.IsDeleted)
@@ -981,7 +981,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 UnReadTaskList = x.Where(y => y.ReReadingApplyState != ReReadingApplyState.HaveApplyed).Select(u => new IRUnreadTaskView() { Id = u.Id, IsUrgent = u.IsUrgent, SuggesteFinishedTime = u.SuggesteFinishedTime }).ToList(),
             }).Where(x => x.UnReadTaskCount > 0).OrderBy(x => x.SubjectId);
 
-            return visitTaskQuery;
+            return (visitGroupQuery, visitTaskQuery);
         }