diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index c1e223dcb..3b70a8eac 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -357,13 +357,14 @@ namespace IRaCIS.Core.Application.Service var visitTaskQuery = visitGroupQuery.Select(x=> new IRUnReadSubjectView() { SubjectId=x.Key.SubjectId, - SubjectCode=x.Key.BlindSubjectCode==null?x.Key.Code: x.Key.BlindSubjectCode, + 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(), }); var totalCount = visitGroupQuery.Count(); - var currentPageData = await visitTaskQuery.OrderBy(x => x.SubjectCode).Skip((iRUnReadSubjectQuery.PageIndex - 1) * iRUnReadSubjectQuery.PageSize).Take(iRUnReadSubjectQuery.PageSize).ToListAsync(); + var currentPageData = await visitTaskQuery.OrderBy(x => x.SubjectCode).Skip((iRUnReadSubjectQuery.PageIndex - 1) * iRUnReadSubjectQuery.PageSize) + .Take(iRUnReadSubjectQuery.PageSize).ToListAsync(); var result = new PageOutput() {