From a3fcff07fc07bd35f41fd7f9b8f3a9df2676a581 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期六, 12 十月 2024 18:42:44 +0800
Subject: [PATCH] 常规检查 叫号

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 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 da4e17e..f7fa9bc 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
@@ -332,8 +332,15 @@
     @Override
     public void finishNextPatient(Long roomId, String bedNo) {
         // 浠� DB 鎶� 灏辫瘖涓殑浜� 璁剧疆涓哄氨璇婂畬鎴�
-        Integer ret =  queueMapper.updateBedQueueStatus(roomId, bedNo,
-                QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
+        //Integer ret =  queueMapper.updateBedQueueStatus(roomId, bedNo,
+        //        QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
+
+        // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣�
+        List<Byte> queueStatusList = new ArrayList<>();
+        queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
+        Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
+        if ( num != null && num > 0)
+            return;
 
         startNextPatient(roomId, bedNo);
     }
@@ -345,7 +352,7 @@
         //Integer ret =  queueMapper.updateBedQueueStatus(roomId, bedNo,
         //        QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());
 
-        // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純.鍙栦笅涓�浣�
+        // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣�
         List<Byte> queueStatusList = new ArrayList<>();
         queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
         Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
@@ -362,7 +369,7 @@
         //Integer ret =  queueMapper.updateBedQueueStatus(roomId, bedNo,
         //        QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());
 
-        // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純.鍙栦笅涓�浣�
+        // 浠� DB 妫�鏌� 璇ュ伐浣� 鏄惁鏈� [灏辫瘖涓璢 浜哄憳锛岃嫢鏈夊氨.鏀惧純鍙栦笅涓�浣�
         List<Byte> queueStatusList = new ArrayList<>();
         queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
         Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);

--
Gitblit v1.9.3