修改一版

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -169,6 +169,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public int UnReadTaskCount { get; set; }
 
+        public bool ExixtsReadingApply { get; set; }
+
         public DateTime? SuggesteFinishedTime => UnReadTaskList.Max(t => t.SuggesteFinishedTime);
 
         public List<IRUnreadTaskView> UnReadTaskList { get; set; } = new List<IRUnreadTaskView>();

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -909,16 +909,17 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                 var visitGroupQuery = _visitTaskRepository.Where(x => x.TrialId == trialId && x.DoctorUserId == _userInfo.Id)
                     .Where(x => !x.Subject.IsDeleted)
-                .Where(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect)
+                .Where(t => (t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect)||t.ReReadingApplyState==ReReadingApplyState.HaveApplyed)
                     .GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode });
 
                 var visitTaskQuery = visitGroupQuery.Select(x => new IRUnReadSubjectView()
                 {
                     SubjectId = x.Key.SubjectId,
                     SubjectCode = x.Key.BlindSubjectCode == string.Empty ? x.Key.Code : x.Key.BlindSubjectCode,
-                    UnReadTaskCount = x.Count(),
-                    UnReadTaskList = x.Select(u => new IRUnreadTaskView() { Id = u.Id, IsUrgent = u.IsUrgent, SuggesteFinishedTime = u.SuggesteFinishedTime }).ToList(),
-                });
+                    UnReadTaskCount = x.Where(y=>y.ReReadingApplyState!= ReReadingApplyState.HaveApplyed).Count(),
+                    ExixtsReadingApply=x.Any(y=>y.ReReadingApplyState== ReReadingApplyState.HaveApplyed),
+                    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);
 
                 var totalCount = visitGroupQuery.Count();
                 var currentPageData = await visitTaskQuery.OrderBy(x => x.SubjectId).Skip((iRUnReadSubjectQuery.PageIndex - 1) * iRUnReadSubjectQuery.PageSize)