From 239c01b5fe968134a1fa8dffc1d240fbd58d32db Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Sat, 8 Jun 2024 22:57:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GetAppointScheduleListInputDto.cs         | 10 ++++++++++
 .../AppointScheduleAppService.cs              | 19 ++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/Shentun.WebPeis.Application.Contracts/AppointSchedules/GetAppointScheduleListInputDto.cs b/src/Shentun.WebPeis.Application.Contracts/AppointSchedules/GetAppointScheduleListInputDto.cs
index c34adea..1ad9804 100644
--- a/src/Shentun.WebPeis.Application.Contracts/AppointSchedules/GetAppointScheduleListInputDto.cs
+++ b/src/Shentun.WebPeis.Application.Contracts/AppointSchedules/GetAppointScheduleListInputDto.cs
@@ -10,5 +10,15 @@ namespace Shentun.WebPeis.AppointSchedules
         /// 体检中心ID
         /// </summary>
         public Guid MedicalCenterId { get; set; }
+
+        /// <summary>
+        /// 开始日期
+        /// </summary>
+        public string StartDate { get; set; }
+
+        /// <summary>
+        /// 结束日期
+        /// </summary>
+        public string EndDate { get; set; }
     }
 }
diff --git a/src/Shentun.WebPeis.Application/AppointSchedules/AppointScheduleAppService.cs b/src/Shentun.WebPeis.Application/AppointSchedules/AppointScheduleAppService.cs
index f676520..fd1b63d 100644
--- a/src/Shentun.WebPeis.Application/AppointSchedules/AppointScheduleAppService.cs
+++ b/src/Shentun.WebPeis.Application/AppointSchedules/AppointScheduleAppService.cs
@@ -257,16 +257,29 @@ namespace Shentun.WebPeis.AppointSchedules
         }
 
 
-      
+
 
         /// <summary>
         /// 获取预约计划
         /// </summary>
         /// <returns></returns>
-        [HttpPost("api/app/AppointSchedule/GetAppointScheduleNumberLimitList")]
+        [HttpPost("api/app/AppointSchedule/GetAppointScheduleList")]
         public async Task<List<AppointScheduleDto>> GetAppointScheduleListAsync(GetAppointScheduleListInputDto input)
         {
             var entList = (await _appointScheduleRepository.GetQueryableAsync()).Where(m => m.MedicalCenterId == input.MedicalCenterId);
+
+            if (!string.IsNullOrWhiteSpace(input.StartDate))
+            {
+                if (!string.IsNullOrWhiteSpace(input.EndDate))
+                {
+                    entList = entList.Where(m => m.AppointDate.Date >= DateTime.Parse(input.StartDate)
+                    && m.AppointDate.Date <= DateTime.Parse(input.EndDate));
+                }
+                else
+                {
+                    entList = entList.Where(m => m.AppointDate.Date >= DateTime.Parse(input.StartDate));
+                }
+            }
             var entListDto = entList.Select(s => new AppointScheduleDto
             {
                 AppointDate = DataHelper.ConversionDateShortToString(s.AppointDate),
@@ -288,7 +301,7 @@ namespace Shentun.WebPeis.AppointSchedules
         /// 删除预约计划
         /// </summary>
         /// <returns></returns>
-        [HttpPost("api/app/AppointSchedule/DeleteAppointScheduleNumberLimit")]
+        [HttpPost("api/app/AppointSchedule/DeleteAppointSchedule")]
         public async Task DeleteAppointScheduleAsync(DeleteAppointScheduleInputDto input)
         {
             if (input.AppointScheduleIds.Any())