Browse Source

0324

master
wxd 3 weeks ago
parent
commit
210e72eaba
  1. 8
      src/Shentun.Peis.Application/ChargeRequests/ChargeRequestAppService.cs
  2. 4
      src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs
  3. 5
      src/Shentun.Peis.Application/RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs
  4. 6
      src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs

8
src/Shentun.Peis.Application/ChargeRequests/ChargeRequestAppService.cs

@ -243,7 +243,7 @@ namespace Shentun.Peis.ChargeRequests
} }
/// <summary> /// <summary>
///
/// 已发送申请单信息
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
@ -281,6 +281,12 @@ namespace Shentun.Peis.ChargeRequests
return result; return result;
} }
/// <summary>
/// 申请单包含的项目
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
[HttpPost("api/app/ChargeRequest/GetChargeRequestAsbitemsByChargeRequestId")] [HttpPost("api/app/ChargeRequest/GetChargeRequestAsbitemsByChargeRequestId")]
public async Task<List<ChargeRequestAsbitemDto>> GetChargeRequestAsbitemsByChargeRequestIdAsync(ChargeRequestIdInputDto input) public async Task<List<ChargeRequestAsbitemDto>> GetChargeRequestAsbitemsByChargeRequestIdAsync(ChargeRequestIdInputDto input)
{ {

4
src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs

@ -185,7 +185,7 @@ namespace Shentun.Peis.QueueRegisters
WaitCount = roomGroup.Count(c => c.queueRegisterEmpty != null), WaitCount = roomGroup.Count(c => c.queueRegisterEmpty != null),
ItemTypeDisplayOrder = roomGroup.FirstOrDefault().itemTypeEmpty != null ? roomGroup.FirstOrDefault().itemTypeEmpty.DisplayOrder : 0, ItemTypeDisplayOrder = roomGroup.FirstOrDefault().itemTypeEmpty != null ? roomGroup.FirstOrDefault().itemTypeEmpty.DisplayOrder : 0,
RoomDisplayOrder = roomGroup.FirstOrDefault().room.DisplayOrder RoomDisplayOrder = roomGroup.FirstOrDefault().room.DisplayOrder
}).ToList().OrderBy(o => o.ItemTypeDisplayOrder).ThenBy(o => o.RoomDisplayOrder).ToList();
}).ToList().OrderBy(o => o.RoomDisplayOrder).ToList();
return entListDto; return entListDto;
} }
@ -209,7 +209,7 @@ namespace Shentun.Peis.QueueRegisters
WaitCount = roomGroup.Count(c => c.queueRegisterEmpty != null), WaitCount = roomGroup.Count(c => c.queueRegisterEmpty != null),
ItemTypeDisplayOrder = roomGroup.FirstOrDefault().itemTypeEmpty != null ? roomGroup.FirstOrDefault().itemTypeEmpty.DisplayOrder : 0, ItemTypeDisplayOrder = roomGroup.FirstOrDefault().itemTypeEmpty != null ? roomGroup.FirstOrDefault().itemTypeEmpty.DisplayOrder : 0,
RoomDisplayOrder = roomGroup.FirstOrDefault().room.DisplayOrder RoomDisplayOrder = roomGroup.FirstOrDefault().room.DisplayOrder
}).ToList().OrderBy(o => o.ItemTypeDisplayOrder).ThenBy(o => o.RoomDisplayOrder).ToList();
}).ToList().OrderBy(o => o.RoomDisplayOrder).ToList();
return entListDto; return entListDto;
} }

5
src/Shentun.Peis.Application/RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs

@ -349,8 +349,11 @@ namespace Shentun.Peis.RegisterAsbitems
OrderBy(o => o.DisplayOrder).ToList(); OrderBy(o => o.DisplayOrder).ToList();
return entdto; return entdto;
} }
/// <summary> /// <summary>
///
/// 未发送申请的项目
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>

6
src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs

@ -65,6 +65,12 @@ namespace Shentun.Peis.ChargeRequests
}; };
} }
/// <summary>
/// 发送申请单
/// </summary>
/// <param name="id"></param>
/// <param name="funName"></param>
/// <returns></returns>
public async Task SendThirChargeRequestAsync(Guid id,string funName) public async Task SendThirChargeRequestAsync(Guid id,string funName)
{ {
var patientRegisterEntity = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync() var patientRegisterEntity = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()

Loading…
Cancel
Save