Uat_Study
he 2022-07-22 14:54:27 +08:00
parent a58e4ac1a1
commit 712ed21783
3 changed files with 3 additions and 2 deletions

View File

@ -1013,7 +1013,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
SuggesteFinishedTime = u.SuggesteFinishedTime, SuggesteFinishedTime = u.SuggesteFinishedTime,
ReadingCategory = u.ReadingCategory, ReadingCategory = u.ReadingCategory,
}).ToList(), }).ToList(),
}).OrderBy(x => x.SubjectId); }).Where(x => x.UnReadTaskCount > 0).OrderBy(x => x.SubjectId);

View File

@ -145,6 +145,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{ {
public Guid? SubjectId { get; set; } public Guid? SubjectId { get; set; }
public string SubjectCode { get; set; }=string.Empty;
public Guid TrialId { get; set; } public Guid TrialId { get; set; }

View File

@ -295,7 +295,7 @@ namespace IRaCIS.Application.Services
index++; index++;
}); });
var subjectIndex = subjectTaskList.Where(x => x.SubjectId == inDto.SubjectId).Select(x => x.Index).FirstOrDefault(); var subjectIndex = subjectTaskList.Where(x => x.SubjectId == inDto.SubjectId&&x.SubjectCode==inDto.SubjectCode).Select(x => x.Index).FirstOrDefault();
var currentSubject = subjectTaskList.Where(x => x.Index >= subjectIndex&&!x.ExistReadingApply).OrderBy(x => x.Index).FirstOrDefault(); var currentSubject = subjectTaskList.Where(x => x.Index >= subjectIndex&&!x.ExistReadingApply).OrderBy(x => x.Index).FirstOrDefault();