Merge branch 'master' of http://140.143.162.39:3000/wxd/WebPeis0523

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; }
     }
 }

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())