From 49d9cc9a0a4021dcf744689e10b533fc1a3961dc Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 7 Jun 2022 15:26:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/Dto/ReadingPeriodSetViewModel.cs    |  2 ++
 .../Service/Reading/ReadingPeriodSetService.cs  | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

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
     /// </summary>
     public class PreviewTheReadingListOutDto
     {
+        public Guid Id { get; set; }
+
         /// <summary>
         /// 项目中心Code
         /// </summary>
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
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<List<PreviewTheReadingListOutDto>> GetPreviewTheReadingPlanList(PreviewTheReadingListInDto inDto)
+        public async Task<PageOutput<PreviewTheReadingListOutDto>> 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);
         }