From cd9b85533a35ae804fde9b1ee7af51ebb1630aeb Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 29 八月 2024 17:32:07 +0800
Subject: [PATCH] 问诊重置功能

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java |    9 +++------
 1 files changed, 3 insertions(+), 6 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 03f445e..ae4fdb7 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
@@ -200,7 +200,7 @@
         // DB update
         List statusList = new ArrayList<BedStatusEnum>();
         statusList.add(BedStatusEnum.CLOSED);
-        Integer updateNum = roomMapper.setBedStatus(roomId, bedNo,
+        Integer updateNum = roomMapper.setBedOpeningClosed(roomId, bedNo,
                 BedStatusEnum.OPENING, statusList);
         if ( null==updateNum || 0 == updateNum )
             return ROOM_INVALID_STATUS;
@@ -230,7 +230,6 @@
         if (bedQueueBO.getQueueNum().get() >0)
             return QUEUE_HAVE_PATIENT;
 
-        BedStatusEnum destStatusEnum = destStatusEnum = BedStatusEnum.CLOSED;
         mapBedVsQueue.remove(String.format("%09d%s", roomId, bedNo));
         priorityQueue.remove(bedQueueBO);
 
@@ -239,7 +238,8 @@
         statusList.add(BedStatusEnum.OPENING);
         statusList.add(BedStatusEnum.DOCTOR_ON);
         statusList.add(BedStatusEnum.PAUSE);
-        Integer updateNum = roomMapper.setBedStatus(roomId, bedNo, destStatusEnum, statusList);
+        Integer updateNum = roomMapper.setBedOpeningClosed(roomId, bedNo,
+                BedStatusEnum.CLOSED, statusList);
         if ( null==updateNum || 0 == updateNum )
             return ROOM_INVALID_STATUS;
 
@@ -475,9 +475,6 @@
         queueSaveReqVO.setStatus(QueueStatusEnum.WAITING.getStatus()); //鎺掗槦涓�
         QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
         queueMapper.insert(queue);
-
-        if (0 == openingFlag.get())
-            return;
 
         startHurryUp();
     }

--
Gitblit v1.9.3