From a360c371647cbf260a536f646b8651c7100dd4f1 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 23 Jun 2022 14:17:18 +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/Reading/ReadingImageTaskService.cs     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index c3993c41a..4d5ff7563 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -89,16 +89,22 @@ namespace IRaCIS.Application.Services
             if (subjectId != null)
             {
 
-                var subjectList = await _subjectRepository.Where(t => t.TrialId == trialId)
+                var subjectList =await  _subjectRepository.Where(t => t.TrialId == trialId)
                  .Where(t => t.SubjectDoctorList.Any(t => t.DoctorUserId == _userInfo.Id))
-                 .Select((s,index) => new SubjectTask()
+                 .Select(s => new SubjectTask()
                  {
-                     Index=index,
                      SubjectId = s.Id,
                      UnReadTaskCount = s.SubjectVisitTaskList.Count(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.DoctorUserId == _userInfo.Id),
                  }).ToListAsync();
+                subjectList = subjectList.Select((x, index) => new SubjectTask()
+                {
+                    Index = index,
+                    SubjectId = x.SubjectId,
+                    UnReadTaskCount = x.UnReadTaskCount,
+                }).ToList();
 
-                var subjectIndex = subjectList.Where(x => x.SubjectId == subjectId).Select(x=>x.Index).FirstOrDefault();
+
+               var subjectIndex = subjectList.Where(x => x.SubjectId == subjectId).Select(x=>x.Index).FirstOrDefault();
                 var newSubjectId = subjectList.Where(x => x.Index >= subjectIndex && x.UnReadTaskCount != 0).Select(x=>x.SubjectId).FirstOrDefault();
                 task = await _visitTaskRepository.Where(x => x.TrialId == trialId && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.SubjectId == newSubjectId && x.DoctorUserId == _userInfo.Id).Select(x => new GetReadingTaskDto()
                 {