diff --git a/src/Shentun.Peis.Application/ChargeRequests/ChargeRequestAppService.cs b/src/Shentun.Peis.Application/ChargeRequests/ChargeRequestAppService.cs index 4b731d97..b2f47941 100644 --- a/src/Shentun.Peis.Application/ChargeRequests/ChargeRequestAppService.cs +++ b/src/Shentun.Peis.Application/ChargeRequests/ChargeRequestAppService.cs @@ -243,7 +243,7 @@ namespace Shentun.Peis.ChargeRequests } /// - /// + /// 已发送申请单信息 /// /// /// @@ -281,6 +281,12 @@ namespace Shentun.Peis.ChargeRequests return result; } + /// + /// 申请单包含的项目 + /// + /// + /// + /// [HttpPost("api/app/ChargeRequest/GetChargeRequestAsbitemsByChargeRequestId")] public async Task> GetChargeRequestAsbitemsByChargeRequestIdAsync(ChargeRequestIdInputDto input) { diff --git a/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs b/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs index c8325acc..96862ed4 100644 --- a/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs +++ b/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs @@ -185,7 +185,7 @@ namespace Shentun.Peis.QueueRegisters WaitCount = roomGroup.Count(c => c.queueRegisterEmpty != null), ItemTypeDisplayOrder = roomGroup.FirstOrDefault().itemTypeEmpty != null ? roomGroup.FirstOrDefault().itemTypeEmpty.DisplayOrder : 0, RoomDisplayOrder = roomGroup.FirstOrDefault().room.DisplayOrder - }).ToList().OrderBy(o => o.ItemTypeDisplayOrder).ThenBy(o => o.RoomDisplayOrder).ToList(); + }).ToList().OrderBy(o => o.RoomDisplayOrder).ToList(); return entListDto; } @@ -209,7 +209,7 @@ namespace Shentun.Peis.QueueRegisters WaitCount = roomGroup.Count(c => c.queueRegisterEmpty != null), ItemTypeDisplayOrder = roomGroup.FirstOrDefault().itemTypeEmpty != null ? roomGroup.FirstOrDefault().itemTypeEmpty.DisplayOrder : 0, RoomDisplayOrder = roomGroup.FirstOrDefault().room.DisplayOrder - }).ToList().OrderBy(o => o.ItemTypeDisplayOrder).ThenBy(o => o.RoomDisplayOrder).ToList(); + }).ToList().OrderBy(o => o.RoomDisplayOrder).ToList(); return entListDto; } diff --git a/src/Shentun.Peis.Application/RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs b/src/Shentun.Peis.Application/RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs index 8eab82fb..5f4e7ad8 100644 --- a/src/Shentun.Peis.Application/RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs +++ b/src/Shentun.Peis.Application/RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs @@ -349,8 +349,11 @@ namespace Shentun.Peis.RegisterAsbitems OrderBy(o => o.DisplayOrder).ToList(); return entdto; } + + + /// - /// + /// 未发送申请的项目 /// /// /// diff --git a/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs b/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs index e123c76a..1352b43f 100644 --- a/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs +++ b/src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs @@ -65,6 +65,12 @@ namespace Shentun.Peis.ChargeRequests }; } + /// + /// 发送申请单 + /// + /// + /// + /// public async Task SendThirChargeRequestAsync(Guid id,string funName) { var patientRegisterEntity = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()