From b72836017fca08c7d786c61c073b4d0cf16095d2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com>
Date: Wed, 26 Jun 2024 00:08:30 +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

---
 .../AppointPatientRegisterAppService.cs       | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/Shentun.WebPeis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs b/src/Shentun.WebPeis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs
index e60c496..a311a8b 100644
--- a/src/Shentun.WebPeis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs
+++ b/src/Shentun.WebPeis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs
@@ -177,7 +177,7 @@ namespace Shentun.WebPeis.AppointPatientRegisters
         /// <param name="input"></param>
         /// <returns></returns>
         /// <exception cref="UserFriendlyException"></exception>
-        //[AllowAnonymous]
+        [AllowAnonymous]
         [HttpPost("api/app/AppointPatientRegister/GetListByFilter")]
         public async Task<List<AppointPatientRegisterDto>> GetListByFilterAsync(AppointPatientRegisterInputDto input)
         {
@@ -316,7 +316,7 @@ namespace Shentun.WebPeis.AppointPatientRegisters
 
         }
         /// <summary>
-        /// 获取某人的预约列表,小程序使用
+        /// 获取某人的个人预约列表,小程序使用
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -345,7 +345,8 @@ namespace Shentun.WebPeis.AppointPatientRegisters
                          join customerOrg in await _customerOrgRepository.GetQueryableAsync()
                          on appointPatientRegister.CustomerOrgId equals customerOrg.CustomerOrgId
                          where appointPatientRegister.PersonId == input.PersonId &&
-                               appointPatientRegister.CompleteFlag != AppointPatientRegisterCompleteFlag.CancelAppoint
+                               appointPatientRegister.CompleteFlag != AppointPatientRegisterCompleteFlag.CancelAppoint &&
+                               appointPatientRegister.CustomerOrgId != GuidFlag.PersonCustomerOrgId
                          orderby appointPatientRegister.AppointDate
                          select new
                          {
@@ -428,7 +429,7 @@ namespace Shentun.WebPeis.AppointPatientRegisters
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        //[AllowAnonymous]
+        [AllowAnonymous]
         [HttpPost("api/app/AppointPatientRegister/GetAppointRegisterAsbitemListById")]
         public async Task<List<AppointRegisterAsbitemDto>> GetAppointRegisterAsbitemListByIdAsync(AppointPatientRegisterIdInputDto input)
         {
@@ -493,25 +494,25 @@ namespace Shentun.WebPeis.AppointPatientRegisters
 
 
         /// <summary>
-        /// 获取预约的组合项目通过备单登记ID
+        /// 获取预约的人员信息通过备单登记ID
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [HttpPost("api/app/AppointPatientRegister/GetAppointRegisterAsbitemListByPatientRegisterId")]
-        public async Task<List<AppointRegisterAsbitemDto>> GetAppointRegisterAsbitemListByPatientRegisterIdAsync(PatientRegisterIdInputDto input)
+        [AllowAnonymous]
+        [HttpPost("api/app/AppointPatientRegister/GetByPatientRegisterId")]
+        public async Task<AppointPatientRegisterDto> GetByPatientRegisterIdAsync(PatientRegisterIdInputDto input)
         {
+            if (input == null) throw new UserFriendlyException("参数不能为空");
             var appointRegister = await _repository.FindAsync(o => o.PatientRegisterId == input.PatientRegisterId && o.CompleteFlag == AppointPatientRegisterCompleteFlag.Appoint);
             if (appointRegister == null)
             {
                 throw new UserFriendlyException("没有预约的人员信息");
             }
-            var appointPatientRegisterIdInputDto = new AppointPatientRegisterIdInputDto()
+            var AppointPatientRegisterDto = new AppointPatientRegisterDto()
             {
                 AppointPatientRegisterId = appointRegister.AppointPatientRegisterId
             };
-
-            var asbitems = await GetAppointRegisterAsbitemListByIdAsync(appointPatientRegisterIdInputDto);
-            return asbitems;
+            return AppointPatientRegisterDto;
         }
         /// <summary>
         /// 获取单位预约病人