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 /// /// /// - //[AllowAnonymous] + [AllowAnonymous] [HttpPost("api/app/AppointPatientRegister/GetListByFilter")] public async Task> GetListByFilterAsync(AppointPatientRegisterInputDto input) { @@ -316,7 +316,7 @@ namespace Shentun.WebPeis.AppointPatientRegisters } /// - /// 获取某人的预约列表,小程序使用 + /// 获取某人的个人预约列表,小程序使用 /// /// /// @@ -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 /// /// /// - //[AllowAnonymous] + [AllowAnonymous] [HttpPost("api/app/AppointPatientRegister/GetAppointRegisterAsbitemListById")] public async Task> GetAppointRegisterAsbitemListByIdAsync(AppointPatientRegisterIdInputDto input) { @@ -493,25 +494,25 @@ namespace Shentun.WebPeis.AppointPatientRegisters /// - /// 获取预约的组合项目通过备单登记ID + /// 获取预约的人员信息通过备单登记ID /// /// /// - [HttpPost("api/app/AppointPatientRegister/GetAppointRegisterAsbitemListByPatientRegisterId")] - public async Task> GetAppointRegisterAsbitemListByPatientRegisterIdAsync(PatientRegisterIdInputDto input) + [AllowAnonymous] + [HttpPost("api/app/AppointPatientRegister/GetByPatientRegisterId")] + public async Task 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; } /// /// 获取单位预约病人