From aa2afbc3a63030ff81e6a7a3d0737d6c8d304c97 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期日, 01 九月 2024 12:29:36 +0800
Subject: [PATCH] 逻辑顺序调整

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
index 5c8b473..518ed2e 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
@@ -305,15 +305,15 @@
 
     @Override
     public CommonResult<RoomRespVO> getRoom(Long roomId, String bedNo, Long docId) {
+        RoomDO roomDO = roomMapper.getRoom(roomId, bedNo, docId);
+        if (null == roomDO) {
+            return error(ROOM_NOT_SIT);
+        }
+
         BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
         if (null == bedQueueBO) {
             log.error("getRoom mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
             return error(QUEUE_BED_NOT_EXIST);
-        }
-
-        RoomDO roomDO = roomMapper.getRoom(roomId, bedNo, docId);
-        if (null == roomDO) {
-            return error(ROOM_NOT_SIT);
         }
 
         RoomRespVO roomRespVO = BeanUtils.toBean(roomDO, RoomRespVO.class);

--
Gitblit v1.9.3