From cd6c57cec8aeb1d83d9da82900cb538549640c49 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Fri, 22 Nov 2024 10:33:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Visit/DTO/VisitPlanViewModel.cs   |  6 +++++-
 .../Service/Visit/VisitPlanService.cs         | 21 ++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/VisitPlanViewModel.cs b/IRaCIS.Core.Application/Service/Visit/DTO/VisitPlanViewModel.cs
index 6e428afdb..a15032eec 100644
--- a/IRaCIS.Core.Application/Service/Visit/DTO/VisitPlanViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Visit/DTO/VisitPlanViewModel.cs
@@ -29,9 +29,13 @@ namespace IRaCIS.Application.Contracts
 
     }
 
+    public class GetVisitStageListInDto:PageInput
+    {
+        public Guid TrialId { get; set; }
+    }
     public class VisitPlanView
     {
-        public List<VisitStageDTO> VisitPlanList = new List<VisitStageDTO>();
+        public PageOutput<VisitStageDTO> VisitPlanList { get; set; }
 
         public decimal TimePointsPerPatient { get; set; }
         public bool VisitPlanConfirmed { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
index c7afc5d1f..8ad101753 100644
--- a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
@@ -34,16 +34,23 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
-        /// <summary> 根据项目Id，获取项目访视计划(不分页)[New]</summary>
-        [HttpGet("{trialId:guid}")]
-        public async Task<VisitPlanView> GetVisitStageList(Guid trialId)
+        /// <summary>
+        /// 根据项目Id，获取项目访视计划
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<VisitPlanView> GetVisitStageList(GetVisitStageListInDto inDto)
         {
-            var query = _visitStageRepository.AsQueryable(true).Where(u => u.TrialId == trialId)
+            var query = _visitStageRepository.AsQueryable(true).Where(u => u.TrialId == inDto.TrialId)
                 .ProjectTo<VisitStageDTO>(_mapper.ConfigurationProvider).OrderBy(t => t.VisitNum);
-            var list = await query.ToListAsync();
-            var trial = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId)).IfNullThrowException();
+            var list = await query.ToPagedListAsync(inDto);
+            var trial = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == inDto.TrialId)).IfNullThrowException();
 
-            var isHaveGeneratedTask = (await _visitTaskRepository.AnyAsync(t => t.TrialId == trialId));
+
+
+
+            var isHaveGeneratedTask = (await _visitTaskRepository.AnyAsync(t => t.TrialId == inDto.TrialId));
             return new VisitPlanView()
             {
                 VisitPlanList = list,