diff --git a/src/Shentun.Peis.Application.Contracts/Rooms/GetRoomNameByRoomNoDto.cs b/src/Shentun.Peis.Application.Contracts/Rooms/GetRoomNameByRoomNoDto.cs
new file mode 100644
index 0000000..02721d5
--- /dev/null
+++ b/src/Shentun.Peis.Application.Contracts/Rooms/GetRoomNameByRoomNoDto.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Peis.Rooms
+{
+ public class GetRoomNameByRoomNoDto
+ {
+ ///
+ /// 房间名称
+ ///
+ public string RoomName { get; set; }
+ }
+}
diff --git a/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs b/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs
index ae3ff0a..00240ec 100644
--- a/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs
+++ b/src/Shentun.Peis.Application/QueueRegisters/QueueRegisterAppService.cs
@@ -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;
}
+
+
+ ///
+ /// 获取房间名称 根据房间号
+ ///
+ ///
+ ///
+ [HttpPost("api/app/QueueRegister/GetRoomNameByRoomNo")]
+ public async Task 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;
+ }
}
}