From b716f199f344e4ecbaeb5a315bb6be3205c4bbc5 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 07 四月 2025 17:11:34 +0800
Subject: [PATCH] 就诊准备 改为 候诊中
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java | 2 +-
jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/QueueStatusEnum.java | 2 +-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java | 14 +++++++-------
README.md | 8 ++++----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/README.md b/README.md
index f708f85..d06bb12 100644
--- a/README.md
+++ b/README.md
@@ -8,10 +8,10 @@
## 涓氬姟瀹炵幇
### 鍒嗘祦
-01. 銆愭帓闃熶腑銆� 鎮ｈ�� 鏈垎娴佸埌 璇婂锛屾病鏈夊唴閮� seqNum ==>銆愬氨璇婂噯澶囥��
+01. 銆愭帓闃熶腑銆� 鎮ｈ�� 鏈垎娴佸埌 璇婂锛屾病鏈夊唴閮� seqNum ==>銆愬�欒瘖涓��
02. 棰勭害纭鏃讹紝涓诲姩瑙﹀彂鍒嗘祦 鍒版敮鎸佽棰勭害椤圭洰鐨勫伐浣�1銆佸伐浣�2...宸ヤ綅N
-03. 鍙彿鏃讹紝銆愬氨璇婂噯澶囥��=>銆愬氨璇婁腑銆� 涓诲姩瑙﹀彂鍒嗘祦 鍒拌宸ヤ綅
-04. 妫�鏌ラ」鐩紭鍏堥槦鍒� (宸ヤ綅闃熷垪) 璁板綍鐨勬槸 宸ヤ綅涓娿�愬氨璇婂噯澶囥�戠殑浜烘暟
+03. 鍙彿鏃讹紝銆愬�欒瘖涓��=>銆愬氨璇婁腑銆� 涓诲姩瑙﹀彂鍒嗘祦 鍒拌宸ヤ綅
+04. 妫�鏌ラ」鐩紭鍏堥槦鍒� (宸ヤ綅闃熷垪) 璁板綍鐨勬槸 宸ヤ綅涓娿�愬�欒瘖涓�戠殑浜烘暟
### 杩囧彿
01. 杩囧彿銆佸畨瑁呰繃鍙�
@@ -19,5 +19,5 @@
### 浜插拰
01. 浜插拰锛氭偅鑰呯殑澶氫釜妫�鏌ラ」鐩彲浠ュ湪宸ヤ綅涓婁竴骞跺仛锛岄伩鍏嶅娆℃帓闃燂紝姣斿鍔ㄦ�佸績鐢点�佸姩鎬佽鍘�
-02. 浜插拰锛氭槸渚濋檮鑰咃紝渚濋檮鍒板凡鍒嗘祦鍒拌瘖瀹ょ殑妫�鏌ラ」鐩紝涔熷氨鏄�愬氨璇婂噯澶囥�戙�愬氨璇婁腑銆戙�愯繃鍙枫�戙�愬彫鍥炪�戠殑妫�鏌ラ」 (鏈夊伐浣嶅拰鍐呴儴搴忓彿) 浼氱洿鎺ヤ笂浣� 銆愬氨璇婁腑銆�
+02. 浜插拰锛氭槸渚濋檮鑰咃紝渚濋檮鍒板凡鍒嗘祦鍒拌瘖瀹ょ殑妫�鏌ラ」鐩紝涔熷氨鏄�愬�欒瘖涓�戙�愬氨璇婁腑銆戙�愯繃鍙枫�戙�愬彫鍥炪�戠殑妫�鏌ラ」 (鏈夊伐浣嶅拰鍐呴儴搴忓彿) 浼氱洿鎺ヤ笂浣� 銆愬氨璇婁腑銆�
03. 浜插拰-瀹夎锛氭槸渚濋檮鑰咃紝渚濋檮鍒般�愬畨瑁呬腑銆戙�愬畨瑁呰繃鍙枫�戙�愬畨瑁呭彫鍥炪�戠殑妫�鏌ラ」 浼氱洿鎺ヤ笂浣� 銆愬畨瑁呬腑銆�
diff --git a/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/QueueStatusEnum.java b/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/QueueStatusEnum.java
index 0ae20c5..7f4acd3 100644
--- a/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/QueueStatusEnum.java
+++ b/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/QueueStatusEnum.java
@@ -23,7 +23,7 @@
AFFINITY_INSTALL(13, "浜插拰-瀹夎"),
RECALLED(15, "宸插彫鍥�"),
RECALLED_INSTALL(17, "宸插彫鍥�-瀹夎"),
- READY(20, "鍊欒瘖涓�"), // 灏辫瘖鍑嗗 宸插垎娴佸埌宸ヤ綅
+ READY(20, "鍊欒瘖涓�"), // 鍊欒瘖涓� 宸插垎娴佸埌宸ヤ綅
ONSTAGE(30, "灏辫瘖涓�"), // 鎴� 棰嗙敤涓�
RECEIVED(33, "宸查鐢�"),
INSTALLING(36, "瀹夎涓�"),
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 21757ee..38abeaf 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
@@ -683,7 +683,7 @@
* 棰勭害纭鍚庯紝涓诲姩瀵绘眰渚濋檮
*/
private void procAffinityWhenQueue(/*IN, OUT*/QueueSaveReqVO queueSaveReqVO, Integer[] affinityCheckTypes) {
- // 濡傛灉瀛樺湪 [灏辫瘖鍑嗗] [灏辫瘖涓璢 [杩囧彿] [宸插彫鍥瀅 鑳借渚濋檮鐨勬鏌ラ」锛屽垯渚濋檮鍒板叾涓竴涓�
+ // 濡傛灉瀛樺湪 [鍊欒瘖涓璢 [灏辫瘖涓璢 [杩囧彿] [宸插彫鍥瀅 鑳借渚濋檮鐨勬鏌ラ」锛屽垯渚濋檮鍒板叾涓竴涓�
List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatusList(
queueSaveReqVO.getPatId(), affinityCheckTypes,
List.of(QueueStatusEnum.READY.getStatus(), QueueStatusEnum.ONSTAGE.getStatus(),
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java
index 208d2cb..b3b7fb4 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java
@@ -245,15 +245,15 @@
/* 2024.11.11
// 甯歌 鎴栬�� 棰嗙敤 鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
public ErrorCode nextPatient(Long roomId, String bedNo) {
- // 浠� DB 鎶婅宸ヤ綅.搴忓彿鏈�灏忕殑 [灏辫瘖鍑嗗涓璢 鐨勪汉 璁剧疆涓� [灏辫瘖涓璢 (鎴栭鐢ㄤ腑)
+ // 浠� DB 鎶婅宸ヤ綅.搴忓彿鏈�灏忕殑 [鍊欒瘖涓腑] 鐨勪汉 璁剧疆涓� [灏辫瘖涓璢 (鎴栭鐢ㄤ腑)
Integer updateNum = queueMapper.updateBedQueueStatus(roomId, bedNo,
QueueStatusEnum.READY.getStatus(), QueueStatusEnum.ONSTAGE.getStatus());
- // 璇ュ伐浣� 娌℃湁 [灏辫瘖鍑嗗涓璢 浜哄憳
+ // 璇ュ伐浣� 娌℃湁 [鍊欒瘖涓腑] 浜哄憳
if (null == updateNum || 0 == updateNum) {
return QUEUE_NOT_READY_PATIENT;
}
- // 浼樺厛闃熷垪涓� 璇ュ伐浣� 灏辫瘖鍑嗗涓汉鐨勬暟閲� 鍑忎竴
+ // 浼樺厛闃熷垪涓� 璇ュ伐浣� 鍊欒瘖涓腑浜虹殑鏁伴噺 鍑忎竴
BedQueueBO bo = mapBedVsQueue.get( Utils.formatRoomBed( roomId, bedNo ) );
bo.queueNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊�
@@ -265,7 +265,7 @@
// 甯歌 鎴栬�� 棰嗙敤 鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
public ErrorCode nextPatient(Long roomId, String bedNo) {
QueueDO firstReadyQueueItem = queueMapper.getFirstItemByBedAndStatus(roomId, bedNo, QueueStatusEnum.READY.getStatus());
- // 璇ュ伐浣� 娌℃湁 [灏辫瘖鍑嗗涓璢 浜哄憳
+ // 璇ュ伐浣� 娌℃湁 [鍊欒瘖涓腑] 浜哄憳
if (null == firstReadyQueueItem) {
return QUEUE_NOT_READY_PATIENT;
}
@@ -274,7 +274,7 @@
firstReadyQueueItem.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
queueMapper.updateById( firstReadyQueueItem );
- // 浼樺厛闃熷垪涓� 璇ュ伐浣� 灏辫瘖鍑嗗涓汉鐨勬暟閲� 鍑忎竴
+ // 浼樺厛闃熷垪涓� 璇ュ伐浣� 鍊欒瘖涓腑浜虹殑鏁伴噺 鍑忎竴
BedQueueBO bo = mapBedVsQueue.get( Utils.formatRoomBed( roomId, bedNo ) );
bo.queueNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊�
@@ -331,7 +331,7 @@
List<RoomDO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList);
List<BedQueueBO> bedQueueBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedQueueBO.class)).toList();
- // 浠嶥B 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛樼粺璁� 鍒楄〃
+ // 浠嶥B 鑾峰彇 闃熷垪涓� 鍊欒瘖涓腑浜哄憳缁熻 鍒楄〃
List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.READY.getStatus());
List<QueueStatisticDO> queueStatisticDOList = queueMapper.queueStatistic(queueStatusList);
@@ -549,7 +549,7 @@
}
/**
- * 鏈夋鏌ラ」鍒嗘祦鍒拌瘖瀹ゅ悗锛屼篃灏辨槸杩涘叆[灏辫瘖鍑嗗]鍚庯紝鎷� [鎺掗槦涓璢 + 鍏锋湁浜插拰鎬х殑 妫�鏌ラ」 鏉ヤ緷闄勮妫�鏌ラ」
+ * 鏈夋鏌ラ」鍒嗘祦鍒拌瘖瀹ゅ悗锛屼篃灏辨槸杩涘叆[鍊欒瘖涓璢鍚庯紝鎷� [鎺掗槦涓璢 + 鍏锋湁浜插拰鎬х殑 妫�鏌ラ」 鏉ヤ緷闄勮妫�鏌ラ」
*/
private void procAffinityWhenPreempt(QueueDO preemptQueueItem, Integer[] affinityCheckTypes) {
List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
--
Gitblit v1.9.3