From cbb0b98ad8f0c7634463a8cbea199bd72e0aff44 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Thu, 25 Jul 2024 09:45:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AB=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Rooms/GetRoomNameByRoomNoDto.cs           | 14 +++++++
 .../QueueRegisters/QueueRegisterAppService.cs | 37 ++++++++++++++-----
 2 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 src/Shentun.Peis.Application.Contracts/Rooms/GetRoomNameByRoomNoDto.cs

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
+    {
+        /// <summary>
+        /// 房间名称
+        /// </summary>
+        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;
         }
+
+
+        /// <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;
+        }
     }
 }