修改一版
parent
db334205de
commit
e32b4d4010
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue