|
|
|
@ -360,15 +360,15 @@ namespace Shentun.Peis.QueueRegisters |
|
|
|
//筛选项目类别
|
|
|
|
//项目类别下登记的所有组合项目
|
|
|
|
var asbitemIds = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync() |
|
|
|
join registerCheck in await _registerCheckRepository.GetQueryableAsync() |
|
|
|
on patientRegister.Id equals registerCheck.PatientRegisterId |
|
|
|
join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync() |
|
|
|
on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId |
|
|
|
join asbitem in await _asbitemRepository.GetQueryableAsync() |
|
|
|
on registerCheckAsbitem.AsbitemId equals asbitem.Id |
|
|
|
where patientRegisterIds.Contains(patientRegister.Id) && input.ItemTypeIds.Contains(asbitem.ItemTypeId) |
|
|
|
group registerCheckAsbitem by registerCheckAsbitem.AsbitemId into cc |
|
|
|
select cc.Key).ToList(); |
|
|
|
join registerCheck in await _registerCheckRepository.GetQueryableAsync() |
|
|
|
on patientRegister.Id equals registerCheck.PatientRegisterId |
|
|
|
join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync() |
|
|
|
on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId |
|
|
|
join asbitem in await _asbitemRepository.GetQueryableAsync() |
|
|
|
on registerCheckAsbitem.AsbitemId equals asbitem.Id |
|
|
|
where patientRegisterIds.Contains(patientRegister.Id) && input.ItemTypeIds.Contains(asbitem.ItemTypeId) |
|
|
|
group registerCheckAsbitem by registerCheckAsbitem.AsbitemId into cc |
|
|
|
select cc.Key).ToList(); |
|
|
|
|
|
|
|
|
|
|
|
query = query.Where(m => asbitemIds.Contains(m.asbitemId)); |
|
|
|
@ -467,5 +467,24 @@ namespace Shentun.Peis.QueueRegisters |
|
|
|
|
|
|
|
return entDto; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 获取房间名称 根据房间号
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="input"></param>
|
|
|
|
/// <returns></returns>
|
|
|
|
[HttpPost("api/app/QueueRegister/GetRoomNameByRoomNo")] |
|
|
|
public async Task<GetRoomNameByRoomNoDto> GetRoomNameByRoomNoAsync(RoomNoInputDto input) |
|
|
|
{ |
|
|
|
var roomEnt = await _roomRepository.FirstOrDefaultAsync(f => f.RoomNo == input.RoomNo); |
|
|
|
if (roomEnt == null) |
|
|
|
throw new UserFriendlyException("房间号不存在"); |
|
|
|
var entDto = new GetRoomNameByRoomNoDto |
|
|
|
{ |
|
|
|
RoomName = roomEnt.DisplayName |
|
|
|
}; |
|
|
|
return entDto; |
|
|
|
} |
|
|
|
} |
|
|
|
} |