diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs index 2422c51f3..2ac247960 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs @@ -82,6 +82,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public class PreviewTheReadingListOutDto { + public Guid Id { get; set; } + /// /// 项目中心Code /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs index 21ae061cb..8cb4f74dd 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs @@ -207,25 +207,28 @@ namespace IRaCIS.Application.Services /// /// [HttpPost] - public async Task> GetPreviewTheReadingPlanList(PreviewTheReadingListInDto inDto) + public async Task> GetPreviewTheReadingPlanList(PreviewTheReadingListInDto inDto) { - var plans =await _readingPeriodPlanRepository.Where(x => x.ReadingPeriodSetId == inDto.ReadingPeriodSetId).Include(x => x.SubjectVisit).Include(x => x.SubjectVisit.TrialSite).Include(x => x.SubjectVisit.Subject) - .Include(x => x.ReadingPeriodSet).ToListAsync(); - - return plans.Select(x => new PreviewTheReadingListOutDto + var plans = _readingPeriodPlanRepository.Where(x => x.ReadingPeriodSetId == inDto.ReadingPeriodSetId).Include(x => x.SubjectVisit).Include(x => x.SubjectVisit.TrialSite).Include(x => x.SubjectVisit.Subject) + .Include(x => x.ReadingPeriodSet).Select(x => new PreviewTheReadingListOutDto { + + Id=x.Id, ExpirationDate = x.ReadingPeriodSet.ExpirationDate, SubjectVisitId = x.SubjectVisitId, TrialSiteCode = x.SubjectVisit.TrialSite.TrialSiteCode, LatestScanDate =x.SubjectVisit.LatestScanDate, ReadingPeriodName = x.ReadingPeriodSet.ReadingPeriodName, - ReadingPeriodSetId = x.ReadingPeriodSet.Id, + ReadingPeriodSetId = x.ReadingPeriodSetId, SubjectCode = x.SubjectVisit.Subject.Code, SubjectId = x.SubjectVisit.SubjectId, SubjectVisitName = x.SubjectVisit.VisitName, //Remark= readset.Remark - }).ToList(); + }); + + return await plans.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField == null ? "SubjectId" : inDto.SortField, + inDto.Asc); }