From 68ff33beff11310e830b0615b5a81f83fad0f683 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:33:14 +0800
Subject: [PATCH] ai优化
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java | 22
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java | 103
jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/RegisterDateTruncationTest.java | 139 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/CheckTypeController.java | 10
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java | 100
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/RoutineFinishReqVO.java | 12
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 235 +
jh-framework/jh-spring-boot-starter-web/src/main/java/cn/lihu/jh/framework/web/core/handler/GlobalExceptionHandler.java | 43
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java | 403 +++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java | 133 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java | 12
jh-framework/jh-spring-boot-starter-excel/src/main/java/cn/lihu/jh/framework/excel/core/convert/DictConvert.java | 9
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java | 34
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java | 388 ++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomRespVO.java | 7
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/utils/IpUtils.java | 258 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queuesequence/QueueSequenceMapper.java | 41
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/controller/admin/appointment/vo/AppointmentPageReqVO.java | 13
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Utils.java | 50
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/config/EcgConfigServiceImpl.java | 49
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java | 576 +++
jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/enums/HisCheckStatusEnumTest.java | 108
jh-server/src/main/java/cn/lihu/jh/server/ecg/FrontendAuthorizeRequestsCustomizer.java | 106
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queuesequence/SeqCounterDO.java | 40
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/call/CallMapper.java | 14
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java | 176 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentService.java | 9
jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/dal/mysql/queuesequence/SeqCounterInterceptorIgnoreTest.java | 76
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java | 5
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomSeatRespVO.java | 72
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java | 80
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java | 25
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/enums/HisCheckNameEnum.java | 82
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java | 13
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java | 221 +
jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/his/HisEcgFilterTest.java | 328 ++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/enums/HisCheckStatusEnum.java | 110
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queuesequence/QueueSequenceServiceImpl.java | 281 +
jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/enums/SeqRuleEnumTest.java | 232 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java | 674 ++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 23
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/ScreenQueueRespVO.java | 24
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/jobrecord/JobRecordDO.java | 13
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queuesequence/QueueSequenceService.java | 15
jh-server/src/main/java/cn/lihu/jh/server/ecg/FrontendResourceConfig.java | 109
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/vo/JobRecordRespVO.java | 7
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java | 53
jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/HisCheckAppointmentCheckTypeTest.java | 110
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/MonitorInfoVO.java | 6
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java | 24
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java | 11
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java | 287 ++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedDoctorOnCallable.java | 7
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueuePageReqVO.java | 3
jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/SeqRuleEnum.java | 150 +
jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/HisParseSafetyTest.java | 388 ++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/annotation/RequireBedOwner.java | 33
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/his/HisEcgFilter.java | 454 +++
jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/ErrorCodeConstants.java | 24
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/QueueDO.java | 13
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java | 22
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomSelectBedRespVO.java | 84
jh-server/src/main/java/cn/lihu/jh/server/ecg/SpaForwardController.java | 143 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/aspect/BedOwnerAspect.java | 108
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java | 207 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java | 43
jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/HisDoctorTimeParseTest.java | 93
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/call/CallServiceImpl.java | 30
69 files changed, 7,417 insertions(+), 358 deletions(-)
diff --git a/jh-framework/jh-spring-boot-starter-excel/src/main/java/cn/lihu/jh/framework/excel/core/convert/DictConvert.java b/jh-framework/jh-spring-boot-starter-excel/src/main/java/cn/lihu/jh/framework/excel/core/convert/DictConvert.java
index 727036a..27353ff 100644
--- a/jh-framework/jh-spring-boot-starter-excel/src/main/java/cn/lihu/jh/framework/excel/core/convert/DictConvert.java
+++ b/jh-framework/jh-spring-boot-starter-excel/src/main/java/cn/lihu/jh/framework/excel/core/convert/DictConvert.java
@@ -37,7 +37,8 @@
String label = readCellData.getStringValue();
String value = DictFrameworkUtils.parseDictDataValue(type, label);
if (value == null) {
- log.error("[convertToJavaData][type({}) 瑙f瀽涓嶆帀 label({})]", type, label);
+ // 銆愭湰闇�姹傘�戜笌瀵煎嚭鏂瑰悜涓�鑷达細瀛楀吀缂洪」灞炴暟鎹棶棰橈紝鐢� WARN 鑰屼笉鏄� ERROR锛堥伩鍏嶅鍏ユ椂鍒风孩鏃ュ織锛�
+ log.warn("[convertToJavaData][type({}) 鏈壘鍒板瓧鍏搁」 label({})锛屾寜 null 澶勭悊]", type, label);
return null;
}
// 灏� String 鐨� value 杞崲鎴愬搴旂殑灞炴��
@@ -58,7 +59,11 @@
String value = String.valueOf(object);
String label = DictFrameworkUtils.getDictDataLabel(type, value);
if (label == null) {
- log.error("[convertToExcelData][type({}) 杞崲涓嶄簡 label({})]", type, value);
+ // 銆愭湰闇�姹傘�戝瓧鍏搁噷娌℃湁杩欎釜鍊兼椂锛屽睘浜�"鏁版嵁娌¢厤瀛楀吀"锛屼笉鏄郴缁熼敊璇細
+ // 鍘熸潵鐢� log.error锛屽鍑� N 琛屽氨浼氬埛 N 鏉� ERROR锛堜緥濡�"鎮h�呮�у埆=0"鍦ㄥ瓧鍏搁噷娌℃湁 0锛夛紝
+ // 鐜板満鐪嬬潃鍍忕郴缁熷嚭鏁呴殰銆傝繖閲岄檷涓� WARN锛屼粛淇濈暀鍙拷婧俊鎭��
+ // 杩斿洖鍊间繚鎸佺┖鍗曞厓鏍硷紙姣旂洿鎺ヨ緭鍑哄師濮嬪�� "0" 鏇村悎鐞嗭級銆�
+ log.warn("[convertToExcelData][type({}) 鏈壘鍒板瓧鍏搁」 value({})锛屽鍑轰负绌篯", type, value);
return new WriteCellData<>("");
}
// 鐢熸垚 Excel 灏忚〃鏍�
diff --git a/jh-framework/jh-spring-boot-starter-web/src/main/java/cn/lihu/jh/framework/web/core/handler/GlobalExceptionHandler.java b/jh-framework/jh-spring-boot-starter-web/src/main/java/cn/lihu/jh/framework/web/core/handler/GlobalExceptionHandler.java
index 009c5ee..9ae60a9 100644
--- a/jh-framework/jh-spring-boot-starter-web/src/main/java/cn/lihu/jh/framework/web/core/handler/GlobalExceptionHandler.java
+++ b/jh-framework/jh-spring-boot-starter-web/src/main/java/cn/lihu/jh/framework/web/core/handler/GlobalExceptionHandler.java
@@ -4,6 +4,8 @@
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.exc.InvalidFormatException;
import cn.lihu.jh.framework.apilog.core.service.ApiErrorLogFrameworkService;
import cn.lihu.jh.framework.common.exception.ServiceException;
import cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil;
@@ -17,6 +19,7 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.springframework.http.converter.HttpMessageNotReadableException;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.util.Assert;
import org.springframework.validation.BindException;
@@ -124,6 +127,46 @@
}
/**
+ * 澶勭悊璇锋眰浣擄紙@RequestBody锛夊弽搴忓垪鍖栧け璐ャ��
+ *
+ * <h3>涓轰粈涔堥渶瑕佸崟鐙鐞�</h3>
+ * 涔嬪墠娌℃湁杩欎釜澶勭悊鍣紝JSON 閲岀殑瀛楁绫诲瀷涓嶅锛堜緥濡� {@code "bookCheckType": "甯歌蹇冪數鍥�"}锛�
+ * 鑰屽疄浣撳瓧娈垫槸 {@code Integer}锛夋椂浼氭姏 {@link HttpMessageNotReadableException}锛�
+ * 涓�璺惤鍒� {@link #defaultExceptionHandler} 鍏滃簳 鈥斺�� 鍓嶇鍙湅鍒� <b>500銆岀郴缁熷紓甯搞��</b>锛�
+ * 瀹屽叏鐪嬩笉鍑烘槸鍙傛暟鏍煎紡闂锛堝疄娴� 2026-10-28 鎺掓煡 {@code /ecg/appointment/create} 鍗充负姝わ級銆�
+ *
+ * <p>鐜板湪鏀逛负杩斿洖 <b>400</b> 骞舵槑纭寚鍑恒�屽摢涓瓧娈点�佹敹鍒颁粈涔堝�笺�佹湡鏈涗粈涔堢被鍨嬨�嶃��
+ */
+ @ExceptionHandler(HttpMessageNotReadableException.class)
+ public CommonResult<?> httpMessageNotReadableExceptionHandler(HttpMessageNotReadableException ex) {
+ log.warn("[httpMessageNotReadableExceptionHandler]", ex);
+ return CommonResult.error(BAD_REQUEST.getCode(), "璇锋眰鍙傛暟鏍煎紡閿欒:" + buildMessageNotReadableDetail(ex));
+ }
+
+ /**
+ * 鎶婂弽搴忓垪鍖栧紓甯哥炕璇戞垚浜鸿兘鐪嬫噦鐨勮鏄庯細瀛楁鍚� + 鏀跺埌鐨勫�� + 鏈熸湜鐨勭被鍨嬨��
+ */
+ private String buildMessageNotReadableDetail(HttpMessageNotReadableException ex) {
+ Throwable cause = ex.getMostSpecificCause();
+ // 鈶� 瀛楁绫诲瀷涓嶅尮閰嶏紙鏈�甯歌锛夛細鎷垮埌浜嗗瓧娈靛悕 / 瀹為檯鍊� / 鏈熸湜绫诲瀷
+ if (cause instanceof InvalidFormatException) {
+ InvalidFormatException ife = (InvalidFormatException) cause;
+ String field = ife.getPath().isEmpty()
+ ? "" : ife.getPath().get(ife.getPath().size() - 1).getFieldName();
+ Object value = ife.getValue();
+ Class<?> target = ife.getTargetType();
+ return String.format("瀛楁銆�%s銆嶇被鍨嬩笉姝g‘锛堟敹鍒板��:%s锛屾湡鏈涚被鍨�:%s锛�",
+ StrUtil.blankToDefault(field, "鏈煡瀛楁"), value, null == target ? "鏈煡" : target.getSimpleName());
+ }
+ // 鈶� 璇锋眰浣撶己澶� / JSON 璇硶閿欒绛夛細鐢ㄦ渶鍏蜂綋鐨勫師鍥�
+ if (cause instanceof JsonParseException) {
+ return "JSON 鏍煎紡涓嶆纭�:" + ((JsonParseException) cause).getOriginalMessage();
+ }
+ String message = null == cause ? ex.getMessage() : cause.getMessage();
+ return StrUtil.blankToDefault(message, "璇锋眰浣撴棤娉曡В鏋�");
+ }
+
+ /**
* 澶勭悊 SpringMVC 鍙傛暟鏍¢獙涓嶆纭�
*/
@ExceptionHandler(MethodArgumentNotValidException.class)
diff --git a/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/ErrorCodeConstants.java b/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/ErrorCodeConstants.java
index afcb65e..b2c27c4 100644
--- a/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/ErrorCodeConstants.java
+++ b/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/ErrorCodeConstants.java
@@ -35,6 +35,24 @@
ErrorCode ROOM_NOT_EXISTS = new ErrorCode(1_010_002_000, "璇婂鍜岃瘖鐤楀簥涓嶅瓨鍦�");
ErrorCode ROOM_NOT_SIT = new ErrorCode(1_010_002_001, "璇烽噸鏂板氨搴�");
ErrorCode ROOM_INVALID_STATUS = new ErrorCode(1_010_002_001, "璇婂鍜岃瘖鐤楀簥鐘舵�佸紓甯�");
+ /**
+ * 鍏ュ骇琚嫆锛氳宸ヤ綅宸茶**鍏朵粬鍖荤敓**鍗犵敤锛堟湰娆℃柊澧烇級銆�
+ *
+ * <p>鑳屾櫙锛氬師鏉ヨ繖绉嶆儏鍐典篃杩斿洖 {@link #ROOM_INVALID_STATUS}锛�"璇婂鍜岃瘖鐤楀簥鐘舵�佸紓甯�"锛夛紝
+ * 鐜板満鐪嬪埌杩欏彞璇濇棤娉曞垽鏂槸"宸ヤ綅琚汉鍗犱簡"杩樻槸"鐘舵�佷笉瀵�"锛屾帓闅滄垚鏈珮銆�
+ * 鐙珛鎴愮爜鍚庯紝鍓嶇鍙洿鎺ユ彁绀�"璇ュ伐浣嶅凡鐢卞叾浠栧尰鐢熸搷浣滀腑"锛屽苟鍒锋柊鍒楄〃銆�
+ */
+ ErrorCode ROOM_OCCUPIED_BY_OTHER = new ErrorCode(1_010_002_002,
+ "璇ュ伐浣嶅凡鐢卞叾浠栧尰鐢熸搷浣滀腑锛屼笉鑳藉叆搴э紱璇峰埛鏂板悗閫夋嫨绌洪棽宸ヤ綅");
+ /**
+ * 鍥磋妯″紡锛氬綋鍓嶇櫥褰曚汉涓嶆槸璇ュ伐浣嶇殑涓讳汉锛屼笉鑳芥墽琛�**鍐�**鎿嶄綔锛堟湰娆℃柊澧烇級銆�
+ *
+ * <p>鑳屾櫙锛氬紩鍏�"鍥磋"鍚庝换浣曠櫥褰曠敤鎴烽兘鑳芥煡鐪嬩换鎰忓凡寮�鏀惧伐浣嶇殑鏁版嵁锛堝彧璇伙級锛�
+ * 浣嗗彨鍙枫�佽繃鍙枫�佸畬鎴愭鏌ャ�佺‘璐广�侀鐢ㄣ�佽鏈虹瓑鍐欐搷浣滃彧鑳界敱璇ュ伐浣嶄富浜烘墽琛屻��
+ * 鍓嶇绂佺敤鎸夐挳鍙槸鐣岄潰绾﹀畾锛屾湇鍔$鐢� {@code @RequireBedOwner} 鍒囬潰缁熶竴鎷︽埅銆�
+ */
+ ErrorCode ROOM_NOT_OWNER = new ErrorCode(1_010_002_003,
+ "褰撳墠宸ヤ綅鐢卞叾浠栧尰鐢熸搷浣滀腑锛屾偍澶勪簬鍥磋妯″紡锛屼笉鑳芥墽琛岃鎿嶄綔");
ErrorCode QUEUE_NOT_EXISTS = new ErrorCode(1_010_003_000, "鎺掗槦涓嶅瓨鍦�");
ErrorCode QUEUE_BED_NOT_EXIST = new ErrorCode(1_010_003_001, "宸ヤ綅闃熷垪涓嶅瓨鍦�");
@@ -50,6 +68,12 @@
*/
ErrorCode QUEUE_STOP_READY_NOT_CONFIGURED = new ErrorCode(1_010_003_006,
"鍋滄鍊欒瘖鍔熻兘鏈厤缃紝璇峰厛鎵ц鏁版嵁搴撳崌绾ц剼鏈紙clinic_room.stop_ready锛�");
+ /** 鎵嬪伐"鎷夊叆鎺掗槦鎮h��"鏃讹細璇ユ偅鑰呭凡涓嶅湪銆屾帓闃熶腑銆嶏紙琚埆鐨勫伐浣嶆媺璧�/宸插彨鍙凤級 */
+ ErrorCode QUEUE_NOT_WAITING = new ErrorCode(1_010_003_007,
+ "璇ユ偅鑰呭凡涓嶅湪鎺掗槦涓紙鍙兘宸茶鍏朵粬宸ヤ綅鎷夊叆锛夛紝璇峰埛鏂板悗閲嶈瘯");
+ /** 鎵嬪伐"鎷夊叆鎺掗槦鎮h��"鏃讹細妫�鏌ラ」鐩笉鍦ㄦ湰宸ヤ綅寮�灞曡寖鍥村唴 */
+ ErrorCode QUEUE_CHECK_TYPE_NOT_MATCH = new ErrorCode(1_010_003_008,
+ "璇ユ偅鑰呯殑妫�鏌ラ」鐩笉鍦ㄦ湰宸ヤ綅寮�灞曡寖鍥村唴锛屼笉鑳芥媺鍏�");
ErrorCode PATIENT_NOT_EXISTS = new ErrorCode(1_010_004_000, "鎮h�呬笉瀛樺湪");
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 c2d6205..353b995 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
@@ -22,7 +22,7 @@
AFFINITY(12, "浜插拰"),
AFFINITY_INSTALL(13, "浜插拰-瀹夎"),
RECALLED(15, "宸插彫鍥�"),
- READY(20, "鍊欒瘖涓�"), // 鍊欒瘖涓� 宸插垎娴佸埌宸ヤ綅
+ READY(20, "鍑嗗涓�"), // 鍑嗗涓細宸插垎娴佸埌宸ヤ綅锛堝師绉�"鍊欒瘖涓�"锛�2026-10-16 缁熶竴鏀瑰悕涓�"鍑嗗涓�"锛�
ONSTAGE(30, "灏辫瘖涓�"), // 鎴� 棰嗙敤涓�
RECEIVED(33, "宸查鐢�"),
RECALLED_INSTALL(34, "宸插彫鍥�-瀹夎"),
diff --git a/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/SeqRuleEnum.java b/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/SeqRuleEnum.java
new file mode 100644
index 0000000..0e63af0
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-api/src/main/java/cn/lihu/jh/module/ecg/enums/SeqRuleEnum.java
@@ -0,0 +1,150 @@
+package cn.lihu.jh.module.ecg.enums;
+
+import cn.lihu.jh.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 鎺掗槦搴忓彿瑙勫垯鏋氫妇 鈥斺�� 鍦ㄣ�屾鏌ョ被鍨嬬鐞嗐��(system/check-type) 鐨� {@code check_type.seq_rule} 涓婇厤缃��
+ *
+ * <h3>鑳屾櫙</h3>
+ * 绛惧埌鏃堕渶瑕佺粰鎮h�呬竴涓�屾帓闃熷簭鍙枫�嶏紝涓嶅悓妫�鏌ラ」鐩敤涓嶅悓瑙勫垯銆傚師瀹炵幇**鍙敮鎸佷竴绉�**
+ * 锛堟寜鏃舵鍙栧彿锛岃 {@link #TIMESLOT}锛夛紝鏈灇涓炬妸涓夌瑙勫垯鏄惧紡鍖栵紝渚夸簬鎸夐」鐩厤缃��
+ *
+ * <h3>涓夌瑙勫垯</h3>
+ * <ul>
+ * <li>{@link #APPOINT} 鈥斺�� **鐩存帴鐢ㄩ绾︾郴缁熶笅鍙戠殑棰勭害鍙�**锛岀鍒版椂涓嶅啀鍒嗛厤鏂板簭鍙凤紱</li>
+ * <li>{@link #CHECKIN} 鈥斺�� **绛惧埌鏃剁粰绛惧埌搴忓彿**锛氬悓涓�澶┿�佸悓涓�妫�鏌ョ被鍨嬪唴锛岀 1 涓鍒版槸 1 鍙凤紝
+ * 绗� 2 涓槸 2 鍙封�︹�︼紱骞舵寜銆屾瘡 9 涓彿棰勭暀 1 涓�嶈烦杩囬鐣欏彿锛岀暀缁欏姞鎬ユ偅鑰咃紱</li>
+ * <li>{@link #TIMESLOT} 鈥斺�� **鎸夐绾︽椂闂存缁欏彿**锛堢幇鐘惰鍒欙級锛氬彿姹犳寜
+ * {@code (check_type, time_slot)} 缁存姢锛屽閲忓彈鏃舵閰嶇疆闄愬埗銆�</li>
+ * </ul>
+ *
+ * <h3>瀹归噺璇箟宸紓锛堥噸瑕侊級</h3>
+ * {@link #APPOINT} 涓� {@link #CHECKIN} **涓嶈褰撴棩涓婇檺**锛堝彿杩炵画閫掑锛屽彂瀹屽嵆姝笉瀛樺湪锛夛紝
+ * 鍙湁 {@link #TIMESLOT} 淇濈暀鍘熸湁鐨勬椂娈靛閲忔帶鍒躲�傝 {@link #isCapacityLimited()}銆�
+ *
+ * <h3>涓庣幇鏈� {@code timeslot_book_num} / {@code timeslot_reserved_num} 鐨勫叧绯�</h3>
+ * 閭d袱涓瓧娈垫槸**鏃舵鍙锋睜**鐨勫弬鏁帮紝浠呭湪 {@link #TIMESLOT} 涓嬬敓鏁堬紱
+ * {@link #CHECKIN} 鐨勯鐣欒鍒欏浐瀹氫负銆屾瘡 9 涓烦 1 涓�嶏紙9 涓櫘閫氬彿 + 1 涓鐣欏彿 = 涓�杞� 10 涓級銆�
+ *
+ * @author 蹇冪數鎺掗槦瑁呮満绯荤粺
+ */
+@Getter
+@AllArgsConstructor
+public enum SeqRuleEnum implements IntArrayValuable {
+
+ /** 鈶� 鐢ㄩ绾︾郴缁熺殑棰勭害鍙凤紙涓嶅啀鍒嗛厤鏂板彿锛� */
+ APPOINT(0, "棰勭害鍙�"),
+ /** 鈶� 绛惧埌鏃剁粰绛惧埌搴忓彿锛堝綋澶╁悓妫�鏌ョ被鍨嬪唴杩炵画閫掑锛屾瘡 9 涓鐣� 1 涓級 */
+ CHECKIN(1, "绛惧埌搴忓彿"),
+ /** 鈶� 鎸夐绾︽椂闂存缁欏彿锛堢幇鐘惰鍒欙紝鍙锋睜鎸夋椂娈电淮鎶わ級 */
+ TIMESLOT(2, "鏃舵鍙�");
+
+ public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(SeqRuleEnum::getRule).toArray();
+
+ /** 榛樿瑙勫垯锛氫繚鎸佷笌鏀归�犲墠涓�鑷寸殑琛屼负锛岄伩鍏嶅瓨閲忔暟鎹湭閰嶇疆鏃惰涓哄彉鍖� */
+ public static final SeqRuleEnum DEFAULT = TIMESLOT;
+
+ /**
+ * 涓�杞彿鐨勬暟閲忥細9 涓櫘閫氬彿 + 1 涓鐣欏彿銆�
+ * 棰勭暀鍙风敤浜庡姞鎬ユ偅鑰咃紙{@code jjbz=J}锛夈��
+ */
+ public static final int ROUND_SIZE = 10;
+
+ /** 涓�杞腑琚鐣欑殑鍙蜂釜鏁帮紙姣� {@link #ROUND_SIZE} 涓暀 1 涓級 */
+ public static final int RESERVED_PER_ROUND = 1;
+
+ /** 瑙勫垯鍊� */
+ private final Integer rule;
+ /** 瑙勫垯鍚� */
+ private final String name;
+
+ @Override
+ public int[] array() {
+ return ARRAYS;
+ }
+
+ /**
+ * 璇ヨ鍒欎笅鏄惁闇�瑕佹鏌ャ�屾椂娈靛彿姹犲閲忋�嶃��
+ * <p>
+ * 浠� {@link #TIMESLOT} 闇�瑕� 鈥斺�� 瀹冨彈 {@code queue_sequence.queue_full} 闄愬埗锛�
+ * 鍙︿袱绉嶈鍒欏彿鍊兼槸杩炵画閫掑鐨勶紝涓嶈涓婇檺銆�
+ */
+ public boolean isCapacityLimited() {
+ return this == TIMESLOT;
+ }
+
+ /**
+ * 鎸夎鍒欏�艰В鏋愭灇涓撅紱鏃犳硶璇嗗埆鎴栦负 null 鏃惰繑鍥� {@link #DEFAULT}銆�
+ * <p>
+ * 涔嬫墍浠ヤ笉鎶涘紓甯革細璇ュ�兼潵鑷暟鎹簱閰嶇疆锛屽瓨閲忚鍙兘涓� null锛�
+ * 鍙栭粯璁ゅ�煎彲淇濊瘉鍗囩骇鍚�**琛屼负涓庢敼閫犲墠涓�鑷�**锛屼笉鍥犳湭閰嶇疆鑰岄樆鏂鍒般��
+ */
+ public static SeqRuleEnum parse(Integer rule) {
+ if (rule == null) {
+ return DEFAULT;
+ }
+ for (SeqRuleEnum item : values()) {
+ if (item.rule.equals(rule)) {
+ return item;
+ }
+ }
+ return DEFAULT;
+ }
+
+ /**
+ * 鍒ゆ柇缁欏畾鍙锋槸鍚︿负銆岄鐣欏彿銆嶏紙鐣欑粰鍔犳�ユ偅鑰咃級銆�
+ * <p>
+ * 瑙勫垯锛氭瘡 {@link #ROUND_SIZE} 涓彿鐣� {@link #RESERVED_PER_ROUND} 涓��
+ * 浠� 1 涓鸿捣鐐规椂锛屾瘡杞殑绗� 10 涓紙10銆�20銆�30鈥︼級涓洪鐣欏彿銆�
+ *
+ * @param seq 鍊欓�夊彿锛堜粠 1 寮�濮嬶級
+ * @return true 琛ㄧず璇ュ彿闇�璺宠繃锛堥櫎闈炴槸鍔犳�ユ偅鑰咃級
+ */
+ public static boolean isReservedSeq(int seq) {
+ return seq > 0 && seq % ROUND_SIZE == 0;
+ }
+
+ /**
+ * 鍙� {@code from} 鍙婁箣鍚庣涓�涓�岄潪棰勭暀鍙枫�嶃��
+ *
+ * <p>鐢ㄤ簬鏅�氭偅鑰咃細鑻ヨ鏁板櫒绠楀嚭鐨勫彿鎭板ソ鏄鐣欏彿锛�10 鐨勫�嶆暟锛夛紝
+ * 鍒欐敼鐢ㄤ笅涓�涓彿锛屾妸棰勭暀鍙风暀缁欏姞鎬ユ偅鑰呫��
+ *
+ * <p>娉ㄦ剰涓庤皟鐢ㄦ柟 {@code advanceNormalSeq} 鐨勯厤鍚堬細璁℃暟鍣ㄥ湪鍚屼竴浜嬪姟鍐�
+ * <b>涔熻</b>璺宠繃璇ラ鐣欏彿锛堝 +1锛夛紝鍚﹀垯涓嬩竴娆′細鎶婂悓涓�涓彿鍐嶅彂涓�娆°��
+ * 璇﹁ {@code QueueSequenceMapper#advanceNormalSeq} 鐨勮鏄庛��
+ *
+ * @param from 璧峰鍙凤紙鍚級
+ * @return 绗竴涓潪棰勭暀鍙�
+ */
+ public static int nextNormalSeq(int from) {
+ int seq = Math.max(1, from);
+ while (isReservedSeq(seq)) {
+ seq++;
+ }
+ return seq;
+ }
+
+ /**
+ * 鍙栦笅涓�涓鐣欏彿锛堢粰鍔犳�ユ偅鑰咃級銆�
+ * <p>
+ * 鑻� {@code from} 鏈韩宸叉槸棰勭暀鍙峰垯鐩存帴杩斿洖锛涘惁鍒欒烦鍒版湰杞殑棰勭暀鍙枫��
+ * 渚嬶細from=1 鈫� 10锛沠rom=10 鈫� 10锛沠rom=11 鈫� 20銆�
+ *
+ * @param from 璧峰鍙凤紙鍚級
+ * @return 涓嶅皬浜� {@code from} 鐨勭涓�涓鐣欏彿
+ */
+ public static int nextReservedSeq(int from) {
+ int seq = Math.max(1, from);
+ int rem = seq % ROUND_SIZE;
+ if (rem == 0) {
+ return seq;
+ }
+ return seq + (ROUND_SIZE - rem);
+ }
+
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java
index e24893d..37f0aa5 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Constants.java
@@ -12,6 +12,28 @@
static final String ECG_SCREEN_PANE_PASSED_KEY = "ecg.screen.pane.passed";
static final String DEV_CODE_CHOICE = "dev.code.choice";
+ /**
+ * 閫夋嫨宸ヤ綅妯″紡锛堥渶姹傦細宸ヤ綅閫夋嫨妯″紡锛夈��
+ * <p>鍙栧�硷細
+ * <ul>
+ * <li>{@code 0} 鎸夐渶瑕佸己鍒堕�夋嫨宸ヤ綅锛�=鍘熸潵琛屼负锛氱櫥褰曞悗鏈叆搴у氨寮哄埗鍘婚�夊伐浣嶏級</li>
+ * <li>{@code 1} 鐧诲綍IP鍖归厤宸ヤ綅锛堟寜鏉ヨIP鑷姩鍖归厤宸ヤ綅骞惰嚜鍔ㄥ叆搴э紱鍖归厤涓嶅埌鍒欐寜 0 鎵ц锛�</li>
+ * <li>{@code 2} 鐧诲綍鏃舵墜鍔ㄩ�夋嫨宸ヤ綅锛堝己鍒堕�夋嫨锛屽苟鎶婃湰鏈篒P鍐欏叆鎵�閫夊伐浣嶇殑 clinic_room.ip锛�</li>
+ * <li>{@code 3} 鎸夌郴缁熼粯璁ゅ鐞嗭紙璇P鏈粦瀹氳繃宸ヤ綅鈫掓寜 2 閫変竴娆″苟璁颁綇IP锛涘凡缁戝畾鈫掓寜 1 鑷姩鍖归厤锛涘尮閰嶄笉鍒扳啋鎸� 0锛�</li>
+ * </ul>
+ * 鍙傛暟缂哄け鎴栭潪娉曟椂锛屼竴寰嬫寜 {@code 0} 澶勭悊锛屼繚璇佷笉褰卞搷瀛橀噺閮ㄧ讲銆�</p>
+ */
+ static final String ECG_ROOM_SELECT_MODE_KEY = "ecg.room.select.mode";
+
+ /** 閫夋嫨宸ヤ綅妯″紡锛氭寜闇�瑕佸己鍒堕�夋嫨宸ヤ綅锛堥粯璁わ紝绛変环浜庡師琛屼负锛� */
+ static final int ROOM_SELECT_MODE_FORCE = 0;
+ /** 閫夋嫨宸ヤ綅妯″紡锛氱櫥褰旾P鍖归厤宸ヤ綅 */
+ static final int ROOM_SELECT_MODE_BY_IP = 1;
+ /** 閫夋嫨宸ヤ綅妯″紡锛氱櫥褰曟椂鎵嬪姩閫夋嫨宸ヤ綅锛屽苟鍐欏叆鏈満IP */
+ static final int ROOM_SELECT_MODE_MANUAL_BIND_IP = 2;
+ /** 閫夋嫨宸ヤ綅妯″紡锛氭寜绯荤粺榛樿澶勭悊锛堥娆�=鎵嬪姩閫夊苟璁癐P锛屼箣鍚�=IP鍖归厤锛� */
+ static final int ROOM_SELECT_MODE_SYSTEM_DEFAULT = 3;
+
// 鏃堕棿娈�.闂撮殧鏃堕暱
static final String BOOK_TIMESLOT_LENGTH = "book.timeslot.length";
//static final String BOOK_TIMESLOT_LIST = "book.timeslot.list";
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Utils.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Utils.java
index bd936db..32694b3 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Utils.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Utils.java
@@ -1,9 +1,12 @@
package cn.lihu.jh.module.ecg;
+import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
+
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -91,5 +94,52 @@
return localTimeList;
}
+
+ /**
+ * 鎶娿�屼翰鍜岄」銆嶆彃鍥炲埌瀹冪殑銆屼富椤广�嶅悗闈紝浣夸袱鑰呭湪鐣岄潰涓婄揣鎸ㄧ潃鏄剧ず銆�
+ *
+ * <p>浜插拰椤� = 鍚屼竴鎮h�呯殑鍙︿竴涓鏌ラ」鐩細涓婚」杩涘�欒瘖鏃跺畠涓�璧疯繘锛屼富椤瑰仛瀹屾椂瀹冧竴璧峰仛瀹�
+ * 锛堣 {@code QueueServiceTxFunctions#procAffinityWhenPreempt}锛夈��
+ *
+ * <p>涔嬫墍浠ユ娊鎴愪竴涓柟娉曪細杩欐閫昏緫鍦ㄥ伐浣滃彴鍒楄〃銆佽瘖闂村睆銆佸ぇ灞忓叡 <b>5 澶�</b>閲嶅锛�
+ * 鑰屽師瀹炵幇鏈変袱涓潙锛堥殢銆屾帓闃熷彿缁熶竴銆嶆敼閫犱竴骞朵慨姝o級锛�
+ * <ol>
+ * <li>鍙敤 {@code seqNum} 鐩哥瓑鏉ュ畾浣嶄富椤广�傛帓闃熷彿鏀逛负銆屾寜妫�鏌ョ被鍨嬪悇鑷紪鍙枫�嶅悗鍙蜂細璺ㄦ鏌ョ被鍨嬮噸澶嶏紝
+ * 鍙兘鎶婁翰鍜岄」鎻掑埌<b>鍒殑妫�鏌ョ被鍨�</b>鐨勬偅鑰呭悗闈紱鏁呭悓鏃惰姹� {@code patId} 鐩稿悓銆�</li>
+ * <li>鐢� {@code ==} 姣旇緝 {@code Integer}锛氬彿澶т簬 127 鏃舵槸寮曠敤姣旇緝銆佹案杩滀笉鐩哥瓑锛�
+ * 浜插拰椤硅 {@code remove} 涔嬪悗鎻掍笉鍥炲幓 鈥斺�� 琛ㄧ幇涓�<b>浜插拰椤瑰湪鍒楄〃閲屾秷澶�</b>
+ * 锛堟椂娈靛彿瑙勫垯涓嬪彿寰堝鏄撹秴杩� 127锛夈�傛敼涓烘寜鍊兼瘮杈冿紝骞跺姞"鎵句笉鍒颁富椤瑰氨杩藉姞鍒版湯灏�"鐨勫厹搴曘��</li>
+ * </ol>
+ *
+ * @param list 宸叉帓濂藉簭鐨勫垪琛紙璋冪敤鏂归渶鍏堟妸浜插拰椤逛粠涓Щ闄わ級
+ * @param affinityItems 琚Щ闄ゅ嚭鏉ョ殑浜插拰椤�
+ */
+ public static void insertAffinityItemsAfterMain(List<QueueDO> list, List<QueueDO> affinityItems) {
+ if (list == null || affinityItems == null || affinityItems.isEmpty()) {
+ return;
+ }
+ for (QueueDO affinityItem : affinityItems) {
+ boolean inserted = false;
+ for (int i = list.size() - 1; i >= 0; i--) {
+ QueueDO mainItem = list.get(i);
+ if (isSameSeqNum(affinityItem.getSeqNum(), mainItem.getSeqNum())
+ && Objects.equals(affinityItem.getPatId(), mainItem.getPatId())) {
+ list.add(i + 1, affinityItem);
+ inserted = true;
+ break;
+ }
+ }
+ if (!inserted) {
+ // 涓婚」涓嶅湪鏈垪琛紙渚嬪宸插氨璇婂畬鎴愯鐘舵�佽繃婊ゆ帀锛夛細鍏滃簳杩藉姞鍒版湯灏撅紝
+ // 瀹佸彲浣嶇疆涓嶅畬缇庯紝涔熶笉鑳借鍊欒瘖涓殑鎮h�呬粠鍒楄〃閲�"娑堝け"銆�
+ list.add(affinityItem);
+ }
+ }
+ }
+
+ /** 鎺掗槦鍙锋寜鍊兼瘮杈冿紙{@code Integer} 鐢� {@code ==} 鍦ㄥぇ浜� 127 鏃舵槸寮曠敤姣旇緝锛屼細璇垽涓轰笉绛夛級 */
+ private static boolean isSameSeqNum(Integer a, Integer b) {
+ return a != null && b != null && a.intValue() == b.intValue();
+ }
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/annotation/RequireBedOwner.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/annotation/RequireBedOwner.java
new file mode 100644
index 0000000..3f54bbe
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/annotation/RequireBedOwner.java
@@ -0,0 +1,33 @@
+package cn.lihu.jh.module.ecg.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 鏍囪銆屽繀椤绘槸璇ュ伐浣嶇殑涓讳汉鎵嶈兘璋冪敤銆嶇殑鍐欐帴鍙o紙涓�/鍥磋妯″瀷鐨勬牳蹇冮壌鏉冿級銆�
+ *
+ * <h3>涓轰粈涔堥渶瑕佸畠</h3>
+ * 寮曞叆"鍥磋"鍚庯紝浠讳綍鐧诲綍鐢ㄦ埛閮借兘**鏌ョ湅**浠绘剰宸插紑鏀惧伐浣嶇殑鏁版嵁锛堝彧璇伙級锛�
+ * 浣�**鍐�**鎿嶄綔锛堝彨鍙枫�佽繃鍙枫�佸畬鎴愭鏌ャ�佺‘璐广�侀鐢ㄣ�佽鏈衡�︼級鍙兘鐢辫宸ヤ綅鐨勪富浜烘墽琛屻��
+ *
+ * <p>鍓嶇铏界劧浼氬湪鍥磋妯″紡涓嬬鐢ㄦ寜閽紝浣嗛偅鍙槸鐣岄潰绾﹀畾 鈥斺�� 浠讳綍浜虹粫杩囩晫闈㈢洿鎺ヨ皟鎺ュ彛鐓ф牱鑳芥敼鏁版嵁銆�
+ * 鍥犳鏈嶅姟绔繀椤荤粺涓�鏍¢獙锛�<b>褰撳墠鐧诲綍浜� == clinic_room 璇� roomId+bedNo 鐨� doc_id</b>銆�
+ *
+ * <h3>鐢ㄦ硶</h3>
+ * 鍔犲湪 Controller 鐨勫啓鏂规硶涓婂嵆鍙紝鍒囬潰浼氳嚜鍔ㄤ粠鍙傛暟閲岃В鏋� roomId / bedNo锛�
+ * <ul>
+ * <li>{@code @RequestParam("roomId") Long roomId} / {@code @RequestParam("bedNo") String bedNo}锛�</li>
+ * <li>鎴� {@code @RequestBody XxxVO vo}锛孷O 閲屾湁 {@code getRoomId()} / {@code getBedNo()}銆�</li>
+ * </ul>
+ * 瑙f瀽涓嶅埌 roomId/bedNo 鏃�**鏀捐骞惰璀﹀憡**锛堥伩鍏嶈浼わ級锛屾绫绘帴鍙i渶鍦ㄤ笟鍔¢噷鑷鏍¢獙
+ * 锛堜緥濡傚彧甯� rentId 鐨� {@code fee-confirm}锛夈��
+ *
+ * @author 蹇冪數鎺掗槦瑁呮満绯荤粺
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RequireBedOwner {
+
+ /** 渚夸簬鏃ュ織鎺掓煡锛氬啓娓呰繖涓帴鍙f槸鍋氫粈涔堢殑锛堝彲閫夛級 */
+ String value() default "";
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/aspect/BedOwnerAspect.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/aspect/BedOwnerAspect.java
new file mode 100644
index 0000000..64d3339
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/aspect/BedOwnerAspect.java
@@ -0,0 +1,108 @@
+package cn.lihu.jh.module.ecg.aspect;
+
+import cn.lihu.jh.module.ecg.annotation.RequireBedOwner;
+import cn.lihu.jh.module.ecg.service.room.RoomService;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.annotation.Resource;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+
+/**
+ * 銆屽繀椤绘槸宸ヤ綅涓讳汉銆嶇殑鍐欐搷浣滈壌鏉冨垏闈紙涓�/鍥磋妯″瀷鐨勬牳蹇冿級銆�
+ *
+ * <p>澶勭悊琚� {@link RequireBedOwner} 鏍囨敞鐨� Controller 鏂规硶锛氳В鏋愬嚭 roomId / bedNo锛�
+ * 浜ょ粰 {@link RoomService#assertBedOwner(Long, String)} 鏍¢獙锛�
+ * 鍥磋浜烘垨鏃犲骇鑰呰皟鐢ㄥ啓鎺ュ彛鏃剁洿鎺ユ姏 {@code ROOM_NOT_OWNER}锛�"鎮ㄥ浜庡洿瑙傛ā寮忥紝涓嶈兘鎵ц璇ユ搷浣�"锛夈��
+ *
+ * <p><b>涓轰粈涔堣В鏋愪笉鍒板氨鏀捐</b>锛氬彧甯� rentId 涔嬬被鐨勬帴鍙f嬁涓嶅埌 roomId/bedNo锛�
+ * 鑻ヤ竴寰嬫嫆缁濅細鎶婃甯镐笟鍔′篃鎸℃帀锛堜緥濡傜‘璐癸級銆傝繖绫绘帴鍙h璀﹀憡鏃ュ織锛屽苟鐢变笟鍔¤嚜琛屾牎楠屻��
+ */
+@Aspect
+@Component
+@Slf4j
+public class BedOwnerAspect {
+
+ @Resource
+ private RoomService roomService;
+
+ @Before("@annotation(requireBedOwner)")
+ public void checkBedOwner(JoinPoint joinPoint, RequireBedOwner requireBedOwner) {
+ Long roomId = null;
+ String bedNo = null;
+
+ Object[] args = joinPoint.getArgs();
+ MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+ Method method = signature.getMethod();
+ Annotation[][] paramAnnotations = method.getParameterAnnotations();
+
+ for (int i = 0; i < args.length; i++) {
+ Object arg = args[i];
+ if (null == arg) {
+ continue;
+ }
+ // 鈶� @RequestParam("roomId"/"bedNo") 鐩存帴鍙傛暟
+ Annotation[] annotations = (i < paramAnnotations.length) ? paramAnnotations[i] : null;
+ if (null != annotations) {
+ for (Annotation annotation : annotations) {
+ if (!(annotation instanceof RequestParam)) {
+ continue;
+ }
+ String name = ((RequestParam) annotation).value();
+ if (name.isEmpty()) {
+ name = ((RequestParam) annotation).name();
+ }
+ if ("roomId".equals(name) && arg instanceof Number) {
+ roomId = ((Number) arg).longValue();
+ } else if ("bedNo".equals(name)) {
+ bedNo = String.valueOf(arg);
+ }
+ }
+ }
+ // 鈶� 璇锋眰浣� VO锛氬弽灏勮 getRoomId() / getBedNo()
+ if (isSimpleValue(arg)) {
+ continue;
+ }
+ if (null == roomId) {
+ Object v = readGetter(arg, "getRoomId");
+ if (v instanceof Number) {
+ roomId = ((Number) v).longValue();
+ }
+ }
+ if (null == bedNo) {
+ Object v = readGetter(arg, "getBedNo");
+ if (null != v) {
+ bedNo = String.valueOf(v);
+ }
+ }
+ }
+
+ if (null == roomId || null == bedNo || bedNo.isEmpty() || "null".equals(bedNo)) {
+ log.warn("[RequireBedOwner] 鏈兘浠庡弬鏁拌В鏋� roomId/bedNo锛岃烦杩囦富浜烘牎楠岋紙璇ユ帴鍙i渶鑷鏍¢獙锛�. 鎺ュ彛={} 鏍囪={}",
+ signature.getName(), requireBedOwner.value());
+ return;
+ }
+ roomService.assertBedOwner(roomId, bedNo);
+ }
+
+ /** 绠�鍗曠被鍨嬶紙鏁板瓧/瀛楃涓�/闆嗗悎绛夛級涓嶉渶瑕佸仛 getter 鍙嶅皠 */
+ private boolean isSimpleValue(Object arg) {
+ return arg instanceof Number || arg instanceof CharSequence || arg instanceof Boolean
+ || arg instanceof java.util.Collection || arg instanceof java.util.Map;
+ }
+
+ private Object readGetter(Object target, String getterName) {
+ try {
+ Method getter = target.getClass().getMethod(getterName);
+ return getter.invoke(target);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
index c1230ce..832609a 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
@@ -126,10 +126,29 @@
return success(BeanUtils.toBean(appointmentList.get(0), AppointmentRespVO.class));
}
+ /**
+ * 銆愭湰闇�姹傦細绱ф�ユ偅鑰呬笉鎺掗槦鐩存帴妫�鏌ャ�戞寜銆岀敵璇峰崟鍙� / 灏辫瘖鍙� / 鎮h�呯紪鍙枫�嶆煡杩戜竴涓湀鐨勯绾﹁褰曘��
+ *
+ * <p>宸ヤ綔鍙板湪涓変釜杈撳叆妗嗛噷鎸夊洖杞︽椂璋冪敤锛涚粨鏋滄寜**棰勭害鏃堕棿鍊掑簭**锛堟渶杩戠殑鍦ㄥ墠锛夛紝
+ * 澶氭潯鏃剁敱鍓嶇寮归�夋嫨妗嗐�傜獥鍙d负 [浠婂ぉ-30 澶�, 浠婂ぉ+30 澶锛屽苟鎸夋湰绐楀彛寮�灞曠殑妫�鏌ラ」鐩繃婊ゃ��
+ *
+ * @param code 鐢宠鍗曞彿 / 灏辫瘖娴佹按鍙� / 鎮h�呯紪鍙凤紙涓夎�呬箣涓�锛�
+ * @param checkTypes 鏈獥鍙o紙璇婂锛夊紑灞曠殑妫�鏌ラ」鐩紝閫楀彿鍒嗛殧锛涗负绌鸿〃绀轰笉闄愬埗
+ */
+ @GetMapping("/emergency-candidates")
+ @Operation(summary = "绱ф�ュ姞鍋氾細鎸夌敵璇峰崟鍙�/灏辫瘖鍙�/鎮h�呯紪鍙锋煡杩戜竴涓湀鐨勯绾﹁褰�")
+ @Parameter(name = "code", description = "鐢宠鍗曞彿 / 灏辫瘖娴佹按鍙� / 鎮h�呯紪鍙�", required = true)
+ @Parameter(name = "checkTypes", description = "鏈獥鍙e紑灞曠殑妫�鏌ラ」鐩紝閫楀彿鍒嗛殧锛涗负绌轰笉闄愬埗")
+ @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
+ public CommonResult<List<AppointmentRespVO>> getEmergencyCandidates(@RequestParam("code") String code,
+ @RequestParam(value = "checkTypes", required = false) String checkTypes) {
+ List<AppointmentDO> appointmentList = appointmentService.getEmergencyCandidates(code, checkTypes);
+ return success(BeanUtils.toBean(appointmentList, AppointmentRespVO.class));
+ }
+
@GetMapping("/page")
@Operation(summary = "鑾峰緱棰勭害鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
- public CommonResult<PageResult<AppointmentRespVO>> getAppointmentPage(AppointmentPageReqVO pageReqVO) {
+ @PreAuthorize("@ss.hasPermission('ecg:appointment:query')") public CommonResult<PageResult<AppointmentRespVO>> getAppointmentPage(AppointmentPageReqVO pageReqVO) {
pageReqVO.setOrderCreateTime("1");
PageResult<AppointmentDO> pageResult = appointmentService.getAppointmentPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, AppointmentRespVO.class));
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java
index 9952184..fddc1e8 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java
@@ -48,4 +48,17 @@
private Integer isVip;
+ /**
+ * 銆愭湰闇�姹傘�戞槸鍚�"宸茬‘璁ょ鍏�"闈炲綋澶╅绾︺��
+ *
+ * <p>棰勭害鏃ユ湡涓嶆槸褰撳ぉ鏃讹細
+ * <ul>
+ * <li>{@code forceCheckIn != true} 鈥斺�� 鐩存帴杩斿洖 {@code APPOINTMENT_NOT_TODAY}锛�
+ * 鍓嶇鎹寮广�岄潪褰撳ぉ棰勭害锛屾槸鍚︾户缁鍒般�嶏紱</li>
+ * <li>{@code forceCheckIn == true} 鈥斺�� 鍏佽绛惧叆锛屽苟鎸�**棰勭暀鍙�**鍙栧彿
+ * 锛堜笉鍗犵敤褰撳ぉ鍚屾椂娈电殑姝e父棰勭害鍙凤級銆�</li>
+ * </ul>
+ */
+ private Boolean forceCheckIn;
+
}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java
index 23c018f..bdba5c7 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java
@@ -72,6 +72,19 @@
@Schema(description = "棰勭害鏃ユ湡")
private LocalDate bookDate;
+ /**
+ * 銆愭湰闇�姹傘�戦绾︽棩鏈�**鏃堕棿娈�**鏌ヨ锛氳捣濮嬶紙鍚綋澶� 00:00:00锛夈��
+ * <p>鍓嶇銆岄绾︽棩鏈熴�嶇敤鏃ユ湡鑼冨洿閫夋嫨鍣紝鏌ヨ鏃舵媶鎴� start(00:00:00) / end(23:59:59) 涓や釜鍙傛暟锛�
+ * 涓庢棦鏈夌殑 {@code registerDateStart/End}銆亄@code createTimeStart/End} 鍐欐硶淇濇寔涓�鑷淬��
+ */
+ @Schema(description = "棰勭害鏃ユ湡-寮�濮嬶紙鍚級", example = "2026-11-01 00:00:00")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime bookDateStart;
+
+ @Schema(description = "棰勭害鏃ユ湡-缁撴潫锛堝惈锛�", example = "2026-11-30 23:59:59")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime bookDateEnd;
+
@Schema(description = "棰勭害鏃堕棿娈�")
private Integer bookTimeslot;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java
index 5fabb13..b22a44d 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java
@@ -9,11 +9,11 @@
import java.time.LocalDate;
import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
-
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
import cn.lihu.jh.framework.excel.core.annotations.DictFormat;
import cn.lihu.jh.framework.excel.core.convert.DictConvert;
@@ -51,6 +51,8 @@
@Schema(description = "鎮h�呯敓鏃�")
@ExcelProperty("鎮h�呯敓鏃�")
+ // 銆愭湰闇�姹傘�戝鍑哄彧鏄剧ず鏃ユ湡锛堝師鏉� LocalDateTime 榛樿甯︽椂鍒嗙 鈫� "1990-01-01 00:00:00"锛�
+ @DateTimeFormat("yyyy-MM-dd")
private LocalDateTime patBirthday;
@Schema(description = "鎮h�呮墜鏈�")
@@ -99,6 +101,9 @@
@Schema(description = "棰勭害鍙戠敓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("棰勭害鍙戠敓鏃堕棿")
+ // 銆愭湰闇�姹傘�戝垪瀹藉浐瀹� 20锛氬師鍏堥潬 LongestMatchColumnWidth 鑷姩绠楋紙绾� 18锛夛紝
+ // 涓庣櫥璁版椂闂�/寮�鍗曟椂闂达紙Date 鍨嬪崟鍏冩牸鍙畻鍒� 12锛変笉涓�鑷达紝杩欓噷涓夊垪缁熶竴銆�
+ @ColumnWidth(20)
private LocalDateTime bookTime;
@Schema(description = "棰勭害妫�鏌ョ被鍨�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@@ -106,8 +111,15 @@
@ExcelProperty(value = "棰勭害妫�鏌ョ被鍨�", converter = DictConvert.class)
private Integer bookCheckType;
- @Schema(description = "鍐呴儴棰勭害缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("鍐呴儴棰勭害缂栧彿")
+ /**
+ * 鎺掗槦鍙凤紙瀵瑰瀛楁鍚嶄繚鎸� bookSeqNum 涓嶅彉锛夈��
+ *
+ * <p>銆愬彿缁熶竴锛堟湰闇�姹傦級銆戝�兼潵婧愬凡鏀逛负 {@code queue.seq_num} 鈥斺��
+ * 鍙峰湪绛惧埌鏃朵竴娆℃�у垎閰嶃�佷箣鍚庝笉鍙橈紱鏈瓧娈靛彧鍦�"璇ラ绾﹀凡鎺掗槦"鏃剁敤浜庡洖鏄俱��
+ * 鏄剧ず鏃惰鎷间笂 {@code check_type.seq_prefix}锛堝彿鎸夋鏌ラ」鐩悇鑷紪鍙凤紝浼氳法椤圭洰閲嶅锛夈��
+ */
+ @Schema(description = "鎺掗槦鍙凤紙鏉ユ簮 queue.seq_num锛涘凡鏃� book 鍙凤級", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鎺掗槦鍙�")
private Integer bookSeqNum;
@Schema(description = "棰勭害鏉ユ簮锛歑绯荤粺銆佹姢澹墜鍔ㄩ绾�", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -131,6 +143,9 @@
*/
@Schema(description = "鐧昏鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鐧昏鏃堕棿")
+ // 銆愭湰闇�姹傘�戝垪瀹藉浐瀹� 20锛堜笌銆岄绾﹀彂鐢熸椂闂淬�嶄竴鑷达級锛�
+ // Date 鍨嬪崟鍏冩牸鍦� LongestMatchColumnWidth 涓嬪彧浼氱畻鍒� 12锛屾椂闂磋鎴柇銆�
+ @ColumnWidth(20)
private Date registerDate;
/**
@@ -173,6 +188,8 @@
* 寮�鍗曟椂闂�
*/
@ExcelProperty("寮�鍗曟椂闂�")
+ // 銆愭湰闇�姹傘�戝垪瀹藉浐瀹� 20锛堜笌銆岄绾﹀彂鐢熸椂闂淬�嶄竴鑷达級
+ @ColumnWidth(20)
private Date doctorTime;
// ==================== HIS 鎺ュ叆琛ュ厖瀛楁锛�2026-09-27 闅忚〃鏂板鍒椾竴璧峰姞鍏ワ級 ====================
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java
index 965228c..ef9a3cf 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java
@@ -3,7 +3,9 @@
import cn.hutool.extra.servlet.ServletUtil;
import cn.lihu.jh.framework.common.pojo.CommonResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
+import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
+import cn.lihu.jh.module.ecg.dal.mysql.checktype.CheckTypeMapper;
import cn.lihu.jh.module.ecg.service.callingscreen.CallingScreenService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -17,6 +19,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
@@ -30,6 +33,14 @@
@Resource
private CallingScreenService callingScreenService;
+
+ /** 鐢ㄤ簬缁欏睆骞曟暟鎹ˉ銆屾帓闃熷彿鍓嶇紑銆嶏紙check_type.seq_prefix锛� */
+ @Resource
+ private CheckTypeMapper checkTypeMapper;
+
+ /** 銆愰噸鍙�戠敤浜庣粰灞忓箷鏁版嵁琛�"鏈�杩戜竴娆″彨鍙疯褰昳d"锛坈all_patient锛� */
+ @Resource
+ private cn.lihu.jh.module.ecg.dal.mysql.call.CallMapper callMapper;
@GetMapping("/display-col-info")
@Operation(summary = "鍒椾笂鏄剧ず鐨勬鏌ョ被鍨嬪悕绉�")
@@ -48,10 +59,16 @@
Map<Integer, List<QueueDO>> map = callingScreenService.getBigScreenPatient();
Map<Integer, List<ScreenQueueRespVO>> mapVO = new HashMap<>();
+ // 灞忓箷瑕佹樉绀恒�屽墠缂� + 鎺掗槦鍙枫�嶏紝璁惧鏈櫥褰曟嬁涓嶅埌妫�鏌ラ」鐩瓧鍏革紝鏁呯敱鍚庣涓�骞朵笅鍙戯紙姣忔璇锋眰璇讳竴娆★級
+ Map<Integer, String> seqPrefixMap = getSeqPrefixMap();
+ // 銆愰噸鍙�戜竴骞朵笅鍙�"鏈�杩戜竴娆″彨鍙疯褰昳d"锛屽睆骞曟嵁姝ら噸鏂版挱鎶�
+ Map<String, Long> callIdMap = getLatestCallIdMap();
map.keySet().forEach( displayCol -> {
//log.info("dispayCol: " + displayCol);
List<QueueDO> columnQueueDOList = map.get(displayCol);
List<ScreenQueueRespVO> screenQueueRespVOList = BeanUtils.toBean(columnQueueDOList, ScreenQueueRespVO.class);
+ fillSeqPrefix(screenQueueRespVOList, seqPrefixMap);
+ fillCallId(screenQueueRespVOList, callIdMap);
mapVO.put(displayCol, screenQueueRespVOList);
});
@@ -69,9 +86,88 @@
List<QueueDO> queueDOList2 = callingScreenService.getRoomInstallRelatedPatient(reqIp, roomId);
Map<Integer, List<ScreenQueueRespVO>> mapVO = new HashMap<>();
- mapVO.put(1, BeanUtils.toBean(queueDOList1, ScreenQueueRespVO.class));
- mapVO.put(2, BeanUtils.toBean(queueDOList2, ScreenQueueRespVO.class));
+ List<ScreenQueueRespVO> waitingVOList = BeanUtils.toBean(queueDOList1, ScreenQueueRespVO.class);
+ List<ScreenQueueRespVO> installVOList = BeanUtils.toBean(queueDOList2, ScreenQueueRespVO.class);
+ // 灞忓箷瑕佹樉绀恒�屽墠缂� + 鎺掗槦鍙枫�嶏紝璁惧鏈櫥褰曟嬁涓嶅埌妫�鏌ラ」鐩瓧鍏革紝鏁呯敱鍚庣涓�骞朵笅鍙戯紙姣忔璇锋眰璇讳竴娆★級
+ Map<Integer, String> seqPrefixMap = getSeqPrefixMap();
+ Map<String, Long> callIdMap = getLatestCallIdMap();
+ fillSeqPrefix(waitingVOList, seqPrefixMap);
+ fillSeqPrefix(installVOList, seqPrefixMap);
+ fillCallId(waitingVOList, callIdMap);
+ fillCallId(installVOList, callIdMap);
+ mapVO.put(1, waitingVOList);
+ mapVO.put(2, installVOList);
return success( mapVO );
}
+ /**
+ * 缁欏睆骞曟暟鎹ˉ涓娿�屾帓闃熷彿鏄剧ず鍓嶇紑銆�= {@code check_type.seq_prefix}銆�
+ *
+ * <p>銆愬彿缁熶竴锛堟湰闇�姹傦級銆戞帓闃熷彿鎸夋鏌ラ」鐩悇鑷紪鍙凤紝涓嶅悓妫�鏌ラ」鐩細鍑虹幇鐩稿悓鏁板瓧锛�
+ * 灞忓箷涓婂繀椤诲甫鍓嶇紑鎵嶅垎寰楁竻锛堜緥锛欰5 / B5锛夈�傚睆骞曡澶囦笉鐧诲綍銆佹棤娉曡皟鐢ㄦ鏌ラ」鐩帴鍙o紝
+ * 鍥犳鍦ㄨ繖閲岃ˉ榻愩��
+ *
+ * <p>姣忔璇锋眰鏌ヤ竴娆″叏琛ㄥ缓鏄犲皠锛堟鏌ラ」鐩彧鏈夊崄鍑犱釜锛岄噺绾у緢灏忥級锛�
+ * 涓嶅仛闀挎湡缂撳瓨锛岄伩鍏嶇鐞嗗憳鏀逛簡鍓嶇紑鍚庡睆骞曚竴鐩存樉绀烘棫鍊笺��
+ * 鏌ヤ笉鍒伴厤缃椂鐣欑┖涓测�斺�斿畞鍙彧鏄剧ず鏁板瓧锛屼篃涓嶈璁╁睆骞曟姤閿欐垨绌虹櫧銆�
+ */
+ private void fillSeqPrefix(List<ScreenQueueRespVO> voList, Map<Integer, String> seqPrefixMap) {
+ if (voList == null || voList.isEmpty() || seqPrefixMap == null) {
+ return;
+ }
+ voList.forEach(vo -> vo.setSeqPrefix(seqPrefixMap.getOrDefault(vo.getBookCheckType(), "")));
+ }
+
+ /* ==================== 閲嶅彨锛氫笅鍙�"鏈�杩戜竴娆″彨鍙疯褰昳d" ==================== */
+
+ /**
+ * 缁欏睆骞曟暟鎹ˉ涓� {@code callId}锛堣鎮h�呮渶杩戜竴娆″彨鍙疯褰曠殑 id锛夈��
+ *
+ * <p>涓轰粈涔堥渶瑕侊細灞忓箷鎾姤闈�"鏁版嵁鍙樺寲"瑙﹀彂 鈥斺�� 澶у睆鍒ゆ柇"鏌愭偅鑰呮柊鍑虹幇鍦ㄥ彨鍙峰垪"銆�
+ * 璇婇棿灞忓垽鏂�"璇婁腑绗竴浜哄彉鍖�"銆傝�屽尰鐢熺偣銆岄噸鍙�嶆椂**鎮h�呰繕鏄偅涓汉銆佽瘖瀹よ繕鏄偅涓瘖瀹�**锛�
+ * 闃熷垪鏁版嵁涓�鐐规病鍙橈紝涓ゅ潡灞忚嚜鐒朵笉浼氬啀鎾�傞噸鍙細鏂板涓�鏉″彨鍙疯褰曪紙call_patient锛夛紝
+ * 鎶婂畠鐨� id 涓嬪彂鍚庯紝灞忓箷鍙鍙戠幇 callId 鍙樹簡灏遍噸鏂版挱鎶ャ��
+ */
+ private void fillCallId(List<ScreenQueueRespVO> voList, Map<String, Long> callIdMap) {
+ if (voList == null || voList.isEmpty() || callIdMap == null || callIdMap.isEmpty()) {
+ return;
+ }
+ voList.forEach(vo -> {
+ if (null != vo.getPatId()) {
+ vo.setCallId(callIdMap.get(vo.getPatId()));
+ }
+ });
+ }
+
+ /** 涓�娆℃煡璇㈠彇鍒般�屾偅鑰呯紪鍙� 鈫� 鏈�杩戜竴娆″彨鍙疯褰� id銆嶏紱澶辫触鏃惰繑鍥炵┖鏄犲皠锛堝睆骞曟寜鑰侀�昏緫鎾姤锛� */
+ private Map<String, Long> getLatestCallIdMap() {
+ try {
+ Map<String, Long> map = new HashMap<>();
+ for (Map<String, Object> row : callMapper.selectLatestCallIds()) {
+ Object patId = row.get("patId");
+ Object callId = row.get("callId");
+ if (null != patId && callId instanceof Number) {
+ map.put(String.valueOf(patId), ((Number) callId).longValue());
+ }
+ }
+ return map;
+ } catch (Exception e) {
+ log.error("[getLatestCallIdMap] 璇诲彇鏈�杩戝彨鍙疯褰曞け璐ワ紝閲嶅彨灏嗕笉浼氳Е鍙戝睆骞曢噸鎾�", e);
+ return new HashMap<>();
+ }
+ }
+
+ /** 璇讳竴娆℃鏌ラ」鐩厤缃紝寰楀埌銆屾鏌ラ」鐩�� 鈫� 鎺掗槦鍙峰墠缂�銆嶆槧灏勶紱澶辫触鏃惰繑鍥炵┖鏄犲皠锛堝睆骞曞彧鏄剧ず鍙凤級 */
+ private Map<Integer, String> getSeqPrefixMap() { try {
+ return checkTypeMapper.simpleCheckTypeList().stream()
+ .filter(checkType -> null != checkType.getValue())
+ .collect(Collectors.toMap(CheckTypeDO::getValue,
+ checkType -> null == checkType.getSeqPrefix() ? "" : checkType.getSeqPrefix(),
+ (a, b) -> a));
+ } catch (Exception e) {
+ log.error("[getSeqPrefixMap] 璇诲彇妫�鏌ラ」鐩墠缂�澶辫触锛屽睆骞曞皢鍙樉绀哄彿", e);
+ return new HashMap<>();
+ }
+ }
+
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/ScreenQueueRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/ScreenQueueRespVO.java
index 55818e9..5a02157 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/ScreenQueueRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/ScreenQueueRespVO.java
@@ -34,11 +34,33 @@
@ExcelProperty("鎺掗槦搴忓彿")
private Integer seqNum;
- @Schema(description = "棰勭害搴忓彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ /**
+ * 鎺掗槦鍙锋樉绀哄墠缂�锛坽@code check_type.seq_prefix}锛夈��
+ *
+ * <p>銆愬彿缁熶竴锛堟湰闇�姹傦級銆戞帓闃熷彿鏀逛负**鎸夋鏌ラ」鐩悇鑷紪鍙�**锛屼笉鍚屾鏌ラ」鐩箣闂翠細鍑虹幇鐩稿悓鏁板瓧
+ * 锛堜緥锛氬姩鎬佸績鐢� 5 鍙枫�佸姩鎬佽鍘� 5 鍙凤級锛屽睆骞曞繀椤婚潬鍓嶇紑鍖哄垎锛屾晠鐢卞悗绔殢闃熷垪鏁版嵁涓�骞朵笅鍙戙��
+ * <p>灞忓箷璁惧鏈櫥褰曘�佹嬁涓嶅埌妫�鏌ラ」鐩瓧鍏告帴鍙o紝鍥犳涓嶈兘鐢卞墠绔嚜琛屾煡琛ㄣ��
+ */
+ @Schema(description = "鎺掗槦鍙锋樉绀哄墠缂�锛堟鏌ラ」鐩厤缃殑 seq_prefix锛�", example = "A")
+ @ExcelProperty("鎺掗槦鍙峰墠缂�")
+ private String seqPrefix;
+
+ /** 銆愬凡鍋滅敤銆戝睆骞曡鏄剧ず seqPrefix + seqNum锛涙湰瀛楁浠呬繚鐣欏吋瀹硅�佸睆骞曢〉闈紝鍚庣宸蹭笉鍐嶅啓鍏� */
+ @Schema(description = "棰勭害搴忓彿锛堝凡鍋滅敤锛岃鐢� seqPrefix + seqNum锛�", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("棰勭害搴忓彿")
private Integer bookSeqNum;
/**
+ * 銆愰噸鍙紙鏈渶姹傦級銆戣鎮h��**鏈�杩戜竴娆″彨鍙疯褰�**鐨� id銆�
+ *
+ * <p>灞忓箷闈�"鏁版嵁鍙樺寲"瑙﹀彂鎾姤锛氬尰鐢熺偣銆岄噸鍙�嶅彧浼氭柊澧炰竴鏉″彨鍙疯褰曘�佷笉鏀瑰彉闃熷垪鏁版嵁锛�
+ * 鍥犳鎶� callId 涓�骞朵笅鍙� 鈥斺�� 瀹冧竴鍙橈紝灞忓箷灏遍噸鏂版挱鎶ワ紙澶у睆缁曡繃"鍚屼竴鎮h�呭彧鎾竴娆�"鐨勯攣锛�
+ * 璇婇棿灞忓姣斾笂娆$殑 callId锛夈�備负绌鸿〃绀轰粖澶╄繕娌℃湁鍙彿璁板綍锛屽睆骞曟寜鑰侀�昏緫澶勭悊銆�
+ */
+ @Schema(description = "鏈�杩戜竴娆″彨鍙疯褰昳d锛堢敤浜庨噸鍙椂閲嶆柊鎾姤锛�", example = "1234")
+ private Long callId;
+
+ /**
* 5:杩囧彿 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚
*/
@Schema(description = "鎺掗槦鐘舵��", example = "1")
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/CheckTypeController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/CheckTypeController.java
index c77b2d0..434dcf9 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/CheckTypeController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/checktype/CheckTypeController.java
@@ -39,11 +39,17 @@
@Resource
private CheckTypeService checkTypeService;
+ /** 銆愭湰娆″姞鍥恒�戞鏌ラ」鐩敼鍔ㄥ悗鍒锋柊鎺掗槦妯″潡鐨勬鏌ラ」鐩紦瀛橈紙浜插拰椤广�佸�欒瘖涓婇檺绛夛級锛屾敼瀹屼笉鐢ㄩ噸鍚湇鍔� */
+ @Resource
+ private cn.lihu.jh.module.ecg.service.queue.QueueService queueService;
+
@PostMapping("/create")
@Operation(summary = "鍒涘缓妫�鏌ョ被鍨�")
@PreAuthorize("@ss.hasPermission('ecg:check-type:create')")
public CommonResult<Integer> createCheckType(@Valid @RequestBody CheckTypeSaveReqVO createReqVO) {
- return success(checkTypeService.createCheckType(createReqVO));
+ Integer id = checkTypeService.createCheckType(createReqVO);
+ queueService.initCheckType();
+ return success(id);
}
@PutMapping("/update")
@@ -51,6 +57,7 @@
@PreAuthorize("@ss.hasPermission('ecg:check-type:update')")
public CommonResult<Boolean> updateCheckType(@Valid @RequestBody CheckTypeSaveReqVO updateReqVO) {
checkTypeService.updateCheckType(updateReqVO);
+ queueService.initCheckType();
return success(true);
}
@@ -60,6 +67,7 @@
@PreAuthorize("@ss.hasPermission('ecg:check-type:delete')")
public CommonResult<Boolean> deleteCheckType(@RequestParam("id") Integer id) {
checkTypeService.deleteCheckType(id);
+ queueService.initCheckType();
return success(true);
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
index 3f49886..62b580a 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
@@ -1,319 +1,705 @@
package cn.lihu.jh.module.ecg.controller.admin.devrent;
+
+
import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
+
import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO;
+
import cn.lihu.jh.module.ecg.dal.dataobject.devmanage.DeviceDO;
+
import cn.lihu.jh.module.ecg.enums.DevStateEnum;
+
+import cn.lihu.jh.module.ecg.annotation.RequireBedOwner;
+
import cn.lihu.jh.module.ecg.service.appointment.AppointmentService;
+
+
import cn.lihu.jh.module.ecg.service.devmanage.DeviceService;
+
+
import cn.lihu.jh.module.ecg.service.queue.QueueService;
+
import lombok.extern.slf4j.Slf4j;
+
import org.springframework.web.bind.annotation.*;
+
import org.springframework.validation.annotation.Validated;
+
import org.springframework.security.access.prepost.PreAuthorize;
+
import io.swagger.v3.oas.annotations.tags.Tag;
+
import io.swagger.v3.oas.annotations.Parameter;
+
import io.swagger.v3.oas.annotations.Operation;
+
+
import java.util.*;
+
import java.io.IOException;
+
+
import cn.lihu.jh.framework.common.pojo.PageParam;
+
import cn.lihu.jh.framework.common.pojo.PageResult;
+
import cn.lihu.jh.framework.common.pojo.CommonResult;
+
import cn.lihu.jh.framework.common.util.object.BeanUtils;
+
+
import cn.lihu.jh.framework.excel.core.util.ExcelUtils;
+
+
import cn.lihu.jh.framework.apilog.core.annotation.ApiAccessLog;
+
+
import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.*;
+
+
import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*;
+
import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
+
+
import cn.lihu.jh.module.ecg.service.devrent.DevRentService;
+
+
import javax.annotation.Resource;
+
import javax.servlet.http.HttpServletResponse;
+
import javax.validation.Valid;
+
+
@Tag(name = "瑁呮満鎷嗘満")
+
@RestController
+
@RequestMapping("/ecg/dev-rent")
+
@Validated
+
@Slf4j
+
public class DevRentController {
+
+
@Resource
+
private DevRentService devRentService;
+
+
@Resource
+
private DeviceService deviceService;
+
+
@Resource
+
private QueueService queueService;
+
+
@Resource
+
private AppointmentService appointmentService;
+ /** 銆愪富/鍥磋銆戝啓鎿嶄綔鐨勫伐浣嶄富浜烘牎楠岋紙鍙甫鎮h�呬俊鎭殑鎺ュ彛鍦ㄦ柟娉曢噷鏄惧紡璋冪敤锛� */
+ @Resource
+
+ private cn.lihu.jh.module.ecg.service.room.RoomService roomService;
+
+
+
// 甯歌妫�鏌� 瀹屾垚
+
+ @RequireBedOwner("妫�鏌ュ畬鎴�")
+
@PostMapping("/routine-finish")
+
@Operation(summary = "甯歌妫�鏌ュ畬鎴�")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<Long> routineFinish(@Valid @RequestBody RoutineFinishReqVO routineFinishReqVO) {
+
CommonResult<Long> result = devRentService.routineFinishOperation(routineFinishReqVO);
+
+
try {
+
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
- Long rentId = routineFinishReqVO.getId();
+
+ // 銆愮己闄蜂慨澶嶃�戜紭鍏堢敤**鏈嶅姟杩斿洖鐨� rentId**锛�= 鏈瀹屾垚瀹為檯鍐欏叆鐨勬鏌ュ崟 id锛夛細
+ // 路 鏅�氭偅鑰咃細璇锋眰閲屽甫浜� id锛屼袱鑰呯浉鍚岋紱
+ // 路 绱ф�ュ姞鍋氭偅鑰咃細璇锋眰閲屾病鏈� id锛堟病绛惧埌杩囷級锛屾湇鍔′細鏂板缓妫�鏌ュ崟 鈥斺��
+ // 鍘熷疄鐜扮敤 routineFinishReqVO.getId()锛坣ull锛夊幓纭垂锛屽繀鐒跺け璐ワ紙涓旇 catch 鍚炴帀锛夛紝
+ // 鐜板満琛ㄧ幇涓�"鍔犳�ユ偅鑰呮鏌ュ畬鎴愬悗娌℃湁纭垂"銆�
+ Long rentId = null != result && null != result.getData()
+ ? result.getData() : routineFinishReqVO.getId();
+
devRentService.feeConfirm(rentId, userHisId, userNickname, true); // 鏁呮剰 涓嶆鏌ヨ繑鍥炲��
+
} catch (Exception e) {
+
log.error("甯歌妫�鏌ュ畬鎴�, 鑷姩纭垂澶辫触", e);
+
}
+
+
return result;
+
}
+
+
+
+ @RequireBedOwner("璁惧棰嗙敤瀹屾垚")
@PostMapping("/dev-ready")
+
@Operation(summary = "璁惧棰嗙敤瀹屾垚")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<Long> devReady(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
+
String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
createReqVO.setOperater(userNickname);
+
CommonResult<Long> result = devRentService.readyOperation(createReqVO);
+
+
try {
+
Long rentId = createReqVO.getId();
+
devRentService.feeConfirm(rentId, userHisId, userNickname, true); // 鏁呮剰 涓嶆鏌ヨ繑鍥炲��
+
} catch (Exception e) {
+
log.error("璁惧棰嗙敤瀹屾垚, 鑷姩纭垂澶辫触", e);
+
}
+
+
return result;
+
}
+
+
+
+ @RequireBedOwner("瑁呮満瀹屾垚")
@PostMapping("/dev-install")
+
@Operation(summary = "瑁呮満")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<Long> devInstall(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
+
return devRentService.installOperation(createReqVO);
+
}
+
+
+
+ @RequireBedOwner("鎷嗘満")
@PostMapping("/dev-dismantle")
+
@Operation(summary = "鎷嗘満")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<Long> devDismantle(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
+
devRentService.dismantleOperation(createReqVO);
+
return CommonResult.success(0L);
+
}
+
+
+
+ @RequireBedOwner("鏁版嵁褰曞叆")
@PostMapping("/dev-data-entry")
+
@Operation(summary = "鏁版嵁褰曞叆")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<Long> devDataEntry(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
+
devRentService.dataEntryOperation(createReqVO);
+
return CommonResult.success(0L);
+
}
+
+
@PostMapping("/routine-check-cancel")
+
@Operation(summary = "鍙栨秷甯歌妫�鏌�")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<Long> routineCheckCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
+
+ // 銆愪富/鍥磋銆戣鎺ュ彛娌℃湁 roomId/bedNo锛屾寜銆屾偅鑰� + 妫�鏌ラ」鐩�嶅弽鏌ュ叾鎵�鍦ㄥ伐浣嶅啀鏍¢獙涓讳汉韬唤
+ roomService.assertBedOwnerByPatient(cancelReqVO.getPatId(), cancelReqVO.getCheckType());
+
return devRentService.cancelRoutineOperation(cancelReqVO);
+
}
+
+
@PostMapping("/dev-ready-cancel")
+
@Operation(summary = "鍙栨秷棰嗙敤")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<Long> devReadyCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
+
+ // 銆愪富/鍥磋銆戞寜銆屾偅鑰� + 妫�鏌ラ」鐩�嶅弽鏌ュ伐浣嶅啀鏍¢獙涓讳汉韬唤
+ roomService.assertBedOwnerByPatient(cancelReqVO.getPatId(), cancelReqVO.getCheckType());
+
return devRentService.cancelReadyOperation(cancelReqVO);
+
}
+
+
@PostMapping("/dev-install-cancel")
+
@Operation(summary = "鍙栨秷瑁呮満")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<Long> devInstallCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
+
+ // 銆愪富/鍥磋銆戞寜銆屾偅鑰� + 妫�鏌ラ」鐩�嶅弽鏌ュ伐浣嶅啀鏍¢獙涓讳汉韬唤
+ roomService.assertBedOwnerByPatient(cancelReqVO.getPatId(), cancelReqVO.getCheckType());
+
return devRentService.cancelInstallOperation(cancelReqVO);
+
}
+
+
+
+ @RequireBedOwner("璁惧閬楀け")
@PostMapping("/dev-lose")
+
@Operation(summary = "閬楀け")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<Long> devLose(@Valid @RequestBody DevRentSaveReqVO loseReqVO) {
+
loseReqVO.setState(DevStateEnum.LOST.getState());
+
return devRentService.dismantleExceptionOperation(loseReqVO);
+
}
+
+
+
+ @RequireBedOwner("璁惧鎹熷潖")
@PostMapping("/dev-damage")
+
@Operation(summary = "鎹熷潖")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<Long> devDamage(@Valid @RequestBody DevRentSaveReqVO damageReqVO) {
+
damageReqVO.setState(DevStateEnum.DAMAGED.getState());
+
return devRentService.dismantleExceptionOperation(damageReqVO);
+
}
+
+
@PostMapping("/create")
+
@Operation(summary = "鍒涘缓瑁呮満鎷嗘満")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<Long> createDevRent(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
+
return CommonResult.success(devRentService.createDevRent(createReqVO));
+
}
+
+
@PutMapping("/update")
+
@Operation(summary = "鏇存柊瑁呮満鎷嗘満")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<Boolean> updateDevRent(@Valid @RequestBody DevRentSaveReqVO updateReqVO) {
+
devRentService.updateDevRent(updateReqVO);
+
return CommonResult.success(true);
+
}
+
+
@DeleteMapping("/delete")
+
@Operation(summary = "鍒犻櫎瑁呮満鎷嗘満")
+
@Parameter(name = "id", description = "缂栧彿", required = true)
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<Boolean> deleteDevRent(@RequestParam("id") Long id) {
+
devRentService.deleteDevRent(id);
+
return CommonResult.success(true);
+
}
+
+
@GetMapping("/get")
+
@Operation(summary = "鑾峰緱瑁呮満鎷嗘満")
+
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<DevRentRespVO> getDevRent(@RequestParam("id") Long id) {
+
DevRentDO devRent = devRentService.getDevRent(id);
+
+
DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
+
+
DeviceDO deviceDO = deviceService.getDevice(devRent.getDevId());
+
if (null != deviceDO) {
+
devRentRespVO.setCategory(deviceDO.getCategory());
+
devRentRespVO.setBrand(deviceDO.getBrand());
+
devRentRespVO.setModel(deviceDO.getModel());
+
devRentRespVO.setDevState(deviceDO.getState());
+
}
+
return CommonResult.success(devRentRespVO);
+
}
+
+
@GetMapping("/page")
+
@Operation(summary = "鑾峰緱瑁呮満鎷嗘満鍒嗛〉")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<PageResult<DevRentRespVO>> getDevRentPage(@Valid DevRentPageReqVO pageReqVO) {
+
PageResult<DevRentDO> pageResult = devRentService.getDevRentPage(pageReqVO);
+
return CommonResult.success(BeanUtils.toBean(pageResult, DevRentRespVO.class));
+
}
+
+
@GetMapping("/export-excel")
+
@Operation(summary = "瀵煎嚭瑁呮満鎷嗘満 Excel")
+
@PreAuthorize("@ss.hasPermission('ecg:dev-rent:export')")
+
@ApiAccessLog(operateType = EXPORT)
+
public void exportDevRentExcel(@Valid DevRentPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
+
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+
List<DevRentDO> list = devRentService.getDevRentPage(pageReqVO).getList();
+
// 瀵煎嚭 Excel
+
ExcelUtils.write(response, "瑁呮満鎷嗘満.xls", "鏁版嵁", DevRentRespVO.class, BeanUtils.toBean(list, DevRentRespVO.class));
+
}
+
+
@GetMapping("/get-free-rent")
+
@Operation(summary = "鏍规嵁鎮h�呮垨璁惧, 鑾峰彇宸查鍙栫璧佹儏鍐�")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<DevRentRespVO> getFreeRent(@Valid DevRentSearchReqVO searchReqVO) {
+
DevRentDO devRent = devRentService.getFreeRent(searchReqVO);
+
if (null == devRent) {
+
return CommonResult.success(null);
+
}
+
+
DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
+
return CommonResult.success(devRentRespVO);
+
}
+
+
@GetMapping("/get-ready-rent")
+
@Operation(summary = "鑾峰彇宸查鍙栫璧佹儏鍐�")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<DevRentRespVO> getReadyRent(@Valid DevRentSearchReqVO searchReqVO) {
+
DevRentDO devRent = devRentService.getReadyOrCancelledRent(searchReqVO);
+
if (null == devRent) {
+
return CommonResult.success(null);
+
}
+
+
DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
+
+
DeviceDO deviceDO = deviceService.getDevice(devRent.getDevId());
+
if (null != deviceDO) {
+
devRentRespVO.setCategory(deviceDO.getCategory());
+
devRentRespVO.setBrand(deviceDO.getBrand());
+
devRentRespVO.setModel(deviceDO.getModel());
+
devRentRespVO.setDevState(deviceDO.getState());
+
}
+
return CommonResult.success(devRentRespVO);
+
}
+
+
@GetMapping("/get-existing-rent")
+
@Operation(summary = "鑾峰彇宸插畨瑁呫�佸凡棰嗙敤鐨勭璧佹儏鍐�")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<DevRentRespVO> getInstalledRent(@Valid DevRentSearchReqVO searchReqVO) {
+
DevRentDO devRent = devRentService.getExistingRent(searchReqVO);
+
if (null == devRent) {
+
return CommonResult.success(null);
+
}
+
+
DeviceDO deviceDO = deviceService.getDevice(devRent.getDevId());
+
+
DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
+
devRentRespVO.setCategory(deviceDO.getCategory());
+
devRentRespVO.setBrand(deviceDO.getBrand());
+
devRentRespVO.setModel(deviceDO.getModel());
+
devRentRespVO.setDevState(devRent.getState());
+
return CommonResult.success(devRentRespVO);
+
}
+
+
@GetMapping("/get-dismantled-rent")
+
@Operation(summary = "鑾峰彇宸叉媶鍗哥璧佹儏鍐�")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<DevRentRespVO> getDismantledRent(@Valid DevRentSearchReqVO searchReqVO) {
+
DevRentDO devRent = devRentService.getDismantledRent(searchReqVO);
+
if (null == devRent) {
+
return CommonResult.success(null);
+
}
+
+
DeviceDO deviceDO = deviceService.getDevice(devRent.getDevId());
+
+
DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
+
devRentRespVO.setCategory(deviceDO.getCategory());
+
devRentRespVO.setBrand(deviceDO.getBrand());
+
devRentRespVO.setModel(deviceDO.getModel());
+
return CommonResult.success(devRentRespVO);
+
}
+
+
// 纭垂
+
@GetMapping("/fee-confirm")
+
@Operation(summary = "纭垂")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<Integer> feeConfirm(@Valid Long rentId) {
+
Long userId = SecurityFrameworkUtils.getLoginUserId();
+
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+
+
+
+ // 銆愪富/鍥磋銆戠‘璐逛篃瑕佹嫤鍥磋浜猴細鎸夎绉熻祦鍗曠殑鎮h�呭弽鏌ュ叾褰撳墠宸ヤ綅骞舵牎楠屼富浜鸿韩浠姐��
+ // 鐢� Soft 鐗堟湰锛氱‘璐瑰父鍦ㄦ祦绋嬫湯绔皟鐢紝鎮h�呭彲鑳藉凡涓嶅湪闃熷垪涓婏紝鏌ヤ笉鍒板伐浣嶆椂鍙璀﹀憡鏀捐銆�
+ assertRentBedOwnerSoft(rentId);
Integer result = devRentService.feeConfirm(rentId, userHisId, userNickname, true);
+
if (1 == result) return CommonResult.error(result, "纭垂澶辫触");
+
+
return CommonResult.success(result);
+
}
+
+
// 鍙栨秷纭垂
+
@GetMapping("/fee-cancel")
+
@Operation(summary = "鍙栨秷纭垂")
+
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+
public CommonResult<Integer> feeCancel(@Valid Long rentId) {
+
Long userId = SecurityFrameworkUtils.getLoginUserId();
+
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+
+
+ // 銆愪富/鍥磋銆戝彇娑堢‘璐瑰悓鏍疯鎷﹀洿瑙備汉锛圫oft锛氭煡涓嶅埌宸ヤ綅鍙璀﹀憡锛�
+ assertRentBedOwnerSoft(rentId);
+
Integer result = devRentService.feeConfirm(rentId, userHisId, userNickname, false);
+
if (1 == result) return CommonResult.error(result, "鍙栨秷纭垂澶辫触");
+
+
return CommonResult.success(result);
+
}
+
+ /**
+ * 銆愪富/鍥磋銆戠‘璐� / 鍙栨秷纭垂鐨勪富浜烘牎楠屻��
+ *
+ * <p>鎺ュ彛鍙甫 rentId锛屾嬁涓嶅埌 roomId/bedNo锛屽洜姝ゅ厛鎸夌璧佸崟鎵惧埌鎮h�咃紝
+ * 鍐嶇敱 {@link cn.lihu.jh.module.ecg.service.room.RoomService#assertBedOwnerByPatientSoft}
+ * 鎸夋偅鑰呭綋鍓嶆墍鍦ㄥ伐浣嶆牎楠屼富浜鸿韩浠斤紙鏌ヤ笉鍒板伐浣嶆椂鍙璀﹀憡鏀捐锛岄伩鍏嶈浼ゆ湯绔祦绋嬶級銆�
+ *
+ * <p>娉ㄦ剰锛氬彧鍖呬綇"璇荤璧佸崟"杩欎竴姝ワ紝**涓嶈兘**鎶婁富浜烘牎楠岀殑寮傚父涔熷悶鎺夛紝鍚﹀垯绛変簬娌℃湁鏍¢獙銆�
+ */
+ private void assertRentBedOwnerSoft(Long rentId) {
+ cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO rent;
+ try {
+ rent = devRentService.getDevRent(rentId);
+ } catch (Exception e) {
+ log.error("[assertRentBedOwnerSoft] 璇诲彇绉熻祦鍗曞け璐ワ紝璺宠繃涓讳汉鏍¢獙. rentId={}", rentId, e);
+ return;
+ }
+ roomService.assertBedOwnerByPatientSoft(null == rent ? null : rent.getPatId(),
+ null == rent ? null : rent.getCheckType());
+ }
+
}
+
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/RoutineFinishReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/RoutineFinishReqVO.java
index f6a24ba..d8612d2 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/RoutineFinishReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/RoutineFinishReqVO.java
@@ -66,4 +66,16 @@
@Schema(description = "璇婂簥缂栧彿")
String bedNo;
+
+ /**
+ * 銆愭湰闇�姹傦細绱ф�ユ偅鑰呬笉鎺掗槦鐩存帴妫�鏌ャ�戞槸鍚︺�岀揣鎬ュ姞鍋氥�嶃��
+ *
+ * <p>涓� {@code true} 鏃讹紝鍚庣鍦ㄨ鎮h�� + 妫�鏌ラ」鐩�**浠婂ぉ娌℃湁銆屽緟妫�鏌�(0)銆嶆鏌ュ崟**鐨勬儏鍐典笅锛�
+ * 浼氭寜棰勭害鍗曡嚜鍔ㄨˉ寤轰竴鏉★紙鍥犱负杩欎簺鎮h�呮病璧扮鍒�/鎺掗槦锛屾甯哥鍒版墠浼氬缓杩欐潯锛夛紝
+ * 浠庤�屽彲浠ュ儚鎺掗槦鎮h�呬竴鏍峰畬鎴愭鏌ュ苟鍐欏叆銆屽凡瀹屾垚鍒楄〃銆嶃��
+ *
+ * <p>涓� {@code false}/{@code null} 鏃讹紝琛屼负涓庢敼閫犲墠**瀹屽叏涓�鑷�**銆�
+ */
+ @Schema(description = "鏄惁绱ф�ュ姞鍋氾紙涓嶆帓闃熺洿鎺ユ鏌ワ級", example = "false")
+ private Boolean emergency;
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java
index 6359151..64ab9e6 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java
@@ -12,6 +12,7 @@
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
+import cn.lihu.jh.module.ecg.annotation.RequireBedOwner;
import cn.lihu.jh.module.ecg.service.call.CallService;
import cn.lihu.jh.module.ecg.service.queue.QueueService;
import io.swagger.v3.oas.annotations.Operation;
@@ -25,6 +26,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
import static cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS;
@@ -42,9 +44,14 @@
@Resource
private QueueService queueService;
+ /** 銆愭湰娆′慨澶嶃�戞挙閿�"妫�鏌ュ畬鎴�"鏃跺洖婊氭鏌ュ崟鐘舵�佸苟鍙栨秷纭垂 */
+ @Resource
+ private cn.lihu.jh.module.ecg.service.devrent.DevRentService devRentService;
+
@Resource
private CallService callService;
+ @RequireBedOwner("鏆傚仠鎺ヨ瘖")
@GetMapping("/bed-doctor-pause")
@Operation(summary = "鍖荤敓鏆傚仠")
@PreAuthorize("@ss.hasPermission('ecg:doctor:state')")
@@ -64,6 +71,7 @@
return error(result);
}
+ @RequireBedOwner("鎭㈠鎺ヨ瘖")
@GetMapping("/bed-doctor-resume")
@Operation(summary = "鍖荤敓鎭㈠")
@PreAuthorize("@ss.hasPermission('ecg:doctor:state')")
@@ -86,12 +94,15 @@
@PreAuthorize("@ss.hasPermission('ecg:doctor:state')")
public CommonResult<Integer> bedDoctorOn(
@RequestParam("roomId") Long roomId,
- @RequestParam("bedNo") String bedNo)
+ @RequestParam("bedNo") String bedNo,
+ // 宸ヤ綅涓婚敭锛堝墠绔姹傞噷鏈潵灏卞甫锛夛細浼犲叆鏃朵紭鍏堟寜瀹冨畾浣嶏紝閬垮厤 bed_no 涓庤姹傚��
+ // 瀛樺湪鑲夌溂闅捐鲸鐨勫樊寮傦紙缁撳熬绌烘牸/澶у皬鍐�/鍏ㄨ锛夋椂"鏄庢槑绌洪棽鍗存洿鏂� 0 琛�"
+ @RequestParam(value = "id", required = false) Integer bedId)
{
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- ErrorCode result = queueService.startBedDoctorOn(roomId, bedNo, userId, userNickname);
+ ErrorCode result = queueService.startBedDoctorOn(roomId, bedNo, userId, userNickname, bedId);
if (result.equals(SUCCESS))
return success(0);
@@ -167,6 +178,7 @@
return result;
}
+ @RequireBedOwner("鍙彿锛氬彇涓嬩竴浣嶆偅鑰�")
@GetMapping("/finish-next-patient")
@Operation(summary = "甯歌鍙彿銆佷笅涓�浣嶆偅鑰�")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@@ -193,6 +205,7 @@
return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
}
+ @RequireBedOwner("棰嗙敤锛氬彇涓嬩竴浣嶆偅鑰�")
@GetMapping("/finish-receive-next-patient")
@Operation(summary = "棰嗙敤鍙彿銆佷笅涓�浣嶆偅鑰�")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@@ -219,6 +232,7 @@
return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
}
+ @RequireBedOwner("瑁呮満锛氬彇涓嬩竴浣嶆偅鑰�")
@GetMapping("/finish-install-next-patient")
@Operation(summary = "瑁呮満鍙彿銆佷笅涓�浣嶆偅鑰�")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@@ -262,6 +276,7 @@
}
// 甯歌妫�鏌ヨ繃鍙枫�侀鐢ㄨ繃鍙�
+ @RequireBedOwner("杩囧彿")
@GetMapping("/pass-next-patient")
@Operation(summary = "杩囧彿銆佷笅涓�浣嶆偅鑰�")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@@ -286,6 +301,7 @@
return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
}
+ @RequireBedOwner("瑁呮満杩囧彿")
@GetMapping("/pass-install-next-patient")
@Operation(summary = "瀹夎杩囧彿銆佷笅涓�浣嶆偅鑰�")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@@ -312,6 +328,7 @@
return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
}
+ @RequireBedOwner("閲嶅彨")
@GetMapping("/call-again")
@Operation(summary = "[甯歌妫�鏌鎴朳棰嗙敤] 閲嶅彨銆佹偅鑰�")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@@ -342,6 +359,7 @@
}
+ @RequireBedOwner("閲嶅彨锛堝畨瑁咃級")
@GetMapping("/call-install-again")
@Operation(summary = "閲嶅彨銆佹偅鑰�")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@@ -382,7 +400,64 @@
@RequestParam("bedNo") String bedNo)
{
List<QueueDO> queueDOList = queueService.getCheckRelatedPatient(roomId, bedNo);
+ // 銆愯嚜鍔╄瘖鏂�戠幇鍦哄娆″嚭鐜�"鍒楄〃鏄┖鐨�"鍗寸湅涓嶅嚭鍘熷洜锛氳繖閲屾妸**鍓嶇闂殑宸ヤ綅 + 鍚庣杩斿洖鍑犳潯**
+ // 鎵撳嚭鏉ワ紝閰嶅悎鎺ュ彛涓�璧风湅灏辫兘绔嬪埢鍖哄垎"鍓嶇闂敊宸ヤ綅 / 鍚庣纭疄娌℃暟鎹� / 椤甸潰娌″埛鏂�"銆�
+ log.info("[getToBeCheckedPatientList] roomId={} bedNo=[{}] 鐧诲綍浜�={} 鈫� 杩斿洖 {} 鏉�",
+ roomId, bedNo, SecurityFrameworkUtils.getLoginUserId(),
+ null == queueDOList ? 0 : queueDOList.size());
return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
+ }
+
+ @GetMapping("/get-room-waiting-list")
+ @Operation(summary = "鍙栨湰璇婂銆屾帓闃熶腑锛堟湭鍒嗛厤宸ヤ綅锛夈�嶆偅鑰呭垪琛�")
+ @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "121")
+ @Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "F1")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<List<QueueRespVO>> getRoomWaitingList(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ // 銆愭湰璇婂鏈垎閰嶃�戝�欒瘖鍒楄〃鍙惈"宸插垎娴佸埌鏈伐浣�"鐨勬偅鑰咃紱杩欓噷鎶�"鏈伐浣嶆鏌ョ被鍨嬨��
+ // 杩樻病鍒嗛厤宸ヤ綅"鐨勬帓闃熸偅鑰咃紙澶у睆鑳界湅鍒般�佸伐浣滃彴鍘熷厛鐪嬩笉鍒帮級鍗曠嫭杩斿洖锛屼緵鍖荤敓鎵嬪伐鎷夊叆銆�
+ List<QueueDO> queueDOList = queueService.getUnassignedWaitingPatient(roomId, bedNo);
+ log.info("[getRoomWaitingList] roomId={} bedNo=[{}] 鐧诲綍浜�={} 鈫� 鏈垎閰嶆帓闃熶腑 {} 鏉�",
+ roomId, bedNo, SecurityFrameworkUtils.getLoginUserId(),
+ null == queueDOList ? 0 : queueDOList.size());
+ return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
+ }
+
+ @RequireBedOwner("鎷夊叆鎺掗槦鎮h��")
+ @GetMapping("/pull-waiting-patient")
+ @Operation(summary = "鎶娿�屾帓闃熶腑銆嶇殑鎮h�呮墜宸ユ媺鍏ユ湰宸ヤ綅")
+ @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "121")
+ @Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "F1")
+ @Parameter(name = "id", description = "鎺掗槦琛宨d", required = true, example = "123")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<String> pullWaitingPatient(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo,
+ @RequestParam("id") Integer id)
+ {
+ ErrorCode result = queueService.pullWaitingPatient(roomId, bedNo, id);
+ if (result.equals(SUCCESS))
+ return success("鎿嶄綔鎴愬姛");
+
+ return error(result);
+ }
+
+ @RequireBedOwner("绔嬪嵆琛ヤ汉")
+ @GetMapping("/hurry-up-now")
+ @Operation(summary = "绔嬪嵆琛ヤ汉锛堟墜鍔ㄨЕ鍙戞湰宸ヤ綅鑷姩鍒嗘祦锛屽苟杩斿洖璇婃柇淇℃伅锛�")
+ @Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "121")
+ @Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "F1")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<Map<String, Object>> hurryUpNow(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ // 鐜板満鑷晳 + 鑷姪璇婃柇锛氬�欒瘖鍖轰负绌烘椂鐐逛竴涓嬶紝绔嬪埢寰楀埌
+ // 銆岀郴缁熷紑璇婄姸鎬� / 鏄惁鍋滄鍊欒瘖 / 鍊欒瘖涓婇檺 / 琛ヤ汉鍓嶅悗浜烘暟 / 缁撹銆嶃��
+ return success(queueService.hurryUpNow(roomId, bedNo));
}
@GetMapping("/get-to-be-installed-list")
@@ -438,6 +513,9 @@
return success(patientStatisticVO);
}
+ // 銆愭湰闇�姹偮锋帓闃熼槦鍒椾緵鏈嶅姟鍙板垎璇婅皟搴︿娇鐢ㄣ�戜笉鍐嶅仛銆屽伐浣嶄富浜恒�嶆牎楠岋細
+ // 鍒嗚瘖鍙颁笉鍗犲骇锛坈linic_room.doc_id 鏄潗璇婂尰鐢燂級锛屽惁鍒欏繀鎶� 1010002003銆屽洿瑙傛ā寮忥紝涓嶈兘鎵ц璇ユ搷浣溿�嶃��
+ // 浠嶄繚鐣� @PreAuthorize('ecg:doctor:task') 鏉冮檺鐐广��
@GetMapping("/recall-pass-waiting-patient")
@Operation(summary = "杩囧彿-鎺掗槦涓� 鎮h�呭彫鍥�")
@Parameter(name = "patId", description = "鎮h�呯紪鍙�", required = true, example = "B2")
@@ -454,6 +532,7 @@
return success("鎿嶄綔鎴愬姛");
}
+ // 銆愭湰闇�姹偮锋帓闃熼槦鍒椾緵鏈嶅姟鍙板垎璇婅皟搴︿娇鐢ㄣ�戜笉鍐嶅仛銆屽伐浣嶄富浜恒�嶆牎楠岋紙鍘熷洜鍚屼笂锛夈��
@GetMapping("/recall-patient")
@Operation(summary = "杩囧彿鐥呬汉鍙洖")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@@ -475,6 +554,7 @@
return success("鎿嶄綔鎴愬姛");
}
+ // 銆愭湰闇�姹偮锋帓闃熼槦鍒椾緵鏈嶅姟鍙板垎璇婅皟搴︿娇鐢ㄣ�戜笉鍐嶅仛銆屽伐浣嶄富浜恒�嶆牎楠岋紙鍘熷洜鍚屼笂锛夈��
@GetMapping("/recall-install-patient")
@Operation(summary = "杩囧彿瀹夎鐥呬汉鍙洖")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@@ -490,10 +570,15 @@
@RequestParam("roomId_operator") Long roomId_operator,
@RequestParam("bedNo_operator") String bedNo_operator )
{
- if (roomId != roomId_operator)
- return error(QUEUE_RECALL_INSTALL_NOT_CUR_ROOM);
+ // 銆愭湰闇�姹偮锋帓闃熼槦鍒椾緵鏈嶅姟鍙板垎璇婅皟搴︿娇鐢ㄣ�戝幓鎺夈�屾搷浣滆�呭伐浣嶅繀椤荤瓑浜庢偅鑰呭伐浣嶃�嶇殑鏍¢獙锛�
+ // 路 鍒嗚瘖鍙颁笉鍗犲骇锛宺oomId_operator / bedNo_operator 鍙兘鏄┖鎴栦笌鏈嶅姟鍙板綋鍓嶅伐浣嶄笉涓�鑷达紱
+ // 路 鎺掗槦闃熷垪椤典紶鐨勬槸**闃熷垪琛屽唴鐨勫伐浣�**锛屾湰鏉ヤ篃鍙敤浜庝翰鍜岄」閲嶆柊瀹氫綅銆�
+ // 鍘熸牎楠岋細if (roomId != roomId_operator) return error(QUEUE_RECALL_INSTALL_NOT_CUR_ROOM);
+ // 鐜板湪锛氭搷浣滆�呭伐浣嶇己澶辨椂锛岄��鍖栦负鐢ㄦ偅鑰呴槦鍒楄涓婄殑宸ヤ綅锛坮oomId/bedNo锛夈��
+ Long operatorRoomId = (null != roomId_operator) ? roomId_operator : roomId;
+ String operatorBedNo = (null != bedNo_operator && !bedNo_operator.isEmpty()) ? bedNo_operator : bedNo;
- Integer result = queueService.recallInstallPatient(roomId, bedNo, patId, checkType, roomId_operator, bedNo_operator);
+ Integer result = queueService.recallInstallPatient(roomId, bedNo, patId, checkType, operatorRoomId, operatorBedNo);
if (null == result || 0 == result)
return error(PATIENT_NOT_EXISTS);
@@ -502,6 +587,7 @@
// ==================== 闇�姹�2锛氭挙閿�銆屽彨鍙� / 妫�鏌ュ畬鎴愩�� ====================
+ @RequireBedOwner("鎾ら攢妫�鏌ュ畬鎴�")
@GetMapping("/undo-finish-patient")
@Operation(summary = "鎾ら攢妫�鏌ュ畬鎴愶細宸插氨璇�(40) 鈫� 鍊欒瘖涓�(20)")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@@ -519,9 +605,14 @@
if (null == result || 0 == result) {
return error(APPOINTMENT_NOT_EXISTS);
}
+ // 銆愭湰娆′慨澶嶃�戝彧鍥炴粴闃熷垪鐘舵�佹槸涓嶅鐨勶細妫�鏌ュ崟(dev_rent)浠嶅仠鍦ㄣ�屽父瑙勬鏌ュ畬鎴�(60)銆嶏紝
+ // 鍓嶇鍐嶆瀹屾垚鏃跺彇涓嶅埌銆屽緟妫�鏌ャ�嶅崟锛坮entId 涓虹┖锛夆啋 鍚庣鎶ャ�岃鍏堥绾︾‘璁ゃ�嶃��
+ // 杩欓噷鎶婃鏌ュ崟鍥炴粴鎴愩�屽緟妫�鏌ャ�嶅苟鍙栨秷纭垂锛堝唴閮ㄥ凡 try/catch锛屽け璐ヤ笉褰卞搷鎾ら攢缁撴灉锛夈��
+ devRentService.rollbackRoutineFinish(patId, checkType);
return success("宸叉挙閿�妫�鏌ュ畬鎴愶紝鎮h�呭凡杩斿洖鍊欒瘖鍖�");
}
+ @RequireBedOwner("鎾ら攢鍙彿")
@GetMapping("/undo-call-patient")
@Operation(summary = "鎾ら攢鍙彿锛氬氨璇婁腑(30) 鈫� 鍊欒瘖涓�(20)")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@@ -551,6 +642,7 @@
// ==================== 闇�姹�3锛氬仠姝㈠�欒瘖寮�鍏� ====================
+ @RequireBedOwner("鍋滄鍊欒瘖")
@GetMapping("/stop-ready")
@Operation(summary = "鍋滄鍊欒瘖锛氫笉鍐嶆柊澧炲�欒瘖鎮h�咃紙宸叉湁鍊欒瘖浠嶅彲鍙彿锛�")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@@ -566,6 +658,7 @@
return success(true);
}
+ @RequireBedOwner("鎭㈠鍊欒瘖")
@GetMapping("/resume-ready")
@Operation(summary = "鎭㈠鍊欒瘖锛氶噸鏂板紑濮嬫帴鏀跺�欒瘖鎮h��")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java
index e4a17eb..8892479 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java
@@ -26,6 +26,7 @@
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
import cn.lihu.jh.module.ecg.service.jobrecord.JobRecordService;
+import cn.lihu.jh.module.ecg.service.room.RoomService;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -39,6 +40,10 @@
@Resource
private JobRecordService jobRecordService;
+
+ /** 銆愪富/鍥磋銆戝洿瑙備汉鏌�"宸ヤ綅涓讳汉鐨勮褰�"鏃堕渶瑕佹牎楠岃宸ヤ綅褰撳墠涓讳汉 */
+ @Resource
+ private RoomService roomService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓宸ヤ綔璁板綍")
@@ -82,13 +87,24 @@
}
@GetMapping("/doctor-page")
- @Operation(summary = "鑾峰緱鐢ㄦ埛鑷繁鐨勫伐浣滆褰曞垎椤�")
+ @Operation(summary = "鑾峰緱宸ヤ綔璁板綍鍒嗛〉锛堥粯璁ゆ煡鑷繁锛涘洿瑙傛椂鎸夊伐浣嶄富浜烘煡锛�")
@PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
- public CommonResult<PageResult<JobRecordRespVO>> getJobRecordDoctorPage(@Valid JobRecordPageReqVO pageReqVO) {
+ public CommonResult<PageResult<JobRecordRespVO>> getJobRecordDoctorPage(
+ @Valid JobRecordPageReqVO pageReqVO,
+ @RequestParam(value = "roomId", required = false) Long roomId,
+ @RequestParam(value = "bedNo", required = false) String bedNo) {
Long userId = SecurityFrameworkUtils.getLoginUserId();
- String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- pageReqVO.setDocId( userId );
+ // 銆愪富/鍥磋銆戦粯璁ゆ煡鑷繁鐨勮褰曪紙淇濇寔鍘熻涓猴級锛�
+ // 浼犱簡鍒汉鐨� docId锛堝洿瑙傛椂鍓嶇浼�"璇ュ伐浣嶄富浜�"锛夆啋 蹇呴』鏍¢獙璇ュ伐浣嶅綋鍓嶄富浜虹‘瀹炴槸杩欎釜 docId锛�
+ // 鍚﹀垯鍥磋浜虹湅鍒扮殑"宸插畬鎴愭鏌ヨ褰�"姘歌繙鏄┖鐨勶紙鍘熷疄鐜版棤鏉′欢瑕嗙洊鎴愮櫥褰曚汉锛夈��
+ Long ownerDocId = pageReqVO.getDocId();
+ if (null == ownerDocId || ownerDocId.equals(userId)) {
+ pageReqVO.setDocId(userId);
+ } else {
+ roomService.assertBedOwnerIs(roomId, bedNo, ownerDocId);
+ }
+
PageResult<JobRecordDO> pageResult = jobRecordService.getJobRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, JobRecordRespVO.class));
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/vo/JobRecordRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/vo/JobRecordRespVO.java
index f0015b1..9ace751 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/vo/JobRecordRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/vo/JobRecordRespVO.java
@@ -63,4 +63,11 @@
@Schema(description = "宸茬即璐�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("宸茬即璐�")
private Integer paid;
+
+ /**
+ * 銆愭挙閿�鏍囪瘑锝滈潪搴撳瓧娈点�戣鏉″畬鎴愯褰曞搴旂殑鎮h��"褰撴棩闃熷垪鐘舵�佸凡涓嶆槸宸插氨璇�(40)"锛�
+ * 鍗�**妫�鏌ュ畬鎴愯鎾ら攢杩囥�佽繕娌¢噸鏂板畬鎴�**銆傛挙閿�鍚庤嚜鍔ㄥ彉 true锛屽啀娆″畬鎴愬悗鑷姩鍙� false銆�
+ */
+ @Schema(description = "鏄惁宸叉挙閿�锛堝畬鎴愯鎾ら攢銆佸皻鏈噸鏂板畬鎴愶級", example = "false")
+ private Boolean undone;
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueuePageReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueuePageReqVO.java
index 55da54a..cf283a3 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueuePageReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueuePageReqVO.java
@@ -46,7 +46,8 @@
@Schema(description = "棰勭害妫�鏌ョ被鍨�", example = "1")
private Integer bookCheckType;
- @Schema(description = "棰勭害搴忓彿")
+ /** 銆愬凡鍋滅敤銆戞帓闃熷彿缁熶竴涓� seqNum锛涙湰瀛楁浠呬繚鐣欏吋瀹癸紝鏌ヨ璇风敤 seqNum */
+ @Schema(description = "棰勭害搴忓彿锛堝凡鍋滅敤锛岃鐢� seqNum锛�")
private Integer bookSeqNum;
@Schema(description = "鎺掗槦搴忓彿")
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java
index 08a2428..aecfc7f 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueRespVO.java
@@ -57,11 +57,12 @@
@ExcelProperty("棰勭害妫�鏌ョ被鍨�")
private Integer bookCheckType;
- @Schema(description = "棰勭害搴忓彿")
+ /** 銆愬凡鍋滅敤銆戞帓闃熷彿缁熶竴涓� seqNum锛堣涓嬶級锛涙湰瀛楁浠呬繚鐣欎互鍏煎鑰佸墠绔�/鑰佹暟鎹紝涓嶅啀鍐欏叆涓庢樉绀� */
+ @Schema(description = "棰勭害搴忓彿锛堝凡鍋滅敤锛岃鐢� seqNum锛�")
@ExcelProperty("棰勭害搴忓彿")
private Integer bookSeqNum;
- @Schema(description = "鎺掗槦搴忓彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @Schema(description = "鎺掗槦搴忓彿锛�= check_type.seq_prefix + 鏈�硷級", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鎺掗槦搴忓彿")
private Integer seqNum;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java
index 4f691fd..0659613 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/QueueSaveReqVO.java
@@ -55,7 +55,8 @@
@Schema(description = "棰勭害妫�鏌ョ被鍨�", example = "1")
private Integer bookCheckType;
- @Schema(description = "棰勭害搴忓彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ /** 銆愬凡鍋滅敤銆戞帓闃熷彿缁熶竴涓� seqNum锛堣涓嬶級锛涙湰瀛楁浠呬繚鐣欎互鍏煎鑰佽皟鐢ㄦ柟锛屾柊浠g爜璇峰嬁璧嬪�� */
+ @Schema(description = "棰勭害搴忓彿锛堝凡鍋滅敤锛岃鐢� seqNum锛�", requiredMode = Schema.RequiredMode.REQUIRED)
//@NotNull(message = "棰勭害搴忓彿涓嶈兘涓虹┖")
private Integer bookSeqNum;
@@ -63,6 +64,7 @@
//@NotNull(message = "鏄惁VIP")
private Integer isVip;
+ /** 鎺掗槦鍙凤細绛惧埌鏃舵寜 check_type.seq_rule 鍒嗛厤涓�娆★紝涔嬪悗涓嶅啀鏀瑰姩 */
@Schema(description = "鎺掗槦搴忓彿", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "鎺掗槦搴忓彿涓嶈兘涓虹┖")
private Integer seqNum;
@@ -95,9 +97,11 @@
* <p>
* 鏉ユ簮锛欻IS 鎶ユ枃 {@code observationRequest.zdy.jjbz}锛圢=甯歌锛孞=鍔犳�ワ級
* 鈫� 棰勭害璁板綍 {@code appointment.jjbz} 鈫� 棰勭害纭鏃跺甫鍏ユ帓闃熴��
- * 涓庝汉宸ユ彃闃燂紙{@code QueueServiceImpl#patientJump}锛夊叡鐢ㄨ瀛楁锛�
- * {@code queue} 琛ㄦ寜 {@code order by jump_flag desc, book_timeslot, create_time} 鍙栧彿锛�
- * 鍥犳缃� 1 鍗冲疄鐜�"鍔犳�ヤ紭鍏�"銆�
+ * 涓庝汉宸ユ彃闃燂紙{@code QueueServiceImpl#patientJump}锛夊叡鐢ㄨ瀛楁銆�
+ * <p>
+ * 銆愬彿缁熶竴鍚庛�戞帓闃熷彿鍦ㄧ鍒版椂涓�娆℃�у畾姝汇�佷箣鍚庝笉鍐嶆敼鍔紝鍔犳��**涓嶅啀闈犳敼鍙�/鎻掗槦閲嶇紪鍙�**锛�
+ * 鑰屾槸闈犳帓搴忥細鍒嗘祦鍙栦汉銆佸彨鍙峰彇浜轰互鍙婂伐浣滃彴/璇婇棿灞�/澶у睆鍒楄〃鍧囦负
+ * {@code jump_flag desc 浼樺厛 鈫� seq_num 鍗囧簭}锛屽洜姝ょ疆 1 鍗冲疄鐜�"鍔犳�ヤ紭鍏�"銆�
*/
@Schema(description = "鍔犳�ユ爣璁� 1=鍔犳��")
private Byte jumpFlag;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
index 6f0b3de..6e5aa4b 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
@@ -10,6 +10,7 @@
import javax.validation.Valid;
import cn.hutool.extra.servlet.ServletUtil;
+import cn.lihu.jh.module.ecg.utils.IpUtils;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
@@ -29,11 +30,16 @@
import cn.lihu.jh.framework.common.pojo.PageParam;
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.pojo.CommonResult;
+import cn.lihu.jh.framework.common.exception.ErrorCode;
+import cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.framework.excel.core.util.ExcelUtils;
import cn.lihu.jh.framework.apilog.core.annotation.ApiAccessLog;
+import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
+import lombok.extern.slf4j.Slf4j;
import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
+import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.*;
@@ -41,6 +47,7 @@
@RestController
@RequestMapping("/clinic/room")
@Validated
+@Slf4j
public class RoomController {
@Resource
@@ -92,6 +99,258 @@
String reqIp = ServletUtil.getClientIP(request);
RoomProfile roomProfile = roomService.getRoomByIP(reqIp, roomId);
return success(BeanUtils.toBean(roomProfile, RoomProfileRespVO.class));
+ }
+
+ /* ==================== 閫夋嫨宸ヤ綅妯″紡锛堥渶姹傦細璇婂宸ヤ綅閫夋嫨妯″紡 0/1/2/3锛� ==================== */
+
+ /**
+ * 鎸夋湰鏈篒P鍖归厤宸ヤ綅锛堟ā寮� 1/3 鐢級銆�
+ *
+ * <p>鍙鎺ュ彛锛�
+ * <ul>
+ * <li>鎶婂悗绔疄闄呰瘑鍒埌鐨勬潵璁縄P涓�璧疯繑鍥烇紝渚夸簬鎺掓煡"鍓嶇疆浠g悊鏈�忎紶 X-Forwarded-For"锛�</li>
+ * <li>鍊欓�夊伐浣嶅凡鎸夈�屾湰浜哄凡鍗犵敤 鈫� 绌洪棽 鈫� 琚粬浜哄崰鐢ㄣ�嶆帓濂藉簭锛屽墠绔彇绗竴涓彲鐢ㄧ殑鑷姩鍏ュ骇锛�</li>
+ * <li>鏈帴鍙d笉鏀逛换浣曠姸鎬侊紝鍏ュ骇浠嶈蛋鍘熸湁鐨� bedDoctorOn 娴佺▼銆�</li>
+ * </ul>
+ * 闇�瑕佺櫥褰曪紙鏈櫥褰曟椂杩斿洖绌虹粨鏋滐級锛屼絾涓嶅仛鑿滃崟鏉冮檺鏍¢獙锛氳兘鐧诲綍灏辫兘鏌ヨ嚜宸辩殑宸ヤ綅銆�</p>
+ */
+ @GetMapping("/get-ip-bed")
+ @Operation(summary = "鎸夋湰鏈篒P鍖归厤宸ヤ綅锛堥�夋嫨宸ヤ綅妯″紡 1/3锛�")
+ public CommonResult<RoomSelectBedRespVO> getIpBed(HttpServletRequest request) {
+ // 瑙勮寖鍖栵細鍘绘嫭鍙�/鍖哄煙鍙枫�佺粺涓�灏忓啓銆両Pv4-mapped IPv6 杩樺師鎴� IPv4锛堟敮鎸� IPv4 涓� IPv6锛�
+ String clientIp = IpUtils.normalize(ServletUtil.getClientIP(request));
+ Long docId = SecurityFrameworkUtils.getLoginUserId();
+ RoomSelectBedRespVO resp = new RoomSelectBedRespVO();
+ resp.setClientIp(clientIp);
+ resp.setIpValid(IpUtils.isBindableIp(clientIp));
+ resp.setIpLoopback(IpUtils.isLoopback(clientIp));
+ resp.setIpv6(IpUtils.isIpv6Address(clientIp));
+ List<RoomSelectBedRespVO.RoomSelectBedItem> beds = roomService.matchBedsByIp(clientIp, docId);
+ resp.setBeds(beds);
+ resp.setIpBound(!beds.isEmpty());
+ // 鏈�"鏈汉宸插崰鐢�"鎴�"绌洪棽"鐨勫伐浣嶏紝灏辫兘鑷姩鍏ュ骇
+ resp.setMatched(beds.stream()
+ .anyMatch(b -> Boolean.TRUE.equals(b.getMine()) || !Boolean.TRUE.equals(b.getOccupied())));
+ log.info("[getIpBed][鎸塈P鍖归厤宸ヤ綅] clientIp={} docId={} ipValid={} loopback={} 鍊欓�夋暟={} 鍙嚜鍔ㄥ叆搴�={}",
+ clientIp, docId, resp.getIpValid(), resp.getIpLoopback(), beds.size(), resp.getMatched());
+ return success(resp);
+ }
+
+ /**
+ * 鎶婃湰鏈篒P鍐欏叆鎸囧畾宸ヤ綅锛堟ā寮� 2/3 鐢級銆�
+ *
+ * <p>鍙洿鏂� {@code clinic_room.ip} 涓�涓瓧娈碉紝涓嶈蛋 {@code clinic:room:update}锛堝惁鍒欎负浜嗛�夊伐浣嶈繕寰楃粰鍖荤敓寮�璇婂绠$悊鏉冮檺锛夛紝
+ * 涔熶笉浼氱 status/doc_id/check_types 绛夊叾瀹冨瓧娈点��
+ * 鑻ヨIP宸茬粦鍦ㄥ埆鐨勫伐浣嶄笂锛岄粯璁よ繑鍥炲啿绐佸伐浣嶈鍓嶇纭锛涚‘璁ゅ悗甯� {@code force=true} 鍐嶈皟涓�娆″嵆瑕嗙洊銆�</p>
+ */
+ @PostMapping("/bind-ip")
+ @Operation(summary = "鎶婃湰鏈篒P缁戝畾鍒板伐浣嶏紙閫夋嫨宸ヤ綅妯″紡 2/3锛�")
+ public CommonResult<Map<String, Object>> bindIp(HttpServletRequest request,
+ @RequestParam("id") Integer id,
+ @RequestParam(value = "force", required = false, defaultValue = "false") Boolean force) {
+ Map<String, Object> data = new HashMap<>();
+ String rawIp = ServletUtil.getClientIP(request);
+ String clientIp = IpUtils.normalize(rawIp);
+ data.put("clientIp", clientIp);
+ if (!IpUtils.isBindableIp(clientIp)) {
+ data.put("code", 400);
+ if (IpUtils.isLoopback(clientIp)) {
+ // 娴忚鍣ㄥ拰鏈嶅姟鍦ㄥ悓涓�鍙版満鍣ㄤ笂璁块棶鏃跺繀鐒跺嚭鐜帮細IPv4 鏄� 127.0.0.1锛孖Pv6 鏄� ::1
+ data.put("msg", "鏃犳硶缁戝畾宸ヤ綅锛氭娴嬪埌褰撳墠璁块棶鏉ヨ嚜鏈満鍥炵幆鍦板潃锛�" + clientIp
+ + "锛屽嵆鏈満璁块棶锛夛紝璇峰湪鍖荤敓瀹為檯浣跨敤鐨勭數鑴戜笂璁块棶鍚庡啀缁戝畾");
+ } else if (IpUtils.isUnspecified(clientIp)) {
+ data.put("msg", "鏃犳硶缁戝畾宸ヤ綅锛氬綋鍓嶈瘑鍒埌鐨勫湴鍧�鏄湭鎸囧畾鍦板潃锛�" + clientIp + "锛�");
+ } else if (IpUtils.isLocalAddress(clientIp)) {
+ // 鏈鏂板锛氱幇鍦烘渶甯歌鐨�"IP 涓嶅"灏辨槸杩欑 鈥斺�� 鍦ㄦ湇鍔″櫒涓婏紙鎴栬繙绋嬫闈㈤噷锛夎闂郴缁燂紝
+ // 瀹㈡埛绔湰鏉ュ氨鏄湇鍔″櫒鑷繁锛涜嫢鎶婂畠鍐欒繘宸ヤ綅锛岃宸ヤ綅浠ュ悗姘歌繙鍖归厤涓嶅埌鍖荤敓鐢佃剳銆�
+ data.put("msg", "鏃犳硶缁戝畾宸ヤ綅锛氳瘑鍒埌鐨勬槸**鏈嶅姟鍣ㄨ嚜韬湴鍧�**锛�" + clientIp
+ + "锛夆�斺�� 璇存槑褰撳墠鏄湪鏈嶅姟鍣ㄤ笂璁块棶锛屾垨缁忚繙绋嬫闈�/鏈満浠g悊璁块棶锛岃繖涓嶆槸鍖荤敓鐢佃剳鐨� IP銆�"
+ + "璇峰湪鍖荤敓瀹為檯浣跨敤鐨勭數鑴戜笂銆佺敤鏈嶅姟鍣ㄧ殑 IPv4 鍦板潃璁块棶鍚庡啀缁戝畾"
+ + "锛堝彲鐢ㄣ�孖P 璇婃柇銆嶆煡鐪嬪悗绔埌搴曟妸璋佸綋鎴愪簡瀹㈡埛绔級");
+ log.warn("[bindIp][璇嗗埆鍒版湇鍔″櫒鑷韩鍦板潃锛屾嫆缁濈粦瀹歖 clientIp={} bedId={} 鏈嶅姟鍣ㄧ綉鍗Pv4={}",
+ clientIp, id, IpUtils.localIpv4Addresses());
+ } else if (IpUtils.isIpv6Address(clientIp)) {
+ // 鏈郴缁熷伐浣嶇粦瀹氱粺涓�閲囩敤 IPv4锛涘鎴风璧� IPv6 鏃舵棤娉曚粠浠g爜"閫�鍖栨垚"IPv4
+ data.put("msg", "鏃犳硶缁戝畾宸ヤ綅锛氬綋鍓嶈闂娇鐢ㄧ殑鏄� IPv6 鍦板潃锛�" + clientIp
+ + "锛夛紝鏈郴缁熷伐浣嶇粦瀹氫粎閲囩敤 IPv4锛岃鏀圭敤鏈嶅姟鍣ㄧ殑 IPv4 鍦板潃璁块棶"
+ + "锛堟垨璁╂湇鍔″彧鐩戝惉 IPv4锛欽VM 鍙傛暟 -Djava.net.preferIPv4Stack=true锛�");
+ } else {
+ data.put("msg", "鏃犳硶缁戝畾宸ヤ綅锛氭湭鑳借瘑鍒埌鍚堟硶鐨� IPv4 鏉ヨ鍦板潃锛�" + clientIp
+ + "锛夛紝璇锋鏌ユ槸鍚﹂�氳繃浠g悊璁块棶銆佷互鍙婁唬鐞嗘槸鍚﹂�忎紶瀹㈡埛绔湴鍧�锛圶-Forwarded-For锛�");
+ }
+ log.warn("[bindIp][IP涓嶅彲鐢紝鎷掔粷缁戝畾] raw={} normalized={} ipv6={} bedId={}",
+ rawIp, clientIp, IpUtils.isIpv6Address(clientIp), id);
+ return success(data);
+ }
+ // 鍐茬獊妫�娴嬶細璇P宸茬粦鍦ㄥ埆鐨勫伐浣� 鈫� 鍏堣鍓嶇纭
+ List<RoomDO> conflicts = roomService.listIpBindings(clientIp, id);
+ if (!conflicts.isEmpty() && !Boolean.TRUE.equals(force)) {
+ RoomDO c = conflicts.get(0);
+ data.put("code", 409);
+ data.put("conflict", true);
+ data.put("conflictBedId", c.getId());
+ data.put("conflictRoomName", c.getRoomName());
+ data.put("conflictBedNo", c.getBedNo());
+ data.put("msg", "璇P宸茬粦瀹氥��" + c.getRoomName() + " / " + c.getBedNo() + "銆�");
+ return success(data);
+ }
+ Integer rows = roomService.bindIpToBed(id, clientIp);
+ data.put("code", rows != null && rows > 0 ? 200 : 500);
+ data.put("msg", rows != null && rows > 0 ? "宸茬粦瀹氭湰鏈篒P鍒拌宸ヤ綅" : "缁戝畾澶辫触锛堝伐浣嶄笉瀛樺湪锛燂級");
+ data.put("rows", rows);
+ log.info("[bindIp][缁戝畾缁撴灉] raw={} clientIp={} bedId={} force={} rows={}", rawIp, clientIp, id, force, rows);
+ return success(data);
+ }
+
+ /* ==================== 鑷姩鍏ュ骇 / 鎴戠殑宸ヤ綅锛堟湰娆¢渶姹傦級 ==================== */
+
+ /**
+ * 涓�閿嚜鍔ㄥ叆搴э紙閫夋嫨宸ヤ綅妯″紡 1/3 鐢級銆�
+ *
+ * <p>涓轰粈涔堝悎骞舵垚涓�涓帴鍙o細鍓嶇鍘熸潵鎶娿�屽尮閰� 鈫� 缁� IP 鈫� 鍏ュ骇銆嶆媶鎴愪笁涓姹傝嚜宸辨嫾锛�
+ * 浠讳竴姝ュけ璐ラ兘鍙兘鍥炶惤"鎵嬮�夊伐浣�"锛岀幇鍦鸿〃鐜板氨鏄�"鐧诲綍鍚庢病鏈夎嚜鍔ㄥ叆搴�"涓旂湅涓嶅嚭鍘熷洜銆�
+ * 鐜板湪涓�娆¤皟鐢ㄥ畬鎴愶紝骞惰繑鍥�**璇嗗埆鍒扮殑 IP** 涓�**鏈叆搴у師鍥�**
+ * 锛坽@code ip_invalid / nomatch / multi / occupied / error}锛夛紝鎺掓煡涓�鐪煎彲杈ㄣ��
+ *
+ * <p>闇�瑕佺櫥褰曪紝浣嗕笉鍋氳彍鍗曟潈闄愭牎楠岋細鑳界櫥褰曞氨鑳藉潗鑷繁鐨勫伐浣嶃��
+ */
+ @PostMapping("/auto-seat")
+ @Operation(summary = "鎸夋湰鏈篒P鑷姩鍖归厤宸ヤ綅骞惰嚜鍔ㄥ叆搴э紙閫夋嫨宸ヤ綅妯″紡 1/3锛�")
+ public CommonResult<RoomSeatRespVO> autoSeat(HttpServletRequest request) {
+ String clientIp = IpUtils.normalize(ServletUtil.getClientIP(request));
+ Long docId = SecurityFrameworkUtils.getLoginUserId();
+ String docName = SecurityFrameworkUtils.getLoginUserNickname();
+ RoomSeatRespVO resp = roomService.autoSeatByIp(clientIp, docId, docName);
+ log.info("[autoSeat][鑷姩鍏ュ骇] clientIp={} docId={} seated={} reason={} 宸ヤ綅={}/{}",
+ clientIp, docId, resp.getSeated(), resp.getReason(), resp.getRoomName(), resp.getBedNo());
+ return success(resp);
+ }
+
+ /**
+ * 鏌ヨ褰撳墠鐧诲綍浜�**宸插叆搴�**鐨勫伐浣嶏紙绯荤粺椤舵爮"褰撳墠宸ヤ綅"鏍囩鐢級銆�
+ *
+ * <p>鏈叆搴ф椂杩斿洖 {@code seated=false}锛屽墠绔嵁姝ゆ樉绀虹伆鑹层�屾湭鍏ュ骇銆嶅苟鍙偣鍑诲幓閫夊伐浣嶃��
+ */
+ @GetMapping("/my-seat")
+ @Operation(summary = "鏌ヨ褰撳墠鐧诲綍浜哄凡鍏ュ骇鐨勫伐浣嶏紙绯荤粺椤舵爮灞曠ず锛�")
+ public CommonResult<RoomSeatRespVO> mySeat() {
+ Long docId = SecurityFrameworkUtils.getLoginUserId();
+ RoomSeatRespVO resp = roomService.getMySeat(docId);
+ log.info("[mySeat][鏌ヨ鎴戠殑宸ヤ綅] docId={} seated={} 宸ヤ綅={}/{}",
+ docId, resp.getSeated(), resp.getRoomName(), resp.getBedNo());
+ return success(resp);
+ }
+
+ /**
+ * 銆愭湰闇�姹偮蜂竴浜哄宸ヤ綅銆戞煡璇㈠綋鍓嶇櫥褰曚汉鍗犳嵁鐨�**鍏ㄩ儴**宸ヤ綅锛堣妭鍋囨棩鍊肩彮澶氬矖浣嶏級銆�
+ *
+ * <p>杩斿洖銆屽尰鐢熷湪搴� / 鍖荤敓鏆傚仠銆嶇殑宸ヤ綅鍒楄〃锛屾寜 roomId + bedNo 鍗囧簭锛涙湭鍗犲伐浣嶈繑鍥炵┖鏁扮粍銆�
+ * 鍓嶇鐢ㄥ畠娓叉煋椤舵爮銆屾垜鐨勫伐浣嶏紙N 涓級銆嶅苟鍦ㄥ伐浣嶄箣闂村垏鎹€��
+ */
+ @GetMapping("/my-seats")
+ @Operation(summary = "鏌ヨ褰撳墠鐧诲綍浜哄凡鍏ュ骇鐨勫叏閮ㄥ伐浣嶏紙涓�浜哄宀椾綅锛�")
+ public CommonResult<List<RoomSeatRespVO>> mySeats() {
+ Long docId = SecurityFrameworkUtils.getLoginUserId();
+ List<RoomSeatRespVO> seats = roomService.getMySeats(docId);
+ log.info("[mySeats][鏌ヨ鎴戠殑鍏ㄩ儴宸ヤ綅] docId={} 鏁伴噺={}", docId, null == seats ? 0 : seats.size());
+ return success(seats);
+ }
+
+ /**
+ * 銆愭湰闇�姹偮锋帴鐝嚜鍔╂帴绠°�戞妸宸ヤ綅浠�"鍒汉鍗犵敤"鏀逛负"褰撳墠鐧诲綍浜哄崰鐢�"銆�
+ *
+ * <p>鍦烘櫙锛氫笂涓�鐝尰鐢熶笅鐝湭鐐广�岀搴с�嶏紝涓嬩竴鐝尰鐢熷湪鍚屼竴鍙扮數鑴�/鍚屼竴宸ヤ綅鎺ョ彮銆�
+ * 鍘熷崰鐢ㄤ汉浼氳寮哄埗绂诲骇锛堝叾椤甸潰 5s 杞浼氭彁绀恒�岃閲嶆柊灏卞潗銆嶅苟杞彧璇伙級銆�
+ * 鏉冮檺娌跨敤鍖荤敓宸ヤ綔鍙板凡鏈夌殑 {@code ecg:doctor:task}锛屾棤闇�鏂板鏉冮檺鐐广��
+ */
+ @PostMapping("/take-over-bed")
+ @Operation(summary = "鎺ョ宸ヤ綅锛堟帴鐝細鎶婁粬浜哄崰鐢ㄧ殑宸ヤ綅杞粰鎴戯級")
+ @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
+ public CommonResult<Boolean> takeOverBed(@RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo) {
+ roomService.takeOverBed(roomId, bedNo);
+ return success(true);
+ }
+
+ /**
+ * 瀹㈡埛绔� IP 璇嗗埆璇婃柇锛堢幇鍦烘帓鏌�"宸ヤ綅缁戝畾鐨� IP 涓嶅"鐢級銆�
+ *
+ * <p>涓�娆℃妸鎵�鏈夌浉鍏崇嚎绱㈡憡寮�锛氬悇涓唬鐞嗗ご銆乀CP 鐩磋繛鍦板潃銆佽鑼冨寲缁撴灉銆佹槸鍚﹀洖鐜�/IPv6銆�
+ * **鏄惁鏄湇鍔″櫒鑷韩鍦板潃**銆佷互鍙婃湇鍔″櫒鎵�鏈� IPv4 缃戝崱鍦板潃銆傜晫闈笂鐨勩�孖P 璇婃柇銆嶆寜閽氨璋冨畠銆�
+ *
+ * <p>鍏稿瀷缁撹锛�
+ * <ul>
+ * <li>鍙栧埌鐨勬槸鏈嶅姟鍣ㄨ嚜韬湴鍧� 鈫� 褰撳墠鏄湪鏈嶅姟鍣ㄤ笂/杩滅▼妗岄潰閲岃闂紝鎴栦唬鐞嗘妸瀹㈡埛绔湴鍧�瑕嗙洊鎴愪簡鏈嶅姟鍣ㄥ湴鍧�锛�</li>
+ * <li>鍙栧埌 127.x / ::1 鈫� 娴忚鍣ㄤ笌鏈嶅姟鍦ㄥ悓涓�鍙版満鍣紱</li>
+ * <li>鍙栧埌 IPv6 鈫� 瀹㈡埛绔蛋 IPv6锛堟湰绯荤粺宸ヤ綅缁戝畾鍙敤 IPv4锛夛紱</li>
+ * <li>{@code X-Forwarded-For} 涓虹┖涓旂洿杩炲湴鍧�=缃戝叧 鈫� 鍓嶉潰鐨勪唬鐞嗘病閫忎紶瀹㈡埛绔湴鍧�銆�</li>
+ * </ul>
+ */
+ @GetMapping("/ip-debug")
+ @Operation(summary = "瀹㈡埛绔疘P璇嗗埆璇婃柇锛堟帓鏌ュ伐浣嶇粦瀹欼P涓嶅锛�")
+ public CommonResult<Map<String, Object>> ipDebug(HttpServletRequest request) {
+ Map<String, Object> data = new LinkedHashMap<>();
+ String xff = request.getHeader("X-Forwarded-For");
+ String realIp = request.getHeader("X-Real-IP");
+ String remoteAddr = request.getRemoteAddr();
+ String raw = ServletUtil.getClientIP(request);
+ String clientIp = IpUtils.normalize(raw);
+
+ data.put("璁块棶Host", request.getHeader("Host"));
+ data.put("X-Forwarded-For", xff);
+ data.put("X-Real-IP", realIp);
+ data.put("Proxy-Client-IP", request.getHeader("Proxy-Client-IP"));
+ data.put("WL-Proxy-Client-IP", request.getHeader("WL-Proxy-Client-IP"));
+ data.put("HTTP_CLIENT_IP", request.getHeader("HTTP_CLIENT_IP"));
+ data.put("鐩磋繛鍦板潃(remoteAddr)", remoteAddr);
+ data.put("鍙栧埌鐨勫師濮嬪��", raw);
+ data.put("瑙勮寖鍖栧悗(宸ヤ綅鎸夋鍖归厤)", clientIp);
+ data.put("鍙敤浜庡伐浣嶇粦瀹�", IpUtils.isBindableIp(clientIp));
+ data.put("鏄洖鐜�(娴忚鍣ㄤ笌鏈嶅姟鍚屾満)", IpUtils.isLoopback(clientIp));
+ data.put("鏄疘Pv6", IpUtils.isIpv6Address(clientIp));
+ data.put("鏄湇鍔″櫒鑷韩鍦板潃", IpUtils.isLocalAddress(clientIp));
+ data.put("鏈嶅姟鍣ㄧ綉鍗Pv4", IpUtils.localIpv4Addresses());
+
+ String verdict;
+ if (IpUtils.isLoopback(clientIp)) {
+ verdict = "瀹㈡埛绔氨鏄湇鍔″櫒鏈満锛堝洖鐜� " + clientIp + "锛夛細灞炪�愭祻瑙堝櫒涓庢湇鍔″湪鍚屼竴鍙版満鍣ㄣ�戠殑姝e父鐜拌薄锛�"
+ + "涓嶈兘浣滀负宸ヤ綅鏍囪瘑锛岃鍦ㄥ尰鐢熺數鑴戜笂璁块棶銆�";
+ } else if (IpUtils.isLocalAddress(clientIp)) {
+ verdict = "鈿� 璇嗗埆鍒扮殑鏄�愭湇鍔″櫒鑷韩鍦板潃銆戯紙" + clientIp + "锛夛細褰撳墠鏄湪鏈嶅姟鍣ㄤ笂/杩滅▼妗岄潰閲岃闂紝"
+ + "鎴栧墠缃唬鐞嗘妸瀹㈡埛绔湴鍧�瑕嗙洊鎴愪簡鏈嶅姟鍣ㄥ湴鍧� 鈫� 涓嶈兘浣滀负宸ヤ綅鏍囪瘑銆�"
+ + "璇峰湪鍖荤敓鐢佃剳涓娿�佺敤鏈嶅姟鍣ㄧ殑 IPv4 鍦板潃璁块棶锛涜嫢纭鏄湪鍖荤敓鐢佃剳涓婅闂紝璇锋鏌ヤ唬鐞嗘槸鍚﹂�忎紶 "
+ + "X-Forwarded-For锛坣ginx: proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;锛夈��";
+ } else if (IpUtils.isIpv6Address(clientIp)) {
+ verdict = "瀹㈡埛绔蛋鐨勬槸 IPv6锛�" + clientIp + "锛夛細鏈郴缁熷伐浣嶇粦瀹氬彧閲囩敤 IPv4锛�"
+ + "璇疯鏈嶅姟鍙洃鍚� IPv4锛圝VM: -Djava.net.preferIPv4Stack=true锛夋垨鏀圭敤 IPv4 鍦板潃璁块棶銆�";
+ } else if (IpUtils.isBindableIp(clientIp)) {
+ verdict = "璇嗗埆姝e父锛屽彲鐢ㄤ簬宸ヤ綅缁戝畾锛�" + clientIp;
+ } else {
+ verdict = "鏈兘璇嗗埆鍒板彲鐢ㄧ殑 IPv4 瀹㈡埛绔湴鍧�锛堝師濮嬪�硷細" + raw + "锛岀洿杩炲湴鍧�锛�" + remoteAddr
+ + "锛夛細璇锋鏌ヤ唬鐞嗘槸鍚﹂�忎紶瀹㈡埛绔湴鍧�锛圶-Forwarded-For锛夈��";
+ }
+ data.put("璇婃柇缁撹", verdict);
+
+ log.info("[ipDebug][瀹㈡埛绔疘P璇婃柇] Host={} XFF={} X-Real-IP={} remoteAddr={} 鈫� clientIp={} 鏈嶅姟鍣ㄥ湴鍧�={}",
+ request.getHeader("Host"), xff, realIp, remoteAddr, clientIp, IpUtils.isLocalAddress(clientIp));
+ return success(data);
+ }
+
+ /**
+ * 宸ヤ綅鐘舵�佽瘖鏂紙鎺掓煡"鍏ュ骇鎶ョ姸鎬佸紓甯� / 鏄庢槑绌洪棽鍗村潗涓嶄笂"锛夈��
+ *
+ * <p>鎶婂簱閲�**鍘熷琛�**鎽婂紑锛歚id / room_id / room_name / bed_no(鍚暱搴︿笌 HEX锛岀敤浜庡彂鐜扮粨灏剧┖鏍笺�佸叏瑙�) /
+ * ip / status / doc_id / doc_name / op_type / deleted / update_time`锛屽苟缁欏嚭涓�鍙ョ粨璁恒��
+ *
+ * <p>鐢ㄦ硶锛歚GET /clinic/room/bed-state?id=3` 鎴� `?roomId=118&bedNo=C1`銆�
+ */
+ @GetMapping("/bed-state")
+ @Operation(summary = "宸ヤ綅鐘舵�佽瘖鏂紙鎺掓煡鍏ュ骇鎶ョ姸鎬佸紓甯革級")
+ public CommonResult<Map<String, Object>> bedState(
+ @RequestParam(value = "id", required = false) Integer id,
+ @RequestParam(value = "roomId", required = false) Long roomId,
+ @RequestParam(value = "bedNo", required = false) String bedNo) {
+ return success(roomService.diagnoseBed(id, roomId, bedNo));
}
@GetMapping("/page")
@@ -166,6 +425,10 @@
List<RoomDO> list = roomService.simpleRoomList();
List<RoomRespVO> list2 = BeanUtils.toBean(list, RoomRespVO.class);
+ // 鏄惧紡鏍囨敞銆屾槸鍚﹀凡琚尰鐢熷崰鐢ㄣ�嶏細閫夊伐浣嶉〉鎹鏄剧ず銆屽凡鍏ュ骇锛氬紶涓夈�嶅苟**绂佺敤鍏ュ骇鎸夐挳**锛�
+ // 涓嶄緷璧� BeanUtils 鏄惁鎶� docId 澶嶅埗杩囨潵锛堝弻淇濋櫓锛涙湰娆$幇鍦哄氨鏈�"鐪嬩笉鍑烘潵璋佸崰浜嗗伐浣�"鐨勫弽棣堬級銆�
+ list2.forEach(roomRespVO -> roomRespVO.setOccupied(null != roomRespVO.getDocId()));
+
Map<Long, List<RoomRespVO>> map = list2.stream().collect(Collectors.groupingBy(RoomRespVO::getRoomId));
return success(map);
}
@@ -200,5 +463,29 @@
return success(0);
}
+ /**
+ * 銆愭湰娆¢渶姹傘�戠鐞嗗憳寮哄埗娓呯┖鏌愪釜宸ヤ綅锛堜笉瑕佹眰鏄崰鐢ㄨ�呮湰浜猴級銆�
+ * <p>
+ * 浣跨敤鍦烘櫙锛氬尰鐢熶笅鐝繕璁般�岀搴с�嶏紝鎴栨崲浜轰娇鐢ㄥ悓涓�宸ヤ綅銆�
+ * <p>
+ * 涓庡尰鐢熻嚜宸辩殑銆岀搴с�嶆帴鍙o紙{@code /ecg/doctor/bed-doctor-off}锛夌殑鍖哄埆锛�
+ * 路 璇ユ帴鍙e彧鑳芥竻**鑷繁**鍗犵敤鐨勫伐浣嶏紙SQL 甯� {@code doc_id = 褰撳墠鐢ㄦ埛}锛夛紱
+ * 路 鏈帴鍙i潰鍚戠鐞嗙锛屽彲浠ユ竻**浠讳綍浜�**鍗犵敤鐨勫伐浣嶏紙浠呰姹傝宸ヤ綅褰撳墠鏄�屽尰鐢熷湪宀� / 鏆傚仠銆嶏級銆�
+ * <p>
+ * 宸ヤ綅绌洪棽鏃朵細杩斿洖銆屽綋鍓嶅伐浣嶇姸鎬佷笉鍏佽璇ユ搷浣溿�嶁�斺�旇繖鏄鏈熻涓恒��
+ */
+ @PostMapping("/force-clear-bed")
+ @Operation(summary = "绠$悊鍛樺己鍒舵竻绌哄伐浣�", description = "鍖荤敓涓嬬彮蹇樼搴� / 鎹汉浣跨敤鍚屼竴宸ヤ綅鏃朵娇鐢�")
+ @PreAuthorize("@ss.hasPermission('clinic:room:update')")
+ public CommonResult<Boolean> forceClearBed(@RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo) {
+ ErrorCode ec = queueService.startBedDoctorOffByAdmin(roomId, bedNo);
+ if (!GlobalErrorCodeConstants.SUCCESS.getCode().equals(ec.getCode())) {
+ log.warn("[forceClearBed] 娓呯┖宸ヤ綅澶辫触 roomId={} bedNo={} code={} msg={}",
+ roomId, bedNo, ec.getCode(), ec.getMsg());
+ throw exception(ec);
+ }
+ return success(true);
+ }
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/MonitorInfoVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/MonitorInfoVO.java
index eb01a73..56daf64 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/MonitorInfoVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/MonitorInfoVO.java
@@ -9,7 +9,13 @@
@Data
public class MonitorInfoVO {
private Integer openingBedNum;
+ /** 鍦ㄥ骇**宸ヤ綅鏁�**锛堝尰鐢熷湪搴� / 鍖荤敓鏆傚仠 鐨勫伐浣嶆暟閲忥紱涓�浜哄宸ヤ綅鏃跺彲鑳藉ぇ浜庡尰鐢熸暟锛� */
private Integer docBedNum;
+ /**
+ * 銆愭湰闇�姹偮风粺璁℃寜浜哄悎骞躲�戝湪搴�**鍖荤敓鏁�**锛堟寜 doc_id 鍘婚噸锛夈��
+ * <p>涓�浜哄宸ヤ綅鍚� {@link #docBedNum} 浼氭寜宸ヤ綅绱锛岀洃鎺ч〉瑕佽〃杈�"鍒板簳鍑犱釜鍖荤敓鍦ㄥ矖"灏辩敤鏈瓧娈点��
+ */
+ private Integer docNum;
private Integer routingBedNum;
private Integer openingFlag;
private Map<Integer, String> checkTypeBedInfo;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomRespVO.java
index 07e4214..437fb3b 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomRespVO.java
@@ -52,6 +52,13 @@
@ExcelProperty("鍖荤敓鍚�")
private String docName;
+ /**
+ * 璇ュ伐浣嶆槸鍚﹀凡琚尰鐢熷崰鐢紙docId 闈炵┖鍗充负鍗犵敤锛夈��
+ * <p>鐢ㄤ簬"鎸塈P鑷姩鍖归厤宸ヤ綅"鏃跺垽鏂�欓�夊伐浣嶆槸鍚﹀彲鐢紱浠呮煡璇㈣繑鍥烇紝涓嶈惤搴撱��</p>
+ */
+ @Schema(description = "鏄惁宸茶鍖荤敓鍗犵敤")
+ private Boolean occupied;
+
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomSeatRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomSeatRespVO.java
new file mode 100644
index 0000000..a512953
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomSeatRespVO.java
@@ -0,0 +1,72 @@
+package cn.lihu.jh.module.ecg.controller.admin.room.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 銆屽伐浣嶅叆搴с�嶇粨鏋� 鈥斺�� 鑷姩鍏ュ骇锛坽@code POST /clinic/room/auto-seat}锛�
+ * 涓庛�屾煡璇㈡垜鐨勫伐浣嶃�嶏紙{@code GET /clinic/room/my-seat}锛夊叡鐢ㄣ��
+ *
+ * <p>鑳屾櫙锛氬墠绔師鏉ユ妸"鎸� IP 鍖归厤 鈫� 缁� IP 鈫� 鍏ュ骇"鎷嗘垚涓変釜璇锋眰鑷繁鎷硷紝
+ * 浠讳竴姝ュけ璐ュ氨鍙兘鍥炶惤鍒�"鎵嬮�夊伐浣�"锛岀幇鍦鸿〃鐜颁负"鐧诲綍鍚庢病鏈夎嚜鍔ㄥ叆搴�"涓旀棤浠庡垽鏂師鍥犮��
+ * 鐜板湪鏀舵暃鎴愪竴涓帴鍙o紝骞舵妸**璇嗗埆鍒扮殑 IP** 涓�**鏈叆搴у師鍥�**涓�璧疯繑鍥烇紝渚夸簬鎺掓煡銆�
+ *
+ * @author 蹇冪數鎺掗槦瑁呮満绯荤粺
+ */
+@Data
+public class RoomSeatRespVO {
+
+ @Schema(description = "鏄惁宸插叆搴э紙true 鏃朵笅闈㈢殑宸ヤ綅淇℃伅鏈夋晥锛�", example = "true")
+ private Boolean seated = false;
+
+ /**
+ * 鏈叆搴у師鍥狅紙seated=true 鏃朵负绌猴級锛�
+ * <ul>
+ * <li>{@code ip_invalid} 鈥斺�� 鏈満 IP 涓嶅彲鐢紙鍥炵幆 / IPv6 / 鏈寚瀹� / 闈炴硶锛夛紝涓嶈兘浣滀负宸ヤ綅鏍囪瘑锛�</li>
+ * <li>{@code nomatch} 鈥斺�� 璇� IP 娌℃湁鍖归厤鍒颁换浣曞伐浣嶏紙宸ヤ綅娌″綍 IP锛屾垨宸ヤ綅宸插叧闂級锛�</li>
+ * <li>{@code multi} 鈥斺�� 璇� IP 瀵瑰簲**澶氫釜绌洪棽宸ヤ綅**锛屾棤娉曠‘瀹氬潗鍝竴涓紝闇�浜哄伐鐐归�夛紱</li>
+ * <li>{@code occupied} 鈥斺�� 鍖归厤鍒扮殑宸ヤ綅宸茶**浠栦汉**鍗犵敤锛堜笉鎸ゆ帀浠栵紝杞墜閫�/鏃佽锛夛紱</li>
+ * <li>{@code error} 鈥斺�� 鍏ュ骇鍐欏簱鏈敓鏁堬紙骞跺彂琚埆浜烘姠鍏堛�佺姸鎬佷笉鍏佽绛夛級銆�</li>
+ * </ul>
+ */
+ @Schema(description = "鏈叆搴у師鍥狅細ip_invalid/nomatch/multi/occupied/error", example = "nomatch")
+ private String reason;
+
+ @Schema(description = "鍚庣瀹為檯璇嗗埆鍒扮殑瀹㈡埛绔疘P锛堟帓鏌ヤ唬鐞嗘湭閫忎紶 X-Forwarded-For 鐢級", example = "32.88.65.208")
+ private String clientIp;
+
+ @Schema(description = "琚崰鐢ㄦ椂鐨勫崰鐢ㄤ汉濮撳悕", example = "寮犱笁")
+ private String ownerName;
+
+ /* ==================== 宸ヤ綅淇℃伅锛坰eated=true 鏃舵湁鏁堬級 ==================== */
+
+ @Schema(description = "宸ヤ綅涓婚敭", example = "1")
+ private Integer id;
+
+ @Schema(description = "璇婂缂栧彿", example = "1")
+ private Long roomId;
+
+ @Schema(description = "璇婂鍚嶇О", example = "1鍙烽棬璇�")
+ private String roomName;
+
+ @Schema(description = "宸ヤ綅鍙�", example = "A1")
+ private String bedNo;
+
+ @Schema(description = "宸ヤ綅缁戝畾鐨処P", example = "32.88.65.208")
+ private String ip;
+
+ @Schema(description = "宸ヤ綅鐘舵�侊細0宸插叧闂� 10宸插紑閫� 20鏈夊尰鐢� 30鏆傚仠", example = "20")
+ private Integer status;
+
+ @Schema(description = "褰撳墠涓讳汉锛堝尰鐢燂級缂栧彿", example = "1")
+ private Long docId;
+
+ @Schema(description = "褰撳墠涓讳汉锛堝尰鐢燂級濮撳悕", example = "寮犱笁")
+ private String docName;
+
+ @Schema(description = "璇ュ伐浣嶅紑灞曠殑妫�鏌ラ」鐩�")
+ private Integer[] checkTypes;
+
+ @Schema(description = "浣滀笟绫诲瀷锛�0妫�鏌� 1棰嗙敤 2瑁呮満", example = "0")
+ private Integer opType;
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomSelectBedRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomSelectBedRespVO.java
new file mode 100644
index 0000000..7a0dc8a
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomSelectBedRespVO.java
@@ -0,0 +1,84 @@
+package cn.lihu.jh.module.ecg.controller.admin.room.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 銆岄�夋嫨宸ヤ綅妯″紡銆�- 鎸夋湰鏈篒P鍖归厤宸ヤ綅鐨勮繑鍥炵粨鏋溿��
+ *
+ * <p>鐢ㄤ簬鍖荤敓绔櫥褰曞悗鑷姩鍖归厤宸ヤ綅锛�
+ * <ul>
+ * <li>{@code clientIp}锛氬悗绔疄闄呰瘑鍒埌鐨勬潵璁縄P锛堟帓鏌�"浠g悊鏈�忎紶 X-Forwarded-For"鏃剁湅杩欎釜锛�</li>
+ * <li>{@code ipValid}锛氳IP鏄惁鍙敤浜庣粦瀹氾紙鎺掗櫎绌恒��0.0.0.0銆�127.0.0.1銆侀潪娉曟牸寮忥級</li>
+ * <li>{@code matched}锛氭槸鍚︽湁鍙洿鎺ヨ嚜鍔ㄥ叆搴х殑宸ヤ綅</li>
+ * <li>{@code beds}锛氳IP涓嬪尮閰嶅埌鐨勫�欓�夊伐浣嶏紝宸叉寜銆屾湰浜哄凡鍗犵敤 鈫� 绌洪棽 鈫� 琚粬浜哄崰鐢ㄣ�嶆帓濂藉簭</li>
+ * </ul>
+ */
+@Data
+@Schema(description = "绠$悊鍚庡彴 - 鎸塈P鍖归厤宸ヤ綅 Response VO")
+public class RoomSelectBedRespVO {
+
+ @Schema(description = "鍚庣璇嗗埆鍒扮殑鏉ヨIP")
+ private String clientIp;
+
+ @Schema(description = "璇P鏄惁鍙敤浜庣粦瀹氾紙绌�/0.0.0.0/127.0.0.1/::1/闈炴硶鏍煎紡涓� false锛�")
+ private Boolean ipValid;
+
+ @Schema(description = "璇P鏄惁鏄湰鏈哄洖鐜湴鍧�锛�127.x / ::1锛夛紝鐢ㄤ簬缁欏嚭銆屾湰鏈鸿闂�嶇殑鍑嗙‘鎻愮ず")
+ private Boolean ipLoopback;
+
+ @Schema(description = "璇P鏄惁鏄� IPv6 鍦板潃锛堟湰绯荤粺宸ヤ綅缁戝畾浠呴噰鐢� IPv4锛孖Pv6 涓嶅弬涓庡尮閰嶄笌缁戝畾锛�")
+ private Boolean ipv6;
+
+ @Schema(description = "璇P鏄惁宸茬粡缁戝畾浜嗗伐浣�")
+ private Boolean ipBound;
+
+ @Schema(description = "鏄惁鏈夊彲鐩存帴鍏ュ骇鐨勫伐浣嶏紙鏈汉宸插崰鐢� 鎴� 绌洪棽锛�")
+ private Boolean matched;
+
+ @Schema(description = "鍊欓�夊伐浣嶅垪琛紙鎸� 鏈汉宸插崰鐢� 鈫� 绌洪棽 鈫� 琚粬浜哄崰鐢� 鎺掑簭锛�")
+ private List<RoomSelectBedItem> beds;
+
+ @Data
+ @Schema(description = "鍊欓�夊伐浣�")
+ public static class RoomSelectBedItem {
+
+ @Schema(description = "宸ヤ綅涓婚敭 clinic_room.id")
+ private Integer id;
+
+ @Schema(description = "璇婂缂栧彿")
+ private Long roomId;
+
+ @Schema(description = "璇婂鍚嶇О")
+ private String roomName;
+
+ @Schema(description = "璇婄枟搴�/宸ヤ綅缂栧彿")
+ private String bedNo;
+
+ @Schema(description = "璇ュ伐浣嶇粦瀹氱殑IP")
+ private String ip;
+
+ @Schema(description = "褰撳墠鍗犵敤鐨勫尰鐢烮D锛岀┖琛ㄧず绌洪棽")
+ private Long docId;
+
+ @Schema(description = "褰撳墠鍗犵敤鐨勫尰鐢熷鍚�")
+ private String docName;
+
+ @Schema(description = "鎿嶄綔绫诲瀷 0妫�鏌� 1棰嗙敤 2瑁呮満")
+ private Integer opType;
+
+ @Schema(description = "宸ヤ綅鎺ヨ瘖鐨勬鏌ョ被鍨�")
+ private Integer[] checkTypes;
+
+ @Schema(description = "寮�璇婄姸鎬�")
+ private Integer status;
+
+ @Schema(description = "鏄惁宸茶鍗犵敤锛坉ocId 闈炵┖锛�")
+ private Boolean occupied;
+
+ @Schema(description = "鏄惁琚�屽綋鍓嶇櫥褰曚汉銆嶅崰鐢紙鍒锋柊/閲嶈繘鏃跺彲鐩存帴鎭㈠锛�")
+ private Boolean mine;
+ }
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/jobrecord/JobRecordDO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/jobrecord/JobRecordDO.java
index c4d4c75..a478f94 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/jobrecord/JobRecordDO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/jobrecord/JobRecordDO.java
@@ -139,4 +139,17 @@
/** 澶氳�愯嵂锛�0鏃� 1澶氳�� 2澶氶噸鑰愯嵂 */
@TableField(exist = false)
private String tolerance;
+
+ /**
+ * 銆愭挙閿�鏍囪瘑锝滈潪搴撳瓧娈点�戣鏉″畬鎴愯褰曞搴旂殑鎮h��**褰撴棩闃熷垪鐘舵�佹槸鍚﹀凡涓嶆槸"宸插氨璇�(40)"**锛�
+ * 鍗�"妫�鏌ュ畬鎴愯鎾ら攢杩囥�佽繕娌¢噸鏂板畬鎴�"銆�
+ *
+ * <p>璁$畻鏂瑰紡锛歚JobRecordServiceImpl#getJobRecordPage` 閲屾寜 (patId, checkType) 鍏宠仈褰撴棩
+ * `queue.status`锛涚姸鎬� 鈮� 40 鈫� true銆傛挙閿�鍚庤嚜鍔ㄥ彉 true锛屾偅鑰呭啀娆″畬鎴愶紙鍥� 40锛夎嚜鍔ㄥ彉 false锛�
+ * 涓嶉渶瑕佸啓搴撱�佷篃涓嶄細婕忔竻鏍囪銆�
+ *
+ * <p>蹇呴』鏍� {@code @TableField(exist = false)}锛氭湰 DO 浼氱敤浜� insert/updateById銆�
+ */
+ @TableField(exist = false)
+ private Boolean undone;
}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/QueueDO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/QueueDO.java
index b9a2c92..b74d5db 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/QueueDO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/QueueDO.java
@@ -73,7 +73,11 @@
*/
private Integer bookCheckType;
/**
- * 棰勭害搴忓彿
+ * 棰勭害搴忓彿銆�
+ *
+ * <p><b>銆愬凡鍋滅敤銆�</b>鎺掗槦鍙风粺涓�涓� {@link #seqNum}锛堢鍒版椂涓�娆℃�у垎閰嶃�佷箣鍚庝笉鍙橈級锛�
+ * 鏈瓧娈典笉鍐嶅啓鍏ャ�佷笉鍐嶆樉绀猴紝浠呬负鍏煎鍘嗗彶鏁版嵁涓庝究浜庡洖婊氳�屼繚鐣欏垪銆�
+ * 鏂颁唬鐮佽鍕胯鍙栨垨璧嬪�笺��
*/
private Integer bookSeqNum;
/**
@@ -81,7 +85,12 @@
*/
private Integer isVip;
/**
- * 鎺掗槦搴忓彿
+ * 鎺掗槦搴忓彿锛堟帓闃熷彿锛夈��
+ *
+ * <p>銆愬彿缁熶竴锛堟湰闇�姹傦級銆�<b>绛惧埌鏃�</b>鎸� {@code check_type.seq_rule} 瑙勫垯鍒嗛厤锛�
+ * 涔嬪悗浠讳綍鐜妭閮戒笉鍐嶆敼鍔紙鍒嗘祦/鍙彿/杩囧彿/鍙洖/鍔犳��/瑁呮満鍙敼鐘舵�佷笌璇婂宸ヤ綅锛夈��
+ * <p>鍙锋寜**妫�鏌ラ」鐩悇鑷紪鍙�**锛岃法妫�鏌ラ」鐩厑璁搁噸澶� 鈫� 鏄剧ず涓�寰嬩负
+ * {@code check_type.seq_prefix + seqNum}銆�
*/
private Integer seqNum;
/**
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queuesequence/SeqCounterDO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queuesequence/SeqCounterDO.java
new file mode 100644
index 0000000..1efbbec
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queuesequence/SeqCounterDO.java
@@ -0,0 +1,40 @@
+package cn.lihu.jh.module.ecg.dal.dataobject.queuesequence;
+
+import lombok.Data;
+
+/**
+ * 绛惧埌搴忓彿璁℃暟鍣紙瀵瑰簲 {@code seq_counter} 琛級銆�
+ *
+ * <p>浠呯敤浜庛�屾帓闃熷簭鍙疯鍒� = 绛惧埌搴忓彿銆嶆椂璇诲彇涓や釜璁℃暟鍣細
+ * <ul>
+ * <li>{@code normalNext} 鈥斺�� 涓嬩竴涓�**鏅�氬彿**锛�1..9銆�11..19鈥︼紝璺宠繃 10 鐨勫�嶆暟锛夛紱</li>
+ * <li>{@code reservedNext} 鈥斺�� 涓嬩竴涓�**棰勭暀鍙�**锛�10銆�20銆�30鈥︼紝鐣欑粰鍔犳�ユ偅鑰咃級銆�</li>
+ * </ul>
+ *
+ * <p>涔嬫墍浠ュ垎鎴愪袱涓鏁板櫒锛氬崟涓鏁板櫒鍦�"璺宠繃棰勭暀鍙�"鏃跺繀鐒朵笌鍚庣画鍙锋挒杞�
+ * 锛坈andidate=10 璺宠繃寰� 11锛屼笅涓�涓� candidate=11 涔熷緱 11锛夈�傝瑙�
+ * {@code QueueSequenceMapper} 涓殑韪╁潙璁板綍銆�
+ *
+ * <p>璇ヨ〃鎸� {@code (check_type, seq_date)} 鍞竴锛屾晠**姣忓ぉ鑷姩閲嶇疆**
+ * 锛堢涓�娆″彇鍙锋椂浠� {@code normal_next=1, reserved_next=10} 鎻掑叆锛夈��
+ *
+ * @author 蹇冪數鎺掗槦瑁呮満绯荤粺
+ */
+@Data
+public class SeqCounterDO {
+
+ private Integer id;
+
+ /** 妫�鏌ョ被鍨嬪�硷紙check_type.value锛� */
+ private Integer checkType;
+
+ /** 鏃ユ湡锛堟寜澶╅噸缃級 */
+ private java.time.LocalDate seqDate;
+
+ /** 涓嬩竴涓櫘閫氬彿 */
+ private Integer normalNext;
+
+ /** 涓嬩竴涓鐣欏彿锛堝姞鎬ョ敤锛� */
+ private Integer reservedNext;
+
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
index d61a930..8779ea3 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
@@ -25,7 +25,9 @@
default PageResult<AppointmentDO> selectPage(AppointmentPageReqVO reqVO) {
LambdaQueryWrapperX<AppointmentDO> wrapper = (LambdaQueryWrapperX<AppointmentDO>) new LambdaQueryWrapperX<AppointmentDO>().eqIfPresent(AppointmentDO::getPatId, reqVO.getPatId()).likeIfPresent(AppointmentDO::getPatName, reqVO.getPatName()).eqIfPresent(AppointmentDO::getPatGender, reqVO.getPatGender()).eqIfPresent(AppointmentDO::getPatBirthday, reqVO.getPatBirthday()).eqIfPresent(AppointmentDO::getPatMobile, reqVO.getPatMobile()).eqIfPresent(AppointmentDO::getPatPhone, reqVO.getPatPhone()).eqIfPresent(AppointmentDO::getPatIdentityId, reqVO.getPatIdentityId()).eqIfPresent(AppointmentDO::getPatAddr, reqVO.getPatAddr()).eqIfPresent(AppointmentDO::getPatDeptCode, reqVO.getPatDeptCode()).eqIfPresent(AppointmentDO::getPatDeptDesc, reqVO.getPatDeptDesc()).eqIfPresent(AppointmentDO::getPatWardCode, reqVO.getPatWardCode()).eqIfPresent(AppointmentDO::getPatWardDesc, reqVO.getPatWardDesc()).eqIfPresent(AppointmentDO::getBookDate, reqVO.getBookDate()).eqIfPresent(AppointmentDO::getBookTimeslot, reqVO.getBookTimeslot()).eqIfPresent(AppointmentDO::getBookCheckType, reqVO.getBookCheckType()).eqIfPresent(AppointmentDO::getBookSrc, reqVO.getBookSrc()).eqIfPresent(AppointmentDO::getPaid, reqVO.getPaid()).eqIfPresent(AppointmentDO::getApplyNo, reqVO.getApplyNo()).eqIfPresent(AppointmentDO::getEpisodeId, reqVO.getEpisodeId()).inIfPresent(AppointmentDO::getStatus, reqVO.getStatus())
// 鉁� 鏂板锛歝reateTime 鍖洪棿鏌ヨ
- .betweenIfPresent(AppointmentDO::getCreateTime, reqVO.getCreateTimeStart(), reqVO.getCreateTimeEnd()).betweenIfPresent(AppointmentDO::getRegisterDate, reqVO.getRegisterDateStart(), reqVO.getRegisterDateEnd());
+ .betweenIfPresent(AppointmentDO::getCreateTime, reqVO.getCreateTimeStart(), reqVO.getCreateTimeEnd()).betweenIfPresent(AppointmentDO::getRegisterDate, reqVO.getRegisterDateStart(), reqVO.getRegisterDateEnd())
+ // 銆愭湰闇�姹傘�戦绾︽棩鏈�**鏃堕棿娈�**鏌ヨ锛堥绾﹁褰曢〉鐨勩�岄绾︽棩鏈熴�嶆棩鏈熻寖鍥达級
+ .betweenIfPresent(AppointmentDO::getBookDate, reqVO.getBookDateStart(), reqVO.getBookDateEnd());
// 鍔ㄦ�佹帓搴�
if (reqVO.getOrderCreateTime() != null) {
wrapper.orderByDesc(AppointmentDO::getCreateTime);
@@ -36,21 +38,75 @@
}
- @Select("select * from lihu.appointment where pat_id = #{patId} and to_days(book_date) = to_days(Now())")
+ @Select("select * from lihu.appointment where deleted = 0 and pat_id = #{patId} and to_days(book_date) = to_days(Now())")
List<AppointmentDO> getCurrentPatId(String patId);
- @Select("select * from lihu.appointment where (apply_no = #{code} or episode_id= #{code} or hospital_no =#{code} or pat_identity_id=#{code}) and book_date >= DATE_ADD(CURDATE(), INTERVAL -5 DAY) AND book_date <= DATE_ADD(CURDATE(), INTERVAL 15 DAY)")
+ /**
+ * 銆愭湰闇�姹傘�戞寜銆屾偅鑰呯紪鍙� / 鐢宠鍗曞彿 / 灏辫瘖娴佹按鍙� / 浣忛櫌鍙� / 韬唤璇佸彿銆嶅尮閰嶉绾︼紙卤5/+15 澶╃獥鍙o級銆�
+ *
+ * <h3>涓轰粈涔堝姞 {@code pat_id} 涓� {@code deleted = 0}</h3>
+ * <ul>
+ * <li><b>pat_id</b>锛氭墜鍔ㄦ柊寤虹殑棰勭害锛坽@code /ecg/appointment/create}锛夊彧鏈� pat_id锛�
+ * {@code apply_no} / {@code episode_id} / {@code hospital_no} / {@code pat_identity_id} 鍏ㄤ负绌猴紝
+ * 绛惧埌椤垫寜鎮h�呯紪鍙锋煡璇㈡椂姘歌繙鏌ヤ笉鍒� 鈫� 鎻愮ず銆岃鍏堥绾︺�嶁啋 鏃犳硶绛惧埌锛�</li>
+ * <li><b>deleted = 0</b>锛氬師 SQL 鏄8鏌ヨ锛岄�昏緫鍒犻櫎鐨勬棫琛屼篃浼氳鎹炲嚭鏉ワ紝
+ * 鍐嶇粡 {@code queryAndCreateAppointmentByPatId} 鐨�"涓嶅瓨鍦ㄥ垯鎻掑叆"閫昏緫鍙兘鎶婂凡鍒犵殑鍗曞啀鎻掑洖鏉ャ��</li>
+ * </ul>
+ */
+ @Select("select * from lihu.appointment where deleted = 0 "
+ + " and (apply_no = #{code} or episode_id = #{code} or hospital_no = #{code} "
+ + " or pat_identity_id = #{code} or pat_id = #{code}) "
+ + " and book_date >= DATE_ADD(CURDATE(), INTERVAL -5 DAY) "
+ + " and book_date <= DATE_ADD(CURDATE(), INTERVAL 15 DAY) "
+ + " order by book_date, id")
List<AppointmentDO> getCurrentCode(String code);
@Select("select * from lihu.appointment where pat_id = #{patId} and book_check_type = #{checkType} and to_days(book_date) = to_days(Now()) limit 1")
AppointmentDO getByPatAndCheckTypeAndBookDate(@Param("patId") String patId, @Param("checkType") Integer checkType);
+ /**
+ * 銆愭湰闇�姹傦細绱ф�ユ偅鑰呬笉鎺掗槦鐩存帴妫�鏌ャ�戞寜銆岀敵璇峰崟鍙� / 灏辫瘖鍙� / 鎮h�呯紪鍙枫�嶆煡杩戜竴涓湀鐨勯绾﹁褰曘��
+ *
+ * <p>绐楀彛 = [浠婂ぉ-30 澶�, 浠婂ぉ+30 澶锛涚粨鏋�**鎸夐绾︽椂闂村�掑簭**锛堟渶杩戠殑鎺掑墠闈級锛屼究浜庡尰鐢熼�夋嫨銆�
+ * 妫�鏌ラ」鐩繃婊わ紙鏈獥鍙e紑灞曠殑妫�鏌ラ」鐩級鐢� {@code checkTypeList} 浼犲叆锛岀┖/鏈紶琛ㄧず涓嶉檺鍒躲��
+ */
+ @Select("<script>" +
+ "select * from lihu.appointment where deleted = 0 " +
+ " and (apply_no = #{code} or episode_id = #{code} or pat_id = #{code}) " +
+ " and book_date >= DATE_ADD(CURDATE(), INTERVAL -30 DAY) " +
+ " and book_date <= DATE_ADD(CURDATE(), INTERVAL 30 DAY) " +
+ " <if test='checkTypeList != null and checkTypeList.size() > 0'> " +
+ " and book_check_type in ( <foreach collection='checkTypeList' separator=',' item='ct'>#{ct}</foreach> ) " +
+ " </if> " +
+ " order by book_date desc, book_timeslot desc, id desc " +
+ "</script>")
+ List<AppointmentDO> getEmergencyCandidates(@Param("code") String code,
+ @Param("checkTypeList") List<Integer> checkTypeList);
+
Integer updateStatusByApplyNo(@Param("applyNo") String applyNo, @Param("status") String status, @Param("registerDate") Date registerDate);
- @Select("select * from lihu.appointment where episode_id = #{episodeId} and apply_no = #{applyNo} limit 1")
+ /**
+ * 鍙洿鏂扮姸鎬侊紙涓嶅姩鍏跺畠瀛楁锛夈��
+ *
+ * <p>鑳屾櫙锛氱姸鎬佹祦鍘熸潵鏄妸 {@code getByApplyNo} 鏌ュ嚭鏉ョ殑鏁磋瀵硅薄鍐� {@code updateById} 鍐欏洖锛�
+ * 灞炰簬銆岃-鏀�-鍐欍�嶃�傚苟鍙�/浜ら敊鏃朵細鎶婂埆鐨勫瓧娈碉紙濡� book_date / book_check_type锛夋寜鏃у揩鐓ц鐩栨帀锛�
+ * 瀹炴祴 2026-10-05 07:58 灏卞嚭鐜拌繃涓�绗旈绾︾殑 check_type 琚姸鎬佹祦瑕嗙洊銆�
+ * 鐘舵�佹祦鍙鏀圭姸鎬侊紝鍥犳鍗曠嫭鎻愪緵杩欎釜鍙敼 status 鐨勮鍙ャ��</p>
+ */
+ @Update("update lihu.appointment set status = #{status}, update_time = sysdate() where apply_no = #{applyNo} and deleted = 0")
+ Integer updateStatusOnlyByApplyNo(@Param("applyNo") String applyNo, @Param("status") String status);
+ /** 銆愭湰娆′慨澶嶃�戣ˉ {@code deleted = 0}锛氶�昏緫鍒犻櫎鐨勮涓嶅簲鍐嶈褰撲綔"宸插瓨鍦�"鑰岃烦杩囨彃鍏ャ�� */
+ @Select("select * from lihu.appointment where deleted = 0 and episode_id = #{episodeId} and apply_no = #{applyNo} limit 1")
AppointmentDO getByEpisodeIdAndApplyNo(@Param("episodeId") String episodeId, @Param("applyNo") String applyNo);
- @Select("select * from lihu.appointment where apply_no = #{applyNo} limit 1")
+ /**
+ * 鎸夌敵璇峰崟鍙峰彇鏈垹闄ょ殑璁板綍銆�
+ *
+ * <p>娉ㄦ剰锛氳繖閲屽繀椤诲甫 {@code deleted = 0}銆傚師瀹炵幇鏄8 select锛屼細鎶�**閫昏緫鍒犻櫎**鐨勬棫琛屼篃鎹炲嚭鏉ワ紝
+ * 閰嶅悎 {@code LIMIT 1} 鏃惰嫢鏃ц id 鏇村皬灏变細鍙栧埌宸插垹闄ょ殑閭f潯 鈥斺�� 杩欐槸"鍒犱簡鍙堣鏇存柊鍥炴潵"鐨勯殣鎮c��
+ * 鍙﹀鏈柟娉曢厤鍚堝敮涓�绱㈠紩 {@code uk_appointment_apply_no_active}锛堝彧绾︽潫鏈垹闄よ锛変娇鐢ㄣ��</p>
+ */
+ @Select("select * from lihu.appointment where apply_no = #{applyNo} and deleted = 0 limit 1")
AppointmentDO getByApplyNo(@Param("applyNo") String applyNo);
/**
@@ -65,5 +121,19 @@
" </foreach> )" +
"</script>")
List<AppointmentDO> getByApplyNoList(@Param("applyNoList") List<String> applyNoList);
+
+ /**
+ * 鍙栬鎮h��**鏈�杩戜竴鏉�**鏈垹闄よ褰曪紝鐢ㄤ簬瀹归敊鏂板鏃剁户鎵挎偅鑰呭浐鏈夊睘鎬�
+ * 锛堢敓鏃�/鐢佃瘽/韬唤璇�/鍦板潃绛� 鈥斺�� S050401 鎶ユ枃鍙甫濮撳悕锛岃繖浜涘瓧娈垫姤鏂囬噷娌℃湁锛夈��
+ *
+ * <p>鎸� {@code create_time desc, id desc} 鎺掑簭锛屼繚璇佺粨鏋滅ǔ瀹氾紙鍚屼竴绉掑唴鎻掑叆鐨勫鏉′篃鑳藉畾搴忥級銆�
+ * 鍙户鎵�**鎮h�呭浐鏈夊睘鎬�**锛屼笉缁ф壙寮�鍗曞尰鐢�/寮�鍗曟椂闂寸瓑娴佹按灞炴�э紙閭e睘浜庢帹鏂紝鍙兘寮犲啝鏉庢埓锛夈��</p>
+ *
+ * @param patId 鎮h�呯紪鍙凤紙{@code appointment.pat_id}锛�
+ * @return 鏈�杩戜竴鏉¤褰曪紱鏃犺褰曟椂杩斿洖 {@code null}
+ */
+ @Select("select * from lihu.appointment where pat_id = #{patId} and deleted = 0 "
+ + "order by create_time desc, id desc limit 1")
+ AppointmentDO getLatestByPatId(@Param("patId") String patId);
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/call/CallMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/call/CallMapper.java
index e6cdbdf..a5e3ee7 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/call/CallMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/call/CallMapper.java
@@ -37,6 +37,20 @@
@Select("select * from lihu.call_patient where pat_id = #{patId} order by id desc limit 1")
CallDO getLatestPatientCall(@Param("patId") String patId);
+ /**
+ * 鍚勬偅鑰�**鏈�杩戜竴娆″彨鍙疯褰�**鐨� id锛坘ey=pat_id锛寁alue=鏈�鏂� id锛夈��
+ *
+ * <p>銆愰噸鍙紙鏈渶姹傦級銆戝ぇ灞�/璇婇棿灞忛潬"鏁版嵁鍙樺寲"瑙﹀彂鎾姤锛岄噸鍙湰韬笉浼氭敼鍙橀槦鍒楁暟鎹紝
+ * 鍥犳涓嬪彂杩欎釜 callId锛氬尰鐢熸瘡鐐逛竴娆¢噸鍙兘浼�**鏂板涓�鏉″彨鍙疯褰�**锛堣 {@code CallService#callAgain}锛夛紝
+ * callId 闅忎箣鍙樺ぇ 鈫� 灞忓箷鎹閲嶆柊鎾姤銆�
+ *
+ * <p>鐢� create_time 闄愬畾杩� 2 澶╋紙call_patient 浼氳姣忔棩娓呯悊锛岃 clearCall锛夛紝
+ * 閬垮厤鍏ㄨ〃 group by锛涗笉渚濊禆 book_date锛堝彲鑳戒负绌猴級銆�
+ */
+ @Select("select pat_id as patId, max(id) as callId from lihu.call_patient " +
+ "where create_time >= date_sub(now(), interval 2 day) group by pat_id")
+ List<Map<String, Object>> selectLatestCallIds();
+
// call_type 0 澶у睆
@Select("select * from lihu.call_patient where called = 0 and call_type = 0 order by id limit 1")
CallDO getNextCall( );
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java
index 017ba7c..9308018 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java
@@ -63,6 +63,28 @@
@Select("select * from lihu.dev_rent where state=#{state} and pat_id=#{patId} and check_type=#{checkType} and to_days(create_time)=to_days(now())")
List<DevRentDO> selectByPatAndChecktypeAndState(@Param("patId") String patId, @Param("checkType") Integer checkType, @Param("state") Integer state);
+ /**
+ * 璇ユ偅鑰� + 妫�鏌ラ」鐩��**浠婃棩**銆佺姸鎬佸湪缁欏畾闆嗗悎閲岀殑**鏈�杩戜竴鏉�**妫�鏌ュ崟銆�
+ *
+ * <p>涓ゅ鐢ㄩ�旓細
+ * <ol>
+ * <li>銆愭挙閿�鍥炴粴銆戞挙閿�銆屾鏌ュ畬鎴愩�嶆椂锛屾妸 60(甯歌妫�鏌ュ畬鎴�) 鐨勫崟鎵惧嚭鏉ュ洖婊氭垚 0(寰呮鏌�)锛�</li>
+ * <li>銆愬畬鎴愬厹搴曘�戝啀娆″畬鎴愭椂鑻ユ壘涓嶅埌銆屽緟妫�鏌�(0)銆嶇殑鍗曪紝鐢ㄦ渶杩戜竴鏉� 60/50 鐨勫崟鍏滃簳澶嶇敤锛�
+ * 閬垮厤鐩存帴鎶ャ�岃鍏堥绾︾‘璁ゃ�嶃��</li>
+ * </ol>
+ */
+ @Select("<script>" +
+ "select * from lihu.dev_rent where pat_id=#{patId} and check_type=#{checkType} " +
+ " and to_days(create_time)=to_days(now()) and state in ( " +
+ " <foreach collection='stateList' separator=',' item='state'>#{state}</foreach> ) " +
+ " order by id desc limit 1" +
+ "</script>")
+ @Results({
+ @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+ })
+ DevRentDO selectLatestByPatCheckTypeStates(@Param("patId") String patId, @Param("checkType") Integer checkType,
+ @Param("stateList") List<Integer> stateList);
+
@Select("<script>" +
"SELECT paid FROM lihu.dev_rent " +
"where id in (" +
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java
index 485c620..14c7549 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java
@@ -10,6 +10,7 @@
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.*;
import java.util.List;
+import java.util.Map;
/**
* 鎺掗槦 Mapper
@@ -36,21 +37,20 @@
.orderByDesc(QueueDO::getId));
}
- @Select("SELECT max(seq_num) FROM lihu.queue")
- Integer getMaxSeqNum();
-
- @Select("SELECT * FROM lihu.queue where seq_num = #{seqNum}")
- @Results({
- @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
- })
- QueueDO getQueueItemBySeqNum(@Param("seqNum")Integer seqNum);
-
@Select("SELECT * FROM lihu.queue where pat_id = #{patId} and book_check_type = #{bookCheckType}")
@Results({
@Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
})
QueueDO getQueueByPatId(@Param("patId")String patId, @Param("bookCheckType")Integer bookCheckType);
+ /**
+ * 璇婇棿灞忥紙{@code ecg_call/small.html}锛夊彇鏁帮細鏈瘖瀹ょ殑妫�鏌ラ槦鍒椼��
+ *
+ * <p>鎺掑簭瑙勫垯锛堝彿缁熶竴鍚庣殑鏈�缁堣鍒欙級锛�<b>灏辫瘖涓�(30) 缃《 鈫� 鍔犳��(jump_flag=1) 鈫� 鍏朵綑鎸夋帓闃熷彿 seq_num 鍗囧簭</b>锛�
+ * 鍙蜂负绌猴紙鏀归�犲綋澶╁皻鏈縼绉荤殑瀛橀噺琛岋級鐨勬帓鍦ㄦ渶鍚庛��
+ * <p>杩囧彿(3/5) <b>涓嶅啀鍗曠嫭鎻愬墠涓�缁�</b>锛氬畠涓庛�岀瓑鍊欍�嶆贩鎺掋�佺暀鍦ㄨ嚜宸辩殑鍙蜂綅涓婏紝
+ * 鐢卞睆涓婄敤绾㈣壊 +銆�(杩�)銆嶅皬瀛楀尯鍒嗭紙闇�姹傦細璇婇棿灞忋�岀瓑鍊欍�嶄笌銆岃繃鍙枫�嶅悎骞朵负涓�涓�岀瓑鍊欍�嶉潰鏉匡級銆�
+ */
@Select("""
<script>
SELECT * FROM lihu.queue
@@ -60,7 +60,8 @@
</foreach> )
order by case
when status = 30 then 0
- when status in (3, 5) then 1
+ when jump_flag = 1 then 1
+ when seq_num is null then 3
else 2
end,
seq_num, book_timeslot
@@ -73,13 +74,18 @@
/**
* 澶у睆鍙栨暟銆�
- * <p>
- * 鎺掑簭瑙勫垯锛堥渶姹�8锛夛細**灏辫瘖涓�(30) 缃《 鈫� 杩囧彿(3/5) 涓庣瓑鍊�(10/15/20/12) 鎸夋帓闃熷簭鍙� seq_num 鍗囧簭娣锋帓**銆�
- * 鍘熷厛鐢� {@code order by status desc}锛屼細鎶婅繃鍙�(3/5)鎺掑埌姣忎竴鍒楁渶搴曢儴锛�
- * 鍦� {@code overflow-y:auto} 鐨勫垪閲屾粴涓嶅埌锛岀瓑鍚屼簬"杩囧彿涓嶆樉绀�"銆�
- * <p>
- * 鍚屾椂琛ヤ笂 {@code deleted = 0}锛氭湰鏂规硶鏄嚜瀹氫箟 {@code @Select}锛�
- * 浼氱粫杩� MyBatis-Plus 鐨� {@code @TableLogic} 閫昏緫鍒犻櫎杩囨护銆�
+ *
+ * <p>鎺掑簭瑙勫垯锛堝彿缁熶竴鍚庣殑鏈�缁堣鍒欙級锛�<b>灏辫瘖涓�(30) 缃《 鈫� 鍔犳��(jump_flag=1) 鈫� 鍏朵綑鎸夋帓闃熷彿 seq_num 鍗囧簭</b>锛�
+ * 鍙蜂负绌猴紙鏀归�犲綋澶╁皻鏈縼绉荤殑瀛橀噺琛岋級鐨勬帓鍦ㄦ渶鍚庛��
+ * <ul>
+ * <li>杩囧彿(3/5) <b>涓嶅啀鍗曠嫭鎻愬墠涓�缁�</b>锛氬畠鐣欏湪鑷繁鐨勫彿浣嶄笂锛屽睆涓婄敤绾㈣壊 + 杩囧彿鏍囪鍖哄垎锛�
+ * 涓庤瘖闂村睆锛坽@code ecg_call/small.html}锛夋敼閫犲悗鐨勫彛寰勪竴鑷淬��
+ * 锛堝師瀹炵幇鏄� {@code status desc}锛屼細鎶婅繃鍙峰帇鍒版渶搴曢儴銆佺瓑鍚屼簬"杩囧彿涓嶆樉绀�"銆傦級</li>
+ * <li>鍔犳�ュ繀椤诲弬涓庢帓搴忥細鎺掗槦鍙锋敼涓虹鍒版椂涓�娆℃�у垎閰嶃�佷箣鍚庝笉鍐嶆敼鍔紝
+ * 鍔犳�ユ棤娉曞啀闈�"鍒嗘祦鏃舵敼鍙�/鎻掗槦閲嶇紪鍙�"浣撶幇銆�</li>
+ * <li>娌跨敤 {@code deleted = 0}锛氭湰鏂规硶鏄嚜瀹氫箟 {@code @Select}锛�
+ * 浼氱粫杩� MyBatis-Plus 鐨� {@code @TableLogic} 閫昏緫鍒犻櫎杩囨护銆�</li>
+ * </ul>
*/
@Select("""
<script>
@@ -90,7 +96,8 @@
</foreach> )
order by case
when status = 30 then 0
- when status in (3, 5) then 1
+ when jump_flag = 1 then 1
+ when seq_num is null then 3
else 2
end,
seq_num, book_timeslot
@@ -226,7 +233,10 @@
<foreach collection='statusList' separator=',' item='status'>
#{status}
</foreach> )
- order by status desc, seq_num, book_timeslot
+ order by case when status = 30 then 0 else 1 end,
+ jump_flag desc,
+ case when seq_num is null then 1 else 0 end,
+ seq_num, book_timeslot
</script>
""")
@Results({
@@ -234,9 +244,20 @@
})
List<QueueDO> getBedQueueByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("statusList")List<Integer> statusList);
+ /**
+ * 鍙彿鍙栦汉锛氭湰宸ヤ綅銆屽�欒瘖涓�(20)銆嶉噷**搴斾紭鍏堝彨**鐨勯偅涓�浣嶃��
+ *
+ * <p>鎺掑簭锛堝彿缁熶竴鍚庣殑鏈�缁堣鍒欙級锛�<b>鍔犳��(jump_flag=1) 鈫� 鎺掗槦鍙� seq_num 鍗囧簭</b>锛屽彿涓虹┖锛堝瓨閲忚锛夋帓鏈�鍚庛��
+ * <p>鎺掗槦鍙峰湪绛惧埌鏃朵竴娆℃�у垎閰嶃�佷箣鍚庝笉鍐嶆敼鍔紝鎵�浠�"涓嬩竴浣嶅彨璋�"瀹屽叏鐢辨湰鏂规硶鍐冲畾锛�
+ * 鍔犳�ュ繀椤诲湪杩欓噷鍙備笌鎺掑簭锛屽惁鍒欏姞鎬ユ偅鑰呮案杩滀笉浼氳浼樺厛鍙埌銆�
+ */
@Select("""
SELECT * from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo}
- and status = #{curStatus} order by seq_num, book_timeslot limit 1
+ and status = #{curStatus} and deleted = 0
+ order by jump_flag desc,
+ case when seq_num is null then 1 else 0 end,
+ seq_num, book_timeslot
+ limit 1
""")
QueueDO getBedFirstQueueItemByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus);
@@ -289,22 +310,30 @@
// 鏌愪釜璇婂鑼冨洿鍐� [宸查鐢╙ [宸插彫鍥�-瀹夎] 浜哄憳 鎶㈠崰, 浼氭洿鏂� [宸ヤ綅鍙穄
// 娌℃湁闄愬畾妫�鏌ョ被鍨嬶紝涓嶈浣跨敤鏃堕棿妲�
+ // 鎺掑簭锛氬姞鎬ヤ紭鍏� 鈫� 鎺掗槦鍙峰崌搴忥紙鍙蜂负绌烘帓鏈�鍚庯級銆傝鏈哄彨鍙峰彇浜轰篃璧拌繖閲屻��
@Select("<script> " +
- "select * from lihu.queue where room_id = #{roomId} and status in ( " +
+ "select * from lihu.queue where deleted = 0 and room_id = #{roomId} and status in ( " +
" <foreach collection='curStatusList' separator=',' item='status'>" +
" #{status} " +
" </foreach> )" +
- " order by seq_num, book_timeslot limit 1 " +
+ " order by jump_flag desc, case when seq_num is null then 1 else 0 end, seq_num, book_timeslot limit 1 " +
"</script>" )
QueueDO getRoomFirstQueueItemByStatus(@Param("roomId")Long roomId, @Param("curStatusList")List<Integer> curStatusList);
+ /**
+ * 鎸夐绾﹀崟 id 鎵归噺鍙� queue 琛屻��
+ *
+ * <p>鐢ㄩ�旓細棰勭害绛惧埌鍓嶏紝鎶娿�岃棰勭害鏄惁宸叉帓闃熴�佹嬁鍒扮殑鎺掗槦鍙锋槸澶氬皯銆嶅洖濉粰鍓嶇銆�
+ * 鍙风粺涓�鍚庡彇鐨勬槸 {@code seq_num}锛堣 AppointmentServiceImpl#queryAndCreateAppointmentByPatId锛夈��
+ * <p>鍘熸柟娉曞悕涓� {@code selectBookSeqNumByAppointIdList}锛屽洜鍙峰凡缁熶竴涓� seq_num 鑰屾敼鍚嶃��
+ */
@Select("<script> " +
- "select * from lihu.queue where appoint_id in ( " +
+ "select * from lihu.queue where deleted = 0 and appoint_id in ( " +
" <foreach collection='appointIdList' separator=',' item='appointId'>" +
" #{appointId} " +
" </foreach> )" +
"</script>" )
- List<QueueDO> selectBookSeqNumByAppointIdList(@Param("appointIdList") List<Long> appointIdList);
+ List<QueueDO> selectQueueByAppointIdList(@Param("appointIdList") List<Long> appointIdList);
/*
@Select("select * from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} " +
@@ -317,9 +346,21 @@
@Update("update lihu.queue set status = #{newStatus} where pat_id = #{patId} and book_check_type = #{checkType} and status = #{curStatus}; " )
Integer updatePatientQueueStatus(@Param("patId")String patId, @Param("checkType")Integer checkType, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
- @Update("update lihu.queue set status = #{newStatus} where status = #{curStatus} and seq_num = \n" +
- "(select a.min_seq_num from \n" +
- " (select min(seq_num) as min_seq_num from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus}) a )")
+ /**
+ * 鎶婃湰宸ヤ綅銆佹寚瀹氱姸鎬佷腑銆屾帓闃熷彿鏈�灏忋�嶇殑涓�浣嶆敼鎴愭柊鐘舵�侊紙杩囧彿鐢級銆�
+ *
+ * <p><b>銆愬彿缁熶竴鏀归�犲繀淇�戝繀椤绘寜琛� id 鏇存柊銆�</b>
+ * 鏃у疄鐜板灞傛潯浠舵槸 {@code where status = ? and seq_num = (select min(seq_num) ...)}鈥斺��
+ * 澶栧眰<b>娌℃湁 room_id / bed_no 鏉′欢</b>锛屽畬鍏ㄤ緷璧�"seq_num 鍏ㄨ〃鍞竴"鎵嶄笉浼氳浼ゃ��
+ * 鏈渶姹傛妸鎺掗槦鍙锋敼涓恒�屾寜妫�鏌ョ被鍨嬪悇鑷紪鍙枫�嶏紝鍙蜂細璺ㄦ鏌ョ被鍨嬮噸澶嶏紝
+ * 鏃у啓娉曚細涓�娆℃�ф妸<b>鍏ㄩ櫌鎵�鏈夊悓鍙峰悓鐘舵�佺殑鎮h��</b>涓�璧锋敼鎺�
+ * 锛堜緥锛氬父瑙勫績鐢� 5 鍙疯繃鍙凤紝鍔ㄦ�佸績鐢电殑 5 鍙蜂篃琚繃鍙凤級銆傛晠鏀逛负鍏堝彇 id銆佸啀鎸� id 鏇存柊銆�
+ */
+ @Update("update lihu.queue set status = #{newStatus} where id = " +
+ " (select a.id from " +
+ " (select id from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} " +
+ " and status = #{curStatus} and deleted = 0 " +
+ " order by case when seq_num is null then 1 else 0 end, seq_num, book_timeslot limit 1) a)")
Integer updateBedQueueStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
// 寮冪敤鍘熷洜锛氶渶瑕佸厛鑾峰彇锛屽垽鏂�昏緫澶勭悊鍚庯紝鍐嶆洿鏂�
@@ -340,40 +381,84 @@
)
Integer preemptToBeInstalledPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatusList")List<Integer> curStatusList, @Param("newStatus")Integer newStatus);
- // 鏁翠釜绯荤粺鑼冨洿鍐� [鎺掗槦涓璢浜哄憳 [琚伐浣嶅尰鐢焆鎶㈠崰
- @Update("update lihu.queue set status = #{newStatus}, room_id = #{roomId}, room_name = #{roomName}, \n" +
- " bed_no = #{bedNo}, seq_num = #{seqNum} where id = \n" +
- " (select a.id from \n" +
- " (select id from lihu.queue where status = #{curStatus} and book_check_type= #{checkType} order by jump_flag desc, book_timeslot, create_time limit 1) a)")
- Integer preemptWaitingPatient(@Param("roomId")Long roomId, @Param("roomName")String roomName, @Param("bedNo")String bedNo,
- @Param("seqNum")Integer seqNum, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus,
- @Param("checkType")Integer checkType);
-
- // 鏁翠釜绯荤粺鑼冨洿鍐� [鎺掗槦涓璢浜哄憳 [琚伐浣嶅尰鐢焆鎶㈠崰 鏍规嵁 澶氫釜妫�鏌ラ」鐩�
- @Update("<script>" +
- "update lihu.queue set status = #{newStatus}, room_id = #{roomId}, room_name = #{roomName}, \n" +
- " bed_no = #{bedNo}, seq_num = #{seqNum} where id = \n" +
- " (select a.id from \n" +
- " (select id from lihu.queue where status = #{curStatus} " +
- " and book_check_type in ( " +
- " <foreach collection='checkTypeArray' separator=',' item='_checkType'>" +
- " #{_checkType} " +
- " </foreach> )" +
- " order by jump_flag desc, book_timeslot, create_time limit 1) a) " +
+ /**
+ * 鍙栥�屾湰宸ヤ綅寮�灞曠殑妫�鏌ラ」鐩�嶄腑涓嬩竴浣嶅簲鍒嗘祦鐨勩�屾帓闃熶腑(10)銆嶆偅鑰呫��
+ *
+ * <p>鎺掑簭锛�<b>鍔犳��(jump_flag=1) 鈫� 棰勭害鏃舵 鈫� 寤哄崟鏃堕棿</b>锛涘彿涓虹┖锛堝瓨閲忚锛夋帓鏈�鍚庛��
+ * <p><b>杩欓噷涓嶅啀鍒嗛厤鎺掗槦鍙�</b>锛氬彿宸插湪绛惧埌鏃朵竴娆℃�у啓鍏� {@code seq_num}锛�
+ * 鍒嗘祦鍙礋璐f妸鎮h�呬粠銆屾帓闃熶腑銆嶆惉鍒版煇涓伐浣嶇殑銆屽�欒瘖涓�嶃��
+ * <p>鍙栧嚭鍚庡啀鐢� {@link #preemptWaitingPatientById} 鍋氭潯浠舵洿鏂帮紝
+ * 闈� {@code and status = 10} 淇濊瘉骞跺彂涓嬪彧鏈変竴鏂硅兘鎶㈠埌璇ヨ銆�
+ */
+ @Select("<script>" +
+ "select * from lihu.queue where deleted = 0 and status = #{curStatus} " +
+ " and book_check_type in ( " +
+ " <foreach collection='checkTypeArray' separator=',' item='_checkType'>" +
+ " #{_checkType} " +
+ " </foreach> )" +
+ " order by jump_flag desc, case when seq_num is null then 1 else 0 end, book_timeslot, create_time limit 1" +
"</script>")
- Integer preemptWaitingPatientWithBedCheckTypes(@Param("roomId")Long roomId, @Param("roomName")String roomName, @Param("bedNo")String bedNo,
- @Param("seqNum")Integer seqNum, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus,
- @Param("checkTypeArray")Integer[] checkTypeArray);
+ @Results({
+ @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+ })
+ QueueDO getFirstWaitingByCheckTypes(@Param("curStatus")Integer curStatus, @Param("checkTypeArray")Integer[] checkTypeArray);
- @Update("update lihu.queue set status = #{newStatus}, seq_num = #{seqNum} " +
- " where id = " +
- " (select a.id from \n" +
- " (select id from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} " +
- " order by seq_num, book_timeslot limit 1" +
- " ) a" +
- " )" )
- Integer queueRecalledPatient(@Param("roomId")Long roomId, @Param("roomName")String roomName, @Param("bedNo")String bedNo,
- @Param("seqNum")Integer seqNum, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
+ /**
+ * 銆屾湰璇婂/鏈伐浣�**鎺掗槦涓�佽繕娌″垎閰嶅伐浣�**銆嶇殑鎮h�咃紙宸ヤ綔鍙�"鏈瘖瀹ゆ帓闃熶腑锛堟湭鍒嗛厤锛�"鍒嗗尯鐢級銆�
+ *
+ * <p>鑳屾櫙锛氬伐浣滃彴鐨勫�欒瘖鍒楄〃鎸� {@code room_id + bed_no} 鏌ワ紝鍙寘鍚�**宸茬粡鍒嗘祦鍒拌宸ヤ綅**鐨勬偅鑰咃紱
+ * 鑰�"鎺掗槦涓�(10)"鐨勬偅鑰� {@code bed_no} 鏄┖鐨勶紙瑙� QueueServiceImpl 閲嶇疆閫昏緫锛歳oom_id=0 / bed_no=' '锛夛紝
+ * 澶у睆浼氭樉绀轰粬浠紙澶у睆涓嶆寜璇婂/宸ヤ綅杩囨护锛夛紝浜庢槸鍑虹幇"澶у睆鏈夈�佸伐浣滃彴鍒楄〃娌℃湁"鐨勫洶鎯戙��
+ * 杩欓噷鎶�"鏈伐浣嶆鏌ョ被鍨嬨�佸皻鏈垎閰嶅伐浣�"鐨勬帓闃熸偅鑰呭崟鐙煡鍑烘潵锛岀敱鍖荤敓**鎵嬪伐鎷夊叆**銆�
+ *
+ * <p>鍒ゅ畾"鏈垎閰�"鐢� {@code bed_no} 涓虹┖锛堝吋瀹� null / 绌轰覆 / 鍗曚釜绌烘牸锛夛紝
+ * 涓嶄緷璧� {@code room_id = 0} 杩欎竴绾﹀畾锛屽閿欐洿濂姐��
+ */
+ @Select("""
+ <script>
+ SELECT * FROM lihu.queue
+ where deleted = 0 and status = #{curStatus}
+ and (bed_no is null or trim(bed_no) = '')
+ and book_check_type in (
+ <foreach collection='checkTypeArray' separator=',' item='_checkType'>
+ #{_checkType}
+ </foreach> )
+ order by jump_flag desc,
+ case when seq_num is null then 1 else 0 end,
+ book_timeslot, create_time
+ </script>
+ """)
+ @Results({
+ @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+ })
+ List<QueueDO> selectUnassignedWaitingByCheckTypes(@Param("curStatus")Integer curStatus,
+ @Param("checkTypeArray")Integer[] checkTypeArray);
+
+ /**
+ * 鎶娿�屾帓闃熶腑銆嶇殑鏌愪竴琛屾姠鍗犲埌鎸囧畾宸ヤ綅銆�
+ *
+ * <p><b>涓嶆敼鎺掗槦鍙�</b>锛堝彿鏄鍒版椂瀹氱殑锛夛細鍙敼鐘舵�併�佽瘖瀹ゃ�佸伐浣嶃��
+ * <p>{@code and status = #{curStatus}} 鏄苟鍙戜繚鎶� 鈥斺�� 涓や釜宸ヤ綅鍚屾椂鎶㈠悓涓�浣嶆偅鑰呮椂锛�
+ * 鍙湁绗竴涓� UPDATE 浼氬懡涓紙杩斿洖 1锛夛紝鍙︿竴鏂硅繑鍥� 0锛岄渶閲嶆柊鍙栦汉銆�
+ */
+ @Update("update lihu.queue set status = #{newStatus}, room_id = #{roomId}, room_name = #{roomName}, bed_no = #{bedNo} " +
+ " where id = #{id} and status = #{curStatus} and deleted = 0")
+ Integer preemptWaitingPatientById(@Param("id")Integer id, @Param("roomId")Long roomId, @Param("roomName")String roomName,
+ @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
+
+ /**
+ * 銆愭湰闇�姹偮峰苟鍙戝姞鍥恒�戞寜涓婚敭 + **褰撳墠鐘舵��**鏉′欢鎺ㄨ繘鐘舵�侊紙鍙彿锛氬�欒瘖涓�(20) 鈫� 灏辫瘖涓�(30)锛夈��
+ *
+ * <p>涓轰粈涔堥渶瑕佸畠锛歿@code nextPatient} 鍘熸潵鏄�"鍏堟煡鏈�灏忓彿鐨勫�欒瘖琛� 鈫� updateById"锛�
+ * 涓や釜骞跺彂璇锋眰锛堝弻鍑� / 澶氱锛夊彲鑳藉悇鎺ㄨ繘涓�鏉� READY锛屽鑷村悓涓�宸ヤ綅鍑虹幇 **2 涓�屽氨璇婁腑銆�**銆�
+ * 鏈変簡 {@code and status = #{curStatus}}锛氬彧鏈夌涓�涓� UPDATE 鍛戒腑锛堣繑鍥� 1锛夛紝
+ * 鍙︿竴鏂硅繑鍥� 0锛岀敱璋冪敤鏂规斁寮冩湰娆″彨鍙凤紝绛変笅涓�娆″啀鍙栥��
+ */
+ @Update("update lihu.queue set status = #{newStatus}, update_time = NOW() "
+ + " where id = #{id} and status = #{curStatus} and deleted = 0")
+ Integer updateStatusByIdIfCurrent(@Param("id") Integer id,
+ @Param("curStatus") Integer curStatus,
+ @Param("newStatus") Integer newStatus);
// 甯歌妫�鏌� 鎴� 棰嗙敤 鐨勬偅鑰呭彫鍥�, 鍘熷伐浣嶅鐞�
@Update("update lihu.queue set status = #{newStatus}, passed = 1 " +
@@ -397,6 +482,24 @@
// ==================== 闇�姹�2锛氳鐐广�屽彨鍙� / 妫�鏌ュ畬鎴愩�嶇殑鎾ら攢 ====================
/**
+ * 鎵归噺鍙栥�岃繖浜涙偅鑰呬粖鏃ョ殑闃熷垪鐘舵�併�嶏紙鐢ㄤ簬鍒ゆ柇"宸插畬鎴愯褰�"鏄惁琚挙閿�杩囷級銆�
+ *
+ * <p>銆愰渶姹傦細鎾ら攢鏍囪瘑銆戞挙閿�銆屾鏌ュ畬鎴愩�嶅彧鏄妸闃熷垪琛� 40(宸插氨璇�) 鏀瑰洖 20(鍑嗗涓�)锛�
+ * 涓嶇 job_record銆傚洜姝�"杩欐潯瀹屾垚璁板綍鏄惁宸叉挙閿�"鐢�**褰撴棩闃熷垪琛岀殑褰撳墠鐘舵��**鍒ゆ柇鍗冲彲锛�
+ * 鐘舵�� 鈮� 40 鈫� 宸茶鎾ら攢锛涘啀娆″畬鎴愭椂浼氬彉鍥� 40 鈫� 鑷姩鎭㈠鎴�"宸插畬鎴�"锛堟棤闇�棰濆娓呮爣璁帮級銆�
+ *
+ * <p>鍙彇褰撴棩锛堟挙閿�鏈韩灏卞彧鏀寔褰撴棩锛夛紝涓�娆℃煡璇㈣В鍐虫暣椤佃褰曘��
+ */
+ @Select("<script>" +
+ "select pat_id as patId, book_check_type as checkType, status " +
+ " from lihu.queue " +
+ " where deleted = 0 and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
+ " and pat_id in ( " +
+ " <foreach collection='patIdList' separator=',' item='_patId'>#{_patId}</foreach> ) " +
+ "</script>")
+ List<Map<String, Object>> selectTodayStatusByPatIds(@Param("patIdList")List<String> patIdList);
+
+ /**
* 鎾ら攢銆屾鏌ュ畬鎴愩�嶏細鎶婃湰宸ヤ綅浠婃棩鐨�**鎸囧畾鎮h��**浠� 宸插氨璇�(40) 閫�鍥� 鍊欒瘖涓�(20)銆�
* <p>
* 蹇呴』鎸� {@code pat_id + book_check_type + 浠婃棩} 绮剧‘瀹氫綅锛�**涓嶈兘**鍙寜
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queuesequence/QueueSequenceMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queuesequence/QueueSequenceMapper.java
index 9ccf2a5..24bf8b8 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queuesequence/QueueSequenceMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queuesequence/QueueSequenceMapper.java
@@ -58,9 +58,48 @@
@Update("update lihu.queue_sequence set queue_vip_no = queue_vip_no + 1 where check_type=#{checkType} and time_slot=#{timeslot} and queue_vip_no=#{curQueueVipNo} and queue_vip_no < queue_vip_full; ")
Integer updateGivenCheckTypeTimeslotVipSeqNo(@Param("checkType") Integer checkType, @Param("timeslot") Integer timeslot, @Param("curQueueVipNo") Integer curQueueVipNo);
- @Update("UPDATE lihu.queue_sequence SET queue_no=queue_set,queue_vip_no=queue_vip_set WHERE deleted=0; ")
+ @Update("UPDATE lihu.queue_sequence SET queue_no=COALESCE(queue_set, 0), queue_vip_no=COALESCE(queue_vip_set, 0) WHERE deleted=0; ")
Integer initNumber();
+ // =========================================================================
+ // 銆愭湰闇�姹傘�戞寜鏃舵棰勭害涓夌骇鍙栧彿锛氭湰娈垫櫘閫氬彿 鈫� 鏈棰勭暀鍙� 鈫� 鎬婚鐣欐睜(time_slot=0)
+ //
+ // 鍙锋绾﹀畾锛堟櫘閫氬湪鍓嶃�侀鐣欑揣璺熷叾鍚庛�佷笅涓�娈佃捣鐐� = 涓婁竴娈� queue_vip_full锛夛細
+ // 鏅�氬彿: queue_set+1 鈥� queue_full
+ // 棰勭暀鍙�: queue_full+1 鈥� queue_vip_full
+ // 鎬婚鐣欐睜: 鍙锋鏀惧湪褰撳ぉ鎵�鏈夋椂娈典箣鍚庯紝涓�**涓嶈涓婇檺**
+ // =========================================================================
+
+ /** 鍙栨煇鏃舵鏁磋锛堟嬁鍒� queue_set/queue_full/queue_vip_set/queue_vip_full 杈圭晫锛� */
+ @Select("select * from lihu.queue_sequence where check_type=#{checkType} and time_slot=#{timeslot} and deleted=0 limit 1")
+ QueueSequenceDO selectSegByCheckTypeAndTimeSlot(@Param("checkType") Integer checkType,
+ @Param("timeslot") Integer timeslot);
+
+ /** 鍙栬妫�鏌ョ被鍨嬬殑銆屾�婚鐣欐睜銆嶈锛坱ime_slot = 0锛� */
+ @Select("select * from lihu.queue_sequence where check_type=#{checkType} and time_slot=0 and deleted=0 limit 1")
+ QueueSequenceDO selectTotalPool(@Param("checkType") Integer checkType);
+
+ /** 璇ユ鏌ョ被鍨嬪綋澶╂墍鏈夋椂娈电殑**鏈�澶ч鐣欏彿涓婇檺**锛堢敤浜庣粰鎬婚鐣欐睜瀹氫綅鍙锋璧风偣锛� */
+ @Select("select COALESCE(MAX(queue_vip_full), 0) from lihu.queue_sequence "
+ + " where check_type=#{checkType} and time_slot<>0 and deleted=0")
+ Integer selectMaxVipFullOfCheckType(@Param("checkType") Integer checkType);
+
+ /**
+ * 鎬婚鐣欐睜鍙戝彿锛�**涓嶈涓婇檺**銆�
+ * <p>
+ * 璇箟涓庡叾瀹冨彿姹犱繚鎸佷竴鑷达紙{@code queue_vip_full} = 褰撳墠鏈�澶у彲鍙戝彿锛夛細
+ * 鍙� +1 鐨勫悓鏃舵妸 {@code queue_vip_full} 椤朵笂鏉ワ紝鍥犳姘歌繙涓嶄細鍑虹幇"鎬绘睜宸叉弧銆佺涓嶄笂"銆�
+ */
+ @Update("update lihu.queue_sequence "
+ + " set queue_vip_no = queue_vip_no + 1, "
+ + " queue_vip_full = GREATEST(queue_vip_full, queue_vip_no + 1) "
+ + " where check_type=#{checkType} and time_slot=0 and deleted=0")
+ Integer advanceTotalPoolVipNo(@Param("checkType") Integer checkType);
+
+ /** 璇诲洖鎬婚鐣欐睜褰撳墠宸插彂鍙凤紙蹇呴』涓庢帹杩涘湪鍚屼竴浜嬪姟鍐咃級 */
+ @Select("select queue_vip_no from lihu.queue_sequence where check_type=#{checkType} and time_slot=0 and deleted=0")
+ Integer selectTotalPoolVipNo(@Param("checkType") Integer checkType);
+
/**
* 銆愪慨澶嶃�屾椂娈典笉鍏�/宸叉弧瀵艰嚧娌℃硶绛惧埌銆嶃�戝垽鏂寚瀹� (妫�鏌ョ被鍨�, 鏃舵) 鏄惁**杩樻湁鍙彇鍙�**銆�
* <p>
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java
index cb951c8..1bc582b 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java
@@ -19,16 +19,64 @@
@Mapper
public interface RoomMapper extends BaseMapperX<RoomDO> {
+ /**
+ * 璇婂宸ヤ綅鍒嗛〉锛堣瘖瀹ょ鐞嗗垪琛� / 瀵煎嚭鍏辩敤锛夈��
+ *
+ * <p>鎺掑簭锛堟湰闇�姹傦級锛�**璇婂缂栧彿鍗囧簭 鈫� 宸ヤ綅鍙峰崌搴�**锛屽悓涓�璇婂鏈夊涓伐浣嶆椂椤哄簭绋冲畾銆�
+ * 鍘熷疄鐜版槸 {@code orderByDesc(id)}锛堝悗鍔犵殑鎺掓渶鍓嶏級锛屼笌"鎸夎瘖瀹ょ紪鍙风湅"鐨勭幇鍦轰範鎯笉绗︺��
+ */
default PageResult<RoomDO> selectPage(RoomPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<RoomDO>()
.eqIfPresent(RoomDO::getRoomId, reqVO.getRoomId())
.eqIfPresent(RoomDO::getBedNo, reqVO.getBedNo())
.betweenIfPresent(RoomDO::getCreateTime, reqVO.getCreateTime())
- .orderByDesc(RoomDO::getId));
+ .orderByAsc(RoomDO::getRoomId)
+ .orderByAsc(RoomDO::getBedNo));
}
- @Select("select * from lihu.clinic_room where ip = #{ip}")
+ /**
+ * 鎸� IP 鏌ヨ IP 涓�**鍙敤**鐨勫伐浣嶏紙渚�"鎸塈P鑷姩鍖归厤宸ヤ綅"浣跨敤锛夈��
+ *
+ * <p>涓夋潯杩囨护缂轰竴涓嶅彲锛�
+ * <ul>
+ * <li>{@code deleted = 0}锛氬師瀹炵幇鏄8鏌ワ紝宸插垹闄ょ殑宸ヤ綅涔熶細琚尮閰嶅埌鈥斺��
+ * 涓�鏃︽煇 IP 琚洖鏀跺啀鍒嗛厤缁欐柊宸ヤ綅锛屽氨浼氳嚜鍔ㄥ叆搴у埌鍘嗗彶鑴忓伐浣嶄笂锛�</li>
+ * <li>{@code status != 0(宸插叧闂�)}锛氬凡鍏抽棴鐨勫伐浣嶄笉璇ヨ鑷姩鍏ュ骇锛堝惁鍒欎汉鍧愪笂鍘诲嵈娌℃湁鍊欒瘖闃熷垪锛岀湅鐫�鍍�"娌$梾浜�"锛夛紱</li>
+ * <li>{@code ip <> ''}锛氱┖ IP 涓嶅仛鍖归厤锛堥伩鍏嶅巻鍙茬┖鍊艰琚壂鍒帮級銆�</li>
+ * </ul>
+ * 鐘舵�佸彇鍊艰 {@link cn.lihu.jh.module.ecg.enums.BedStatusEnum}锛�0宸插叧闂� / 10宸插紑閫� / 20鏈夊尰鐢� / 30鏆傚仠銆�</p>
+ */
+ @Select("select * from lihu.clinic_room " +
+ " where ip = #{ip} and deleted = 0 and coalesce(status, 0) <> 0")
+ @Results({
+ @Result(property = "checkTypes", column = "check_types", typeHandler = com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+ })
List<RoomDO> queueByIp(@Param("ip") String ip);
+
+ /**
+ * 璇� IP 鏄惁宸茬粦瀹氬湪**鍒殑**宸ヤ綅涓婏紙鐢ㄤ簬"閫夋嫨宸ヤ綅妯″紡"閲屽啓 IP 鍓嶇殑鍐茬獊妫�娴嬶級銆�
+ * <p>涓�涓伐浣嶅彧鏈変竴涓� ip 瀛楁锛岃嫢涓ゅ彴鐢佃剳璧板悓涓�鍑哄彛 IP锛屽悗缁戝畾鐨勪細鎶婂墠闈㈢殑鎶㈣蛋锛�
+ * 鎵�浠ヨ鐩栧墠瑕佸厛璁╃敤鎴风‘璁わ紙鍓嶇鎷垮埌鍐茬獊宸ヤ綅鍚庡脊纭锛屽啀甯� force 閲嶈皟锛夈��</p>
+ *
+ * @param ip 寰呯粦瀹氱殑 IP
+ * @param excludeId 鎺掗櫎鐨勫伐浣嶄富閿紙閫氬父鏄湰娆¤缁戝畾鐨勯偅涓級锛屽彲涓虹┖
+ */
+ @Select("<script> " +
+ "SELECT * FROM lihu.clinic_room " +
+ " WHERE deleted = 0 AND ip = #{ip} " +
+ " <if test='excludeId != null'> AND id != #{excludeId} </if> " +
+ " ORDER BY id" +
+ "</script>")
+ @Results({
+ @Result(property = "checkTypes", column = "check_types", typeHandler = com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+ })
+ List<RoomDO> listByIpExcludeId(@Param("ip") String ip, @Param("excludeId") Integer excludeId);
+
+ /**
+ * 鎶婃湰鏈� IP 鍐欏埌鎸囧畾宸ヤ綅锛堝彧鏀� ip 涓�涓瓧娈碉紝渚�"閫夋嫨宸ヤ綅妯″紡 2/3"浣跨敤锛夈��
+ */
+ @Update("update lihu.clinic_room set ip = #{ip} where id = #{id} and deleted = 0")
+ Integer updateIpById(@Param("id") Integer id, @Param("ip") String ip);
@Update("<script> " +
"update lihu.clinic_room set status=#{newStatus}, doc_id=null, doc_name=null " +
@@ -61,6 +109,38 @@
@Select("SELECT * FROM lihu.clinic_room where doc_id=#{docId}")
List<RoomDO> getRoomByDocId(@Param("docId")Long docId);
+
+ /**
+ * 銆愭湰闇�姹偮蜂竴浜哄宸ヤ綅銆戣鍖荤敓**褰撳墠鏈夋晥**鍗犵敤鐨勫叏閮ㄥ伐浣嶃��
+ *
+ * <p>姣� {@link #getRoomByDocId} 澶氫簡涓や釜杩囨护锛�
+ * <ul>
+ * <li>{@code deleted = 0}锛氭帓闄ゅ巻鍙查�昏緫鍒犻櫎琛岋紙鍘� SQL 娌℃湁锛屽彲鑳借繑鍥炶剰琛岋級锛�</li>
+ * <li>{@code status in (20,30)}锛氬彧鍙栥�屽尰鐢熷湪搴�(DOCTOR_ON) / 鍖荤敓鏆傚仠(DOCTOR_PAUSE)銆嶏紝
+ * 鎺掗櫎鏁版嵁涓嶄竴鑷存畫鐣欑殑"doc_id 杩樺湪浣嗙姸鎬佸凡鍥炵┖闂�"銆備袱涓�间互甯搁噺浼犲叆锛岄伩鍏嶇‖缂栫爜銆�</li>
+ * </ul>
+ */
+ @Select("<script> " +
+ "SELECT * FROM lihu.clinic_room where doc_id = #{docId} and deleted = 0 " +
+ " and status in ( " +
+ " <foreach collection='statusList' separator=',' item='st'>#{st}</foreach> " +
+ " ) order by room_id, bed_no " +
+ "</script>")
+ List<RoomDO> getMyActiveBeds(@Param("docId") Long docId, @Param("statusList") List<Integer> statusList);
+
+ /**
+ * 銆愭湰闇�姹偮风粺璁℃寜浜哄悎骞躲�戝綋鍓�**鍦ㄥ骇鍖荤敓鏁�**锛堟寜 doc_id 鍘婚噸锛夈��
+ *
+ * <p>涓�浜哄宸ヤ綅鍚庯紝"鍦ㄥ骇宸ヤ綅鏁�"浼氭寜宸ヤ綅绱锛堟暟鍊兼湰韬纭級锛�
+ * 浣嗙洃鎺ч〉杩橀渶瑕�"鍒板簳鍑犱釜鍖荤敓鍦ㄥ矖"锛岀敤瀹冭ˉ涓�涓寚鏍囥��
+ */
+ @Select("<script> " +
+ "select count(distinct doc_id) from lihu.clinic_room " +
+ " where doc_id is not null and deleted = 0 and status in ( " +
+ " <foreach collection='statusList' separator=',' item='st'>#{st}</foreach> " +
+ " ) " +
+ "</script>")
+ Integer countSeatedDoctors(@Param("statusList") List<Integer> statusList);
@Update("<script> " +
"update lihu.clinic_room set status=#{newStatus.status} " +
@@ -103,23 +183,130 @@
Integer setBedStopReady(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
@Param("stopReady")Integer stopReady);
+ /**
+ * 鍏ュ骇锛氭妸璇ュ伐浣嶇殑**涓讳汉**璁句负鎴戯紙鎸� room_id + bed_no 瀹氫綅锛夈��
+ *
+ * <p>銆愭湰娆℃斁瀹� + 淇銆�
+ * <ul>
+ * <li>鍙叆搴ф潯浠剁粺涓�涓猴細<b>锛堟棤涓讳汉 鎴� 涓讳汉鏄垜锛変笖 鐘舵�� 鈭� claimableStatusList</b>銆�
+ * 鐘舵�侀泦鍚堢敱璋冪敤鏂逛紶 {宸插紑閫�, 鏈夊尰鐢�, 鏆傚仠}锛�**鎺掗櫎"宸插叧闂�"**锛夈��<br>
+ * 鍘熸潵"鏃犱富浜�"鏃跺彧璁�"宸插紑閫�"锛氫竴鏃︽暟鎹噷鍑虹幇"doc_id 涓虹┖浣嗙姸鎬佷粛鏄湁鍖荤敓/鏆傚仠"
+ * 杩欑涓嶄竴鑷达紝鍖荤敓绔欏湪宸ヤ綅鍓嶅嵈濮嬬粓鍧愪笉涓婏紝鍙姤"鐘舵�佸紓甯�"锛岀幇鍦烘棤浠庡鐞嗐��</li>
+ * <li>涓讳汉鏄垜鏃跺悓鏍锋斁琛� 鈫� 涓婃娌℃甯哥搴э紙鍏虫祻瑙堝櫒/瓒呮椂锛変篃鑳藉潗鍥炶嚜宸辩殑宸ヤ綅銆�</li>
+ * <li>涓讳汉鏄�**鍒汉**鏃舵洿鏂� 0 琛岋紝璋冪敤鏂规嵁姝ゆ嫆缁濓紙涓嶆尋鎺夋鍦ㄦ搷浣滅殑浜猴級銆�</li>
+ * </ul>
+ */
@Update("<script> " +
- "update lihu.clinic_room set status=#{newStatus.status}, doc_id=#{docId}, doc_name=#{docName} " +
- "where room_id=#{roomId} and bed_no=#{bedNo} and isNull(doc_id)" +
- "and status in ( " +
- " <foreach collection='curStatusList' separator=',' item='curStatus'>" +
- " #{curStatus.status} " +
- " </foreach> );" +
+ "update lihu.clinic_room set status=#{newStatus.status}, doc_id=#{docId}, doc_name=#{docName}, update_time=NOW() " +
+ "where room_id=#{roomId} and bed_no=#{bedNo} and deleted = 0 " +
+ " and ( isNull(doc_id) or doc_id = #{docId} ) " +
+ " and status in ( " +
+ " <foreach collection='claimableStatusList' separator=',' item='curStatus'>#{curStatus.status}</foreach> );" +
"</script>")
- Integer setBedDoctorOn(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId, @Param("docName")String docName, @Param("newStatus") BedStatusEnum newStatus, @Param("curStatusList") List<BedStatusEnum> curStatusList);
+ Integer setBedDoctorOn(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId, @Param("docName")String docName,
+ @Param("newStatus") BedStatusEnum newStatus,
+ @Param("claimableStatusList") List<BedStatusEnum> claimableStatusList);
+
+ /**
+ * 鍏ュ骇锛氬悓涓婏紝浣嗘寜**涓婚敭 id** 瀹氫綅銆�
+ *
+ * <p>銆愭湰娆′慨澶嶃�戠幇鍦哄嚭鐜拌繃"宸ヤ綅鍦ㄥ簱閲屾槑鏄庢槸绌洪棽鐨勶紝鍏ュ骇鍗存洿鏂� 0 琛� 鈫� 鎶ョ姸鎬佸紓甯�"銆�
+ * 宸茬‘璁や笉鏄鍗犵敤锛涘墿涓嬬殑鍙兘鏄� {@code bed_no} 涓庤姹傚�煎瓨鍦ㄨ倝鐪奸毦杈ㄧ殑宸紓
+ * 锛堢粨灏剧┖鏍笺�佸ぇ灏忓啓銆佸叏瑙掔瓑 鈥斺�� JSON 涓庡鍒剁矘璐撮兘鐪嬩笉鍑烘潵锛夈��
+ * 鍓嶇璇锋眰閲屾湰鏉ュ氨甯� {@code id}锛屽洜姝や紭鍏堟寜涓婚敭鏇存柊锛屽交搴曠粫寮�杩欑被闂銆�
+ */
+ @Update("<script> " +
+ "update lihu.clinic_room set status=#{newStatus.status}, doc_id=#{docId}, doc_name=#{docName}, update_time=NOW() " +
+ "where id=#{id} and deleted = 0 " +
+ " and ( isNull(doc_id) or doc_id = #{docId} ) " +
+ " and status in ( " +
+ " <foreach collection='claimableStatusList' separator=',' item='curStatus'>#{curStatus.status}</foreach> );" +
+ "</script>")
+ Integer setBedDoctorOnById(@Param("id")Integer id, @Param("docId")Long docId, @Param("docName")String docName,
+ @Param("newStatus") BedStatusEnum newStatus,
+ @Param("claimableStatusList") List<BedStatusEnum> claimableStatusList);
+
+ /**
+ * 璇婃柇鐢細鍙栧伐浣�**鍘熷琛�**锛堝惈 {@code bed_no} 鐨勯暱搴︿笌鍗佸叚杩涘埗锛岀敤浜庡彂鐜扮粨灏剧┖鏍�/鍏ㄨ宸紓锛夈��
+ *
+ * <p>浼犲叆 id 鏃舵寜 id 鏌ワ紙鍚凡鍒犻櫎琛岋級锛涘惁鍒欐寜 room_id + {@code TRIM(bed_no)} 瀹芥澗鏌ャ��
+ * 杩斿洖 Map 鑰屼笉鏄� DO锛氳繖閲岃鎶� {@code deleted}銆侀暱搴︺�丠EX 杩欎簺"闈炲疄浣撳瓧娈�"涓�璧峰甫鍑烘潵銆�
+ */
+ @Select("<script>" +
+ "select id, room_id, room_name, bed_no," +
+ " CHAR_LENGTH(bed_no) as bed_no_len, HEX(bed_no) as bed_no_hex," +
+ " ip, status, doc_id, doc_name, op_type, deleted, update_time" +
+ " from lihu.clinic_room" +
+ " where 1 = 1" +
+ " <if test='id != null'> and id = #{id} </if>" +
+ " <if test='id == null'> and room_id = #{roomId} and TRIM(bed_no) = TRIM(#{bedNo}) </if>" +
+ " order by deleted, id" +
+ "</script>")
+ List<Map<String, Object>> selectBedRawState(@Param("id") Integer id, @Param("roomId") Long roomId, @Param("bedNo") String bedNo);
+
+ /**
+ * 銆愭湰闇�姹傘�戜竴涓敤鎴峰彧鍏佽鍗犱竴涓伐浣嶏細鍏ュ骇鎴愬姛鍚庯紝鎶�**鎴戠殑鍏跺畠宸ヤ綅**閲婃斁鎺夈��
+ *
+ * <p>鍙竻 {@code doc_id/doc_name} 骞舵妸鐘舵�佺疆鍥�"宸插紑閫�"锛屼笉鍔� check_types / ip / stop_ready锛�
+ * 鐢� {@code not (room_id = ? and bed_no = ?)} 鎺掗櫎鏈鍏ュ骇鐨勫伐浣嶏紝閬垮厤鎶婅嚜宸卞垰鍧愪笂鐨勪篃娓呮帀銆�
+ *
+ * @param keepRoomId 鏈鍏ュ骇鐨勮瘖瀹ょ紪鍙凤紙淇濈暀涓嶅姩锛�
+ * @param keepBedNo 鏈鍏ュ骇鐨勫伐浣嶅彿锛堜繚鐣欎笉鍔級
+ */
+ @Update("<script> " +
+ "update lihu.clinic_room set status=#{newStatus.status}, doc_id=null, doc_name=null, update_time=NOW() " +
+ "where doc_id=#{docId} and deleted = 0 " +
+ "<if test='keepRoomId != null and keepBedNo != null'>" +
+ " and not (room_id = #{keepRoomId} and bed_no = #{keepBedNo}) " +
+ "</if>" +
+ "</script>")
+ Integer releaseOtherBedsOfDoc(@Param("docId")Long docId, @Param("keepRoomId")Long keepRoomId,
+ @Param("keepBedNo")String keepBedNo, @Param("newStatus") BedStatusEnum newStatus);
@Update("<script> " +
"update lihu.clinic_room set status=#{newStatus.status}, doc_id=null, doc_name=null " +
- "where room_id=#{roomId} and bed_no=#{bedNo} " +
+ "where room_id=#{roomId} and bed_no=#{bedNo} and doc_id=#{docId} " +
"and status in ( " +
" <foreach collection='curStatusList' separator=',' item='curStatus'>" +
" #{curStatus.status} " +
" </foreach> );" +
"</script>")
Integer setBedDoctorOff(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId, @Param("newStatus") BedStatusEnum newStatus, @Param("curStatusList") List<BedStatusEnum> curStatusList);
+
+ /**
+ * 銆愭湰娆¢渶姹傘�戦棴璇婃椂娓呯┖**鎵�鏈夎鍖荤敓鍗犵敤**鐨勫伐浣嶏紙doc_id 闈炵┖锛屼笖鐘舵�佷负銆屽尰鐢熷湪宀� / 鏆傚仠銆嶏級銆�
+ * <p>
+ * 鑳屾櫙锛氬伐浣嶄笉鍐嶅洜銆岀┖闂茶秴鏃� / 浠ょ墝澶辨晥 / 鍒锋柊椤甸潰銆嶈閲婃斁锛堥伩鍏嶅尰鐢熺寮�涓�浼氬効灏变涪宸ヤ綅锛夛紝
+ * 鍥犳闇�瑕佷竴涓厹搴曪紝闃叉鍖荤敓涓嬬彮蹇樼搴у鑷村伐浣嶉暱鏈熻鍗犵敤 鈥斺�� 闂瘖鏃剁粺涓�娓呯┖褰撶彮宸ヤ綅銆�
+ *
+ * @param newStatus 娓呯┖鍚庣疆涓虹殑鐘舵�侊紙绌洪棽 / 宸插紑閫氾級
+ * @param curStatusList 鍏佽琚竻绌虹殑褰撳墠鐘舵�侀泦鍚�
+ */
+ @Update("<script> " +
+ "update lihu.clinic_room set status=#{newStatus.status}, doc_id=null, doc_name=null, update_time=NOW() " +
+ "where deleted = 0 and doc_id is not null " +
+ "and status in ( " +
+ " <foreach collection='curStatusList' separator=',' item='curStatus'>" +
+ " #{curStatus.status} " +
+ " </foreach> )" +
+ "</script>")
+ Integer clearAllBedDoctors(@Param("newStatus") BedStatusEnum newStatus, @Param("curStatusList") List<BedStatusEnum> curStatusList);
+
+ /**
+ * 銆愭湰娆¢渶姹傘�戠鐞嗗憳寮哄埗娓呯┖鏌愪釜宸ヤ綅銆�
+ * <p>
+ * 涓� {@link #setBedDoctorOff} 鐨勫敮涓�鍖哄埆锛�**涓嶅甫 `doc_id = ?` 鏉′欢**锛�
+ * 鍥犳鍙互鎶�"鍒汉鍗犵敤涓�"鐨勫伐浣嶆竻鎺夛紙鍖荤敓涓嬬彮蹇樼搴с�佹崲浜轰娇鐢ㄥ悓涓�宸ヤ綅鏃剁敤锛夈��
+ * 浠嶇劧瑕佹眰褰撳墠鐘舵�佹槸銆屽尰鐢熷湪宀� / 鏆傚仠銆嶄笖 doc_id 闈炵┖锛岄伩鍏嶈娓呯┖闂插伐浣嶃��
+ */
+ @Update("<script> " +
+ "update lihu.clinic_room set status=#{newStatus.status}, doc_id=null, doc_name=null, update_time=NOW() " +
+ "where room_id=#{roomId} and bed_no=#{bedNo} and doc_id is not null " +
+ "and status in ( " +
+ " <foreach collection='curStatusList' separator=',' item='curStatus'>" +
+ " #{curStatus.status} " +
+ " </foreach> )" +
+ "</script>")
+ Integer setBedDoctorOffAdmin(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
+ @Param("newStatus") BedStatusEnum newStatus, @Param("curStatusList") List<BedStatusEnum> curStatusList);
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/enums/HisCheckNameEnum.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/enums/HisCheckNameEnum.java
index f8fa31a..b365dd0 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/enums/HisCheckNameEnum.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/enums/HisCheckNameEnum.java
@@ -4,7 +4,20 @@
import lombok.Getter;
/**
- * His鐨凜heck_type绫诲瀷鏋氫妇
+ * His鐨凜heck_type绫诲瀷鏋氫妇锛堟寜 HIS 浼犳潵鐨�**妫�鏌ラ」鐩悕绉�**鏄犲皠鏈湴 check_type锛�
+ *
+ * <p>娉ㄦ剰锛氬悓涓�涓鏌ュ湪 HIS 渚у彲鑳芥湁澶氫釜鍙硶锛屾湰鏋氫妇鐢ㄣ�屼竴涓�兼寕澶氫釜鍚嶇О銆嶇殑鏂瑰紡鍏煎銆�
+ * 瀹炴祴 2026-10-04/05锛氳繍鍔ㄨ瘯楠岃繖涓�椤� HIS 渚ф敼鍚嶈繃鈥斺��
+ * 銆屽钩鏉胯繍鍔ㄥ績鐢点�嶏紙鏃э級鈫掋�屽钩鏉胯繍鍔ㄨ瘯楠屻�嶏紙鐜帮級锛岃�屾湰鍦� check_type 涓�鐩存槸 400銆�
+ * 鍚嶇О鏄犲皠涓嶅埌鏃讹紝{@code handleAppointmentCreate} 浼氶��鍥炴寜 HIS 妫�鏌ヤ唬鐮佹槧灏�
+ * 锛坽@link HisCheckCodeEnum}锛夛紝涓ゆ潯璺换涓�鏉¢�氬嵆鍙紝閬垮厤鍐嶅嚭鐜� book_check_type 涓虹┖銆�</p>
+ *
+ * <p>瀹炴祴 2026-10-07 鍙堝彂鐜拌鍘嬬被鍚屾牱鐨勯棶棰橈細HIS 鍙戠殑鏄��24灏忔椂鍔ㄦ�佽鍘嬬洃娴嬨�嶏紝
+ * 鑰屾灇涓鹃噷褰撴椂鍙湁銆屽姩鎬佽鍘嬨�嶏紝绮剧‘鍖归厤澶辫触锛堟棩蹇楋細
+ * {@code [handleAppointmentCreate][浣撴鎮h�呮鏌ラ」鐩悕绉版棤娉曟槧灏刔 checkName=24灏忔椂鍔ㄦ�佽鍘嬬洃娴媫锛夈��
+ * 鐜板凡琛ラ綈鍒悕锛涘悓鏃� {@link #getByName(String)} 澧炲姞涓�灞�**瑙勮寖鍖栧厹搴曞尮閰�**锛�
+ * 鐢ㄤ簬鍚告敹 HIS 渚с�屾湁鏃犮��24灏忔椂銆嶅墠缂�銆嶃�屽叏/鍗婅鎷彿銆嶃�屽浣欑┖鏍笺�嶈繖绫绘棤鎰忎箟宸紓锛�
+ * 閬垮厤姣忔崲涓�绉嶅彨娉曞氨瑕佹敼涓�娆′唬鐮併��</p>
*/
@Getter
@AllArgsConstructor
@@ -12,8 +25,23 @@
Y691133607("甯歌蹇冪數鍥�", "100"),
Y201605("24灏忔椂鍔ㄦ�佸績鐢靛浘", "200"),
Y201606("24灏忔椂鍔ㄦ�佸績鐢电洃娴�", "200"),
+ // 鍚屼竴妫�鏌ワ紙鏈湴 check_type=200 鍔ㄦ�佸績鐢碉級鐨勫叾瀹冨彨娉曘��
+ // 瀹炴祴鎶ユ枃閲岃椤圭殑 code 瀛樺湪涓ょ褰㈡�侊細Y201605锛堝甫Y鍓嶇紑锛変笌 201605锛堜笉甯︼級锛�
+ // 鑰� HisCheckCodeEnum 鍙櫥璁颁簡 201605锛屾晠甯� Y 鐨勯偅绉嶅繀椤婚潬鍚嶇О鏄犲皠鍏滀綇銆�
+ Y201605_ALIAS1("鍔ㄦ�佸績鐢靛浘", "200"),
+ Y201605_ALIAS2("24灏忔椂鍔ㄦ�佸績鐢�", "200"),
+ Y201605_ALIAS3("鍔ㄦ�佸績鐢电洃娴�", "200"),
Y200327("鍔ㄦ�佽鍘�", "300"),
+ // 鍚屼竴妫�鏌ワ紙鏈湴 check_type=300 鍔ㄦ�佽鍘嬶級鐨勫叾瀹冨彨娉曘��
+ // 瀹炴祴 2026-10-07锛欻IS 瀹為檯涓嬪彂鐨勬槸銆�24灏忔椂鍔ㄦ�佽鍘嬬洃娴嬨�嶏紙jcxmcode=Y200327锛夛紝
+ // 褰撴椂鏋氫妇鍙湁銆屽姩鎬佽鍘嬨�嶁啋 鍚嶇О鍖归厤澶辫触锛屼笖浠g爜鍏滃簳涔熷涓嶄笂锛堜唬鐮佹槸 Y200327锛岃〃閲岃鐨勬槸 200327锛夈��
+ Y200327_ALIAS1("24灏忔椂鍔ㄦ�佽鍘嬬洃娴�", "300"),
+ Y200327_ALIAS2("24灏忔椂鍔ㄦ�佽鍘�", "300"),
+ Y200327_ALIAS3("鍔ㄦ�佽鍘嬬洃娴�", "300"),
Y201652("骞虫澘杩愬姩蹇冪數", "400"),
+ // 鍚屼竴妫�鏌ワ紙鏈湴 check_type=400锛夌殑鍏跺畠鍙硶锛氭灇涓惧父閲忓悕涓嶈兘閲嶅锛屾晠鍔犲悗缂�
+ Y201652_ALIAS1("骞虫澘杩愬姩璇曢獙", "400"),
+ Y201652_ALIAS2("蹇冪數鍥捐繍鍔ㄨ瘯楠�", "400"),
Y502490914("鍔ㄨ剦纭寲妫�娴�", "500"),
Y419562119("椋熼亾鐢电敓鐞�", "600"),
Y201604("蹇冪數鍥捐嵂鐗╄礋鑽疯瘯楠�", "700"),
@@ -32,20 +60,66 @@
private final String value;
/**
- * 鏍规嵁绫诲瀷鑾峰彇鏋氫妇
+ * 鏍规嵁鍚嶇О鑾峰彇鏈湴妫�鏌ョ被鍨嬶細鍏堢簿纭尮閰嶏紝鍐嶈鑼冨寲鍏滃簳鍖归厤銆�
*
- * @param type 绫诲瀷
- * @return 鏋氫妇
+ * @param name HIS 浼犳潵鐨勬鏌ラ」鐩悕绉�
+ * @return 鏈湴 check_type 瀛楃涓诧紱閮藉尮閰嶄笉鍒拌繑鍥� null
*/
public static String getByName(String name) {
+ if (name == null) {
+ return null;
+ }
+ // 鈶� 绮剧‘鍖归厤锛堜繚鎸佸師鏈夎涓猴級
for (HisCheckNameEnum value : values()) {
if (value.getName().equals(name)) {
return value.getValue();
}
}
+ // 鈶� 瑙勮寖鍖栧悗鍐嶅尮閰嶏細鍚告敹銆�24灏忔椂銆嶅墠缂�銆佸叏/鍗婅鎷彿銆佺┖鏍笺�佸ぇ灏忓啓绛夋棤鎰忎箟宸紓锛�
+ // 閬垮厤 HIS 姣忔崲涓�绉嶅彨娉曞氨婕忔槧灏勶紙渚嬪銆�24灏忔椂鍔ㄦ�佽鍘嬬洃娴嬨�峷s銆屽姩鎬佽鍘嬬洃娴嬨�嶏級
+ String normalized = normalizeName(name);
+ if (normalized.isEmpty()) {
+ return null;
+ }
+ for (HisCheckNameEnum value : values()) {
+ String enumNormalized = normalizeName(value.getName());
+ if (enumNormalized.equals(normalized)) {
+ return value.getValue();
+ }
+ // 鈶� 鍘绘帀銆�24灏忔椂銆嶅悗鍐嶆瘮涓�娆★細HIS 渚ф湁鏃犺鍓嶇紑閮藉彲鑳藉嚭鐜�
+ if (strip24Hour(enumNormalized).equals(strip24Hour(normalized)) && !strip24Hour(normalized).isEmpty()) {
+ return value.getValue();
+ }
+ }
return null;
}
+ /** 瑙勮寖鍖栭」鐩悕绉帮細鍘荤┖鐧姐�佺粺涓�澶у皬鍐欍�佸叏瑙掓嫭鍙封啋鍗婅銆佸幓鎺夈��24灏忔椂銆嶅墠缂� */
+ private static String normalizeName(String name) {
+ if (name == null) {
+ return "";
+ }
+ return name.trim()
+ .replace(" ", "")
+ .replace("\u3000", "")
+ .replace("锛�", "(")
+ .replace("锛�", ")")
+ .replace("锛掞紨", "24")
+ .toLowerCase();
+ }
+
+ /** 鍘绘帀銆�24灏忔椂銆�/銆�24h銆嶅墠缂�锛岀敤浜庢瘮杈冨悓涔夊悕绉� */
+ private static String strip24Hour(String normalizedName) {
+ String v = normalizedName;
+ if (v.startsWith("24灏忔椂")) {
+ v = v.substring("24灏忔椂".length());
+ }
+ if (v.startsWith("24h")) {
+ v = v.substring("24h".length());
+ }
+ return v;
+ }
+
/**
* 鏍规嵁绫诲瀷鑾峰彇鏋氫妇
*
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/enums/HisCheckStatusEnum.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/enums/HisCheckStatusEnum.java
new file mode 100644
index 0000000..19506ae
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/enums/HisCheckStatusEnum.java
@@ -0,0 +1,110 @@
+package cn.lihu.jh.module.ecg.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Objects;
+
+/**
+ * HIS 妫�鏌ョ姸鎬佺紪鐮併��
+ *
+ * <h3>鏉ユ簮</h3>
+ * 闄㈡柟銆婃鏌ョ姸鎬佺紪鐮佽〃銆嬶細
+ * <pre>
+ * 1 鐢宠鍗曞紑绔� 2 鐢宠鍗曟挙閿� 3 妫�鏌ョ櫥璁�
+ * 4 鍙栨秷妫�鏌� 5 妫�鏌ュ紑濮� 6 缁欓�犲奖鍓�
+ * 7 妫�鏌ョ粨鏉� 8 鎶ュ憡鐢熸垚 9 鎶ュ憡鎾ら攢
+ * 10 鎶ュ憡瀹℃牳
+ * 21 鏍囨湰閫佹锛堢梾鐞嗙敤锛� 22 鍙栨秷鏍囨湰閫佹锛堢梾鐞嗙敤锛� 23 宸茬即璐癸紙鐥呯悊鐢級
+ * </pre>
+ * 鍏朵腑 21/22/23 涓�**鐥呯悊涓撶敤锛屽績鐢电郴缁熶笉娑夊強**锛屾湰鏋氫妇涓嶅寘鍚��
+ *
+ * <h3>涓轰粈涔堥渶瑕佸綊涓�鍖�</h3>
+ * HIS 鎶ユ枃涓悓涓�涓姸鎬佷細浠ヤ笉鍚屽瓧闈㈠舰寮忓嚭鐜帮紝瀹炴祴鏃ュ織涓瓨鍦細
+ * <pre>
+ * processStep.code = "3" / "03" / "7" / "08" / "10"
+ * </pre>
+ * 鍗�**鍓嶅闆舵槸鍚﹀瓨鍦ㄥ苟涓嶇ǔ瀹�**锛堟帴鍙f枃妗gず渚嬬粰鐨勬槸 {@code code="01"}锛夈��
+ * 鑻ョ洿鎺ュ啓鍏ユ暟鎹簱锛屼細浜х敓 "3" 涓� "03" 涓ょ鍊硷紝瀵艰嚧鐘舵�佸垽鏂敊涔便��
+ * 鍥犳缁熶竴缁� {@link #normalize(String)} 褰掍竴鍖栦负鏃犲墠瀵奸浂鐨勬爣鍑嗙紪鐮佸悗鍐嶅叆搴撱��
+ *
+ * @author 蹇冪數鎺掗槦瑁呮満绯荤粺
+ */
+@Getter
+@AllArgsConstructor
+public enum HisCheckStatusEnum {
+
+ APPLY_CREATED(1, "鐢宠鍗曞紑绔�"),
+ APPLY_CANCELLED(2, "鐢宠鍗曟挙閿�"),
+ REGISTERED(3, "妫�鏌ョ櫥璁�"),
+ CHECK_CANCELLED(4, "鍙栨秷妫�鏌�"),
+ CHECK_STARTED(5, "妫�鏌ュ紑濮�"),
+ CONTRAST_GIVEN(6, "缁欓�犲奖鍓�"),
+ CHECK_FINISHED(7, "妫�鏌ョ粨鏉�"),
+ REPORT_GENERATED(8, "鎶ュ憡鐢熸垚"),
+ REPORT_CANCELLED(9, "鎶ュ憡鎾ら攢"),
+ REPORT_REVIEWED(10, "鎶ュ憡瀹℃牳");
+
+ /** 鏍囧噯缂栫爜锛堟棤鍓嶅闆讹級 */
+ private final Integer code;
+ /** 鐘舵�佸悕绉� */
+ private final String name;
+
+ /**
+ * 褰掍竴鍖� HIS 鎶ユ枃涓殑鐘舵�佺紪鐮佸瓧绗︿覆銆�
+ * <p>
+ * 澶勭悊鍐呭锛氬幓绌虹櫧銆佸幓鍓嶅闆躲�佹牎楠屾槸鍚﹀湪缂栫爜琛ㄥ唴銆�
+ *
+ * @param raw 鎶ユ枃鍘熷鍊硷紝濡� "3"銆�"03"銆�" 10 "
+ * @return 褰掍竴鍖栧悗鐨勬爣鍑嗙紪鐮佸瓧绗︿覆锛堝 "3"銆�"10"锛夛紱鏃犳硶璇嗗埆鏃惰繑鍥� null
+ */
+ public static String normalize(String raw) {
+ if (raw == null) {
+ return null;
+ }
+ String trimmed = raw.trim();
+ if (trimmed.isEmpty()) {
+ return null;
+ }
+ // 浠呮帴鍙楁暟瀛楋紝閬垮厤鎶婇潪鏁板瓧鍐呭鍐欏叆 status
+ if (!trimmed.matches("\\d+")) {
+ return null;
+ }
+ // 鍘诲墠瀵奸浂锛�"03" -> "3"锛�"0" -> "0"
+ String stripped = trimmed.replaceFirst("^0+(?=\\d)", "");
+ int code;
+ try {
+ code = Integer.parseInt(stripped);
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ // 鍙帴鍙楃紪鐮佽〃鍐呯殑鍊�
+ return contains(code) ? String.valueOf(code) : null;
+ }
+
+ /** 鍒ゆ柇缂栫爜鏄惁灞炰簬鏈紪鐮佽〃锛堜笉鍚梾鐞嗕笓鐢ㄧ姸鎬侊級 */
+ public static boolean contains(Integer code) {
+ if (code == null) {
+ return false;
+ }
+ for (HisCheckStatusEnum item : values()) {
+ if (Objects.equals(item.code, code)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /** 鎸夌紪鐮佸彇鐘舵�佸悕绉帮紝鏈尮閰嶈繑鍥� null */
+ public static String getNameByCode(Integer code) {
+ if (code == null) {
+ return null;
+ }
+ for (HisCheckStatusEnum item : values()) {
+ if (Objects.equals(item.code, code)) {
+ return item.name;
+ }
+ }
+ return null;
+ }
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentService.java
index d1964d6..05fafe2 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentService.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentService.java
@@ -114,6 +114,15 @@
*/
List<AppointmentDO> queryAndCreateAppointmentByPatId(String patCode);
+ /**
+ * 銆愭湰闇�姹傦細绱ф�ユ偅鑰呬笉鎺掗槦鐩存帴妫�鏌ャ�戞寜銆岀敵璇峰崟鍙� / 灏辫瘖鍙� / 鎮h�呯紪鍙枫�嶆煡杩戜竴涓湀鐨勯绾﹁褰曘��
+ *
+ * @param code 鐢宠鍗曞彿 / 灏辫瘖娴佹按鍙� / 鎮h�呯紪鍙凤紙涓夎�呬箣涓�锛�
+ * @param checkTypes 鏈獥鍙e紑灞曠殑妫�鏌ラ」鐩紝閫楀彿鍒嗛殧锛涗负绌鸿〃绀轰笉闄愬埗
+ * @return 棰勭害璁板綍锛�**鎸夐绾︽椂闂村�掑簭**锛堟渶杩戠殑鍦ㄥ墠锛�
+ */
+ List<AppointmentDO> getEmergencyCandidates(String code, String checkTypes);
+
List<AppointmentDO> getAppointmentExtermal(String patId);
Integer appoitmentConfirm(AppointmentConfirmReqVO appointmentConfirmReqVO);
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
index fe54ef3..6df4631 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
@@ -37,6 +37,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -104,6 +105,79 @@
// 杩斿洖
return appointment.getId();
+ }
+
+ /** 骞跺彂鍐茬獊鍚庣殑閲嶈瘯娆℃暟涓庣瓑寰呴棿闅旓紙浠呯敤浜�"鎻掑叆鎾炲敮涓�绱㈠紩"杩欎竴绉嶆儏鍐碉級 */
+ private static final int APPLY_NO_CONFLICT_RETRY = 3;
+ private static final long APPLY_NO_CONFLICT_WAIT_MS = 150L;
+
+ /**
+ * 鎸� {@code apply_no} 鍘熷瓙钀藉簱锛氬凡瀛樺湪鍒欐洿鏂帮紝涓嶅瓨鍦ㄥ垯鎻掑叆锛涘苟鍙戦噸澶嶆彃鍏ユ椂涓嶄細鐣欓噸澶嶈銆�
+ *
+ * <h3>涓轰粈涔堥渶瑕佸畠</h3>
+ * 鍘熷疄鐜版槸銆寋@code getByApplyNo} 鏌ヤ竴涓� 鈫� 娌℃湁灏� insert銆嶏紝鏌ヤ笌鎻掍箣闂存病鏈夊師瀛愭�с��
+ * 瀹炴祴 2026-10-04 12:16锛欻IS 鍦� 423ms 鍐呮妸鍚屼竴寮犵敵璇峰崟鎺ㄤ簡涓ら亶锛屼袱涓嚎绋嬮兘璇诲埌 0 琛屻��
+ * 閮芥墽琛屼簡 insert锛屼簬鏄悓涓� {@code apply_no} 钀戒笅涓ゆ潯锛坕d 211740 / 211741锛夈��
+ * 琛ㄤ笂鍘熸湁鐨勫敮涓�绱㈠紩 {@code uniq-pat-book(pat_id, book_date, book_check_type)}
+ * 鍦� book_date / book_check_type 涓� NULL 鏃朵笉鐢熸晥锛屾嫤涓嶄綇銆�
+ *
+ * <h3>鐜板湪鐨勫仛娉�</h3>
+ * 鏁版嵁搴撲晶宸插姞鍞竴绱㈠紩 {@code uk_appointment_apply_no_active}锛堝彧绾︽潫鏈垹闄よ锛夈��
+ * 杩欓噷鏀规垚銆屽厛灏濊瘯鎻掑叆锛屾挒鍞竴閿氨鍥炶骞舵敼涓烘洿鏂般�嶏細
+ * <ul>
+ * <li>涓茶鍦烘櫙锛氭彃鍏ユ垚鍔燂紝琛屼负涓庡師鏉ヤ竴鑷达紱</li>
+ * <li>骞跺彂鍦烘櫙锛氬叾涓竴涓彃鍏ュ繀鐒跺け璐ワ紙DuplicateKeyException锛夛紝澶辫触鏂硅蛋鏇存柊锛屼笉鍐嶄骇鐢熼噸澶嶈锛�</li>
+ * <li>瀵规柟浜嬪姟灏氭湭鎻愪氦瀵艰嚧鍥炶涓嶅埌鏃讹紝鐭殏绛夊緟鍚庨噸璇曪紙鏈�澶� {@value #APPLY_NO_CONFLICT_RETRY} 娆★級銆�</li>
+ * </ul>
+ *
+ * @return 钀藉簱璁板綍鐨� id
+ */
+ private Long atomicSaveByApplyNo(AppointmentSaveReqVO saveReqVO) {
+ String applyNo = saveReqVO.getApplyNo();
+ // 鈶� 鍏堟寜鐢宠鍗曞彿璧�"鏇存柊"鍒嗘敮锛堜笌鏀归�犲墠鐨勮涔変竴鑷达細鍛戒腑宸插瓨鍦ㄥ垯浠ユ湰娆℃姤鏂囧唴瀹规洿鏂帮級
+ AppointmentDO exists = (applyNo == null) ? null : appointmentMapper.getByApplyNo(applyNo);
+ if (exists != null) {
+ saveReqVO.setId(exists.getId());
+ updateAppointment(saveReqVO);
+ return exists.getId();
+ }
+
+ // 鈶� 涓嶅瓨鍦� 鈫� 灏濊瘯鎻掑叆锛涙挒鍞竴绱㈠紩璇存槑鏈夊苟鍙戞彃鍏ワ紝杞洿鏂伴噸璇�
+ for (int attempt = 0; attempt <= APPLY_NO_CONFLICT_RETRY; attempt++) {
+ try {
+ AppointmentDO toInsert = BeanUtils.toBean(saveReqVO, AppointmentDO.class);
+ toInsert.setId(null);
+ appointmentMapper.insert(toInsert);
+ return toInsert.getId();
+ } catch (DuplicateKeyException e) {
+ AppointmentDO concurrent = (applyNo == null) ? null : appointmentMapper.getByApplyNo(applyNo);
+ if (concurrent != null) {
+ log.warn("[atomicSaveByApplyNo][骞跺彂閲嶅鎻掑叆宸叉嫤鎴紝鏀逛负鏇存柊宸叉湁璁板綍] applyNo={} existingId={}",
+ applyNo, concurrent.getId());
+ saveReqVO.setId(concurrent.getId());
+ updateAppointment(saveReqVO);
+ return concurrent.getId();
+ }
+ // 瀵规柟鍙兘杩樻病鎻愪氦锛氱瓑涓�涓嬪啀璇曪紙鏈�鍚庝粛鎷夸笉鍒板氨涓婃姏锛岀敱澶栧眰璁板綍閿欒鏃ュ織锛�
+ if (attempt < APPLY_NO_CONFLICT_RETRY) {
+ try {
+ Thread.sleep(APPLY_NO_CONFLICT_WAIT_MS);
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ throw e;
+ }
+ AppointmentDO retry = appointmentMapper.getByApplyNo(applyNo);
+ if (retry != null) {
+ saveReqVO.setId(retry.getId());
+ updateAppointment(saveReqVO);
+ return retry.getId();
+ }
+ } else {
+ throw e;
+ }
+ }
+ }
+ throw exception(APPOINTMENT_CREATE_FAIL);
}
@Override
@@ -183,6 +257,12 @@
@Override
public List<AppointmentDO> queryAndCreateAppointmentByPatId(String patCode) {
// 浠庡尰闄㈠钩鍙版煡璇�
+ //
+ // 銆愭湰闇�姹傘�戝尮閰嶅彛寰勪粠銆岀敵璇峰崟鍙� / 灏辫瘖娴佹按鍙� / 浣忛櫌鍙� / 韬唤璇佸彿銆嶆墿灞曚负**鍐嶅姞涓� pat_id**
+ // 锛堣 AppointmentMapper.getCurrentCode 鐨� SQL锛夈�傚師鍥狅細
+ // 鎵嬪姩鏂板缓鐨勯绾︼紙/ecg/appointment/create锛夊彧鏈� pat_id锛�
+ // apply_no / episode_id / hospital_no / pat_identity_id 鍏ㄤ负绌猴紝
+ // 绛惧埌椤垫寜鎮h�呯紪鍙锋煡璇㈡椂**姘歌繙鏌ヤ笉鍒�** 鈫� 椤甸潰鎻愮ず銆岃鍏堥绾︺�嶁啋 鏃犳硶绛惧埌銆�
List<AppointmentDO> appointmentExtermalList = appointmentMapper.getCurrentCode(patCode);
for (int appointmentIndex = 0; appointmentIndex < appointmentExtermalList.size(); appointmentIndex++) {
@@ -190,26 +270,47 @@
if (null == appointmentExtermal) continue;
// 浠嶥B鏌ヨ棰勭害锛屾槸鍚﹀凡缁忓瓨鍦�
- AppointmentDO appointmentDO = appointmentMapper.getByEpisodeIdAndApplyNo(appointmentExtermal.getEpisodeId(), appointmentExtermal.getApplyNo());
+ //
+ // 銆愭湰闇�姹傘�戜紭鍏堟寜**涓婚敭 id** 鍒ゆ柇銆屾槸鍚﹀凡瀛樺湪銆嶏細
+ // getCurrentCode 鏄湰鍦板簱鏌ヨ锛坰elect * 浼氭妸 id 甯﹀洖鏉ワ級锛�
+ // 鑰屽師閫昏緫鐢� getByEpisodeIdAndApplyNo(episodeId, applyNo) 鍒ゆ柇锛�
+ // 鎵嬪姩鏂板缓鐨勮杩欎袱涓瓧娈垫槸 NULL/绌� 鈬� `= NULL` 姘歌繙涓嶅尮閰� 鈬� 姣忔墦寮�涓�娆$鍒伴〉灏�**閲嶅鎻掑叆**涓�鏉°��
+ AppointmentDO appointmentDO = null;
+ if (null != appointmentExtermal.getId()) {
+ appointmentDO = appointmentMapper.selectById(appointmentExtermal.getId());
+ }
+ if (null == appointmentDO) {
+ appointmentDO = appointmentMapper.getByEpisodeIdAndApplyNo(
+ appointmentExtermal.getEpisodeId(), appointmentExtermal.getApplyNo());
+ }
if (null == appointmentDO) {
appointmentMapper.insert(appointmentExtermal);
} else {
appointmentExtermal.setId(appointmentDO.getId()); // 纭繚 杩斿洖鍊煎寘鍚� appointment id
// 澶勭悊绗竴娆$‘璁ゆ椂杩樻病鏈夐绾︽椂闂达紝鍐嶆潵纭鏃跺凡鏈夐绾︽椂闂寸殑鎯呭喌
- if (appointmentDO.getBookDate() != appointmentExtermal.getBookDate()) {
+ // 銆愭湰娆′慨澶嶃�戝師鍐欐硶 `appointmentDO.getBookDate() != appointmentExtermal.getBookDate()`
+ // 鏄�**寮曠敤姣旇緝**锛圠ocalDate 涓や釜涓嶅悓瀹炰緥鍗充娇鍊肩浉鍚屼篃浼氬垽涓轰笉绛夛級锛�
+ // 浼氬鑷存瘡娆¢兘鐧借窇涓�娆� updateById锛堟棤璋撴敼鍐� update_time锛夈�傛敼涓哄�兼瘮杈冦��
+ if (!java.util.Objects.equals(appointmentDO.getBookDate(), appointmentExtermal.getBookDate())) {
appointmentMapper.updateById(appointmentExtermal);
}
}
}
- // 鏌ヨ[queue琛╙琛ュ厖 book_seq_num 鍒拌繑鍥炲�间腑
+ // 鏌ヨ[queue琛╙琛ュ厖銆屾帓闃熷彿銆嶅埌杩斿洖鍊间腑
+ //
+ // 銆愬彿缁熶竴锛堟湰闇�姹傦級銆戞帓闃熷彿鏀逛负鍦ㄧ鍒版椂涓�娆℃�у啓杩� queue.seq_num锛屼笉鍐嶅啓 book_seq_num銆�
+ // 鍥犳杩欓噷鍙� seq_num锛涘澶栧瓧娈靛悕浠嶅彨 bookSeqNum锛堥渶姹傝姹傛帴鍙e瓧娈典繚鐣欎笉鍔級銆�
+ // 杩囨护 null锛氬瓨閲忚锛堟敼閫犲墠绛惧埌鐨勶級seq_num 鍙兘涓虹┖锛岃�� toMap 鐨� value 涓� null 浼氭姏 NPE銆�
if (!appointmentExtermalList.isEmpty()) {
List<Long> appointIdlist = appointmentExtermalList.stream().map(appointmentDO -> appointmentDO.getId()).toList();
- List<QueueDO> simpleQueueDOList = queueService.selectBookSeqNumByAppointIdList(appointIdlist);
+ List<QueueDO> simpleQueueDOList = queueService.selectQueueByAppointIdList(appointIdlist);
if (!simpleQueueDOList.isEmpty()) {
- Map<Long, Integer> mapAppointIdVsBookSeqNo = simpleQueueDOList.stream().collect(Collectors.toMap(QueueDO::getAppointId, QueueDO::getBookSeqNum));
- appointmentExtermalList.forEach(appointmentExterma -> appointmentExterma.setBookSeqNum(mapAppointIdVsBookSeqNo.get(appointmentExterma.getId())));
+ Map<Long, Integer> mapAppointIdVsSeqNo = simpleQueueDOList.stream()
+ .filter(queueDO -> null != queueDO.getAppointId() && null != queueDO.getSeqNum())
+ .collect(Collectors.toMap(QueueDO::getAppointId, QueueDO::getSeqNum, (a, b) -> a));
+ appointmentExtermalList.forEach(appointmentExterma -> appointmentExterma.setBookSeqNum(mapAppointIdVsSeqNo.get(appointmentExterma.getId())));
}
}
@@ -315,27 +416,52 @@
AppointmentDO appointment = getAppointment(confirmReqVO.getId());
if (null == appointment) throw exception(PATIENT_NOT_EXISTS);
- // 鎵嬪姩棰勭害锛岀洿鎺ヨ缃绾︽棩鏈熶负褰撳ぉ
- if (confirmReqVO.getIsVip() == 1) {
+ boolean isVipFlag = (null != confirmReqVO.getIsVip() && 1 == confirmReqVO.getIsVip());
+ boolean forceCheckIn = Boolean.TRUE.equals(confirmReqVO.getForceCheckIn());
+ // 娉ㄦ剰锛氳繖閲岀殑"鏄惁褰撳ぉ"蹇呴』鍦ㄦ敼鍐� bookDate 涔嬪墠鍒ゆ柇锛堜笅闈細鎶婇潪褰撳ぉ鏀逛负褰撳ぉ锛�
+ boolean bookDateIsToday = DateUtils.isToday(appointment.getBookDate());
+
+ // 鎵嬪姩棰勭害 / VIP 鍔犲彿锛氶绾︽棩鏈熺洿鎺ユ寜褰撳ぉ绛惧埌
+ if (isVipFlag) {
appointment.setBookDate(LocalDate.now());
+ bookDateIsToday = true;
}
- if (!DateUtils.isToday(appointment.getBookDate())) throw exception(APPOINTMENT_NOT_TODAY);
-
+ // 銆愭湰闇�姹傘�戦潪褰撳ぉ棰勭害鐨勭鍒帮細鍏堟彁閱掋�佺‘璁ゅ悗鍏佽绛惧叆锛堝墠绔脊绐楃‘璁ゅ悗甯� forceCheckIn=true锛�
+ // 鈶� 鏈‘璁わ紙鍓嶇杩樻病璁╃敤鎴风‘璁わ級鈫� 浠嶈繑鍥� APPOINTMENT_NOT_TODAY锛屽墠绔嵁姝ゅ脊銆岄潪褰撳ぉ锛屾槸鍚︾鍒般�嶏紱
+ // 鈶� 宸茬‘璁� 鈫� 鍏佽绛惧叆锛屽苟涓�**寮哄埗璧伴鐣欏彿閫氶亾**锛岄伩鍏嶅崰鐢ㄥ綋澶╁悓鏃舵鐨勬甯搁绾﹀彿锛�
+ // 鈶� 棰勭害鏃ユ湡鏀瑰啓涓哄綋澶╋細闃熷垪/澶у睆/宸ヤ綔鍙伴兘鎸� book_date = 浠婂ぉ 杩囨护锛�
+ // 鑻ヤ繚鐣欏師鏃ユ湡锛屾偅鑰呯鍏ュ悗涓嶄細鍑虹幇鍦ㄤ换浣曞垪琛ㄩ噷銆�
+ if (!bookDateIsToday) {
+ if (!forceCheckIn) {
+ throw exception(APPOINTMENT_NOT_TODAY);
+ }
+ log.info("[appoitmentConfirm] 闈炲綋澶╅绾︾鍏ワ紙鏀圭敤棰勭暀鍙凤紝棰勭害鏃ユ湡鏀逛粖澶╋級. appointmentId={} 鍘熼绾︽棩鏈�={} checkType={} timeslot={}",
+ appointment.getId(), appointment.getBookDate(), confirmReqVO.getBookCheckType(),
+ confirmReqVO.getBookTimeslot());
+ appointment.setBookDate(LocalDate.now());
+ }
// 銆愰渶姹傦細鎺掗槦搴忓彿瑙勫垯銆戞寜 check_type.seq_rule 鍐冲畾鍙栧彿鏂瑰紡锛�
// 0=棰勭害鍙凤紙鐢ㄩ绾︾郴缁熷凡涓嬪彂鐨勫彿锛涘綋鍓� HIS 鏈笅鍙戯紝浼氳嚜鍔ㄥ洖閫�鍒扮鍒板簭鍙凤級
// 1=绛惧埌搴忓彿锛堝綋澶╁悓妫�鏌ョ被鍨嬭繛缁�掑锛屾瘡 9 涓鐣� 1 涓粰鍔犳�ワ級
// 2=鏃舵鍙凤紙鎸� bookTimeslot 浠庡彿姹犲彇鍙� 鈥斺�� 鏀归�犲墠鐨勫師鏈夎涓猴紝涔熸槸鏈厤缃椂鐨勯粯璁わ級
+ //
+ // 銆愭湰闇�姹傦細鎸夋椂娈甸绾︺�戝鍔� VIP/鍔犲彿鏍囪锛�
+ // 路 VIP/鍔犲彿/闈炲綋澶╃鍏� 鈫� 鏈棰勭暀鍙� 鈫� 鎬婚鐣欐睜锛坱ime_slot=0锛�
+ // 路 鏅�� 鈫� 鏈鏅�氬彿 鈫� 鏈棰勭暀鍙� 鈫� 鎬婚鐣欐睜
+ // 娌℃湁棰勭害鏃舵锛坆ookTimeslot 涓虹┖/0/瀛楀吀澶栵級鏃朵篃鑳界鍒帮細鐩存帴钀藉埌鎬婚鐣欐睜銆�
boolean urgent = isHisUrgent(appointment);
+ boolean vip = isVipFlag || urgent || !bookDateIsToday;
Integer newSeqNo = queueSequenceService.distributeSeqNoByRule(
confirmReqVO.getBookCheckType(),
confirmReqVO.getBookTimeslot(),
appointment.getBookSeqNum(),
- urgent);
- log.info("[appoitmentConfirm][鍒嗛厤鎺掗槦搴忓彿] appointmentId={} checkType={} timeslot={} 瑙勫垯鍙栧彿={} 鍔犳��={}",
+ urgent,
+ vip);
+ log.info("[appoitmentConfirm][鍒嗛厤鎺掗槦搴忓彿] appointmentId={} checkType={} timeslot={} 瑙勫垯鍙栧彿={} 鍔犳��={} VIP/鍔犲彿={}",
appointment.getId(), confirmReqVO.getBookCheckType(), confirmReqVO.getBookTimeslot(),
- newSeqNo, urgent);
+ newSeqNo, urgent, vip);
try {
QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO();
@@ -348,14 +474,19 @@
queueSaveReqVO.setBookDate(appointment.getBookDate());
queueSaveReqVO.setBookTimeslot(confirmReqVO.getBookTimeslot()); /*appointment.getBookTimeslot()*/
queueSaveReqVO.setBookCheckType(appointment.getBookCheckType());
- queueSaveReqVO.setBookSeqNum(newSeqNo);
+ // 銆愬彿缁熶竴锛堟湰闇�姹傦級銆戠鍒版椂鍙栫殑鍙�**鐩存帴鍐欏叆 seq_num**锛堜笉鍐嶅啓 book_seq_num锛夈��
+ // 涔嬪悗浠讳綍鐜妭閮戒笉鍐嶆敼杩欎釜鍙凤細鍒嗘祦銆佽繃鍙枫�佸彫鍥炪�佸姞鎬ャ�佽鏈哄潎鍙敼鐘舵��/宸ヤ綅銆�
+ // 鍙栧彿瑙勫垯浠嶇敱 check_type.seq_rule 鍐冲畾锛堥绾﹀彿 / 绛惧埌搴忓彿 / 鏃舵鍙凤級锛岃 distributeSeqNoByRule銆�
+ queueSaveReqVO.setSeqNum(newSeqNo);
queueSaveReqVO.setIsVip(confirmReqVO.getIsVip());
queueSaveReqVO.setPassed((byte) 0);
queueSaveReqVO.setExpired((byte) 0);
// 闇�姹�2锛欼SCB銆屾槸鍚﹀簥杈广�嶉殢闃熷垪涓�璧疯惤搴擄紝渚涘睆骞�/椤甸潰灞曠ず
queueSaveReqVO.setIsBedside(appointment.getIsBedside());
// HIS 鍔犳�ユ爣璁帮紙jjbz=J锛夆啋 鎺掗槦鍔犳�ワ紝涓庝汉宸ユ彃闃熷叡鐢� jump_flag銆�
- // queue 琛ㄦ寜 "order by jump_flag desc, book_timeslot, create_time" 鍙栧彿锛岀疆 1 鍗充紭鍏堛��
+ // 銆愬彿缁熶竴鍚庛�戝姞鎬�**涓嶆敼鎺掗槦鍙�**锛堝彿鍦ㄤ笅闈� setSeqNum 鏃跺凡缁忓畾姝伙級锛�
+ // 鑰屾槸闈犳帓搴忎綋鐜帮細鍒嗘祦鍙栦汉銆佸彨鍙峰彇浜恒�佸伐浣滃彴/璇婇棿灞�/澶у睆鍒楄〃閮芥槸
+ // "jump_flag desc 浼樺厛 鈫� seq_num 鍗囧簭"锛岀疆 1 鍗虫帓鍒版渶鍓嶃��
if (urgent) {
queueSaveReqVO.setJumpFlag((byte) 1);
log.info("[appoitmentConfirm][HIS 鍔犳�ユ偅鑰咃紝鎺掗槦鏍囪涓哄姞鎬 applyNo={} patId={}",
@@ -471,6 +602,40 @@
appointment.setTargetSiteCode(targetSite);
}
+ // 棰勭害鏃堕棿/鏃堕棿娈�/璇婂锛圫0201ECG 鎶ユ枃鐨� component2.observationRequest.ZDY锛屽疄娴嬪舰濡傦細
+ // ZDY={time=2026-10-06 08:00-08:30, area=..., roomname=6鍙疯瘖瀹�(鍘呭彸渚�), roomcode=, jcxmcode=201652, jcxmname=骞虫澘杩愬姩璇曢獙}
+ // 鍘熷疄鐜板彧鎶婂畠褰�"妫�鏌ョ被鍨�"鐢紝娌¤В鏋愰绾︿俊鎭紝瀵艰嚧杩欐潯娴佸缓鍑烘潵鐨勮褰�
+ // book_date / book_timeslot / book_time / room_name 鍏ㄤ负绌猴紙瀹炴祴 211741銆�211962 灏辨槸杩欑鍗婃潯鏁版嵁锛夈��
+ Object zdyRaw = c2.get("ZDY");
+ if (zdyRaw == null) {
+ zdyRaw = c2.get("zdy");
+ }
+ if (zdyRaw instanceof Map) {
+ Map<String, Object> zdyMap = (Map<String, Object>) zdyRaw;
+ Object timeObj = zdyMap.get("time");
+ String timeRange = timeObj == null ? null : timeObj.toString();
+ Integer timeslot = parseBookTimeslot(timeRange);
+ if (timeslot != null) {
+ appointment.setBookTimeslot(timeslot);
+ // 鐢辨椂闂存璧峰鎺ㄧ畻棰勭害鏃跺埢锛堝 8000830 鈫� 08:00锛夛紱book_date 瑙佷笅鏂� 鈶� 鐨勭粺涓�鎺ㄥ
+ LocalTime startTime = timeOfTimeslot(timeslot);
+ if (startTime != null) {
+ appointment.setBookTime(LocalDateTime.of(LocalDate.now(), startTime));
+ }
+ } else {
+ // 鏃堕棿娈佃В鏋愪笉鍑烘潵鏃讹紝閫�鍥炵敤 effectiveTime锛堟姤鏂囬噷鍙︿竴涓绾︽椂鍒诲瓧娈碉級
+ LocalDateTime bookTime = parseDateTime(digText(c2, "effectiveTime", "any", "value"));
+ if (bookTime != null) {
+ appointment.setBookTime(bookTime);
+ appointment.setBookDate(bookTime.toLocalDate());
+ }
+ }
+ Object roomName = zdyMap.get("roomname");
+ if (roomName != null && StringUtils.isNotEmpty(roomName.toString())) {
+ appointment.setRoomName(truncate(roomName.toString(), ROOM_NAME_MAX_LEN));
+ }
+ }
+
// 鍖诲槺鍙凤細component2.observationRequest.id.item[root=2.16.156.10011.1.28].extension
//
// 渚濇嵁锛圚IS銆婁氦浜掓湇鍔¢�氱敤鎺ュ彛鏂囨。銆嬶級锛�
@@ -491,15 +656,29 @@
}
}
- // 鍖荤敓寮�鍗曟椂闂�
- Optional.ofNullable(dataMap.get("controlActProcess")).map(controlActProcess -> (Map<String, Object>) controlActProcess).map(controlActProcess -> (Map<String, Object>) controlActProcess.get("subject")).map(subject -> (Map<String, Object>) subject.get("observationRequest")).map(observationRequest -> (Map<String, Object>) observationRequest.get("author")).map(author -> (Map<String, Object>) author.get("time")).map(time -> (String) time.get("value")).map(str -> {
- try {
- return new SimpleDateFormat("yyyyMMddHHmmss").parse(str);
- } catch (Exception e) {
- e.printStackTrace();
- return null;
+ // 鍖荤敓寮�鍗曟椂闂达紙鎶ユ枃璺緞锛歝ontrolActProcess.subject.observationRequest.author.time.value锛�
+ //
+ // 銆愪负浠�涔堜笉鐢ㄤ竴琛� Optional 閾剧洿鎺� parse銆�
+ // 鍘熷疄鐜板啓姝� `SimpleDateFormat("yyyyMMddHHmmss")`锛屾牸寮忎笉绗﹀彧浼� **闈欓粯涓㈠純**
+ // 锛坈atch 閲屼粎 printStackTrace锛屼笉钀芥棩蹇楀瓧娈碉級鈥斺�旂嚎涓婂嚭鐜伴棶棰樻椂鏃犱粠瀹氫綅銆�
+ // 鐜版敼涓烘樉寮忓垎鏀� + 缁撴瀯鍖� WARN 鏃ュ織锛岃嚦灏戞妸銆屾姤鏂囧師鍊� / 鐢宠鍗曞彿銆嶈涓嬫潵銆�
+ String doctorTimeRaw = digText(dataMap, "controlActProcess", "subject",
+ "observationRequest", "author", "time", "value");
+ // 璇ュ灏氭湭鎵ц鍒颁笅鏂圭殑 setApplyNo锛堝師 L575锛夛紝鏁呭崟鐙彇涓�娆$敵璇峰崟鍙凤紝浠呯敤浜庢棩蹇楀畾浣�
+ String applyNoForLog = digText(dataMap, "controlActProcess", "subject",
+ "observationRequest", "id", "item", "extension");
+ if (StringUtils.isNotEmpty(doctorTimeRaw)) {
+ // 鍘熸牱閲囩撼 HIS 鎵�鍙戠殑鍊硷紙涓嶅仛鍙栬垗锛岄伩鍏嶈鍒ゅ弽鑰屽啓鍧忔暟鎹級銆�
+ // 鑻ヤ负銆屾棩鏈熷�笺�嶏紙鏃跺垎绉�=000000锛屽疄娴嬬害 61%锛夛紝parseHisDoctorTime 浼氭墦 WARN
+ // 璁板綍鍘熷鎶ユ枃鍊� + 鐢宠鍗曞彿锛屼究浜庡悜 HIS 渚у弽棣堬紱鍐欏叆琛屼负涓庢敼鍔ㄥ墠涓�鑷淬��
+ java.util.Date parsedDoctorTime = parseHisDoctorTime(doctorTimeRaw, applyNoForLog);
+ if (parsedDoctorTime != null) {
+ appointment.setDoctorTime(parsedDoctorTime);
}
- }).filter(Objects::nonNull).ifPresent(appointment::setDoctorTime);
+ } else {
+ log.warn("[handleAppointmentCreate][鎶ユ枃缂哄皯寮�鍗曟椂闂� author/time/value锛宒octor_time 灏嗕负绌篯 applyNo={}",
+ applyNoForLog);
+ }
//璁剧疆寮�鍗曞尰鐢熷鍚�
Optional.ofNullable(dataMap.get("controlActProcess")).map(controlActProcess -> (Map<String, Object>) controlActProcess).map(controlActProcess -> (Map<String, Object>) controlActProcess.get("subject")).map(subject -> (Map<String, Object>) subject.get("observationRequest")).map(observationRequest -> (Map<String, Object>) observationRequest.get("author")).map(author -> (Map<String, Object>) author.get("assignedEntity")).map(assignedEntity -> (Map<String, Object>) assignedEntity.get("assignedPerson")).map(assignedPerson -> (Map<String, Object>) assignedPerson.get("name")).map(name -> (Map<String, Object>) name.get("item")).map(item -> (Map<String, Object>) item.get("part")).map(part -> (String) part.get("value")).ifPresent(appointment::setDoctor);
@@ -563,6 +742,33 @@
// 璁剧疆鐢宠鍗曞彿
Optional.ofNullable(dataMap.get("controlActProcess")).map(controlActProcess -> (Map<String, Object>) controlActProcess).map(controlActProcess -> (Map<String, Object>) controlActProcess.get("subject")).map(subject -> (Map<String, Object>) subject.get("observationRequest")).map(observationRequest -> (Map<String, Object>) observationRequest.get("id")).map(id -> (Map<String, Object>) id.get("item")).map(item -> (String) item.get("extension")).ifPresent(appointment::setApplyNo);
+ // 棰勭害鏃ユ湡锛氭姤鏂囬噷鐨勯绾︽椂闂存 ZDY.time 褰㈠ "2026-10-06 08:00-08:30"銆�
+ // 涓婇潰瑙f瀽鏃堕棿娈垫椂鍙嬁鍒颁簡鏃跺垎锛堢敤浜� book_timeslot/book_time锛夛紝杩欓噷琛ユ棩鏈燂細
+ // 鑻ュ彧鎷垮埌鏃堕棿娈佃�屾棩鏈熶负绌猴紝灏变粠 ZDY.time 鐨勬棩鏈熼儴鍒嗚ˉ涓婏紝骞舵嵁姝や慨姝� book_time 鐨勬棩鏈熴��
+ String zdyTimeRange = digText(dataMap, "controlActProcess", "subject", "observationRequest",
+ "component2", "observationRequest", "ZDY", "time");
+ if (StringUtils.isEmpty(zdyTimeRange)) {
+ zdyTimeRange = digText(dataMap, "controlActProcess", "subject", "observationRequest",
+ "component2", "observationRequest", "zdy", "time");
+ }
+ if (StringUtils.isNotEmpty(zdyTimeRange)) {
+ String[] parts = zdyTimeRange.trim().split("\\s+");
+ if (parts.length >= 1) {
+ LocalDateTime parsedDate = parseDateTime(parts[0] + " 00:00");
+ if (parsedDate != null) {
+ LocalDate zdyBookDate = parsedDate.toLocalDate();
+ if (appointment.getBookDate() == null) {
+ appointment.setBookDate(zdyBookDate);
+ }
+ // book_time 涔嬪墠鍙槸鐢�"浠婂ぉ"鍗犱綅锛岃繖閲屾崲鎴愮湡瀹為绾︽棩鏈�
+ if (appointment.getBookTime() != null) {
+ appointment.setBookTime(appointment.getBookTime().withYear(zdyBookDate.getYear())
+ .withMonth(zdyBookDate.getMonthValue()).withDayOfMonth(zdyBookDate.getDayOfMonth()));
+ }
+ }
+ }
+ }
+
//璁剧疆妫�鏌ョ被鍨�
// String checkType = Optional.ofNullable(dataMap.get("controlActProcess")).map(controlActProcess -> (Map<String, Object>) controlActProcess).map(controlActProcess -> (Map<String, Object>) controlActProcess.get("component2")).map(component2 -> (Map<String, Object>) component2.get("observationRequest")).map(observationRequest -> (Map<String, Object>) observationRequest.get("code")).map(code -> (String) code.get("code")).orElseThrow(() -> exception(APPOINTMENT_CREATE_FAIL));
String checkType = Optional.ofNullable(dataMap.get("controlActProcess")).map(controlActProcess -> (Map<String, Object>) controlActProcess).map(controlActProcess -> (Map<String, Object>) controlActProcess.get("subject")).map(subject -> (Map<String, Object>) subject.get("observationRequest")).map(observationRequest -> (Map<String, Object>) observationRequest.get("component2")).map(component2 -> (Map<String, Object>) component2.get("observationRequest")).map(observationRequest -> (Map<String, Object>) observationRequest.get("code")).map(code -> (String) code.get("code")).orElseThrow(() -> exception(APPOINTMENT_CREATE_FAIL));
@@ -582,7 +788,17 @@
if (value != null) {
appointment.setBookCheckType(value);
} else {
- log.warn("[handleAppointmentCreate][浣撴鎮h�呮鏌ラ」鐩悕绉版棤娉曟槧灏刔 checkName={}", checkName);
+ // 鍚嶇О鏄犲皠涓嶅埌灏遍��鍥炪�屾寜 HIS 妫�鏌ヤ唬鐮佹槧灏勩�嶏細
+ // 瀹炴祴杩愬姩璇曢獙鍦� HIS 渚ф敼杩囧悕锛堝钩鏉胯繍鍔ㄥ績鐢� 鈫� 骞虫澘杩愬姩璇曢獙锛夛紝
+ // 鍙鍚嶇О浼氳 book_check_type 钀界┖锛涜�屾姤鏂囬噷鐨� code锛堝 201652锛夋槸绋冲畾鐨勩��
+ Integer fallback = resolveBookCheckTypeFromComponent2(dataMap);
+ if (fallback != null) {
+ appointment.setBookCheckType(fallback);
+ log.info("[handleAppointmentCreate][浣撴鎮h�呭悕绉版湭鏄犲皠锛屽凡鎸夋鏌ヤ唬鐮佸厹搴昡 checkName={} bookCheckType={}",
+ checkName, fallback);
+ } else {
+ log.warn("[handleAppointmentCreate][浣撴鎮h�呮鏌ラ」鐩悕绉颁笌浠g爜鍧囨棤娉曟槧灏刔 checkName={}", checkName);
+ }
}
} else {
Integer value = resolveBookCheckTypeFromComponent2(dataMap);
@@ -627,13 +843,12 @@
if (appointmentDO != null) {
// 淇濈暀鍘熻褰曚腑鏈鎶ユ枃鏈彁渚涚殑瀛楁锛岄伩鍏嶈绌哄�艰鐩�
mergeUnsetFields(appointment, appointmentDO);
+ // 鍚堝苟缁撴灉瑕佸洖鍒� saveReqVO 涓婏紝鍚﹀垯鏇存柊/鎻掑叆鐢ㄧ殑杩樻槸"鏈悎骞�"鐨勬姤鏂囧��
saveReqVO = BeanUtils.toBean(appointment, AppointmentSaveReqVO.class);
- saveReqVO.setId(appointmentDO.getId());
- updateAppointment(saveReqVO);
- return appointmentDO.getId();
}
-
- return createAppointment(saveReqVO);
+ // 浜ょ粰鍘熷瓙钀藉簱锛氫笉瀛樺湪鍒欐彃鍏ワ紝宸插瓨鍦ㄥ垯鏇存柊锛涘苟鍙戦噸澶嶆彃鍏ヤ細琚敮涓�绱㈠紩鎷︿笅骞惰浆涓烘洿鏂帮紝
+ // 涓嶄細鍐嶅嚭鐜�"鍚屼竴 apply_no 涓ゆ潯璁板綍"锛堝師瀹炵幇鍦ㄨ繖閲�"鏌ヤ竴娆″啀鎻�"锛屽苟鍙戜笅蹇呯劧婕忥級銆�
+ return atomicSaveByApplyNo(saveReqVO);
} catch (Exception e) {
log.error("[handleAppointmentCreate][澶勭悊棰勭害鍒涘缓澶辫触 dataMap({})]", dataMap, e);
throw exception(APPOINTMENT_CREATE_FAIL);
@@ -904,12 +1119,18 @@
// 3. 鏈湴璁板綍鍖归厤
AppointmentDO existingAppointment = appointmentMapper.getByApplyNo(applyNo);
if (existingAppointment != null) {
- existingAppointment.setStatus(status);
- if (HisCheckStatusEnum.REGISTERED.getCode().toString().equals(status)) {
- existingAppointment.setRegisterDate(new Date());
- }
- AppointmentSaveReqVO updateReqVO = BeanUtils.toBean(existingAppointment, AppointmentSaveReqVO.class);
- updateAppointment(updateReqVO);
+ // 鐘舵�佹祦鍙厑璁告敼 status / register_date锛�
+ // 鍘熷疄鐜版妸鏌ュ嚭鏉ョ殑鏁磋瀵硅薄鍐� updateById 鍐欏洖锛堣-鏀�-鍐欙級锛屼細鎶� book_date / book_check_type
+ // 绛夊瓧娈垫寜鏃у揩鐓ц鐩栥�傚疄娴� 2026-10-05 07:58锛屼竴绗旈绾﹀垰琚� S050401 鍐欏ソ棰勭害鏃堕棿涓庢鏌ョ被鍨嬶紝
+ // 3.6 绉掑悗 S0405 鐘舵�佹祦鍙堟妸鏁磋鍐欏洖涓�娆★紝check_type 琚啓鎴愪簡绌恒��
+ // 杩欓噷鏀规垚鍙洿鏂扮姸鎬侊紙register_date 浠呭湪鐘舵��=鐧昏鏃跺啓鍏ワ紝鐢� updateStatusByApplyNo 澶勭悊锛夈��
+ Date registerDate = HisCheckStatusEnum.REGISTERED.getCode().toString().equals(status)
+ ? new Date() : null;
+ Integer updated = registerDate != null
+ ? appointmentMapper.updateStatusByApplyNo(applyNo, status, registerDate)
+ : appointmentMapper.updateStatusOnlyByApplyNo(applyNo, status);
+ log.info("[handleAppointmentStateUpdate][浠呮洿鏂扮姸鎬乚 applyNo={} status={} 褰卞搷琛屾暟={}",
+ applyNo, status, updated);
return;
}
@@ -1062,6 +1283,121 @@
return o == null ? null : o.toString();
}
+ /**
+ * 浠� S050401/S050501锛堟鏌ラ绾︼級鎶ユ枃鐨� {@code ZDY} 鑺傜偣瑙f瀽鏈湴 {@code book_check_type}銆�
+ *
+ * <h3>涓轰粈涔堥渶瑕佽繖涓柟娉�</h3>
+ * {@code S050401/S050501} 鎶ユ枃鐨勬鏌ラ」鐩斁鍦� {@code ZDY.jcxmcode / ZDY.jcxmname}
+ * 锛堝舰濡� {@code jcxmcode=201652, jcxmname=骞虫澘杩愬姩璇曢獙}锛夛紝
+ * 涓� {@code S0201ECG} 鐨� {@code component2.observationRequest.code.code} **涓嶆槸鍚屼竴璺緞**銆�
+ * 鍘熷厛鍙湁 S0201ECG 閭f潯璺緞瑙f瀽妫�鏌ョ被鍨嬶紝浜庢槸銆孲050401 鍏堝埌銆丼0201ECG 鏈埌銆嶆椂璧�
+ * {@link #insertAppointmentFromCheckAppointment} 瀹归敊鏂板锛�
+ * {@code book_check_type} 浼�**姘歌繙涓虹┖** 鈥斺�� 瀹炴祴 2026-09-29~10-09 鍏� 279 鏉�
+ * 锛堝 {@code apply_no=8826092420371106}锛屾姤鏂囬噷 {@code jcxmcode=201652} 鏄庢槑瀛樺湪锛夈��
+ *
+ * <h3>瑙f瀽椤哄簭</h3>
+ * <ol>
+ * <li><b>鍚嶇О浼樺厛</b>锛歿@code jcxmname} 鈫� {@link HisCheckNameEnum#getByName}銆�
+ * 璇ユ灇涓惧凡鍚�屽钩鏉胯繍鍔ㄨ瘯楠屻�嶇瓑 HIS 鏀瑰悕鍒悕锛屼笖鍐呯疆瑙勮寖鍖栧尮閰嶏紱</li>
+ * <li><b>浠g爜鍏滃簳</b>锛歿@code jcxmcode} 鈫� {@link HisCheckCodeEnum}锛�
+ * 鍏煎甯�/涓嶅甫 {@code Y} 鍓嶇紑銆�</li>
+ * </ol>
+ *
+ * <h3>澶氬�煎鐞�</h3>
+ * 瀹炴祴璇ュ瓧娈靛彲鑳戒负閫楀彿鍒嗛殧澶氬�硷紙濡� S0405 鐨� {@code jcxmcode=1080,3016,3014}锛夈��
+ * 绛栫暐锛�**鎸夐『搴忓彇绗竴涓兘鏄犲皠鎴愬姛鐨勫��**锛涘厛鏁翠綋璇曟帰锛堝崟鍊煎満鏅級锛屽啀閫愭璇曟帰銆�
+ *
+ * @param zdy 鎶ユ枃涓殑 {@code ZDY} 鑺傜偣锛屽彲涓� null
+ * @return 鏈湴妫�鏌ョ被鍨嬪�硷紙濡� 400锛夛紱鏃犳硶瑙f瀽鏃惰繑鍥� null锛堣皟鐢ㄦ柟淇濇寔鍘熷�间笉鍐欙級
+ */
+ private Integer resolveBookCheckTypeFromZdy(Map<String, Object> zdy, String applyNo) {
+ if (zdy == null) {
+ log.warn("[resolveBookCheckTypeFromZdy][鎶ユ枃鏃� ZDY 鑺傜偣锛屾棤娉曡В鏋愭鏌ョ被鍨媇 applyNo={}", applyNo);
+ return null;
+ }
+ String jcxmName = extractZdyValueFromMap(zdy, "jcxmname");
+ String jcxmCode = extractZdyValueFromMap(zdy, "jcxmcode");
+
+ // 鈶� 鍚嶇О鏄犲皠锛堜紭鍏堬細鍙锛屼笖鏋氫妇宸茶鐩� HIS 鏀瑰悕涓庤鑼冨寲宸紓锛�
+ Integer byName = mapCheckNameToType(jcxmName);
+ if (byName != null) {
+ return byName;
+ }
+ // 鈶� 浠g爜鏄犲皠锛堝厹搴曪細瀹炴祴 HIS 渚ф敼杩囧悕锛屼唬鐮佹洿绋冲畾锛�
+ Integer byCode = mapCheckCodeToType(jcxmCode);
+ if (byCode != null) {
+ log.info("[resolveBookCheckTypeFromZdy][鍚嶇О鏈槧灏勶紝宸叉寜妫�鏌ヤ唬鐮佸厹搴昡 "
+ + "applyNo={} jcxmname={} jcxmcode={} bookCheckType={}",
+ applyNo, jcxmName, jcxmCode, byCode);
+ return byCode;
+ }
+
+ log.warn("[resolveBookCheckTypeFromZdy][妫�鏌ラ」鐩悕绉颁笌浠g爜鍧囨棤娉曟槧灏勶紝book_check_type 淇濇寔鍘熷�糫 "
+ + "applyNo={} jcxmname={} jcxmcode={}", applyNo, jcxmName, jcxmCode);
+ return null;
+ }
+
+ /** 妫�鏌ラ」鐩悕绉� 鈫� 鏈湴妫�鏌ョ被鍨嬶紙鏀寔閫楀彿鍒嗛殧澶氬�硷紝鍙栫涓�涓彲鏄犲皠鐨勶級 */
+ private Integer mapCheckNameToType(String rawName) {
+ if (StringUtils.isEmpty(rawName)) {
+ return null;
+ }
+ for (String candidate : splitMultiValue(rawName)) {
+ // 鍘荤┖鐧斤細HIS 鎶ユ枃閲屽伓瑙併�屽钩鏉胯繍鍔ㄨ瘯楠� 銆嶈繖绫诲熬闅忕┖鏍�
+ String mapped = HisCheckNameEnum.getByName(candidate.replaceAll("\\s+", ""));
+ Integer value = parseIntegerQuietly(mapped);
+ if (value != null) {
+ return value;
+ }
+ }
+ return null;
+ }
+
+ /** HIS 妫�鏌ヤ唬鐮� 鈫� 鏈湴妫�鏌ョ被鍨嬶紙鏀寔閫楀彿鍒嗛殧澶氬�硷紱鍏煎甯�/涓嶅甫 Y 鍓嶇紑锛� */
+ private Integer mapCheckCodeToType(String rawCode) {
+ if (StringUtils.isEmpty(rawCode)) {
+ return null;
+ }
+ for (String candidate : splitMultiValue(rawCode)) {
+ String code = candidate.replaceAll("\\s+", "");
+ if (code.isEmpty()) {
+ continue;
+ }
+ // 鍏煎涓ょ鎶ユ枃褰㈡�侊細甯﹀墠缂�锛圷1202065锛変笌涓嶅甫鍓嶇紑锛�201652锛�
+ String[] tries = code.length() > 1
+ ? new String[]{code, code.substring(1)}
+ : new String[]{code};
+ for (String t : tries) {
+ Integer value = parseIntegerQuietly(HisCheckCodeEnum.getByCode(t));
+ if (value != null) {
+ return value;
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 鎷嗗垎銆屽彲鑳界殑澶氬�笺�嶅瓧娈点��
+ * <p>
+ * 鍏堣繑鍥�**鏁翠綋**锛堣鐩栧崟鍊煎満鏅紝涔熼伩鍏嶆妸鍚嶇О閲屾湰灏卞惈閫楀彿鐨勯」鎷嗗潖锛夛紝
+ * 鍐嶈繑鍥炴寜 {@code ,} / {@code 锛寎 鎷嗗嚭鐨勫悇娈点��
+ */
+ private List<String> splitMultiValue(String raw) {
+ List<String> result = new ArrayList<>();
+ if (StringUtils.isEmpty(raw)) {
+ return result;
+ }
+ result.add(raw);
+ for (String part : raw.split("[,锛宂")) {
+ String p = part == null ? "" : part.trim();
+ if (!p.isEmpty() && !p.equals(raw)) {
+ result.add(p);
+ }
+ }
+ return result;
+ }
+
/** {@code appointment.remark} 鍒楀涓婇檺锛堣 08_fix_remark_length.sql锛屽綋鍓� varchar(2000)锛� */
private static final int REMARK_MAX_LEN = 2000;
/** {@code appointment.room_name} 鍒楀涓婇檺 */
@@ -1139,6 +1475,27 @@
/** HIS 鎶ユ枃涓�屽尰鍢卞彿/鍖诲槺ID銆嶇殑 id root锛堣銆婁氦浜掓湇鍔¢�氱敤鎺ュ彛鏂囨。銆�6.1 / 6.4 / 6.5锛� */
private static final String ORDER_NO_ROOT = "2.16.156.10011.1.28";
+
+ /**
+ * HIS銆屽紑鍗曟椂闂淬��({@code author/time/value}) 鐨勬椂闂存牸寮忋��
+ * 娉ㄦ剰锛歿@link SimpleDateFormat} **涓嶆槸绾跨▼瀹夊叏**鐨勶紝鏁呰繖閲屽彧淇濆瓨 pattern 瀛楃涓诧紝
+ * 姣忔閮芥柊寤哄疄渚嬶紙瑙� {@link #parseHisDoctorTime}锛夈��
+ */
+ private static final String HIS_DOCTOR_TIME_PATTERN = "yyyyMMddHHmmss";
+
+ /**
+ * 鍒ゆ柇 HIS 寮�鍗曟椂闂存槸鍚︿负銆屾棩鏈熷�笺�嶏紙褰㈠ {@code 20261001000000}锛屾椂鍒嗙鍏� 0锛夈��
+ *
+ * <p>鐢� {@code endsWith} 鑰屼笉鏄鍒欙細璇箟鐩寸櫧涓旀棤杞箟鍧�
+ * 锛堟浘鍐欒繃 {@code value.matches("\\d{6}000000")}锛屽洜杞箟灞傜骇鍑洪敊瀵艰嚧姘镐笉鍖归厤锛夈��
+ */
+ private boolean isHisTimeOnlyDate(String value) {
+ if (value == null || value.length() != 14) {
+ return false;
+ }
+ // 鍚� 6 浣嶏紙HHmmss锛夊叏涓� '0' 鍗充负銆屾棩鏈熷�笺�嶅舰鎬�
+ return value.endsWith("000000");
+ }
/**
* 鍦� HL7 鐨� {@code id} 鑺傜偣涓紝鎸� {@code root} 鍖归厤骞跺彇鍑� {@code extension}銆�
@@ -1442,6 +1799,15 @@
if (roomName != null && StringUtils.isNotEmpty(roomName.toString())) {
appointment.setRoomName(truncate(roomName.toString(), ROOM_NAME_MAX_LEN));
}
+ // 妫�鏌ョ被鍨嬶細**浠呭湪涓虹┖鏃惰ˉ**
+ // 绛栫暐 (a)锛氫笉瑕嗙洊宸叉湁鍊硷紝閬垮厤鏀瑰潖鏁版嵁锛堜緥濡傝鍗曟浘鐢� S0201ECG 姝g‘鍐欏叆杩囩被鍨嬶級銆�
+ // 涓庡閿欐柊澧炲垎鏀繚鎸佸悓涓�閫昏緫銆�
+ if (appointment.getBookCheckType() == null) {
+ Integer checkTypeValue = resolveBookCheckTypeFromZdy(zdy, applyNo);
+ if (checkTypeValue != null) {
+ appointment.setBookCheckType(checkTypeValue);
+ }
+ }
}
// 棰勭害鎺掑簭鍙凤紙patient.id.item[4]锛�
Integer seqNum = extractBookSeqNum(actAppointment);
@@ -1548,6 +1914,23 @@
appointment.setBookSrc(bookSrcValue);
appointment.setStatus(status);
+ // 鎮h�呮潵婧愶紙pat_src锛夛細涓� S0201ECG 淇濇寔鍚屼竴鍋氭硶 鈥斺�� 鐩存帴鍙栨姤鏂囦腑鐨勬偅鑰呯被鍨嬩唬鐮併��
+ //
+ // 鈿狅笍 宸茬煡椋庨櫓锛堜繚鐣欑幇鐘讹紝涓嶅湪鏈鏀瑰姩鑼冨洿鍐咃級锛�
+ // 瀹炴祴 S050401 鎶ユ枃瀵规湰鏉′綋妫�鍗曠粰鍑虹殑鏄� code=3 / displayName=浣撴锛�
+ // 鑰屾湰鍦板瓧鍏革紙ecg_patient_source锛変笌鏁版嵁鍒嗗竷閮借〃鏄庛�屼綋妫� = 4銆佷綇闄� = 3銆嶏細
+ // 鍏ㄥ簱 pat_src=4 鐨� 55,729 鏉$瀹ゅ潎涓恒�屽仴搴风鐞嗕腑蹇冦�嶏紝88 鍓嶇紑锛堜綋妫�锛夊崟 55,874 鏉′负 pat_src=4銆�
+ // 鍗虫姤鏂� code 涓庢湰鍦板瓧鍏哥紪鐮佸苟涓嶄竴鑷淬�傛澶�**鍒绘剰娌跨敤鎶ユ枃鍘熷��**浠ヤ笌 S0201ECG 琛屼负涓�鑷达紝
+ // 濡傞渶鎸夊悕绉扮籂姝o紙浣撴鈫�4锛夛紝搴旂粺涓�鍦ㄤ袱澶勪竴璧锋敼锛岄伩鍏嶄袱鏉℃祦鍐欏嚭涓嶅悓鍊笺��
+ Map<String, Object> codeNode = (Map<String, Object>) actAppointment.get("code");
+ Integer patSrcValue = codeNode == null ? null : parseIntegerQuietly(str(codeNode.get("code")));
+ if (patSrcValue != null) {
+ appointment.setPatSrc(patSrcValue);
+ } else {
+ log.warn("[insertAppointmentFromCheckAppointment][鎶ユ枃缂烘偅鑰呯被鍨�(actAppointment.code.code)锛�"
+ + "pat_src 灏嗕负绌篯 applyNo={} code={}", applyNo, codeNode);
+ }
+
Map<String, Object> zdy = (Map<String, Object>) actAppointment.get("ZDY");
// ZDY 涓殑 remark锛堟敞鎰忎簨椤癸級涓� roomname锛堟埧闂村悕绉帮級宸查殢琛ㄦ柊澧炲垪钀藉簱锛�
// area锛堜綅缃級涓� roomcode锛堟埧闂寸紪鐮侊級鐩墠浠嶆棤瀵瑰簲鍒楋紝鏆備笉淇濆瓨銆�
@@ -1559,6 +1942,18 @@
Object roomName = zdy.get("roomname");
if (roomName != null && StringUtils.isNotEmpty(roomName.toString())) {
appointment.setRoomName(truncate(roomName.toString(), ROOM_NAME_MAX_LEN));
+ }
+ // 妫�鏌ョ被鍨嬶細鎶ユ枃閲岀殑 ZDY.jcxmcode / ZDY.jcxmname
+ //
+ // 銆愪慨澶嶃�戝師鍏堟澶�**瀹屽叏娌℃湁**瑙f瀽妫�鏌ョ被鍨嬶紝瀵艰嚧銆孲050401 鍏堝埌銆佷笖灏氭棤 S0201ECG 璁板綍銆�
+ // 鏃跺閿欐柊澧炲嚭鏉ョ殑 appointment.book_check_type 姘歌繙涓虹┖銆�
+ // 瀹炴祴 2026-09-29~10-09 鍏� 279 鏉★紙濡� apply_no=8826092420371106锛�
+ // 鎶ユ枃 ZDY 閲� jcxmcode=201652 / jcxmname=骞虫澘杩愬姩璇曢獙 鏄庢槑瀛樺湪锛夈��
+ if (appointment.getBookCheckType() == null) {
+ Integer checkTypeValue = resolveBookCheckTypeFromZdy(zdy, applyNo);
+ if (checkTypeValue != null) {
+ appointment.setBookCheckType(checkTypeValue);
+ }
}
}
// 棰勭害鎺掑簭鍙凤紙patient.id.item[4]锛�
@@ -1584,6 +1979,17 @@
}
if (patIdItems.size() > 3) {
appointment.setHospitalNo((String) ((Map<String, Object>) patIdItems.get(3)).get("extension"));
+ }
+ // 灏辫瘖娴佹按鍙凤紙episode_id锛夛細patient.id.item[5]
+ //
+ // 涓� S0201ECG 鍚屾簮锛堥偅杈瑰彇鑷� placerGroup.componentOf1.encounter.id.item[1]锛�
+ // 瀹炴祴涓ゅ鍊肩浉鍚岋細鏈潯鍧囦负 882609242037锛夈��
+ // 銆愪慨澶嶃�戝師鍏堝閿欐柊澧�**瀹屽叏娌℃湁**鍐欏叆灏辫瘖娴佹按鍙凤紝瀵艰嚧璇ュ瓧娈典负绌恒��
+ if (patIdItems.size() > 5) {
+ String episodeId = (String) ((Map<String, Object>) patIdItems.get(5)).get("extension");
+ if (StringUtils.isNotEmpty(episodeId)) {
+ appointment.setEpisodeId(episodeId);
+ }
}
// 棰勭害鎺掑簭鍙峰凡鍦ㄤ笂鏂归�氳繃 extractBookSeqNum 缁熶竴璧嬪�硷紝姝ゅ涓嶅啀閲嶅澶勭悊
// 鎮h�呭鍚�
@@ -1628,8 +2034,84 @@
log.warn("[insertAppointmentFromCheckAppointment][鎶ユ枃鏈彁渚涙偅鑰呮�у埆锛屾寜鏈煡(0)鍐欏叆] applyNo={}", applyNo);
appointment.setPatGender(UNKNOWN_GENDER);
}
+ // 鎮h�呭浐鏈夊睘鎬у洖濉紙鐢熸棩 / 鐢佃瘽 / 韬唤璇� / 鍦板潃锛�
+ //
+ // 銆愪负浠�涔堥渶瑕併�慡050401 鎶ユ枃鐨� patient.patientPerson **鍙甫濮撳悕**锛�
+ // 涓嶅惈鐢熸棩/鐢佃瘽/韬唤璇侊紙S0201ECG 鏈夈�丼0405 涔熸湁锛屼絾杩欎袱鏉℃姤鏂囧湪鏈満鏅病鏈夊厛鍒帮級锛�
+ // 浜庢槸瀹归敊鏂板鍑烘潵鐨勮褰曡繖浜涘瓧娈靛叏涓虹┖锛屼笌 S0201ECG 寤虹殑鍗曠浉姣�"缂哄瓧娈�"銆�
+ //
+ // 銆愪负浠�涔堣繖鏍疯ˉ鏄噯纭殑銆戣繖浜涙槸**鎮h�呭浐鏈夊睘鎬�**锛堜笉鏄祦姘村睘鎬э級锛�
+ // 鍚屼竴 pat_id 鐨勫巻鍙茶褰曢噷蹇呯劧涓�鑷达紙鍏ㄥ簱濉厖鐜� 99%锛夈��
+ // 娉ㄦ剰锛氬紑鍗曞尰鐢�/寮�鍗曟椂闂村睘娴佹按灞炴�э紝**鍒绘剰涓嶇户鎵�**锛堥偅灞炰簬鎺ㄦ柇锛屽彲鑳藉紶鍐犳潕鎴达級銆�
+ inheritPatientDemographics(appointment, applyNo);
+
AppointmentSaveReqVO saveReqVO = BeanUtils.toBean(appointment, AppointmentSaveReqVO.class);
createAppointment(saveReqVO);
+ }
+
+ /**
+ * 瀹归敊鏂板鏃讹紝浠庤鎮h�呮渶杩戜竴鏉¤褰曠户鎵�**鎮h�呭浐鏈夊睘鎬�**銆�
+ *
+ * <p>鍙ˉ銆屾湰娆′负绌恒�嶇殑瀛楁锛岀粷涓嶈鐩栨姤鏂囧凡鎻愪緵鐨勫�笺��
+ * 缁ф壙澶辫触锛堟棤鍘嗗彶璁板綍 / 鏌ヨ寮傚父锛変笉褰卞搷钀藉簱锛屼粎璁版棩蹇椼��</p>
+ *
+ * <p><b>鍒绘剰涓嶇户鎵�</b>鐨勫瓧娈碉細{@code doctor}/{@code doctor_code}/{@code doctor_time}
+ * 锛堝紑鍗曞尰鐢熶笌寮�鍗曟椂闂村睘娴佹按灞炴�э紝鎶ユ枃鏈彁渚涙椂鍙兘鎺ㄦ柇锛屽疄娴嬪悓鎮h�呭悓鏃ヤ竴鑷寸巼 90%锛�
+ * 瀛樺湪寮犲啝鏉庢埓椋庨櫓锛屾晠鎸変笟鍔$‘璁や繚鎸佷负绌猴級銆亄@code register_date}
+ * 锛堝彧搴斿湪 HIS 鎶ャ�屾鏌ョ櫥璁般�嶇姸鎬佹椂鍐欏叆锛夈��</p>
+ *
+ * @param target 鏈瀹归敊鏂板鐨勫璞★紙灏卞湴琛ュ叏锛�
+ * @param applyNo 鐢宠鍗曞彿锛屼粎鐢ㄤ簬鏃ュ織
+ */
+ private void inheritPatientDemographics(AppointmentDO target, String applyNo) {
+ if (StringUtils.isEmpty(target.getPatId())) {
+ return;
+ }
+ // 涓夐」鍏抽敭浜哄彛瀛︿俊鎭姤鏂囬兘缁欎簡灏辨棤闇�缁ф壙锛堟姤鏂囧�间紭鍏堬級
+ if (target.getPatBirthday() != null
+ && StringUtils.isNotEmpty(target.getPatIdentityId())
+ && StringUtils.isNotEmpty(target.getPatMobile())) {
+ return;
+ }
+ AppointmentDO sibling;
+ try {
+ sibling = appointmentMapper.getLatestByPatId(target.getPatId());
+ } catch (Exception e) {
+ log.warn("[inheritPatientDemographics][鏌ヨ鍚屾偅鑰呭巻鍙茶褰曞け璐ワ紝璺宠繃缁ф壙] applyNo={} patId={} err={}",
+ applyNo, target.getPatId(), e.getMessage());
+ return;
+ }
+ if (sibling == null) {
+ log.warn("[inheritPatientDemographics][璇ユ偅鑰呮棤鍘嗗彶璁板綍鍙户鎵匡紝鎮h�呬俊鎭皢涓嶅畬鏁碷 "
+ + "applyNo={} patId={}", applyNo, target.getPatId());
+ return;
+ }
+ StringBuilder inherited = new StringBuilder();
+ if (target.getPatBirthday() == null && sibling.getPatBirthday() != null) {
+ target.setPatBirthday(sibling.getPatBirthday());
+ inherited.append("pat_birthday ");
+ }
+ if (StringUtils.isEmpty(target.getPatIdentityId()) && StringUtils.isNotEmpty(sibling.getPatIdentityId())) {
+ target.setPatIdentityId(sibling.getPatIdentityId());
+ inherited.append("pat_identity_id ");
+ }
+ if (StringUtils.isEmpty(target.getPatMobile()) && StringUtils.isNotEmpty(sibling.getPatMobile())) {
+ target.setPatMobile(sibling.getPatMobile());
+ inherited.append("pat_mobile ");
+ }
+ if (StringUtils.isEmpty(target.getPatPhone()) && StringUtils.isNotEmpty(sibling.getPatPhone())) {
+ target.setPatPhone(sibling.getPatPhone());
+ inherited.append("pat_phone ");
+ }
+ if (StringUtils.isEmpty(target.getPatAddr()) && StringUtils.isNotEmpty(sibling.getPatAddr())) {
+ target.setPatAddr(sibling.getPatAddr());
+ inherited.append("pat_addr ");
+ }
+ if (inherited.length() > 0) {
+ log.info("[inheritPatientDemographics][S050401 鎶ユ枃涓嶅惈鎮h�呬汉鍙e淇℃伅锛�"
+ + "宸蹭粠鍚屾偅鑰呮渶杩戣褰曠户鎵縘 applyNo={} patId={} fromApplyNo={} fields=[{}]",
+ applyNo, target.getPatId(), sibling.getApplyNo(), inherited.toString().trim());
+ }
}
/** 瑙f瀽 {@code yyyyMMddHHmmss} 鏃堕棿锛屽け璐ユ垨涓虹┖杩斿洖 null锛堜笉鎶涘紓甯革級 */
@@ -1641,6 +2123,96 @@
return LocalDateTime.parse(value.trim(), DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
} catch (Exception e) {
log.warn("[parseDateTime][鏃堕棿鏍煎紡闈炴硶锛屽拷鐣 value={}", value);
+ return null;
+ }
+ }
+
+ /**
+ * 瑙f瀽 HIS 鎶ユ枃涓殑銆屽紑鍗曟椂闂淬��({@code author/time/value})銆�
+ *
+ * <h3>鑳屾櫙锛堝疄娴嬬粨璁猴紝2026-10 鎺掓煡锛�</h3>
+ * 搴撲腑绾� <b>61%</b> 鐨� {@code appointment.doctor_time} 涓� {@code yyyy-MM-dd 00:00:00}銆�
+ * 缁忔牳鏌�**涓嶆槸**鏈」鐩殑鏍煎紡鍖栫己闄凤細
+ * <ul>
+ * <li>鍒楃被鍨嬫槸 {@code datetime}锛屽啓鍏ョ殑鏄� {@code java.util.Date}锛屼繚鐣欐椂鍒嗙锛�</li>
+ * <li>鐪熷疄鎶ユ枃鏍蜂緥涓瀛楁褰㈠ {@code 20260917005255}锛堝甫鏃跺垎绉掞級锛�</li>
+ * <li>鏈夌湡瀹炴椂鍒荤殑璁板綍鍛堟甯稿伐浣滄椂娈靛垎甯冿紙06:00鈫�08:00 涓洪珮宄帮級锛�
+ * 鑰岃惤鍦ㄥ紑璇婂墠鐨� 00:00-05:59 鐨勪粎 15 鏉� 鈥斺�� 璇存槑璇ユ椂娈垫湰灏卞嚑涔庝笉寮�鍗曪紱</li>
+ * <li>鎸夊氨璇婄被鍒湅锛氶棬璇�({@code book_src=1}) 99.6%銆佷綇闄�({@code book_src=2}) 90.5%
+ * 涓� 0 鐐癸紝涓旇鐜拌薄璐┛ 2026 鍏ㄥ勾锛堜笌 2026-09-27 鐨� {@code register_date}
+ * 鎴柇缂洪櫡鏃犲叧锛夈��</li>
+ * </ul>
+ * 鈬� 缁撹锛�**鏄� HIS 渚ф妸璇ュ瓧娈电殑鏃跺垎绉掑彂鎴愪簡 {@code 000000}**锛堝緢鍙兘鏄�屽彧绮剧‘鍒版棩銆�
+ * 鎴栬ˉ褰�/鎵归噺鍥炰紶鐨勫尰鍢憋級銆�
+ *
+ * <h3>鏈柟娉曞仛浠�涔�</h3>
+ * <ul>
+ * <li>鎸� {@code yyyyMMddHHmmss} 瑙f瀽锛�</li>
+ * <li>璇嗗埆銆屾椂鍒嗙 = 000000銆嶇殑**鏃ユ湡鍊�**锛屾墦鍑哄甫**鍘熷鎶ユ枃鍊� + 鐢宠鍗曞彿**鐨� WARN
+ * 鈥斺�� 鍘熷疄鐜板彧 {@code printStackTrace()}锛屽嚭闂鏃舵棤浠庡畾浣嶏紱</li>
+ * <li><b>浠嶇劧鍐欏叆</b>锛堜繚鐣欐棩鏈熼儴鍒嗭級锛氬洜涓恒�岃窛浠婂ぉ鏁般�嶃�屾寜鏃ユ湡鎺掑簭/绛涢�夈�嶉兘鐢ㄦ棩鏈燂紝
+ * 鍐欏叆 NULL 浼氳杩欎簺鍔熻兘閫�鍖栵紝涓旇鍊肩‘涓� HIS 鎵�鍙戙�佸師鏍蜂繚瀛樻洿鍙拷婧��</li>
+ * </ul>
+ *
+ * @param rawValue HIS 鎶ユ枃鍘熷�硷紙褰㈠ {@code 20260917005255}锛�
+ * @param applyNo 鐢宠鍗曞彿锛屼粎鐢ㄤ簬鏃ュ織瀹氫綅
+ * @return 瑙f瀽鍚庣殑鏃堕棿锛涙牸寮忛潪娉曟椂杩斿洖 {@code null}锛堜笉鍐欏簱锛�
+ */
+ private java.util.Date parseHisDoctorTime(String rawValue, String applyNo) {
+ String v = rawValue == null ? null : rawValue.trim();
+ if (StringUtils.isEmpty(v)) {
+ return null;
+ }
+ if (!v.matches("\\d{14}")) {
+ // 瀹炴祴 HIS 鏂囨。鏍蜂緥涓瓨鍦� 12 浣嶏紙yyyyMMddHHmm锛夌敋鑷崇┖鍊硷紝缁熶竴璁� WARN 渚夸簬鍚� HIS 鍙嶉
+ log.warn("[parseHisDoctorTime][寮�鍗曟椂闂存牸寮忛潪 14 浣嶏紝鏃犳硶瑙f瀽锛宒octor_time 灏嗕负绌篯 "
+ + "applyNo={} raw={} length={}", applyNo, v, v.length());
+ return null;
+ }
+ try {
+ // 鈿狅笍 蹇呴』 setLenient(false)锛歋impleDateFormat 榛樿瀹芥澗锛�
+ // 浼氭妸闈炴硶鏃ユ湡闈欓粯婊氭垚鍚堟硶鍊硷紙濡� 13 鏈� 鈫� 娆″勾 1 鏈堬級锛屽鑷磋剰鏁版嵁鍏ュ簱銆�
+ // 瀹炴祴锛歭enient 涓� "20261301000000" 琚В鏋愭垚 2027-01-01 涓斾笉鎶ラ敊銆�
+ SimpleDateFormat sdf = new SimpleDateFormat(HIS_DOCTOR_TIME_PATTERN);
+ sdf.setLenient(false);
+ java.util.Date parsed = sdf.parse(v);
+ if (isHisTimeOnlyDate(v)) {
+ log.warn("[parseHisDoctorTime][HIS 寮�鍗曟椂闂存椂鍒嗙涓� 000000锛堟棩鏈熷�硷級锛�"
+ + "doctor_time 灏嗕繚瀛樹负褰撴棩 00:00:00 鈥斺�� 璇ュ�肩敱 HIS 鎶ユ枃鍘熸牱鑰屾潵] "
+ + "applyNo={} raw={}", applyNo, v);
+ }
+ return parsed;
+ } catch (Exception e) {
+ log.warn("[parseHisDoctorTime][寮�鍗曟椂闂磋В鏋愬け璐ワ紝doctor_time 灏嗕负绌篯 applyNo={} raw={} err={}",
+ applyNo, v, e.getMessage());
+ return null;
+ }
+ }
+
+ /**
+ * 鐢� {@code book_timeslot}锛坔hmmhhmm锛屽 8000830=08:00-08:30銆�13301400=13:30-14:00锛夊彇棰勭害鏃跺埢锛堝彧鍚椂鍒嗭級銆�
+ * <p>鐢ㄦ潵缁� S0201ECG 杩欐潯娴佽ˉ {@code book_time}锛氬師瀹炵幇鏁存潯娴佷笉鍐欓绾︽椂闂达紝
+ * 寤哄嚭鏉ョ殑璁板綍 book_date/book_timeslot/book_time 鍏ㄧ┖锛堝疄娴� 211741銆�211962锛夈��</p>
+ */
+ private LocalTime timeOfTimeslot(Integer timeslot) {
+ if (timeslot == null) {
+ return null;
+ }
+ try {
+ String s = String.valueOf(timeslot);
+ if (s.length() < 5) {
+ return null;
+ }
+ String start = s.substring(0, s.length() - 4); // 鍓嶄竴娈� = 寮�濮嬫椂闂� hhmm
+ int hhmm = Integer.parseInt(start);
+ int hour = hhmm / 100;
+ int minute = hhmm % 100;
+ if (hour > 23 || minute > 59) {
+ return null;
+ }
+ return LocalTime.of(hour, minute);
+ } catch (Exception e) {
+ log.warn("[timeOfTimeslot][鏃堕棿娈佃В鏋愬け璐ワ紝蹇界暐] timeslot={}", timeslot);
return null;
}
}
@@ -1680,6 +2252,38 @@
}
}
+ /**
+ * 銆愭湰闇�姹傦細绱ф�ユ偅鑰呬笉鎺掗槦鐩存帴妫�鏌ャ�戞寜銆岀敵璇峰崟鍙� / 灏辫瘖鍙� / 鎮h�呯紪鍙枫�嶆煡杩戜竴涓湀鐨勯绾﹁褰曘��
+ * <p>
+ * 绐楀彛 [浠婂ぉ-30 澶�, 浠婂ぉ+30 澶锛屾寜鏈獥鍙e紑灞曠殑妫�鏌ラ」鐩繃婊わ紝缁撴灉鎸�**棰勭害鏃堕棿鍊掑簭**銆�
+ */
+ @Override
+ public List<AppointmentDO> getEmergencyCandidates(String code, String checkTypes) {
+ if (StringUtils.isEmpty(code)) {
+ return new ArrayList<>();
+ }
+ List<Integer> checkTypeList = splitToIntList(checkTypes);
+ List<AppointmentDO> list = appointmentMapper.getEmergencyCandidates(code.trim(), checkTypeList);
+ log.info("[getEmergencyCandidates] 绱ф�ュ姞鍋氬�欓�夋煡璇�. code={} checkTypes={} 鍛戒腑={}",
+ code, checkTypes, null == list ? 0 : list.size());
+ return null == list ? new ArrayList<>() : list;
+ }
+
+ /** 鎶� `100,200` 杩欑被閫楀彿鍒嗛殧涓茶В鏋愭垚 List<Integer>锛涢潪娉曢」蹇界暐 */
+ private List<Integer> splitToIntList(String raw) {
+ List<Integer> result = new ArrayList<>();
+ if (StringUtils.isEmpty(raw)) {
+ return result;
+ }
+ for (String part : raw.split("[,锛宂")) {
+ Integer v = parseIntegerQuietly(part);
+ if (null != v && !result.contains(v)) {
+ result.add(v);
+ }
+ }
+ return result;
+ }
+
/** 瀹芥澗 Byte 瑙f瀽锛氶潪鏁板瓧鎴栫┖杩斿洖 null锛堢敤浜庢偅鑰呮�у埆绛� tinyint 瀛楁锛� */
private Byte parseByteQuietly(String value) {
if (StringUtils.isEmpty(value) || !value.trim().matches("-?\\d+")) {
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/call/CallServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/call/CallServiceImpl.java
index d42a4a6..f127ae9 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/call/CallServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/call/CallServiceImpl.java
@@ -16,6 +16,8 @@
import javax.annotation.Resource;
+import java.time.Duration;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@@ -30,6 +32,7 @@
*/
@Service
@Validated
+@lombok.extern.slf4j.Slf4j
public class CallServiceImpl implements CallService {
@Resource
@@ -99,12 +102,31 @@
return callMapper.selectPage(pageReqVO);
}
+ /**
+ * 閲嶅彨锛氬啀鐢熸垚涓�鏉″彨鍙疯褰曪紝璁╁ぇ灞� / 璇婇棿灞忛噸鏂版挱鎶ャ��
+ *
+ * <p>銆愭湰娆′慨澶嶃�戝師瀹炵幇锛�
+ * <pre>
+ * CallDO callDO = callMapper.getLatestPatientCall(patId);
+ * if (null != callDO && callDO.getCalled() == 0) return 0; // 鈫� 姘歌繙鎴愮珛
+ * return createCall(createReqVO);
+ * </pre>
+ * 鑰�**鍏ㄩ」鐩病鏈変换浣曞湴鏂规妸 {@code called} 缃负 1**锛坽@code getNextCall} /
+ * {@code getNextInstallCall} 鍙煡 {@code called = 0}锛夆噿 璇ュ畧鍗瘡娆¢兘鍛戒腑 鈬�
+ * <b>閲嶅彨浠庝笉鍐欏叆鏂拌褰�</b>锛屼袱鍧楀睆涔熷氨瀹屽叏娌℃湁鍙嶅簲锛堢幇鍦哄弽棣堝嵆姝わ級銆�
+ *
+ * <p>鐜板湪鍙仛"闃茶繛鐐�"锛氬悓涓�鎮h�� **3 绉掑唴**鐨勯噸澶嶉噸鍙拷鐣ワ紝鍏朵綑鎯呭喌涓�寰嬫甯告柊寤恒��
+ */
@Override
public Integer callAgain(CallSaveReqVO createReqVO) {
- CallDO callDO = callMapper.getLatestPatientCall(createReqVO.getPatId());
- if (null != callDO && callDO.getCalled() == 0)
- return 0;
-
+ CallDO latest = callMapper.getLatestPatientCall(createReqVO.getPatId());
+ if (null != latest && null != latest.getCreateTime()) {
+ long seconds = Duration.between(latest.getCreateTime(), LocalDateTime.now()).getSeconds();
+ if (seconds >= 0 && seconds < 3) {
+ log.info("[callAgain] 3 绉掑唴閲嶅閲嶅彨锛屽拷鐣�. patId={} 涓婃={}", createReqVO.getPatId(), latest.getCreateTime());
+ return 0;
+ }
+ }
return createCall(createReqVO);
}
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
index 0f8a490..49812b1 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
@@ -1,6 +1,7 @@
package cn.lihu.jh.module.ecg.service.callingscreen;
import cn.lihu.jh.framework.common.pojo.PageResult;
+import cn.lihu.jh.module.ecg.Utils;
import cn.lihu.jh.module.ecg.controller.admin.checktype.vo.CheckTypePageReqVO;
import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
@@ -157,7 +158,7 @@
});
mapDisplayColQueue.values().forEach( _queueDOList -> {
- //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
+ //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰锛堝悓鎺掗槦鍙� + 鍚屾偅鑰呮墠绠椾竴缁勶紝瑙� Utils#insertAffinityItemsAfterMain锛�
List<QueueDO> affinityWaitingList = new ArrayList<>();
ListIterator<QueueDO> iterator = _queueDOList.listIterator();
while (iterator.hasNext()) {
@@ -167,14 +168,7 @@
affinityWaitingList.add(item);
}
}
- affinityWaitingList.forEach( affinityWaitingItem -> {
- for (int i = _queueDOList.size()-1; i >= 0; i--) {
- if ( affinityWaitingItem.getSeqNum() == _queueDOList.get(i).getSeqNum() ) {
- _queueDOList.add(i + 1, affinityWaitingItem);
- break;
- }
- }
- });
+ Utils.insertAffinityItemsAfterMain(_queueDOList, affinityWaitingList);
});
return mapDisplayColQueue;
@@ -213,7 +207,7 @@
// 闇�姹�1锛氬洖濉偅鑰呬俊鎭紙璇婇棿灞�-妫�鏌ラ槦鍒楋級
queueService.fillAppointmentInfo(queueDOList);
- //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
+ //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰锛堝悓鎺掗槦鍙� + 鍚屾偅鑰呮墠绠椾竴缁勶紝瑙� Utils#insertAffinityItemsAfterMain锛�
List<QueueDO> affinityWaitingList = new ArrayList<>();
ListIterator<QueueDO> iterator = queueDOList.listIterator();
while (iterator.hasNext()) {
@@ -223,14 +217,7 @@
affinityWaitingList.add(item);
}
}
- affinityWaitingList.forEach( affinityWaitingItem -> {
- for (int i = queueDOList.size()-1; i >= 0; i--) {
- if ( affinityWaitingItem.getSeqNum() == queueDOList.get(i).getSeqNum() ) {
- queueDOList.add(i + 1, affinityWaitingItem);
- break;
- }
- }
- });
+ Utils.insertAffinityItemsAfterMain(queueDOList, affinityWaitingList);
return queueDOList;
}
@@ -260,7 +247,7 @@
// 闇�姹�1锛氬洖濉偅鑰呬俊鎭紙璇婇棿灞�-瑁呮満闃熷垪锛�
queueService.fillAppointmentInfo(queueDOList);
- //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
+ //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰锛堝悓鎺掗槦鍙� + 鍚屾偅鑰呮墠绠椾竴缁勶紝瑙� Utils#insertAffinityItemsAfterMain锛�
List<QueueDO> affinityReceivedList = new ArrayList<>();
ListIterator<QueueDO> iterator = queueDOList.listIterator();
while (iterator.hasNext()) {
@@ -270,14 +257,7 @@
affinityReceivedList.add(item);
}
}
- affinityReceivedList.forEach( affinityReceivedItem -> {
- for (int i = queueDOList.size()-1; i >= 0; i--) {
- if ( affinityReceivedItem.getSeqNum() == queueDOList.get(i).getSeqNum() ) {
- queueDOList.add(i + 1, affinityReceivedItem);
- break;
- }
- }
- });
+ Utils.insertAffinityItemsAfterMain(queueDOList, affinityReceivedList);
return queueDOList;
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/config/EcgConfigServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/config/EcgConfigServiceImpl.java
index c97bcbd..03935f2 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/config/EcgConfigServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/config/EcgConfigServiceImpl.java
@@ -62,24 +62,45 @@
String strRoomResetTime = configApi.getConfigValueByKey(ECG_ROOM_RESET_TIME_KEY);
LocalTime roomResetTime = Utils.parseTime(strRoomResetTime);
+ // 銆愭湰闇�姹偮峰厹搴曞姞鍥恒�戦厤缃」 ecg.room.reset.time 缂哄け/鏍煎紡闈炴硶鏃� parseTime 杩斿洖 null锛�
+ // 鍘熷疄鐜扮洿鎺� roomResetTime.getMinute() 浼氭姏 NPE锛岃�� resetScheduler() 鍦ㄥ惎鍔ㄧ洃鍚噷
+ // **娌℃湁 try/catch** 鈬� 寮�璇�/闂瘖/閲嶇疆涓変釜瀹氭椂浠诲姟鍏ㄩ儴娉ㄥ唽澶辫触锛堢瓑浜�"姣忔棩閲嶇疆"浠庢湭鐢熸晥锛夈��
+ // 杩欓噷缁欓粯璁� 23:00锛屽苟淇濊瘉姣忎釜浠诲姟娉ㄥ唽澶辫触鍙 ERROR銆佷笉褰卞搷鍚姩銆�
+ if (null == roomResetTime) {
+ roomResetTime = LocalTime.of(23, 0);
+ log.warn("[resetScheduler] 閰嶇疆椤� {} 缂哄け鎴栨牸寮忛潪娉曪紙鍘熷��=[{}]锛夛紝姣忔棩宸ヤ綅閲嶇疆鏃堕棿鍥為��涓洪粯璁� 23:00",
+ ECG_ROOM_RESET_TIME_KEY, strRoomResetTime);
+ }
String roomResetCronExpression = String.format("0 %d %d * * ?", roomResetTime.getMinute(), roomResetTime.getHour());
- startBizTask = taskRegistrar.scheduleCronTask(new CronTask(() -> {
- System.out.println("Opening Task executed at: " + System.currentTimeMillis());
- queueService.startBiz();
- }, openCronExpression));
+ try {
+ startBizTask = taskRegistrar.scheduleCronTask(new CronTask(() -> {
+ System.out.println("Opening Task executed at: " + System.currentTimeMillis());
+ queueService.startBiz();
+ }, openCronExpression));
+ } catch (Exception e) {
+ log.error("[resetScheduler] 娉ㄥ唽銆屽紑璇娿�嶅畾鏃朵换鍔″け璐ワ紙涓嶅奖鍝嶅叾瀹冧换鍔★級. cron={}", openCronExpression, e);
+ }
- closeBizTask = taskRegistrar.scheduleCronTask(new CronTask(() -> {
- System.out.println("Close Task executed at: " + System.currentTimeMillis());
- queueService.closeBiz();
- }, closeCronExpression));
+ try {
+ closeBizTask = taskRegistrar.scheduleCronTask(new CronTask(() -> {
+ System.out.println("Close Task executed at: " + System.currentTimeMillis());
+ queueService.closeBiz();
+ }, closeCronExpression));
+ } catch (Exception e) {
+ log.error("[resetScheduler] 娉ㄥ唽銆岄棴璇娿�嶅畾鏃朵换鍔″け璐ワ紙涓嶅奖鍝嶅叾瀹冧换鍔★級. cron={}", closeCronExpression, e);
+ }
- resetRoomTask = taskRegistrar.scheduleCronTask(new CronTask(() -> {
- System.out.println("Room Reset Task executed at: " + System.currentTimeMillis());
- roomService.resetRoom(false);
- //queueSequenceService.resetQueueSequence();
- queueSequenceService.initNumber();
- }, roomResetCronExpression));
+ try {
+ resetRoomTask = taskRegistrar.scheduleCronTask(new CronTask(() -> {
+ System.out.println("Room Reset Task executed at: " + System.currentTimeMillis());
+ roomService.resetRoom(false);
+ //queueSequenceService.resetQueueSequence();
+ queueSequenceService.initNumber();
+ }, roomResetCronExpression));
+ } catch (Exception e) {
+ log.error("[resetScheduler] 娉ㄥ唽銆屾瘡鏃ュ伐浣嶉噸缃�嶅畾鏃朵换鍔″け璐�. cron={}", roomResetCronExpression, e);
+ }
taskRegistrar.afterPropertiesSet();
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java
index e34d230..2c70c1b 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java
@@ -139,4 +139,15 @@
DevRentDO getDismantledRent(DevRentSearchReqVO searchReqVO);
Integer feeConfirm(Long rentId, String hisId, String userNickname, Boolean isFeeConfirmOrCancel);
+
+ /**
+ * 鎾ら攢銆屾鏌ュ畬鎴愩�嶅悗鐨勫洖婊氾紙鏈鏂板锛夛細
+ * 鎶婅鎮h�呬粖鏃ャ�佽妫�鏌ラ」鐩殑 **60(甯歌妫�鏌ュ畬鎴�) 鈫� 0(寰呮鏌�)**锛屽苟**鍙栨秷纭垂**銆�
+ *
+ * <p>涓轰粈涔堝繀椤诲洖婊氾細鎾ら攢鍘熷厛鍙妸闃熷垪琛� 40鈫�20锛屾鏌ュ崟浠嶆槸 60锛�
+ * 鍓嶇鍐嶆瀹屾垚鏃� `getFreeRent` 鍙栦笉鍒般�屽緟妫�鏌ャ�嶅崟锛坮entId 涓虹┖锛夛紝鍚庣渚挎姤銆岃鍏堥绾︾‘璁ゃ�嶃��
+ *
+ * <p>鍐呴儴宸� try/catch锛氬洖婊氬け璐ヤ笉搴斿奖鍝�"鎾ら攢"鏈韩鐨勭粨鏋溿��
+ */
+ void rollbackRoutineFinish(String patId, Integer checkType);
}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
index c987e9d..8b21939 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
@@ -85,6 +85,9 @@
@Autowired
private WebServiceClient webServiceClient;
+ /** 銆愭湰闇�姹傘�戠揣鎬ュ姞鍋氱殑澶囨敞鏍囪锛屼究浜庡湪瀹屾垚鍒楄〃/鎶ヨ〃閲屽尯鍒嗚繖绫�"涓嶆帓闃熺洿鎺ユ鏌�"鐨勮褰� */
+ private static final String EMERGENCY_REMARK = "绱ф�ュ姞鍋�";
+
@Override
public CommonResult<Long> registerOperation(DevRentSaveReqVO createReqVO) {
@@ -101,6 +104,13 @@
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+ // 銆愭湰闇�姹傦細绱ф�ユ偅鑰呬笉鎺掗槦鐩存帴妫�鏌ャ��
+ // 姝e父鎮h�呯殑銆屽緟妫�鏌�(0)銆嶆鏌ュ崟鏄鍒板缓闃熷垪鏃朵竴璧锋彃鐨勶紱绱ф�ュ姞鍋氱殑鎮h�呮病璧扮鍒帮紝
+ // 鍥犳杩欓噷鍏堟妸杩欐潯鍗曡ˉ鍑烘潵锛屽悗缁�昏緫锛堝啓浣滀笟璁板綍銆佹洿鏂伴槦鍒椼�佸洖鍐欓泦鎴愬钩鍙帮級瀹屽叏澶嶇敤銆�
+ if (Boolean.TRUE.equals(routineFinishReqVO.getEmergency())) {
+ prepareEmergencyDevRent(routineFinishReqVO, createReqVO);
+ }
+
// 鍦ㄩ绾︾‘璁ゆ椂 灏辫繘鍏� [dev_rent] 琛ㄤ簡
Long rent_id = createReqVO.getId();
@@ -110,33 +120,64 @@
JobRecordDO jobRecordDO = jobRecordMapper.selectByRentIdDocId(rent_id, userId, jobTypeList);
if (null == jobRecordDO) {
List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
- if (devRentDOList.size() == 0) throw exception(DEV_INSTALL_NOT_APPOINTMENT);
- else if (devRentDOList.size() != 1) {
- throw exception(DEV_INSTALL_EXCEPTION);
+
+ // 銆愭湰娆′慨澶嶃�戞挙閿�鍚庡啀娆″畬鎴愭椂鐨勫厹搴曪細
+ // 鑻ャ�屽緟妫�鏌�(0)銆嶇殑鍗曞瓙涓嶅瓨鍦紙鎾ら攢鏃舵病鑳藉洖婊氬埌 0銆佹垨鍘嗗彶鏁版嵁锛夛紝
+ // 涓嶈兘鍐嶇洿鎺ユ姤銆岃鍏堥绾︾‘璁ゃ�嶏紝鍚﹀垯鍖荤敓鏃犳硶鎶婅瀹屾垚鐨勬偅鑰呴噸鏂板畬鎴愩��
+ // 杩欓噷澶嶇敤**浠婃棩鏈�杩戜竴鏉�**銆屽父瑙勬鏌ュ畬鎴�(60)/甯歌妫�鏌ユ斁寮�(50)銆嶇殑鍗曪紱
+ // 涓斿鏋滆鍗曞凡缁忔湁瀹屾垚璁板綍锛屽氨璧颁笅闈㈢殑"鏇存柊"鍒嗘敮锛岄伩鍏嶉噸澶嶆彃鍏� job_record銆�
+ if (devRentDOList.isEmpty()) {
+ List<Integer> fallbackStateList = new ArrayList<>();
+ fallbackStateList.add(DevRentStateEnum.ROUTINE_FINISH.getState());
+ fallbackStateList.add(DevRentStateEnum.ROUTINE_CANCELLED.getState());
+ DevRentDO fallbackRent = devRentMapper.selectLatestByPatCheckTypeStates(
+ createReqVO.getPatId(), createReqVO.getCheckType(), fallbackStateList);
+ if (null == fallbackRent) {
+ throw exception(DEV_INSTALL_NOT_APPOINTMENT);
+ }
+ log.warn("[routineFinishOperation] 銆屽緟妫�鏌ャ�嶅崟涓嶅瓨鍦紝鍏滃簳澶嶇敤鏈�杩戜竴鏉″凡瀹屾垚/宸叉斁寮冨崟. "
+ + "rentId={} patId={} checkType={}",
+ fallbackRent.getId(), createReqVO.getPatId(), createReqVO.getCheckType());
+ devRentDOList = new ArrayList<>(List.of(fallbackRent));
+ jobRecordDO = jobRecordMapper.selectByRentIdDocId(fallbackRent.getId(), userId, jobTypeList);
+ if (null != jobRecordDO) {
+ rent_id = fallbackRent.getId();
+ createReqVO.setId(rent_id);
+ }
}
- rent_id = devRentDOList.get(0).getId();
- createReqVO.setId(rent_id);
- createReqVO.setState(DevRentStateEnum.ROUTINE_FINISH.getState());
- updateDevRent(createReqVO);
+ if (null != jobRecordDO) {
+ // 鍏滃簳鍛戒腑宸叉湁瀹屾垚璁板綍 鈫� 钀藉埌涓嬫柟"鏇存柊"鍒嗘敮锛堜笌 else 鍒嗘敮鍚屾牱鐨勫鐞嗭級
+ } else {
+ if (devRentDOList.size() != 1) {
+ throw exception(DEV_INSTALL_EXCEPTION);
+ }
- JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
- jobRecordSaveReqVO.setRentId(rent_id);
- jobRecordSaveReqVO.setDevId(createReqVO.getDevId());
- jobRecordSaveReqVO.setDocId(userId);
- jobRecordSaveReqVO.setDocName(userNickname);
- jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
- jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
- jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
- jobRecordSaveReqVO.setJobType(DevRentStateEnum.ROUTINE_FINISH.getState());
- jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
- jobRecordSaveReqVO.setSummary("");
- jobRecordSaveReqVO.setCheckType(createReqVO.getCheckType());
+ rent_id = devRentDOList.get(0).getId();
+ createReqVO.setId(rent_id);
+ createReqVO.setState(DevRentStateEnum.ROUTINE_FINISH.getState());
+ updateDevRent(createReqVO);
- JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
- jobRecordMapper.insert(jobRecord);
- } else {
+ JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
+ jobRecordSaveReqVO.setRentId(rent_id);
+ jobRecordSaveReqVO.setDevId(createReqVO.getDevId());
+ jobRecordSaveReqVO.setDocId(userId);
+ jobRecordSaveReqVO.setDocName(userNickname);
+ jobRecordSaveReqVO.setPatId(createReqVO.getPatId());
+ jobRecordSaveReqVO.setPatName(createReqVO.getPatName());
+ jobRecordSaveReqVO.setJobTime(createReqVO.getRentTime());
+ jobRecordSaveReqVO.setJobType(DevRentStateEnum.ROUTINE_FINISH.getState());
+ jobRecordSaveReqVO.setRemark(createReqVO.getRemark());
+ jobRecordSaveReqVO.setSummary("");
+ jobRecordSaveReqVO.setCheckType(createReqVO.getCheckType());
+
+ JobRecordDO jobRecord = BeanUtils.toBean(jobRecordSaveReqVO, JobRecordDO.class);
+ jobRecordMapper.insert(jobRecord);
+ }
+ }
+ if (null != jobRecordDO) {
// 鎾ら攢 鏀惧純鎿嶄綔
+ createReqVO.setId(rent_id);
createReqVO.setState(DevRentStateEnum.ROUTINE_FINISH.getState());
updateDevRent(createReqVO);
@@ -240,6 +281,106 @@
}
return CommonResult.success(rent_id);
+ }
+
+ /**
+ * 銆愭湰闇�姹傦細绱ф�ユ偅鑰呬笉鎺掗槦鐩存帴妫�鏌ャ�戜负銆岀揣鎬ュ姞鍋氥�嶇殑鎮h�呭噯澶囥�屽緟妫�鏌�(0)銆嶆鏌ュ崟銆�
+ *
+ * <h3>涓轰粈涔堥渶瑕佸畠</h3>
+ * 姝e父鎮h�呯殑 {@code dev_rent(state=0)} 琛屾槸**绛惧埌寤洪槦鍒�**鏃朵竴璧锋彃鍏ョ殑锛堣
+ * {@code QueueServiceImpl#queue}锛夈�傜揣鎬ュ姞鍋氱殑鎮h�呬笉璧扮鍒�/鎺掗槦锛屾墍浠ュ畬鎴愭椂鎵句笉鍒拌繖琛岋紝
+ * 鍘熼�昏緫浼氱洿鎺ユ姏 {@code DEV_INSTALL_NOT_APPOINTMENT}锛�"璇峰厛棰勭害纭"锛夈��
+ *
+ * <h3>鍋氭硶</h3>
+ * <ol>
+ * <li>浠婂ぉ宸叉湁璇ユ偅鑰� + 妫�鏌ラ」鐩殑銆屽緟妫�鏌ャ�嶈 鈫� 浠�涔堥兘涓嶅仛锛堣蛋姝e父娴佺▼锛夛紱</li>
+ * <li>鍚﹀垯鎸�**棰勭害鍗�**锛堢敵璇峰崟鍙蜂紭鍏堬紝鍏舵鎮h�呯紪鍙� + 妫�鏌ラ」鐩紝杩� 卤30 澶╋級琛ュ缓涓�琛岋紱</li>
+ * <li>鍚屾椂鎶婂娉ㄨˉ涓娿�岀揣鎬ュ姞鍋氥�嶏紝渚夸簬鍦ㄥ畬鎴愬垪琛�/鎶ヨ〃閲屽尯鍒嗐��</li>
+ * </ol>
+ * 棰勭害鍗曚笉瀛樺湪鎴栨鏌ラ」鐩笉鍖归厤鏃�**涓嶈ˉ寤�**锛岃鍘熼�昏緫鐓у父鎶ラ敊锛岄伩鍏嶄骇鐢熻剰鏁版嵁銆�
+ */
+ private void prepareEmergencyDevRent(RoutineFinishReqVO req, DevRentSaveReqVO createReqVO) {
+ // 澶囨敞缁熶竴鎵撴爣锛堝師澶囨敞淇濈暀锛�
+ String remark = createReqVO.getRemark();
+ if (org.springframework.util.StringUtils.hasText(remark)) {
+ if (!remark.contains(EMERGENCY_REMARK)) {
+ createReqVO.setRemark(EMERGENCY_REMARK + "锛�" + remark);
+ }
+ } else {
+ createReqVO.setRemark(EMERGENCY_REMARK);
+ }
+
+ if (org.springframework.util.StringUtils.hasText(req.getPatId()) && null != req.getCheckType()) {
+ List<DevRentDO> existList = devRentMapper.selectByPatAndChecktypeAndState(
+ req.getPatId(), req.getCheckType(), DevRentStateEnum.FREE.getState());
+ if (!existList.isEmpty()) {
+ log.info("[prepareEmergencyDevRent] 浠婃棩宸叉湁寰呮鏌ュ崟锛屾寜姝e父娴佺▼瀹屾垚. patId={} checkType={} 鏉℃暟={}",
+ req.getPatId(), req.getCheckType(), existList.size());
+ return;
+ }
+ }
+
+ AppointmentDO appointment = findEmergencyAppointment(req);
+ if (null == appointment) {
+ log.warn("[prepareEmergencyDevRent] 鏈壘鍒板彲鐢ㄧ殑棰勭害鍗曪紝璺宠繃琛ュ缓锛堝師閫昏緫灏嗘姤銆岃鍏堥绾︾‘璁ゃ�嶏級. "
+ + "applyNo={} patId={} checkType={}", req.getApplyNo(), req.getPatId(), req.getCheckType());
+ return;
+ }
+
+ DevRentDO devRent = new DevRentDO();
+ devRent.setApplyNo(nonBlank(appointment.getApplyNo(), req.getApplyNo()));
+ devRent.setEpisodeId(nonBlank(appointment.getEpisodeId(), req.getEpisodeId()));
+ devRent.setPatId(nonBlank(appointment.getPatId(), req.getPatId()));
+ devRent.setPatName(nonBlank(appointment.getPatName(), req.getPatName()));
+ devRent.setCheckType(appointment.getBookCheckType());
+ devRent.setPaid(appointment.getPaid());
+ devRent.setState(DevRentStateEnum.FREE.getState());
+ devRent.setRemark(createReqVO.getRemark());
+ devRentMapper.insert(devRent);
+
+ // 璁╁悗缁�屾寜鎮h�� + 妫�鏌ラ」鐩� + 浠婃棩 + 寰呮鏌ャ�嶈兘姝e父瀹氫綅鍒�
+ createReqVO.setId(devRent.getId());
+ createReqVO.setApplyNo(devRent.getApplyNo());
+ createReqVO.setEpisodeId(devRent.getEpisodeId());
+ // 妫�鏌ラ」鐩互棰勭害鍗曚负鍑嗭紱棰勭害鍗曟病鍐欐椂鎵嶆部鐢ㄨ姹傞噷鐨勫�硷紙閬垮厤鎶� checkType 缃┖瀵艰嚧鍚庣画鎶ラ敊锛�
+ if (null != devRent.getCheckType()) {
+ createReqVO.setCheckType(devRent.getCheckType());
+ }
+ if (null == createReqVO.getPaid()) {
+ createReqVO.setPaid(devRent.getPaid());
+ }
+ log.info("[prepareEmergencyDevRent] 绱ф�ュ姞鍋氾細宸茶ˉ寤恒�屽緟妫�鏌ャ�嶆鏌ュ崟. rentId={} patId={} checkType={} applyNo={}",
+ devRent.getId(), devRent.getPatId(), devRent.getCheckType(), devRent.getApplyNo());
+ }
+
+ /** 绱ф�ュ姞鍋氾細瀹氫綅瑕佺敤鍝紶棰勭害鍗曪紙鐢宠鍗曞彿浼樺厛锛屽叾娆℃偅鑰呯紪鍙� + 妫�鏌ラ」鐩紝杩� 卤30 澶╋紝鍙栨渶杩戠殑锛� */
+ private AppointmentDO findEmergencyAppointment(RoutineFinishReqVO req) {
+ // 鈶� 鐢宠鍗曞彿鑳界洿鎺ュ懡涓�
+ if (org.springframework.util.StringUtils.hasText(req.getApplyNo())) {
+ AppointmentDO byApplyNo = appointmentMapper.getByApplyNo(req.getApplyNo());
+ if (null != byApplyNo && matchesCheckType(byApplyNo, req.getCheckType())) {
+ return byApplyNo;
+ }
+ }
+ // 鈶� 鎸夋偅鑰呯紪鍙� + 妫�鏌ラ」鐩紝鍙栨渶杩戜竴寮�
+ if (org.springframework.util.StringUtils.hasText(req.getPatId()) && null != req.getCheckType()) {
+ List<Integer> one = new ArrayList<>();
+ one.add(req.getCheckType());
+ List<AppointmentDO> candidates = appointmentMapper.getEmergencyCandidates(req.getPatId(), one);
+ if (!candidates.isEmpty()) {
+ return candidates.get(0);
+ }
+ }
+ return null;
+ }
+
+ private boolean matchesCheckType(AppointmentDO appointment, Integer checkType) {
+ return null == checkType || null == appointment.getBookCheckType()
+ || checkType.equals(appointment.getBookCheckType());
+ }
+
+ private String nonBlank(String first, String second) {
+ return org.springframework.util.StringUtils.hasText(first) ? first : second;
}
/**
@@ -854,9 +995,55 @@
return devRentDO;
}
+ /**
+ * 鎾ら攢銆屾鏌ュ畬鎴愩�嶅悗鐨勫洖婊氾細妫�鏌ュ崟 60(甯歌妫�鏌ュ畬鎴�) 鈫� 0(寰呮鏌�)锛屽苟鍙栨秷纭垂銆�
+ *
+ * <p>銆愭湰娆′慨澶嶇殑鏍瑰洜銆戞挙閿�鍘熷厛鍙妸闃熷垪琛� 40鈫�20锛宍dev_rent` 浠嶆槸 60锛�
+ * 鍓嶇鍐嶆瀹屾垚鏃� `getFreeRent`锛堝彧鏌� state=0锛夊彇涓嶅埌鍗� 鈫� `formData.id` 涓虹┖
+ * 鈫� 鍚庣 `routineFinishOperation` 鎸� (patId, checkType, state=0) 涔熸壘涓嶅埌 鈫� 鎶ャ�岃鍏堥绾︾‘璁ゃ�嶃��
+ * 鎶婄姸鎬佸洖婊氬埌 0 鍚庯紝鏁存潯閾捐矾鎭㈠姝e父銆�
+ *
+ * <p>澶辫触绛栫暐锛氬叏绋� try/catch锛屽洖婊�/鍙栨秷璐瑰け璐ラ兘鍙鏃ュ織锛�**涓嶅奖鍝�"鎾ら攢"鏈韩鐨勭粨鏋�**銆�
+ */
@Override
- public DevRentDO getFreeRent(DevRentSearchReqVO searchReqVO) {
- List<Integer> stateList = new ArrayList<>();
+ public void rollbackRoutineFinish(String patId, Integer checkType) {
+ try {
+ List<Integer> finishedStateList = new ArrayList<>();
+ finishedStateList.add(DevRentStateEnum.ROUTINE_FINISH.getState());
+ DevRentDO rent = devRentMapper.selectLatestByPatCheckTypeStates(patId, checkType, finishedStateList);
+ if (null == rent) {
+ log.warn("[rollbackRoutineFinish] 鏈壘鍒颁粖鏃ヨ鎮h�呯殑銆屽父瑙勬鏌ュ畬鎴愩�嶆鏌ュ崟锛岃烦杩囧洖婊�. patId={} checkType={}",
+ patId, checkType);
+ return;
+ }
+
+ // 鈶� 鐘舵�佸洖婊氾紙鍙敼 state锛宺ent_time/return_time 淇濈暀锛屼綔涓�"鍋氳繃涓�娆�"鐨勭棔杩癸級
+ DevRentDO updateObj = new DevRentDO();
+ updateObj.setId(rent.getId());
+ updateObj.setState(DevRentStateEnum.FREE.getState());
+ devRentMapper.updateById(updateObj);
+ log.info("[rollbackRoutineFinish] 妫�鏌ュ崟宸插洖婊氫负[寰呮鏌. rentId={} patId={} checkType={}",
+ rent.getId(), patId, checkType);
+
+ // 鈶� 鍙栨秷纭垂锛堢涓�娆″畬鎴愭椂鎺у埗鍣ㄤ細鑷姩纭垂锛涙挙閿�鍚庡簲鍥為��锛屽啀娆″畬鎴愭椂閲嶆柊纭垂锛�
+ Integer paid = rent.getPaid();
+ if (null != paid && 1 == paid) {
+ try {
+ String hisId = SecurityFrameworkUtils.getLoginUserHisId();
+ String nickname = SecurityFrameworkUtils.getLoginUserNickname();
+ Integer ret = feeConfirm(rent.getId(), hisId, nickname, false);
+ log.info("[rollbackRoutineFinish] 宸插彇娑堢‘璐�. rentId={} 杩斿洖={}", rent.getId(), ret);
+ } catch (Exception e) {
+ log.error("[rollbackRoutineFinish] 鍙栨秷纭垂澶辫触锛堜笉褰卞搷鎾ら攢锛�. rentId={}", rent.getId(), e);
+ }
+ }
+ } catch (Exception e) {
+ log.error("[rollbackRoutineFinish] 鍥炴粴妫�鏌ュ崟澶辫触锛堜笉褰卞搷鎾ら攢锛�. patId={} checkType={}", patId, checkType, e);
+ }
+ }
+
+ @Override
+ public DevRentDO getFreeRent(DevRentSearchReqVO searchReqVO) { List<Integer> stateList = new ArrayList<>();
stateList.add(DevRentStateEnum.FREE.getState());
searchReqVO.setStateList(stateList);
DevRentDO devRentDO = devRentMapper.getRentByState(searchReqVO);
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/his/HisEcgFilter.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/his/HisEcgFilter.java
new file mode 100644
index 0000000..31236db
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/his/HisEcgFilter.java
@@ -0,0 +1,454 @@
+package cn.lihu.jh.module.ecg.service.his;
+
+import cn.lihu.jh.module.ecg.enums.HisCheckCodeEnum;
+import cn.lihu.jh.module.ecg.enums.HisCheckNameEnum;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 鍒ゅ畾涓�鏉� HIS 鎶ユ枃鏄惁涓恒�屽績鐢典笟鍔″崟銆嶃��
+ *
+ * <h3>涓轰粈涔堥渶瑕佸畠</h3>
+ * {@code S0405}锛堢敵璇峰崟鐘舵�佹洿鏂帮級鏄�**鍏ㄩ櫌閫氱敤**鏈嶅姟锛屾帴鍙f枃妗e畾涔変负
+ * {@code S0405|S0405HIS|S040501HIS}锛屼笉鍖哄垎绉戝銆傚尰闄細鎶�**鎵�鏈夋鏌ョ瀹�**
+ * 锛圕T銆丮RI銆丏R銆佽秴澹般�侀瀵嗗害鈥︼級鐨勬鏌ョ姸鎬佷竴骞舵帹閫佺粰蹇冪數绯荤粺銆�
+ *
+ * <p>瀹炴祴 2026-09-17 鏃ュ織锛歋0405 鍏� 1225 娆★紝鍏朵腑浠� 3.5% 鐨勭敵璇峰崟鍙疯兘鍦�
+ * 蹇冪數搴撲腑鎵惧埌銆傚叾浣欎负鏀惧皠/瓒呭0绛夌瀹ょ殑鍗曪紝渚嬪锛�
+ * <pre>
+ * 妫�鏌ラ」鐩細鑳搁儴CT骞虫壂銆佸啝鑴塁TA銆侀鑴慚RI骞虫壂銆佸僵瓒呰倽鑳嗚儼鑴俱�侀瀵嗗害鈥�
+ * 璇婂 锛�10鍙锋満鎴�(CT)銆佹�ヨ瘖CT瀹ゃ��15鍙锋満鎴�(MRI)銆佷骇绉戣秴澹�1銆佹�ヨ瘖B瓒呪��
+ * </pre>
+ * 鑻ヤ笉杩囨护锛屼細瀵硅繖浜涘崟鎵ц"鏌ヤ笉鍒� 鈫� 鎻掑叆鏂拌褰�"锛屽悜 appointment 琛ㄧ亴鍏�
+ * 澶ч噺鏃犲叧鏁版嵁锛堝疄娴嬪崟鏃ラ�惧崈鏉★級銆�
+ *
+ * <h3>鍒ゅ畾鏂瑰紡锛堜笁閲嶏紝浠讳竴鍛戒腑鍗充负蹇冪數鍗曪級</h3>
+ * <ol>
+ * <li><b>A. 鐢宠鍗曞彿鍚庣紑</b>锛氬績鐢靛崟鐢� {@code S0201ECG} 鍒涘缓锛岀紪鍙峰甫鍥哄畾鍚庣紑
+ * {@value #ECG_APPLY_NO_SUFFIX_1101} / {@value #ECG_APPLY_NO_SUFFIX_6401}
+ * 锛堝疄娴嬫牱渚� {@code 8826091720001101}銆亄@code 8826081120716401}锛夈��
+ * 涓庢斁灏勭鐨勭函鏁板瓧娴佹按鍙凤紙濡� {@code 2126091700001}锛夊舰鎬佹槑鏄句笉鍚屻��</li>
+ * <li><b>B. 妫�鏌ョ被鍨�</b>锛欻IS 妫�鏌ヤ唬鐮侊紙{@code jcxmcode} / 鎶ユ枃鐨�
+ * {@code component2...code.code}锛夎兘鍖归厤 {@link HisCheckCodeEnum}锛�
+ * 鎴栨鏌ュ悕绉拌兘鍖归厤 {@link HisCheckNameEnum}锛堜綋妫�鎮h�呮寜鍚嶇О鍖归厤锛夈��</li>
+ * <li><b>C. 鎵ц绉戝</b>锛欻IS 鎵ц绉戝浠g爜鍦ㄩ厤缃櫧鍚嶅崟鍐呫��
+ * 璇ョ櫧鍚嶅崟鏉ヨ嚜閰嶇疆椤� {@code ecg.his.ecg-dept-codes}锛堥�楀彿鍒嗛殧锛夈��
+ * <b>鏈厤缃椂鏈」涓嶅弬涓庡垽瀹�</b>锛岄伩鍏嶈鍒ゃ��</li>
+ * </ol>
+ *
+ * <h3>淇濆畧绛栫暐</h3>
+ * 褰撲笁椤瑰潎鏃犳硶鍒ゅ畾鏃讹紝杩斿洖 {@code false}锛堣涓洪潪蹇冪數鍗曪級骞惰褰曚竴鏉� DEBUG 鏃ュ織銆�
+ * 杩欐槸鍒绘剰鐨勪繚瀹堥�夋嫨锛氬畞鍙紡鏀讹紙鏈夋棩蹇楀彲鏌ャ�佸彲琛ワ級锛屼篃涓嶅悜涓氬姟琛ㄧ亴鍏ユ棤鍏虫暟鎹��
+ *
+ * @author 蹇冪數鎺掗槦瑁呮満绯荤粺
+ */
+@Slf4j
+@Component
+public class HisEcgFilter {
+
+ /** 蹇冪數鐢宠鍗曞彿鍚庣紑涔嬩竴锛堝搴� check_type=1100 甯歌蹇冪數鍥�-蹇冪數鍚戦噺鍥� 绯诲垪锛� */
+ public static final String ECG_APPLY_NO_SUFFIX_1101 = "1101";
+ /** 蹇冪數鐢宠鍗曞彿鍚庣紑涔嬩簩锛堝搴� check_type=500 鍔ㄨ剦纭寲妫�娴� 绯诲垪锛� */
+ public static final String ECG_APPLY_NO_SUFFIX_6401 = "6401";
+
+ /** 蹇冪數鐢宠鍗曞彿鍚庣紑鐧藉悕鍗� */
+ private static final List<String> ECG_APPLY_NO_SUFFIXES = Arrays.asList(
+ ECG_APPLY_NO_SUFFIX_1101, ECG_APPLY_NO_SUFFIX_6401);
+
+ /**
+ * 蹇冪數妫�鏌ラ」鐩悕绉板叧閿瓧锛�**杈呭姪淇″彿锛屼笉鏄敮涓�渚濇嵁**锛夈��
+ * <p>
+ * <b>鈿狅笍 閲嶈鏇存</b>锛氭棭鏈熺増鏈敞閲婃浘澹扮О"鏈櫌鍏ㄩ儴 15 涓績鐢甸」鐩悕绉板潎鍚�屽績鐢点��"锛�
+ * 杩欐槸**閿欒鐨�**銆傛牳瀵� {@code check_type} 琛ㄥ悗鏈� **4 涓績鐢电被鍨嬩笉鍚�"蹇冪數"**锛�
+ * <pre>
+ * 300 鍔ㄦ�佽鍘� 搴撲腑 9083 鏉�
+ * 500 鍔ㄨ剦纭寲妫�娴� 搴撲腑 11205 鏉�
+ * 600 椋熼亾鐢电敓鐞� 搴撲腑 60 鏉�
+ * 900 蹇冨鏅氱數浣� 搴撲腑 0 鏉�
+ * </pre>
+ * 鍥犳**缁濅笉鑳�**鐢�"鍚績鐢�"浣滀负鍞竴鍒ゅ畾渚濇嵁锛屽惁鍒欒繖 2 涓囧鏉$湡瀹炲績鐢佃褰曚細琚涪寮冦��
+ * <p>
+ * 鏈叧閿瓧浠呬綔涓�**鐧藉悕鍗曚箣澶栫殑琛ュ厖**锛坽@link #ECG_NAME_WHITELIST} 鏈敹褰曠殑
+ * 闀垮熬鍚嶇О鍙樹綋锛屽"鍗佷簩瀵艰仈蹇冪數妫�鏌�"锛夈�傜湡姝g殑鏉冨▉渚濇嵁鏄細
+ * 鈶� 妫�鏌ヤ唬鐮侊紙{@link HisCheckCodeEnum}锛夈�佲憽 鍚嶇О鐧藉悕鍗曘�佲憿 闈炲績鐢垫帓闄よ瘝銆�
+ */
+ private static final String ECG_NAME_KEYWORD = "蹇冪數";
+
+ /**
+ * 蹇冪數妫�鏌ラ」鐩悕绉扮櫧鍚嶅崟銆�
+ * <p>
+ * 涓や釜鏉ユ簮鍚堝苟锛�
+ * <ol>
+ * <li>{@code check_type} 琛ㄧ殑 15 涓潈濞佸悕绉帮紱</li>
+ * <li>{@code HisCheckNameEnum} 涓� HIS 瀹為檯浣跨敤鐨勫悕绉板彉浣擄紙濡�"24灏忔椂鍔ㄦ�佸績鐢靛浘"銆�
+ * "24灏忔椂鍔ㄦ�佸績鐢电洃娴�"銆�"24灏忔椂鍔ㄦ�佽鍘嬬洃娴�"锛夈��</li>
+ * </ol>
+ * 鐢�**鍘荤┖鐧藉悗鐨勫畬鏁村悕绉扮簿纭尮閰�**锛岄伩鍏�"鍚績鐢�"杩欑被涓嶄弗璋ㄧ殑妯$硦鍒ゆ柇銆�
+ * <p>
+ * 娉ㄦ剰锛�300/500/600/900 杩欏洓绫诲悕绉版湰韬笉鍚�"蹇冪數"锛岄潬鏈櫧鍚嶅崟涓庢鏌ヤ唬鐮佸叡鍚屽厹浣忋��
+ */
+ private static final List<String> ECG_NAME_WHITELIST = Arrays.asList(
+ // 鈥斺�� check_type 琛� 15 涓潈濞佸悕绉帮紙鍓嶇紑鍖归厤锛屽彲瑕嗙洊甯﹀墠鍚庣紑鐨勫彉浣擄級鈥斺��
+ "甯歌蹇冪數鍥�",
+ "鍔ㄦ�佸績鐢�",
+ "鍔ㄦ�佽鍘�",
+ "骞虫澘杩愬姩蹇冪數",
+ "鍔ㄨ剦纭寲妫�娴�",
+ "椋熼亾鐢电敓鐞�",
+ "蹇冪數鍥捐嵂鐗╄礋鑽疯瘯楠�",
+ "棰戣氨蹇冪數鍥�",
+ "蹇冨鏅氱數浣�",
+ "搴婅竟蹇冪數鍥�(甯歌+棰戣氨)",
+ "甯歌蹇冪數鍥�-蹇冪數鍚戦噺鍥�",
+ "鍔ㄦ�佸績鐢靛浘+琛�鍘�",
+ "(GCP)蹇冪數鍥�",
+ "甯歌蹇冪數鍥�18瀵�-蹇冪數鍚戦噺鍥�",
+ "搴婅竟蹇冪數鍥�18瀵硷紙甯歌+棰戣氨锛�",
+ // 鈥斺�� HIS 瀹為檯浣跨敤鐨勫悕绉板彉浣擄紙鏉ヨ嚜 HisCheckNameEnum 涓庣敓浜ф棩蹇楋級鈥斺��
+ "24灏忔椂鍔ㄦ�佸績鐢靛浘",
+ "24灏忔椂鍔ㄦ�佸績鐢电洃娴�",
+ "24灏忔椂鍔ㄦ�佽鍘嬬洃娴�",
+ "蹇冪數鍥捐繍鍔ㄨ瘯楠�", // 瀹炴祴 S050401 鍑虹幇锛屽搴� check_type=400
+ "杩愬姩蹇冪數鍥�",
+ "杩愬姩璇曢獙", // 蹇冪數鍥捐繍鍔ㄨ瘯楠岀殑鐭悕锛堢敤鎴锋彁鍑猴級
+ "骞虫澘杩愬姩", // 瑕嗙洊"骞虫澘杩愬姩璇曢獙"/"骞虫澘杩愬姩蹇冪數鍥�"绛夊彉浣�
+ "娲诲姩骞虫澘璇曢獙",
+ "蹇冪數鍚戦噺鍥�",
+ "搴婅竟蹇冪數鍥�",
+ "棰戣氨蹇冪數",
+ "椋熼亾璋冩悘",
+ "缁忛閬撳績鎴胯皟鎼�",
+ "鍔ㄨ剦纭寲", // check_type=500 鐨勭煭鍚嶏紙琛ㄥ唴涓�"鍔ㄨ剦纭寲妫�娴�"锛�
+ "韪濊噦鎸囨暟",
+ "ABI"
+ );
+
+ /**
+ * 鏄庣‘鐨�**闈炲績鐢�**鎺掗櫎璇嶃��
+ * <p>
+ * 鐢ㄤ簬鍦�"鍚嶇О鏃笉鍦ㄧ櫧鍚嶅崟銆佷篃涓嶅惈蹇冪數鍏抽敭瀛�"鏃讹紝蹇�熷垽瀹氫负鍏朵粬绉戝妫�鏌ャ��
+ * 杩欎簺璇嶆潵鑷疄娴嬬敓浜ф棩蹇椾腑澶ч噺鍑虹幇鐨勫奖鍍�/瓒呭0/鍐呴暅/鍔熻兘妫�鏌ラ」鐩�
+ * 锛堝"褰╄秴鑲濊儐鑳拌劸"銆�"鑳搁儴CT骞虫壂"銆�"鏃犵棝鑳冮暅"銆�"楠ㄥ瘑搴�"锛夈��
+ * <p>
+ * <b>鍒绘剰淇濆畧</b>锛氬彧鏀跺綍涓庡績鐢电粷鏃犱氦闆嗙殑寮虹壒寰佽瘝锛岄伩鍏嶈浼ゃ�備緥濡�
+ * "褰╄秴鑳庡効蹇冭剰"鍚�"蹇冭剰"浣嗗睘瓒呭0绉戯紝鐢�"褰╄秴"鎺掗櫎锛涜�屼笉鏀跺綍瀛ょ珛鐨�"蹇冭剰"锛�
+ * 浠ュ厤璇激鍙兘鐨勫績鐢甸」鐩��
+ */
+ private static final List<String> NON_ECG_EXCLUDE_KEYWORDS = Arrays.asList(
+ // 瓒呭0绫�
+ "褰╄秴", "B瓒�", "瓒呭0", "澶氭櫘鍕掕秴澹�",
+ // 鏀惧皠褰卞儚绫�
+ "CT", "MRI", "MR骞虫壂", "DR", "CR", "X绾�", "鎽勭墖", "姝d晶浣�", "姝f枩浣�", "姝d綅", "渚т綅",
+ "骞虫壂", "澧炲己", "CTA", "MRA", "DWI", "涓夌淮閲嶅缓", "閲嶅缓", "閫犲奖", "閽奸澏",
+ "鏈烘埧", "鏀惧皠", "鏍哥", "纾佸叡鎸�",
+ // 鍐呴暅绫�
+ "鑳冮暅", "鑲犻暅", "鏀皵绠¢暅", "鍠夐暅", "榧诲捊闀�", "鍐呴暅", "鍐呯闀�",
+ // 鍏朵粬鍔熻兘妫�鏌ワ紙闈炲績鐢碉級
+ "鑲哄姛鑳�", "鑲洪�氭皵", "鑲哄讥鏁�", "楠ㄥ瘑搴�", "鑲岀數鍥�", "鑴戠數鍥�", "鑴戣娴�",
+ "鍛兼皵", "婵�鍙戣瘯楠�", "鑸掑紶璇曢獙", "寮规�ф祴瀹�", "寮规�ф垚鍍�", "閲忚〃",
+ "楠ㄩ緞", "KUB", "鎺掔勃閫犲奖",
+ // 鐥呯悊/妫�楠岀被
+ "娲绘", "绌垮埡", "鐥呯悊", "鏍囨湰"
+ );
+
+ /**
+ * HIS 鎵ц绉戝浠g爜鐧藉悕鍗曪紙閰嶇疆椤� {@code ecg.his.ecg-dept-codes}锛岄�楀彿鍒嗛殧锛夈��
+ * <p>
+ * 璇存槑锛氬疄娴嬪簱涓煡涓嶅埌 HIS 鎵ц绉戝浠g爜锛堝 {@code YJ001}锛変笌鏈湴绉戝鐨勬槧灏勮〃锛�
+ * 鍥犳杩欓噷鍋氭垚鍙厤缃」銆傛湭閰嶇疆鏃躲�屼緷鎹� C銆嶄笉鍙備笌鍒ゅ畾锛屼笉褰卞搷 A/B 鐨勮繃婊ゆ晥鏋溿��
+ * 寰呴櫌鏂规彁渚涘績鐢垫墽琛岀瀹や唬鐮佸悗锛屽湪 infra_config 澧炲姞璇ラ厤缃嵆鍙敓鏁堛��
+ */
+ private volatile List<String> ecgDeptCodes = java.util.Collections.emptyList();
+
+ /** 渚涘閮紙閰嶇疆鍒锋柊锛夋敞鍏ョ瀹ょ櫧鍚嶅崟 */
+ public void setEcgDeptCodes(List<String> codes) {
+ this.ecgDeptCodes = codes == null ? java.util.Collections.emptyList() : codes;
+ }
+
+ /**
+ * 鍒ゅ畾缁撴灉锛氭槸鍚︿负蹇冪數涓氬姟鍗曪紝浠ュ強鍛戒腑鐨勪緷鎹紙渚夸簬鎺掓煡锛夈��
+ */
+ public static class Result {
+ private final boolean ecg;
+ private final String reason;
+
+ Result(boolean ecg, String reason) {
+ this.ecg = ecg;
+ this.reason = reason;
+ }
+
+ public boolean isEcg() {
+ return ecg;
+ }
+
+ public String getReason() {
+ return reason;
+ }
+ }
+
+ /**
+ * 缁煎悎鍒ゅ畾锛堜笁閲嶏級銆�
+ *
+ * @param applyNo 鐢宠鍗曞彿锛屽彲涓虹┖
+ * @param hisCheckCode HIS 妫�鏌ラ」鐩唬鐮侊紙濡� {@code Y1202065}锛夛紝鍙负绌�
+ * @param hisCheckName HIS 妫�鏌ラ」鐩悕绉帮紙濡� {@code 搴婅竟蹇冪數鍥�(甯歌+棰戣氨)}锛夛紝鍙负绌�
+ * @param hisDeptCode HIS 鎵ц绉戝浠g爜锛屽彲涓虹┖
+ * @return 鍒ゅ畾缁撴灉
+ */
+ public Result judge(String applyNo, String hisCheckCode, String hisCheckName, String hisDeptCode) {
+ // 渚濇嵁 A锛氱敵璇峰崟鍙峰悗缂�
+ if (matchApplyNoSuffix(applyNo)) {
+ return new Result(true, "A:鐢宠鍗曞彿鍚庣紑");
+ }
+ // 渚濇嵁 B锛氭鏌ョ被鍨嬶紙浠g爜浼樺厛锛屽叾娆″悕绉帮級
+ if (matchCheckCode(hisCheckCode)) {
+ return new Result(true, "B:妫�鏌ラ」鐩唬鐮�=" + hisCheckCode);
+ }
+ if (matchCheckName(hisCheckName)) {
+ return new Result(true, "B:妫�鏌ラ」鐩悕绉�=" + hisCheckName);
+ }
+ // 渚濇嵁 C锛氭墽琛岀瀹わ紙闇�閰嶇疆鐧藉悕鍗曪紝鏈厤缃椂涓嶅弬涓庯級
+ if (matchDeptCode(hisDeptCode)) {
+ return new Result(true, "C:鎵ц绉戝=" + hisDeptCode);
+ }
+ return new Result(false, "鏈懡涓换浣曞績鐢靛垽瀹氫緷鎹�");
+ }
+
+ /**
+ * 缁煎悎鍒ゅ畾锛堝惈 ZDY 妫�鏌ラ」鐩紝鐢ㄤ簬 {@code S050401}/{@code S050501}锛夈��
+ * <p>
+ * 杩欎袱涓湇鍔$殑妫�鏌ラ」鐩笉鍦� {@code component2.observationRequest.code}锛�
+ * 鑰屽湪 {@code actAppointment.ZDY.jcxmcode} / {@code ZDY.jcxmname}锛堥�楀彿鍒嗛殧澶氬�硷級銆�
+ *
+ * @param zdy 鎶ユ枃涓殑 {@code ZDY} 鑺傜偣锛屽彲涓虹┖
+ */
+ public Result judgeWithZdy(String applyNo, String hisDeptCode, Object zdy) {
+ // 渚濇嵁 A锛氱敵璇峰崟鍙峰悗缂�
+ if (matchApplyNoSuffix(applyNo)) {
+ return new Result(true, "A:鐢宠鍗曞彿鍚庣紑");
+ }
+ // 渚濇嵁 B锛歓DY 涓殑妫�鏌ラ」鐩紙浠g爜 + 鍚嶇О锛屾敮鎸侀�楀彿鍒嗛殧澶氬�硷級
+ String jcxmCode = extractZdyValue(zdy, "jcxmcode");
+ String jcxmName = extractZdyValue(zdy, "jcxmname");
+ if (matchCheckItems(jcxmCode, jcxmName)) {
+ return new Result(true, "B:ZDY妫�鏌ラ」鐩� code=" + jcxmCode + " name=" + jcxmName);
+ }
+ // 渚濇嵁 C锛氭墽琛岀瀹�
+ if (matchDeptCode(hisDeptCode)) {
+ return new Result(true, "C:鎵ц绉戝=" + hisDeptCode);
+ }
+ return new Result(false, "鏈懡涓换浣曞績鐢靛垽瀹氫緷鎹�");
+ }
+
+ /** 鍙� ZDY 涓殑鏌愪釜鏂囨湰瀛楁 */
+ private String extractZdyValue(Object zdy, String key) {
+ if (!(zdy instanceof java.util.Map)) {
+ return null;
+ }
+ Object v = ((java.util.Map<?, ?>) zdy).get(key);
+ return v == null ? null : v.toString();
+ }
+
+ /** 渚濇嵁 A锛氱敵璇峰崟鍙锋槸鍚︿互蹇冪數鍚庣紑缁撳熬 */
+ public boolean matchApplyNoSuffix(String applyNo) {
+ if (!StringUtils.hasText(applyNo)) {
+ return false;
+ }
+ String trimmed = applyNo.trim();
+ for (String suffix : ECG_APPLY_NO_SUFFIXES) {
+ if (trimmed.endsWith(suffix)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 渚濇嵁 B-1锛欻IS 妫�鏌ラ」鐩唬鐮佹槸鍚﹀睘蹇冪數銆�
+ * <p>
+ * HIS 鎶ユ枃涓鍊煎舰濡� {@code Y1202065}锛岃�� {@link HisCheckCodeEnum} 鐨� code 涓�
+ * 鍘绘帀鍓嶇紑 {@code Y} 鍚庣殑鏁板瓧锛坽@code 1202065}锛夈�傚師浠g爜浣跨敤
+ * {@code checkType.substring(1)} 鍋氭埅鏂紝杩欓噷鍋氬悓鏍峰吋瀹瑰苟琛ラ暱搴︽牎楠岋紝
+ * 鍚屾椂瀹瑰繊鎶ユ枃鏈韩灏卞甫鎴栦笉甯� {@code Y} 鍓嶇紑銆�
+ */
+ public boolean matchCheckCode(String hisCheckCode) {
+ if (!StringUtils.hasText(hisCheckCode)) {
+ return false;
+ }
+ String raw = hisCheckCode.trim().replaceAll("\\s+", "");
+ // 鍘熼�昏緫锛歴ubstring(1) 鍘绘帀棣栧瓧绗︺�傛澶勫悓鏃跺皾璇曞師鍊间笌鍘婚瀛楃锛屽吋瀹逛袱绉嶆姤鏂�
+ String[] candidates = raw.length() > 1
+ ? new String[]{raw, raw.substring(1)}
+ : new String[]{raw};
+ for (String candidate : candidates) {
+ if (HisCheckCodeEnum.getByCode(candidate) != null) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 渚濇嵁 B-2锛欻IS 妫�鏌ラ」鐩悕绉版槸鍚﹀睘蹇冪數銆�
+ *
+ * <p>鍒ゅ畾椤哄簭锛�**鍏堢櫧鍚嶅崟銆佸悗鍏抽敭瀛椼�佸啀鐢ㄦ帓闄よ瘝鎸′綇**锛夛細
+ * <ol>
+ * <li><b>鍚嶇О鐧藉悕鍗曠簿纭尮閰�</b>锛坽@link ECG_NAME_WHITELIST} 鎴�
+ * {@link HisCheckNameEnum}锛夆�斺�� 瑕嗙洊"鍔ㄦ�佽鍘�""鍔ㄨ剦纭寲妫�娴�"
+ * "椋熼亾鐢电敓鐞�""蹇冨鏅氱數浣�"绛�**涓嶅惈"蹇冪數"**鐨勫績鐢甸」鐩紱</li>
+ * <li><b>鍚�"蹇冪數"鍏抽敭瀛�</b> 鈥斺�� 瑕嗙洊鐧藉悕鍗曟湭鏀跺綍鐨勫悕绉板彉浣�
+ * 锛堝"鍗佷簩瀵艰仈蹇冪數妫�鏌�"锛夛紱</li>
+ * <li><b>鍛戒腑闈炲績鐢垫帓闄よ瘝</b>锛坽@link NON_ECG_EXCLUDE_KEYWORDS}锛夆�斺��
+ * 鏄庣‘鍒や负鍏朵粬绉戝妫�鏌ワ紝鐩存帴杩斿洖 false銆�
+ * 杩欎竴姝ュ緢鍏抽敭锛氳嫢鏌愬悕绉板悓鏃跺懡涓�"蹇冪數"涓庢帓闄よ瘝锛堝紓甯告儏鍐碉級锛�
+ * 璇存槑鎶ユ枃鏈夋涔夛紝瀹佸彲浜ょ粰鎺掗櫎璇嶅垽鍚︼紝涔熶笉璇敹銆�</li>
+ * </ol>
+ *
+ * <p><b>涓轰粈涔堜笉鍙敤"鍚績鐢�"</b>锛氭湰闄� {@code check_type} 琛ㄧ殑 15 涓績鐢电被鍨嬩腑锛�
+ * 鏈� 4 涓笉鍚�"蹇冪數"锛�300 鍔ㄦ�佽鍘嬨��500 鍔ㄨ剦纭寲妫�娴嬨��600 椋熼亾鐢电敓鐞嗐��
+ * 900 蹇冨鏅氱數浣嶏級锛屽簱涓悎璁� 2 涓囦綑鏉$湡瀹炶褰曘�備粎闈犲叧閿瓧浼�**涓㈠純杩欎簺鐪熷疄蹇冪數鍗�**銆�
+ */
+ public boolean matchCheckName(String hisCheckName) {
+ if (!StringUtils.hasText(hisCheckName)) {
+ return false;
+ }
+ String normalized = hisCheckName.trim().replaceAll("\\s+", "");
+
+ // 1) 闈炲績鐢垫帓闄よ瘝浼樺厛鍒ゅ惁锛堥槻姝㈡涔夊悕绉拌鍚庨潰鐨勫叧閿瓧璇敹锛�
+ for (String kw : NON_ECG_EXCLUDE_KEYWORDS) {
+ if (normalized.contains(kw)) {
+ return false;
+ }
+ }
+
+ // 2) 鍚嶇О鐧藉悕鍗曞尮閰�
+ // 閲囩敤**鍓嶇紑鍖归厤**鑰岄潪鍏ㄧ瓑锛欻IS 鐨勫悕绉板父甯﹀墠鍚庣紑鍙樹綋
+ // 锛堝"24灏忔椂鍔ㄦ�佽鍘嬬洃娴�"= 鍓嶇紑"鍔ㄦ�佽鍘�" + "鐩戞祴"锛�
+ // "鍔ㄦ�佸績鐢靛浘+琛�鍘�"浠�"鍔ㄦ�佸績鐢�"寮�澶达級锛屽墠缂�鍖归厤鍙鐩栭暱灏惧彉浣撱��
+ // 瀹夊叏鍓嶆彁锛氭帓闄よ瘝宸插湪绗� 1 姝ュ厛琛屾嫤鎴紝涓嶄細鍑虹幇"褰╄秴鈥�"琚墠缂�璇敹銆�
+ if (HisCheckNameEnum.getByName(normalized) != null) {
+ return true;
+ }
+ for (String name : ECG_NAME_WHITELIST) {
+ if (normalized.startsWith(name)) {
+ return true;
+ }
+ }
+
+ // 3) 鍏抽敭瀛楀厹搴曪紙鐧藉悕鍗曚箣澶栫殑闀垮熬鍚嶇О鍙樹綋锛�
+ return normalized.contains(ECG_NAME_KEYWORD);
+ }
+
+ /**
+ * 渚濇嵁 B锛堝鍊肩増锛夛細鎶ユ枃涓殑妫�鏌ラ」鐩唬鐮�/鍚嶇О鍙兘鏄�**閫楀彿鍒嗛殧鐨勫涓」鐩�**銆�
+ * <p>
+ * 瀹炴祴 {@code S050401}/{@code S050501} 鐨� {@code ZDY.jcxmcode}/{@code ZDY.jcxmname}
+ * 褰㈠锛�
+ * <pre>
+ * jcxmcode=1393,1506 jcxmname=鍙宠倶姝d晶浣�,宸﹁偐鍏宠妭姝d晶浣�
+ * jcxmcode=35672306,35672504,... jcxmname=褰╄秴鍙充笅鑲㈠姩鑴�,褰╄秴鍙充笅鑲㈤潤鑴�,...
+ * </pre>
+ * 鍙**浠讳竴**椤圭洰灞炲績鐢靛嵆鍒ゅ畾涓哄績鐢靛崟銆�
+ *
+ * @param hisCheckCodes 閫楀彿鍒嗛殧鐨勬鏌ラ」鐩唬鐮侊紝鍙负绌�
+ * @param hisCheckNames 閫楀彿鍒嗛殧鐨勬鏌ラ」鐩悕绉帮紝鍙负绌�
+ * @return 鏄惁鍛戒腑蹇冪數妫�鏌ラ」鐩�
+ */
+ public boolean matchCheckItems(String hisCheckCodes, String hisCheckNames) {
+ return matchAny(hisCheckCodes, this::matchCheckCode)
+ || matchAny(hisCheckNames, this::matchCheckName);
+ }
+
+ /** 灏嗗垎闅旂鎷嗗紑鐨勫�奸�愪釜浜ょ粰鍒ゅ畾鍑芥暟锛屼换涓�鍛戒腑鍗宠繑鍥� true */
+ private boolean matchAny(String joined, java.util.function.Predicate<String> matcher) {
+ if (!StringUtils.hasText(joined)) {
+ return false;
+ }
+ for (String part : joined.split("[,锛�;锛沒")) {
+ if (matcher.test(part.trim())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 渚濇嵁 B锛圫050401/S050501 涓撶敤锛夛細浠� {@code ZDY.jcxmcode} / {@code ZDY.jcxmname}
+ * 缁煎悎鍒ゅ畾鏄惁灞炲績鐢垫鏌ャ��
+ */
+ public boolean matchZdyCheckItems(Object zdy) {
+ if (!(zdy instanceof java.util.Map)) {
+ return false;
+ }
+ java.util.Map<?, ?> m = (java.util.Map<?, ?>) zdy;
+ Object code = m.get("jcxmcode");
+ Object name = m.get("jcxmname");
+ return matchCheckItems(code == null ? null : code.toString(),
+ name == null ? null : name.toString());
+ }
+
+ /** 渚濇嵁 C锛氭墽琛岀瀹や唬鐮佹槸鍚﹀湪鐧藉悕鍗曞唴锛堢櫧鍚嶅崟涓虹┖鏃惰涓轰笉鍙備笌鍒ゅ畾锛� */
+ public boolean matchDeptCode(String hisDeptCode) {
+ if (ecgDeptCodes.isEmpty() || !StringUtils.hasText(hisDeptCode)) {
+ return false;
+ }
+ String trimmed = hisDeptCode.trim();
+ return ecgDeptCodes.stream().anyMatch(c -> c.equalsIgnoreCase(trimmed));
+ }
+
+ /**
+ * 渚挎嵎鏂规硶锛氫粎鍒ゅ畾锛屽苟鍦ㄩ潪蹇冪數鍗曟椂杈撳嚭鍙帓鏌ョ殑 DEBUG 鏃ュ織銆�
+ *
+ * @param source 璋冪敤鏉ユ簮鏍囪瘑锛岀敤浜庢棩蹇楀畾浣嶏紙濡� {@code S0405}锛�
+ */
+ public boolean isEcgOrder(String source, String applyNo, String hisCheckCode,
+ String hisCheckName, String hisDeptCode) {
+ Result r = judge(applyNo, hisCheckCode, hisCheckName, hisDeptCode);
+ if (!r.isEcg()) {
+ // 鐢� INFO 绾э細鐢熶骇鏃ュ織绾у埆涓� INFO锛岃嫢鐢� DEBUG 鍒欒烦杩囪褰曞畬鍏ㄤ笉鍙锛�
+ // 鏇惧洜姝ゆ紡鎺変簡 S050401/S050501 娣峰叆闈炲績鐢靛崟鐨勯棶棰橈紙鏃犳硶浠庢棩蹇楀彂鐜帮級銆�
+ log.info("[{}][闈炲績鐢典笟鍔″崟锛岃烦杩囧鐞哴 applyNo={} 妫�鏌ヤ唬鐮�={} 椤圭洰鍚嶇О={} 鎵ц绉戝={} 鍘熷洜={}",
+ source, applyNo, hisCheckCode, hisCheckName, hisDeptCode, r.getReason());
+ }
+ return r.isEcg();
+ }
+
+ /**
+ * 渚挎嵎鏂规硶锛堝惈 ZDY 妫�鏌ラ」鐩級锛氱敤浜� {@code S050401}/{@code S050501}銆�
+ * <p>
+ * 闈炲績鐢靛崟鏃惰緭鍑� INFO 绾ф棩蹇楋紙杩欎袱涓湇鍔℃鍓�**鏈仛浠讳綍杩囨护**锛屽鑷存斁灏�/瓒呭0鍗�
+ * 琚綋浣滃績鐢电敵璇峰崟閲囬泦锛氬疄娴� S050401 鏈� 109/256銆丼050501 鏈� 4/19 灞為潪蹇冪數锛夈��
+ *
+ * @param zdy 鎶ユ枃涓殑 {@code ZDY} 鑺傜偣
+ */
+ public boolean isEcgOrderWithZdy(String source, String applyNo, String hisDeptCode, Object zdy) {
+ Result r = judgeWithZdy(applyNo, hisDeptCode, zdy);
+ if (!r.isEcg()) {
+ Object name = zdy instanceof java.util.Map ? ((java.util.Map<?, ?>) zdy).get("jcxmname") : null;
+ Object room = zdy instanceof java.util.Map ? ((java.util.Map<?, ?>) zdy).get("roomname") : null;
+ log.info("[{}][闈炲績鐢典笟鍔″崟锛岃烦杩囧鐞哴 applyNo={} 妫�鏌ラ」鐩�={} 鎴块棿={} 鎵ц绉戝={} 鍘熷洜={}",
+ source, applyNo, name, room, hisDeptCode, r.getReason());
+ }
+ return r.isEcg();
+ }
+
+ /** 浠庡舰濡� {@code component2={observationRequest={...code={code=Y1202065,...}}}} 鐨勭粨鏋勪腑鍙栨鏌ラ」鐩唬鐮� */
+ @SuppressWarnings("unchecked")
+ public static String extractCheckCode(Object component2) {
+ return Optional.ofNullable(component2)
+ .filter(v -> v instanceof java.util.Map)
+ .map(v -> (java.util.Map<String, Object>) v)
+ .map(m -> (java.util.Map<String, Object>) m.get("observationRequest"))
+ .map(or -> (java.util.Map<String, Object>) or.get("code"))
+ .map(code -> {
+ Object c = code.get("code");
+ return c == null ? null : c.toString();
+ })
+ .orElse(null);
+ }
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java
index a5f0ae4..e14aa53 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java
@@ -19,6 +19,9 @@
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.module.ecg.dal.mysql.jobrecord.JobRecordMapper;
+import cn.lihu.jh.module.ecg.dal.mysql.queue.QueueMapper;
+import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
+import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
@@ -33,10 +36,15 @@
*/
@Service
@Validated
+@Slf4j
public class JobRecordServiceImpl implements JobRecordService {
@Resource
private JobRecordMapper jobRecordMapper;
+
+ /** 銆愭挙閿�鏍囪瘑銆戣褰撴棩闃熷垪鐘舵�侊紝鍒ゆ柇"瀹屾垚鏄惁琚挙閿�杩�" */
+ @Resource
+ private QueueMapper queueMapper;
@Resource
private DevRentMapper devRentMapper;
@@ -98,11 +106,56 @@
}
// 闇�姹�1锛氬洖濉偅鑰呬俊鎭紙鎵归噺锛岄伩鍏� N+1锛�
fillPatientInfo(jobRecordDOList);
+ // 銆愭挙閿�鏍囪瘑銆戞爣璁�"瀹屾垚琚挙閿�杩囥�佽繕娌¢噸鏂板畬鎴�"鐨勮褰�
+ fillUndoneFlag(jobRecordDOList);
}
return pageResult;
}
+ /**
+ * 銆愭挙閿�鏍囪瘑銆戠粰"宸插畬鎴愯褰�"琛ヤ笂 {@code undone}銆�
+ *
+ * <p>鎾ら攢銆屾鏌ュ畬鎴愩�嶅彧鏄妸闃熷垪琛� 40(宸插氨璇�) 鏀瑰洖 20(鍑嗗涓�)锛�**涓嶇 job_record**锛�
+ * 鍥犳鍒ゆ柇瑙勫垯鏄細璇ユ偅鑰�**浠婃棩**瀵瑰簲妫�鏌ラ」鐩殑闃熷垪琛屽瓨鍦ㄣ�佷笖鐘舵�� 鈮� 40 鈫� 宸茶鎾ら攢銆�
+ * 鎮h�呭啀娆″畬鎴愬悗闃熷垪琛屼細鍥炲埌 40 鈫� 鑷姩鎭㈠鎴�"宸插畬鎴�"锛屾棤闇�鍐欏簱銆佷篃涓嶄細婕忔竻鏍囪銆�
+ *
+ * <p>涓�娆℃壒閲忔煡璇㈣В鍐虫暣椤碉紙鎸� patId 鍙栧綋鏃ラ槦鍒楃姸鎬侊紝鍐嶅湪鍐呭瓨閲屾寜 patId+checkType 鍖归厤锛夈��
+ */
+ private void fillUndoneFlag(List<JobRecordDO> jobRecordDOList) {
+ List<String> patIdList = jobRecordDOList.stream()
+ .map(JobRecordDO::getPatId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .toList();
+ if (patIdList.isEmpty()) {
+ return;
+ }
+ Map<String, Integer> statusMap = new HashMap<>();
+ try {
+ for (Map<String, Object> row : queueMapper.selectTodayStatusByPatIds(patIdList)) {
+ Object patId = row.get("patId");
+ Object checkType = row.get("checkType");
+ Object status = row.get("status");
+ if (null != patId && null != checkType && status instanceof Number) {
+ statusMap.put(patId + "#" + checkType, ((Number) status).intValue());
+ }
+ }
+ } catch (Exception e) {
+ log.warn("[fillUndoneFlag] 璇诲彇褰撴棩闃熷垪鐘舵�佸け璐ワ紝鎾ら攢鏍囪瘑鎸夈�愭湭鎾ら攢銆戝鐞�", e);
+ return;
+ }
+ for (JobRecordDO row : jobRecordDOList) {
+ if (null == row.getPatId() || null == row.getCheckType()) {
+ row.setUndone(false);
+ continue;
+ }
+ Integer status = statusMap.get(row.getPatId() + "#" + row.getCheckType());
+ // 闃熷垪琛屼笉瀛樺湪锛堝巻鍙茶褰�/宸叉竻鐞嗭級鈫� 瑙嗕负鏈挙閿�锛涘瓨鍦ㄤ笖涓嶆槸 40 鈫� 宸叉挙閿�
+ row.setUndone(null != status && QueueStatusEnum.FINISH.getStatus() != status);
+ }
+ }
+
// ==================== 闇�姹�1锛氬洖濉偅鑰呬俊鎭� 18 椤� ====================
// 鍥炲~閾捐矾锛堜笁绾э級锛�
// job_record.rentId 鈫� dev_rent.applyNo 鈫� appointment
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedDoctorOnCallable.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedDoctorOnCallable.java
index 889fe78..0cd422b 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedDoctorOnCallable.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedDoctorOnCallable.java
@@ -12,8 +12,10 @@
private String bedNo;
private Long docId;
private String docName;
+ /** 宸ヤ綅涓婚敭锛堝彲閫夛級锛氫紭鍏堟寜瀹冨畾浣嶏紝閬垮厤 bed_no 涓庤姹傚�兼湁鑲夌溂闅捐鲸宸紓鏃舵洿鏂� 0 琛� */
+ private Integer bedId;
- public BedDoctorOnCallable(QueueServiceTxFunctions queueService, Long roomId, String bedNo, Long docId, String docName)
+ public BedDoctorOnCallable(QueueServiceTxFunctions queueService, Long roomId, String bedNo, Long docId, String docName, Integer bedId)
{
super();
this.queueService = queueService;
@@ -21,10 +23,11 @@
this.bedNo = bedNo;
this.docId = docId;
this.docName = docName;
+ this.bedId = bedId;
}
public ErrorCode call() throws Exception {
- ErrorCode ec = queueService.bedDoctorOn(roomId, bedNo, docId, docName);
+ ErrorCode ec = queueService.bedDoctorOn(roomId, bedNo, docId, docName, bedId);
if (GlobalErrorCodeConstants.SUCCESS.equals(ec)) {
queueService.hurryupOneBed(roomId, bedNo);
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java
index 3fd8f0c..b80062c 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java
@@ -57,6 +57,14 @@
* 涓�涓伐浣� 鍙兘鏀寔澶氫釜妫�鏌ョ被鍨嬶紝
*/
void startHurryUpOneBed(Long roomId, String bedNo);
+
+ /**
+ * 绔嬪嵆琛ヤ汉锛堢幇鍦鸿嚜鏁� + 鑷姪璇婃柇锛夛細鎵嬪姩瑙﹀彂涓�娆¤宸ヤ綅鐨勮嚜鍔ㄥ垎娴侊紝
+ * 骞惰繑鍥炪�岀郴缁熷紑璇婄姸鎬� / 鏄惁鍋滄鍊欒瘖 / 鍊欒瘖涓婇檺 / 琛ヤ汉鍓嶅悗浜烘暟 / 缁撹銆嶃��
+ *
+ * <p>璋冪敤鏂瑰繀椤讳繚璇�"褰撳墠鐧诲綍浜烘槸璇ュ伐浣嶄富浜�"锛圕ontroller 涓婄敤 {@code @RequireBedOwner}锛夈��
+ */
+ java.util.Map<String, Object> hurryUpNow(Long roomId, String bedNo);
void startHurryUpOneCheckType(Integer checkType);
void startBedReload();
@@ -67,8 +75,35 @@
ErrorCode startBedClose(Long roomId, String bedNo);
ErrorCode startBedDoctorPause(Long roomId, String bedNo, Long docId, String docName);
ErrorCode startBedDoctorResume(Long roomId, String bedNo, Long docId, String docName);
- ErrorCode startBedDoctorOn(Long roomId, String bedNo, Long docId, String docName);
+ /**
+ * 鍖荤敓鍏ュ骇锛堟妸宸ヤ綅涓讳汉璁句负璇ュ尰鐢燂級銆�
+ *
+ * @param bedId 宸ヤ綅涓婚敭锛堝彲閫夛級锛氫紶鍏ユ椂**浼樺厛鎸夊畠瀹氫綅**锛岄伩鍏� bed_no 涓庤姹傚�煎瓨鍦�
+ * 鑲夌溂闅捐鲸宸紓锛堢粨灏剧┖鏍�/澶у皬鍐�/鍏ㄨ锛夊鑷�"鏄庢槑绌洪棽鍗村叆搴уけ璐�"
+ */
+ ErrorCode startBedDoctorOn(Long roomId, String bedNo, Long docId, String docName, Integer bedId);
+
+ /**
+ * 銆屾湰璇婂鎺掗槦涓紙鏈垎閰嶅伐浣嶏級銆嶇殑鎮h�呭垪琛紙宸ヤ綔鍙�"鏈瘖瀹ゆ帓闃熶腑锛堟湭鍒嗛厤锛�"鍒嗗尯鐢級銆�
+ *
+ * <p>鍊欒瘖鍒楄〃鎸� {@code room_id + bed_no} 鏌ワ紝鍙惈**宸插垎娴佸埌鏈伐浣�**鐨勬偅鑰咃紱
+ * 鎺掗槦涓�(10) 鐨勬偅鑰� {@code bed_no} 涓虹┖锛堝ぇ灞忎細鏄剧ず銆佸伐浣滃彴鐪嬩笉鍒帮級锛岃繖閲屾寜鏈伐浣�
+ * 寮�灞曠殑妫�鏌ラ」鐩崟鐙煡鍑烘潵锛屼緵鍖荤敓鎵嬪伐鎷夊叆銆�
+ */
+ List<cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO> getUnassignedWaitingPatient(Long roomId, String bedNo);
+
+ /**
+ * 鎵嬪伐鎶婃煇浣嶃�屾帓闃熶腑銆嶆偅鑰呮媺鍏ユ湰宸ヤ綅锛堚啋 鍑嗗涓級銆�
+ *
+ * <p>璋冪敤鏂瑰繀椤讳繚璇�"褰撳墠鐧诲綍浜烘槸璇ュ伐浣嶄富浜�"锛圕ontroller 涓婄敤 {@code @RequireBedOwner}锛夈��
+ */
+ ErrorCode pullWaitingPatient(Long roomId, String bedNo, Integer queueId);
ErrorCode startBedDoctorOff(Long roomId, String bedNo, Long docId, String docName);
+
+ /**
+ * 銆愭湰娆¢渶姹傘�戠鐞嗗憳寮哄埗娓呯┖宸ヤ綅锛堜笉瑕佹眰鏄湰浜猴級鈥斺�� 鍖荤敓涓嬬彮蹇樼搴� / 鎹汉浣跨敤鍚屼竴宸ヤ綅鏃剁敤銆�
+ */
+ ErrorCode startBedDoctorOffByAdmin(Long roomId, String bedNo);
ErrorCode startNextPatient(Long roomId, String bedNo);
ErrorCode startNextInstallPatient(Long roomId, String bedNo);
@@ -96,7 +131,11 @@
*/
void queue(QueueSaveReqVO queueSaveReqVO);
- List<QueueDO> selectBookSeqNumByAppointIdList(List<Long> appointIdList);
+ /**
+ * 鎸夐绾﹀崟 id 鎵归噺鍙� queue 琛岋紙棰勭害绛惧埌鍓嶅洖濉�屽凡鎺掗槦 + 鎺掗槦鍙� seq_num銆嶇敤锛夈��
+ * <p>鍘熸柟娉曞悕涓� {@code selectBookSeqNumByAppointIdList}锛屽彿缁熶竴鍒� seq_num 鍚庢敼鍚嶃��
+ */
+ List<QueueDO> selectQueueByAppointIdList(List<Long> appointIdList);
/**
* 甯歌妫�鏌� 鍖荤敓鍙笅涓�浣嶆偅鑰�
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 4b6f9e4..6c3f1e9 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
@@ -2,6 +2,7 @@
import java.util.*;
import java.util.concurrent.*;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import cn.lihu.jh.module.ecg.Utils;
@@ -192,9 +193,41 @@
return ECG_INNER_ERROR;
}
+ /**
+ * 銆屾湰璇婂鎺掗槦涓紙鏈垎閰嶅伐浣嶏級銆嶇殑鎮h�呭垪琛ㄣ��
+ *
+ * <p>宸ヤ綔鍙板�欒瘖鍒楄〃鎸� {@code room_id + bed_no} 鏌ワ紝鍙湅寰楀埌**宸插垎娴佸埌鏈伐浣�**鐨勬偅鑰咃紱
+ * 鑰�"鎺掗槦涓�(10)"鐨勬偅鑰� {@code bed_no} 涓虹┖锛堝ぇ灞忎細鏄剧ず銆佸伐浣滃彴鐪嬩笉鍒帮級锛�
+ * 杩欓噷鎸�**鏈伐浣嶅紑灞曠殑妫�鏌ラ」鐩�**鎶婁粬浠崟鐙煡鍑烘潵锛屼緵鍖荤敓鎵嬪伐鎷夊叆銆�
+ *
+ * <p>宸ヤ綅涓嶅瓨鍦ㄦ垨娌¢厤妫�鏌ラ」鐩椂杩斿洖绌哄垪琛紙璁拌鍛婏級锛屼笉鎶涘紓甯� 鈥斺�� 鍒楄〃涓虹┖涓嶅奖鍝嶄富娴佺▼銆�
+ */
@Override
- public ErrorCode startBedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
- Future<ErrorCode> future = singleThreadExecutor.submit(new BedDoctorOnCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName));
+ public List<QueueDO> getUnassignedWaitingPatient(Long roomId, String bedNo) {
+ RoomDO bed = (null == roomId || null == bedNo) ? null : roomMapper.getRoom(roomId, bedNo);
+ if (null == bed || null == bed.getCheckTypes() || 0 == bed.getCheckTypes().length) {
+ log.warn("[getUnassignedWaitingPatient] 宸ヤ綅涓嶅瓨鍦ㄦ垨鏈厤缃鏌ラ」鐩紝杩斿洖绌�. roomId={} bedNo={}",
+ roomId, bedNo);
+ return new ArrayList<>();
+ }
+ return queueMapper.selectUnassignedWaitingByCheckTypes(
+ QueueStatusEnum.WAITING.getStatus(), bed.getCheckTypes());
+ }
+
+ /**
+ * 鎵嬪伐鎶婃煇浣嶃�屾帓闃熶腑銆嶆偅鑰呮媺鍏ユ湰宸ヤ綅锛堚啋 鍑嗗涓級銆�
+ *
+ * <p>鏉冮檺鐢� Controller 涓婄殑 {@code @RequireBedOwner} 淇濊瘉锛氬彧鏈夋湰宸ヤ綅涓讳汉鑳芥媺銆�
+ * 杩欓噷鍙仛涓氬姟鏍¢獙涓庢潯浠舵洿鏂帮紙骞跺彂瀹夊叏锛歿@code and status = 10}锛夛紝骞跺鐢ㄨ嚜鍔ㄥ垎娴佺殑浜插拰椤归�昏緫銆�
+ */
+ @Override
+ public ErrorCode pullWaitingPatient(Long roomId, String bedNo, Integer queueId) {
+ return queueServiceTxFunctions.pullWaitingPatient(roomId, bedNo, queueId);
+ }
+
+ @Override
+ public ErrorCode startBedDoctorOn(Long roomId, String bedNo, Long docId, String docName, Integer bedId) {
+ Future<ErrorCode> future = singleThreadExecutor.submit(new BedDoctorOnCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName, bedId));
try {
ErrorCode ret = future.get();
@@ -223,6 +256,27 @@
}
//System.out.println("startBedDoctorOff ========");
+ return ECG_INNER_ERROR;
+ }
+
+ /**
+ * 銆愭湰娆¢渶姹傘�戠鐞嗗憳寮哄埗娓呯┖宸ヤ綅锛堜笉瑕佹眰鏄湰浜猴級銆�
+ * <p>
+ * 涓� {@link #startBedDoctorOff} 鍏辩敤鍚屼竴涓崟绾跨▼鎵ц鍣紝淇濊瘉鍚屼竴鏃跺埢鍙鐞嗕竴涓伐浣嶆搷浣滐紝
+ * 閬垮厤涓庛�屽彨鍙� / 鍏ュ骇 / 绂诲骇銆嶅苟鍙戞敼鍚屼竴琛屻��
+ */
+ @Override
+ public ErrorCode startBedDoctorOffByAdmin(Long roomId, String bedNo) {
+ Future<ErrorCode> future = singleThreadExecutor.submit(
+ () -> queueServiceTxFunctions.bedDoctorOffByAdmin(roomId, bedNo));
+ try {
+ return future.get();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ log.error("[绠$悊鍛樻竻绌哄伐浣峕 琚腑鏂�", e);
+ } catch (ExecutionException e) {
+ log.error("[绠$悊鍛樻竻绌哄伐浣峕 鎵ц澶辫触", e.getCause() != null ? e.getCause() : e);
+ }
return ECG_INNER_ERROR;
}
@@ -265,6 +319,12 @@
singleThreadExecutor.execute(() -> {
queueServiceTxFunctions.hurryupOneBed(roomId, bedNo);
});
+ }
+
+ @Override
+ public Map<String, Object> hurryUpNow(Long roomId, String bedNo) {
+ // 鍚屾鎵ц锛氳绔嬪埢杩斿洖"琛ヤ汉鍓嶅悗浜烘暟 + 缁撹"锛屽紓姝ュ氨鐪嬩笉鍒扮粨鏋滀簡
+ return queueServiceTxFunctions.hurryUpNow(roomId, bedNo);
}
@Override
@@ -365,8 +425,8 @@
}
@Override
- public List<QueueDO> selectBookSeqNumByAppointIdList(List<Long> appointIdList) {
- return queueMapper.selectBookSeqNumByAppointIdList(appointIdList);
+ public List<QueueDO> selectQueueByAppointIdList(List<Long> appointIdList) {
+ return queueMapper.selectQueueByAppointIdList(appointIdList);
}
// 甯歌妫�鏌� 鍙彿
@@ -427,7 +487,11 @@
// 浠� DB 鎶� [瀹夎涓璢鐨勪汉 璁剧疆涓� [杩囧彿-瀹夎]
Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo, QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.PASSED_INSTALL.getStatus());
- startNextPatient(roomId, bedNo);
+ // 銆愭棦鏈夌瑪璇慨澶嶃�戣繖閲屽師鏈皟鐨勬槸 startNextPatient锛堝父瑙勬鏌ュ彇浜猴細鍊欒瘖涓� 鈫� 灏辫瘖涓級锛�
+ // 鑰岃鏈鸿繃鍙峰悗搴斿綋缁х画鍙�**瀹夎闃熷垪**閲岀殑涓嬩竴浣嶏紙宸查鐢�/宸插彫鍥�-瀹夎 鈫� 瀹夎涓級銆�
+ // 鐢变簬瑁呮満宸ヤ綅涓嶅弬涓庡垎娴併�佹病鏈�"鍊欒瘖涓�"鎮h�咃紝鍘熻皟鐢ㄥ疄闄呬笂浠�涔堜篃涓嶄細鍙戠敓锛�
+ // 琛ㄧ幇涓�"瑁呮満杩囧彿鍚庝笉浼氳嚜鍔ㄥ彨涓嬩竴浣�"銆�
+ startNextInstallPatient(roomId, bedNo);
}
public List<QueueDO> getBedQueueByStatus(Long roomId, String bedNo, List<Integer> statusList) {
@@ -439,19 +503,57 @@
/**
* 浠庨绾﹀崟琛ラ綈 queue 琛ㄤ笂娌℃湁鐨勬偅鑰呬俊鎭��
*
- * queue 琛ㄤ笉瀛樿繖浜涘瓧娈碉紝浣嗗尰鐢熺鍒楄〃鎺ュ彛闇�瑕佸睍绀猴紝鎵�浠ユ煡璇㈠悗鎸� applyNo 鍥炴煡棰勭害鍗曞~鍏咃細
- * 澶氳�愯嵂銆佹�у埆銆佸嚭鐢熸棩鏈熴�佺櫥璁版椂闂淬�佸紑鍗曞尰甯堛�佸紑鍗曟棩鏈熴��
+ * <p>queue 琛ㄤ笉瀛樿繖浜涘瓧娈碉紝浣嗗尰鐢熺鍒楄〃鎺ュ彛闇�瑕佸睍绀猴紝鎵�浠ユ煡璇㈠悗鎸� applyNo 鍥炴煡棰勭害鍗曞~鍏咃細
+ * 澶氳�愯嵂銆佹�у埆銆佸嚭鐢熸棩鏈熴�佺櫥璁版椂闂淬�佸紑鍗曞尰甯堛�佸紑鍗曟棩鏈熴��</p>
+ *
+ * <h3>鈿狅笍 鎬ц兘淇锛氱敱 N+1 鏀逛负涓�娆℃壒閲忔煡璇�</h3>
+ * <p><b>鍘熷疄鐜�</b>鍦� {@code forEach} 閲屽姣忎竴琛岃皟鐢�
+ * {@code appointmentMapper.getByApplyNo(applyNo)}锛屽嵆**姣忚涓�娆� SQL**銆�
+ * 鍒楄〃姣忛〉 10 鏉� 鈬� 10 娆℃煡璇紱鑰岃 SQL
+ * 锛坽@code WHERE apply_no = ? AND deleted = 0}锛夊湪淇鍓�**鐢ㄤ笉涓婄储寮�**锛�
+ * 姣忔閮芥槸鍏ㄨ〃鎵弿 appointment锛堝疄娴� 16.6 涓囪锛岀害 549 ms/娆★級锛�
+ * 涓�椤靛氨瑕� 4.5~5.5 绉� 鈥斺�� 杩欐槸銆岄槦鍒楀垪琛ㄦ墦寮�寰堟參銆嶇殑鐩存帴鍘熷洜銆�</p>
+ *
+ * <p><b>鐜板疄鐜�</b>鏀逛负锛氬厛鏀堕泦鏈〉鎵�鏈� applyNo锛堝幓閲嶏級鈫� **涓�娆�**
+ * {@code getByApplyNoList} 鎵归噺鍙栧洖 鈫� 鍐呭瓨閲屾寜 applyNo 寤烘槧灏勫啀鍥炲~銆�
+ * 涓�椤� SQL 浠� 10 娆¢檷鍒� 1 娆°��</p>
+ *
+ * <p>娉細閰嶅宸蹭簬 {@code 26_add_index_appointment_apply_no.sql}
+ * 缁� {@code appointment.apply_no} 鍔犱笂绱㈠紩锛�
+ * 浣嗗嵆渚挎湁绱㈠紩锛孨+1 浠嶆槸 10 娆″線杩旓紝鏁呬袱澶勪竴璧锋敼鎵嶆槸鏈�浼樸��</p>
*/
@Override
public void fillAppointmentInfo(List<QueueDO> queueDOList) {
if (CollectionUtils.isEmpty(queueDOList)) {
return;
}
+ // 1. 鏀堕泦鏈闇�瑕佸洖鏌ョ殑鐢宠鍗曞彿锛堣烦杩囩┖鍊硷級銆�
+ // 鐢� LinkedHashSet 鍘婚噸锛氬悓涓�椤甸噷鐞嗚涓� apply_no 鍞竴锛屼絾鍘婚噸鍚� IN 鍒楄〃鏇寸煭銆佹洿瀹夊叏銆�
+ Set<String> applyNoSet = new LinkedHashSet<>();
+ for (QueueDO queueDO : queueDOList) {
+ if (queueDO != null && queueDO.getApplyNo() != null && !queueDO.getApplyNo().isEmpty()) {
+ applyNoSet.add(queueDO.getApplyNo());
+ }
+ }
+ if (applyNoSet.isEmpty()) {
+ return;
+ }
+
+ // 2. 涓�娆℃壒閲忓彇鍥烇紙SQL 鍐呴儴宸插甫 deleted = 0锛夈��
+ // 娉ㄦ剰锛歁ySQL 鐨� IN () 浼氳娉曢敊璇紝鏁呭繀椤讳繚璇佸垪琛ㄩ潪绌� 鈥斺�� 涓婇潰宸插垽绌恒��
+ List<AppointmentDO> appointmentList = appointmentMapper.getByApplyNoList(new ArrayList<>(applyNoSet));
+
+ // 3. 鎸� applyNo 寤烘槧灏勶紱涓埆 applyNo 鏌ヤ笉鍒伴绾﹀崟鏄甯告儏鍐碉紙鍘嗗彶鑴忔暟鎹級锛岃烦杩囧嵆鍙��
+ Map<String, AppointmentDO> appointmentMap = appointmentList.stream()
+ .filter(item -> item != null && item.getApplyNo() != null)
+ .collect(Collectors.toMap(AppointmentDO::getApplyNo, item -> item, (a, b) -> a));
+
+ // 4. 鍐呭瓨鍥炲~锛屼笉鍐嶉�愭潯鏌ュ簱
queueDOList.forEach(queueDO -> {
- if (null == queueDO.getApplyNo() || queueDO.getApplyNo().isEmpty()) {
+ if (queueDO == null || queueDO.getApplyNo() == null || queueDO.getApplyNo().isEmpty()) {
return;
}
- AppointmentDO appointment = appointmentMapper.getByApplyNo(queueDO.getApplyNo());
+ AppointmentDO appointment = appointmentMap.get(queueDO.getApplyNo());
if (null == appointment) {
return;
}
@@ -624,6 +726,19 @@
public void closeBiz() {
queueServiceTxFunctions.setOpeningFlag(0);
+
+ // 銆愭湰娆¢渶姹傘�戦棴璇婃椂娓呯┖褰撶彮宸ヤ綅锛坉oc_id / doc_name 缃┖锛岀姸鎬佹敼鍥炵┖闂诧級銆�
+ //
+ // 鑳屾櫙锛氬伐浣嶄笉鍐嶅洜銆岀┖闂茶秴鏃� / 浠ょ墝澶辨晥 / 鍒锋柊椤甸潰銆嶈閲婃斁锛堥伩鍏嶅尰鐢熺寮�涓�浼氬効灏变涪宸ヤ綅锛夛紝
+ // 鍥犳闇�瑕佷竴涓厹搴� 鈥斺�� 姣忓ぉ闂瘖鏃剁粺涓�娓呯┖锛岄槻姝㈠尰鐢熶笅鐝繕绂诲骇瀵艰嚧宸ヤ綅闀挎湡琚崰鐢ㄣ��
+ // 鍏堟竻搴擄紝鍐嶇敱涓嬮潰鐨� startBedReload() 鎸夊簱閲嶆柊瑁呰浇鍐呭瓨锛屼繚璇佷簩鑰呬竴鑷淬��
+ try {
+ queueServiceTxFunctions.closeBizClearBeds();
+ } catch (Exception e) {
+ // 娓呯┖澶辫触涓嶈兘闃绘柇闂瘖娴佺▼鏈韩
+ log.error("[闂瘖] 娓呯┖褰撶彮宸ヤ綅澶辫触锛堜笉褰卞搷闂瘖锛�", e);
+ }
+
startBedReload();
}
@@ -635,6 +750,25 @@
// 浼氬湪 HurryUpOnBed 閲岄潰澶勭悊 妫�鏌ラ」鐩�.浜插拰鎬�
startHurryUpOneBed(roomId, bedNo);
+
+ // 銆愯瘖鏂�戣ˉ浜哄惊鐜湁涓夐亾闂ㄩ椄锛堟湭寮�璇� / 宸插仠姝㈠�欒瘖 / 鍊欒瘖鍖哄凡婊★級锛�
+ // 浠讳竴鏉℃垚绔嬫椂鎮h�呬細**鍋滃湪銆屽凡鍙洖(15)銆嶄笉杩涘�欒瘖鍖�**銆�
+ // 鐜板湪 nextPatient 鏀寔鐩存帴浠庛�屽凡鍙洖銆嶅彨鍙凤紙2026-10-29 淇锛夛紝杩欓噷鍙ˉ涓�鏉℃棩蹇楁柟渚跨幇鍦烘帓鏌ャ��
+ if (null != updateNum && updateNum > 0) {
+ try {
+ QueueDO stillRecalled = queueMapper.getBedQueueItemByPatAndStatus(
+ roomId, bedNo, patId, checkType, QueueStatusEnum.RECALLED.getStatus());
+ if (null != stillRecalled) {
+ log.warn("[recallPatient] 宸茬疆涓恒�屽凡鍙洖銆嶏紝浣嗘湭杩涘叆鍊欒瘖鍖�"
+ + "锛堝彲鑳藉師鍥狅細鏈紑璇� / 宸插仠姝㈠�欒瘖 / 鍊欒瘖鍖哄凡婊★級锛屽彨鍙锋椂灏嗙洿鎺ヤ粠銆屽凡鍙洖銆嶅彇浜�. "
+ + "宸ヤ綅={}/{} patId={} seqNum={}",
+ roomId, bedNo, patId, stillRecalled.getSeqNum());
+ }
+ } catch (Exception e) {
+ log.warn("[recallPatient] 妫�鏌ャ�屽凡鍙洖銆嶆槸鍚﹁繘鍏ュ�欒瘖鍖烘椂寮傚父锛堜笉褰卞搷鍙洖缁撴灉锛�. 宸ヤ綅={}/{} patId={}",
+ roomId, bedNo, patId, e);
+ }
+ }
return updateNum;
}
@@ -764,7 +898,7 @@
queueStatusList.add(QueueStatusEnum.AFFINITY.getStatus());
List<QueueDO> queueDOList = getBedQueueByStatus(roomId, bedNo, queueStatusList);
- //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
+ //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰锛堝悓鎺掗槦鍙� + 鍚屾偅鑰呮墠绠椾竴缁勶紝瑙� Utils#insertAffinityItemsAfterMain锛�
List<QueueDO> affinityWaitingList = new ArrayList<>();
ListIterator<QueueDO> iterator = queueDOList.listIterator();
while (iterator.hasNext()) {
@@ -774,14 +908,7 @@
affinityWaitingList.add(item);
}
}
- affinityWaitingList.forEach(affinityWaitingItem -> {
- for (int i = queueDOList.size() - 1; i >= 0; i--) {
- if (affinityWaitingItem.getSeqNum() == queueDOList.get(i).getSeqNum()) {
- queueDOList.add(i + 1, affinityWaitingItem);
- break;
- }
- }
- });
+ Utils.insertAffinityItemsAfterMain(queueDOList, affinityWaitingList);
return queueDOList;
}
@@ -811,7 +938,7 @@
//
// 鑳屾櫙锛氫笂闈袱澶勬煡璇㈢殑鏉′欢鏄� `room_id = ? AND status IN (...)`
// 锛坓etRoomQueueByStatus 鐢氳嚦**涓嶅惈 bed_no**锛夛紝**瀹屽叏涓嶇湅 book_check_type**銆�
- // 鑰岃嚜鍔ㄥ垎娴侊紙preemptWaitingPatientWithBedCheckTypes锛夋槸**鎸夊伐浣� checkTypes 杩囨护**鐨勶紝
+ // 鑰岃嚜鍔ㄥ垎娴侊紙QueueMapper#getFirstWaitingByCheckTypes + preemptWaitingPatientById锛夋槸**鎸夊伐浣� checkTypes 杩囨护**鐨勶紝
// 鎵�浠ュ彧鏈�"浜哄伐鎶婃偅鑰呮媺杩涙潵"杩欐潯璺緞浼氭紡 鈥斺�� 琛ㄧ幇涓�
// 銆岃澶囬鐢ㄣ�嶉〉閿欒鍑虹幇甯歌蹇冪數鍥�(100)銆佸钩鏉胯繍鍔ㄥ績鐢�(400)绛�**涓嶉渶棰嗙敤璁惧**鐨勬偅鑰呫��
//
@@ -828,7 +955,7 @@
// 鏁呰繖閲屽彟璧蜂竴涓� final 鍙橀噺锛岃�屼笉鏄鐢ㄤ笂闈㈢殑 queueDOList锛堝畠宸茶閲嶆柊璧嬪�硷級銆�
final List<QueueDO> installQueueList = queueDOList;
- //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
+ //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰锛堝悓鎺掗槦鍙� + 鍚屾偅鑰呮墠绠椾竴缁勶紝瑙� Utils#insertAffinityItemsAfterMain锛�
List<QueueDO> affinityReceivedList = new ArrayList<>();
ListIterator<QueueDO> iterator = installQueueList.listIterator();
while (iterator.hasNext()) {
@@ -838,14 +965,7 @@
affinityReceivedList.add(item);
}
}
- affinityReceivedList.forEach(affinityReceivedItem -> {
- for (int i = installQueueList.size() - 1; i >= 0; i--) {
- if (affinityReceivedItem.getSeqNum() == installQueueList.get(i).getSeqNum()) {
- installQueueList.add(i + 1, affinityReceivedItem);
- break;
- }
- }
- });
+ Utils.insertAffinityItemsAfterMain(installQueueList, affinityReceivedList);
return installQueueList;
}
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 7acf662..575ddc0 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
@@ -65,7 +65,10 @@
AtomicInteger openingFlag = new AtomicInteger(0);
- AtomicInteger curSeqNum = new AtomicInteger(0);
+
+ // 銆愬彿缁熶竴锛堟湰闇�姹傦級銆戝師 curSeqNum锛堝垎娴佹椂缁欐偅鑰呯紪"鍐呴儴搴忓彿"鐨勫唴瀛樿鏁板櫒锛夊凡鍒犻櫎銆�
+ // 鎺掗槦鍙锋敼涓虹鍒版椂涓�娆℃�у啓鍏� queue.seq_num锛屼箣鍚庝换浣曠幆鑺傞兘涓嶅啀璧嬪彿锛�
+ // 鍒嗘祦銆佸彨鍙峰悗琛ラ綈鍊欒瘖銆佽繃鍙枫�佸彫鍥炪�佸姞鎬ャ�佽鏈洪兘鍙敼鐘舵��/璇婂/宸ヤ綅銆�
// 缁存姢 寮�鏀剧殑宸ヤ綅
ConcurrentHashMap<String, BedBO> mapOpeningBed = new ConcurrentHashMap<>();
@@ -255,25 +258,151 @@
return null == bedBO ? null : Boolean.TRUE.equals(bedBO.getStopReady());
}
- public ErrorCode bedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
+ /**
+ * 鍏ュ骇锛堟妸宸ヤ綅涓讳汉璁句负鎴戯級銆�
+ *
+ * @param bedId 宸ヤ綅涓婚敭锛堝墠绔姹傞噷甯︼紱**浼樺厛鎸夊畠瀹氫綅**锛岃涓嬶級鈥斺�斿彲涓虹┖锛屼负绌烘椂鎸� roomId+bedNo 瀹氫綅
+ */
+ public ErrorCode bedDoctorOn(Long roomId, String bedNo, Long docId, String docName, Integer bedId) {
BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) );
if (null == bedBO) {
log.error("bedDoctorOn mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return QUEUE_BED_NOT_EXIST;
}
- // DB update
- List statusList = new ArrayList<BedStatusEnum>();
- statusList.add(BedStatusEnum.OPENING);
- Integer updateNum = roomMapper.setBedDoctorOn(roomId, bedNo, docId, docName, BedStatusEnum.DOCTOR_ON, statusList);
+ // 鍙互"鎴愪负涓讳汉"鐨勭姸鎬侊細宸插紑閫� / 鏈夊尰鐢� / 鏆傚仠锛�**鎺掗櫎"宸插叧闂�"**锛夈��
+ // 銆愭湰娆℃斁瀹姐�戝師鏉�"鏃犱富浜�"鏃跺彧璁�"宸插紑閫�"锛氫竴鏃︽暟鎹嚭鐜�"doc_id 涓虹┖浣嗙姸鎬佷粛鏄湁鍖荤敓/鏆傚仠"
+ // 杩欑涓嶄竴鑷达紝鍖荤敓绔欏湪宸ヤ綅鍓嶅嵈濮嬬粓鍧愪笉涓婏紝鍙姤"鐘舵�佸紓甯�"锛岀幇鍦烘棤浠庡鐞嗐��
+ List<BedStatusEnum> claimableStatusList = new ArrayList<>();
+ claimableStatusList.add(BedStatusEnum.OPENING);
+ claimableStatusList.add(BedStatusEnum.DOCTOR_ON);
+ claimableStatusList.add(BedStatusEnum.DOCTOR_PAUSE);
+
+ // 銆愭湰娆′慨澶嶃�戜紭鍏堟寜**涓婚敭**鏇存柊锛氱幇鍦哄嚭鐜拌繃"宸ヤ綅鍦ㄥ簱閲屾槑鏄庣┖闂层�佸叆搴у嵈鏇存柊 0 琛�"锛�
+ // 宸叉帓闄�"琚崰鐢�"锛涘墿涓嬬殑鍙兘鏄� bed_no 涓庤姹傚�兼湁鑲夌溂闅捐鲸鐨勫樊寮�
+ // 锛堢粨灏剧┖鏍� / 澶у皬鍐� / 鍏ㄨ锛孞SON 涓庡鍒剁矘璐撮兘鐪嬩笉鍑烘潵锛夈�傚墠绔湰鏉ュ氨甯� id锛岀敤瀹冩渶绋炽��
+ Integer updateNum = null;
+ if (null != bedId) {
+ updateNum = roomMapper.setBedDoctorOnById(bedId, docId, docName,
+ BedStatusEnum.DOCTOR_ON, claimableStatusList);
+ if (null != updateNum && updateNum > 0) {
+ // 鏍¢獙涓�涓� id 鎸囧悜鐨勮纭疄灏辨槸璇锋眰鐨勫伐浣嶏紙涓嶄竴鑷磋鏄庡墠绔紦瀛樹笌搴撲笉鍚屾锛岃鏃ュ織渚夸簬鎺掓煡锛�
+ RoomDO seatRow = roomMapper.getRoom(roomId, bedNo);
+ RoomDO idRow = roomMapper.selectById(bedId);
+ if (null != idRow && null != seatRow && !idRow.getId().equals(seatRow.getId())) {
+ log.warn("[bedDoctorOn] 鎸� id 鍏ュ骇鎴愬姛锛屼絾 id 鎸囧悜鐨勫伐浣嶄笌璇锋眰鐨� roomId/bedNo 涓嶆槸鍚屼竴琛岋紒"
+ + " id={} 鈫� {}/{}, 璇锋眰 鈫� {}/{}",
+ bedId, idRow.getRoomId(), idRow.getBedNo(), roomId, bedNo);
+ }
+ }
+ }
+ if (null == updateNum || 0 == updateNum) {
+ // 鍥為��锛氭寜 roomId + bedNo 瀹氫綅锛堝吋瀹逛笉甯� id 鐨勮皟鐢ㄦ柟锛屽鑷姩鍏ュ骇鐨勮�佽矾寰勶級
+ updateNum = roomMapper.setBedDoctorOn(roomId, bedNo, docId, docName,
+ BedStatusEnum.DOCTOR_ON, claimableStatusList);
+ }
+
if ( null==updateNum || 0 == updateNum ) {
- log.error("bedDoctorOn DB invalid status. " + roomId + " " + bedNo);
+ // 浠嶅け璐� 鈫� 鎶婂簱閲�**鐪熷疄鐘舵��**鎽婂紑锛屽苟鍖哄垎鍘熷洜锛堝師鏉ヤ竴寰�"鐘舵�佸紓甯�"锛岀幇鍦虹湅涓嶅嚭鎵�浠ョ劧锛�
+ RoomDO rowById = (null == bedId) ? null : roomMapper.selectById(bedId);
+ RoomDO rowByRoomBed = roomMapper.getRoom(roomId, bedNo);
+ log.warn("[bedDoctorOn] 鍏ュ骇鏇存柊 0 琛�. 璇锋眰 roomId={} bedNo=[{}] bedId={} docId={}锛�"
+ + "鎸塱d鏌ュ埌={} 鎸塺oomId+bedNo鏌ュ埌={}",
+ roomId, bedNo, bedId, docId,
+ null == rowById ? "鏃�" : describeBedRow(rowById),
+ null == rowByRoomBed ? "鏃�" : describeBedRow(rowByRoomBed));
+
+ RoomDO occupant = (null != rowById) ? rowById : rowByRoomBed;
+ if (null != occupant && null != occupant.getDocId() && !occupant.getDocId().equals(docId)) {
+ log.warn("[bedDoctorOn] 宸ヤ綅宸茶浠栦汉鍗犵敤锛屾嫆缁濆叆搴э紙涓嶆尋鎺夛級. 鍗犵敤浜�={}({})",
+ occupant.getDocName(), occupant.getDocId());
+ return ROOM_OCCUPIED_BY_OTHER;
+ }
return ROOM_INVALID_STATUS;
}
+
+ // 銆愭湰闇�姹偮蜂竴浜哄宸ヤ綅銆戝叆搴ф垚鍔熷悗**涓嶅啀閲婃斁**璇ュ尰鐢熺殑鍏跺畠宸ヤ綅锛�
+ // 鑺傚亣鏃ュ�肩彮鏃朵竴浣嶅尰鐢熷彲鑳藉悓鏃跺崰銆屾鏌ュ伐浣� + 棰嗙敤宸ヤ綅 + 瑁呮満宸ヤ綅銆嶏紝
+ // 鐢卞墠绔�屾垜鐨勫伐浣嶃�嶄笅鎷夊湪鍚勫伐浣嶉棿鍒囨崲锛堝啓鎿嶄綔浠嶇敱 @RequireBedOwner 鎸夊伐浣� doc_id 鏍¢獙锛夈��
+ // 鍘熷疄鐜帮細roomMapper.releaseOtherBedsOfDoc(docId, roomId, bedNo, BedStatusEnum.OPENING);
+ // 宸ヤ綅閲婃斁鏀逛负涓夌鏄庣‘閫斿緞锛氣憼 鍖荤敓鐐广�岀搴с�嶏紱鈶� 闂瘖缁熶竴娓呯┖锛涒憿 绠$悊鍛樸�屾竻绌哄伐浣嶃��/鎺ョ彮鍖荤敓銆屾帴绠°�嶃��
bedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
addBedToRoutingQueue(bedBO);
return GlobalErrorCodeConstants.SUCCESS;
+ }
+
+ /**
+ * 鎵嬪伐鎶婃煇浣嶃�屾帓闃熶腑銆嶆偅鑰呮媺鍏ユ寚瀹氬伐浣嶏紙宸ヤ綔鍙�"鏈瘖瀹ゆ帓闃熶腑锛堟湭鍒嗛厤锛�"鍒嗗尯鐨勩�屾媺鍏ャ�嶆寜閽級銆�
+ *
+ * <p>涓庤嚜鍔ㄥ垎娴侊紙{@code hurryupOneCheckType}锛夎蛋**鍚屼竴濂�**鍔ㄤ綔锛�
+ * 鏉′欢鏇存柊銆屾帓闃熶腑(10) 鈫� 鍑嗗涓�(20)銆嶅苟鎶� room/bed 鍐欐垚鏈伐浣嶏紝鐒跺悗澶勭悊浜插拰椤广��
+ * 鍙蜂笉鍙橈紙鍙峰湪绛惧埌鏃跺凡瀹氾級銆�
+ *
+ * <p>涓夐噸鏍¢獙锛氬伐浣嶅瓨鍦� 鈫� 璇ヨ浠嶆槸銆屾帓闃熶腑銆嶁啋 妫�鏌ラ」鐩湪鏈伐浣嶅紑灞曡寖鍥村唴銆�
+ * 鏉′欢鏇存柊鑷甫骞跺彂淇濇姢锛氫袱涓伐浣嶅悓鏃剁偣銆屾媺鍏ャ�嶏紝鍙湁涓�涓兘鎴愬姛銆�
+ */
+ public ErrorCode pullWaitingPatient(Long roomId, String bedNo, Integer queueId) {
+ RoomDO bed = (null == roomId || null == bedNo) ? null : roomMapper.getRoom(roomId, bedNo);
+ if (null == bed) {
+ log.warn("[pullWaitingPatient] 宸ヤ綅涓嶅瓨鍦�. roomId={} bedNo={}", roomId, bedNo);
+ return QUEUE_BED_NOT_EXIST;
+ }
+
+ QueueDO item = (null == queueId) ? null : queueMapper.selectById(queueId);
+ if (null == item) {
+ log.warn("[pullWaitingPatient] 鎺掗槦琛屼笉瀛樺湪. queueId={}", queueId);
+ return QUEUE_NOT_EXISTS;
+ }
+ if (!QueueStatusEnum.WAITING.getStatus().equals(item.getStatus())) {
+ log.warn("[pullWaitingPatient] 璇ユ偅鑰呭凡涓嶅湪鎺掗槦涓�. queueId={} patId={} status={}",
+ queueId, item.getPatId(), item.getStatus());
+ return QUEUE_NOT_WAITING;
+ }
+ Integer[] bedCheckTypes = bed.getCheckTypes();
+ if (null == bedCheckTypes || 0 == bedCheckTypes.length
+ || null == item.getBookCheckType()
+ || !java.util.Arrays.asList(bedCheckTypes).contains(item.getBookCheckType())) {
+ log.warn("[pullWaitingPatient] 妫�鏌ラ」鐩笉鍦ㄦ湰宸ヤ綅鑼冨洿. queueId={} checkType={} 鏈伐浣�={}",
+ queueId, null == item ? null : item.getBookCheckType(), java.util.Arrays.toString(bedCheckTypes));
+ return QUEUE_CHECK_TYPE_NOT_MATCH;
+ }
+
+ Integer updateNum = queueMapper.preemptWaitingPatientById(queueId, roomId, bed.getRoomName(), bedNo,
+ QueueStatusEnum.WAITING.getStatus(), QueueStatusEnum.READY.getStatus());
+ if (null == updateNum || 0 == updateNum) {
+ log.warn("[pullWaitingPatient] 鎷夊叆鏈敓鏁堬紙宸茶鍏朵粬宸ヤ綅鎷夎蛋锛�. queueId={}", queueId);
+ return QUEUE_NOT_WAITING;
+ }
+
+ // 鍐呭瓨瀵硅薄涓庡簱鍐呬繚鎸佷竴鑷达紙浜插拰椤硅璺熼殢涓婚」鐨勮瘖瀹�/宸ヤ綅锛�
+ item.setStatus(QueueStatusEnum.READY.getStatus());
+ item.setRoomId(roomId);
+ item.setRoomName(bed.getRoomName());
+ item.setBedNo(bedNo);
+
+ try {
+ CheckTypeDO checkTypeDO = getCheckTypeItem(item.getBookCheckType());
+ if (null != checkTypeDO && null != checkTypeDO.getAffinityCheckTypes()
+ && checkTypeDO.getAffinityCheckTypes().length > 0) {
+ procAffinityWhenPreempt(item, checkTypeDO.getAffinityCheckTypes());
+ }
+ } catch (Exception e) {
+ // 浜插拰椤瑰鐞嗗け璐ヤ笉褰卞搷涓婚」宸叉垚鍔熸媺鍏�
+ log.error("[pullWaitingPatient] 浜插拰椤瑰鐞嗗け璐ワ紙涓婚」宸叉媺鍏ワ級. queueId={}", queueId, e);
+ }
+
+ log.info("[pullWaitingPatient] 宸叉墜宸ユ媺鍏�. roomId={} bedNo={} queueId={} patId={} seqNum={}",
+ roomId, bedNo, queueId, item.getPatId(), item.getSeqNum());
+ return GlobalErrorCodeConstants.SUCCESS;
+ }
+
+ /** 鎷间竴琛屽伐浣嶅叧閿瓧娈碉紝渚涙棩蹇�/鎺掓煡蹇�熷姣旓紙灏ゅ叾鐪� bed_no 鏄惁涓庤姹備竴鑷达級 */
+ private String describeBedRow(RoomDO row) {
+ return String.format("id=%s,room_id=%s,bed_no=[%s](len=%d),status=%s,doc_id=%s,doc_name=%s",
+ row.getId(), row.getRoomId(), row.getBedNo(),
+ null == row.getBedNo() ? -1 : row.getBedNo().length(),
+ row.getStatus(), row.getDocId(), row.getDocName());
}
public ErrorCode bedDoctorOff(Long roomId, String bedNo, Long docId, String docName) {
@@ -299,6 +428,64 @@
return GlobalErrorCodeConstants.SUCCESS;
}
+ /**
+ * 銆愭湰娆¢渶姹傘�戠鐞嗗憳寮哄埗娓呯┖宸ヤ綅锛堜笉瑕佹眰鏄湰浜猴級銆�
+ * <p>
+ * 涓� {@link #bedDoctorOff} 鐨勫尯鍒細涓嶆竻 {@code doc_id=?} 鏉′欢锛�
+ * 鍥犳鍙妸銆屽埆浜哄崰鐢ㄤ腑銆嶇殑宸ヤ綅娓呮帀 鈥斺�� 鐢ㄤ簬鍖荤敓涓嬬彮蹇樼搴с�佹崲浜轰娇鐢ㄥ悓涓�宸ヤ綅鐨勫満鏅��
+ * 浠嶇劧鍙竻銆屽尰鐢熷湪宀� / 鏆傚仠銆嶄笖 doc_id 闈炵┖鐨勫伐浣嶏紝绌洪棽宸ヤ綅涓嶄細琚鍔ㄣ��
+ */
+ public ErrorCode bedDoctorOffByAdmin(Long roomId, String bedNo) {
+ BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) );
+ if (null == bedBO) {
+ log.error("bedDoctorOffByAdmin mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
+ return QUEUE_BED_NOT_EXIST;
+ }
+
+ List statusList = new ArrayList<BedStatusEnum>();
+ statusList.add(BedStatusEnum.DOCTOR_ON);
+ statusList.add(BedStatusEnum.DOCTOR_PAUSE);
+ Integer updateNum = roomMapper.setBedDoctorOffAdmin(roomId, bedNo, BedStatusEnum.OPENING, statusList);
+ if ( null==updateNum || 0 == updateNum ) {
+ log.error("bedDoctorOffByAdmin DB invalid status. " + roomId + " " + bedNo);
+ return ROOM_INVALID_STATUS;
+ }
+
+ removeBedFromRoutingQueue(bedBO);
+
+ bedBO.setStatus(BedStatusEnum.OPENING.getStatus());
+ log.info("[绠$悊鍛樻竻绌哄伐浣峕 roomId={} bedNo={} 宸茬疆涓虹┖闂�", roomId, bedNo);
+ return GlobalErrorCodeConstants.SUCCESS;
+ }
+
+ /**
+ * 銆愭湰娆¢渶姹傘�戦棴璇婃竻绌猴細鎶婃墍鏈夈�屽尰鐢熷湪宀� / 鏆傚仠銆嶇殑宸ヤ綅缃负绌洪棽锛坉oc_id / doc_name 娓呯┖锛夈��
+ * <p>
+ * 涓� {@link #closeBiz()} 閰嶅悎锛氬厛娓呭簱锛岄殢鍚� {@code startBedReload()} 浼氭寜搴撻噸鏂拌杞藉唴瀛橈紝
+ * 淇濊瘉鍐呭瓨锛坢apOpeningBed / 鍒嗘祦闃熷垪锛変笌搴撲竴鑷淬��
+ *
+ * @return 娓呯┖鐨勫伐浣嶆暟
+ */
+ public int closeBizClearBeds() {
+ List statusList = new ArrayList<BedStatusEnum>();
+ statusList.add(BedStatusEnum.DOCTOR_ON);
+ statusList.add(BedStatusEnum.DOCTOR_PAUSE);
+ Integer updateNum = roomMapper.clearAllBedDoctors(BedStatusEnum.OPENING, statusList);
+
+ // 鍐呭瓨鍚屾锛氭妸宸ヤ綅鐘舵�佹敼鍥炵┖闂诧紝骞朵粠鍒嗘祦闃熷垪鎽橀櫎锛堥伩鍏嶉棴璇婂悗浠嶆湁宸ヤ綅琚淳鎮h�咃級
+ // 娉ㄦ剰锛歴tatus 鏄� Integer 鍖呰绫诲瀷锛屽繀椤荤敤 equals 姣旇緝锛�== 鍙湪 -128~127 缂撳瓨鍖洪棿鍐呭伓鐒舵垚绔嬶級
+ for (BedBO bedBO : mapOpeningBed.values()) {
+ if (Objects.equals(BedStatusEnum.DOCTOR_ON.getStatus(), bedBO.getStatus())
+ || Objects.equals(BedStatusEnum.DOCTOR_PAUSE.getStatus(), bedBO.getStatus())) {
+ removeBedFromRoutingQueue(bedBO);
+ bedBO.setStatus(BedStatusEnum.OPENING.getStatus());
+ }
+ }
+ log.info("[闂瘖] 宸叉竻绌哄綋鐝伐浣� {} 涓紙doc_id / doc_name 缃┖锛岀姸鎬佹敼涓虹┖闂诧級",
+ updateNum == null ? 0 : updateNum);
+ return updateNum == null ? 0 : updateNum;
+ }
+
/* 2024.11.11
// 甯歌 鎴栬�� 棰嗙敤 鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
public ErrorCode nextPatient(Long roomId, String bedNo) {
@@ -321,21 +508,75 @@
// 甯歌 鎴栬�� 棰嗙敤 鏃� 鍖荤敓 鍙栦笅涓�浣嶆偅鑰�
public ErrorCode nextPatient(Long roomId, String bedNo) {
- QueueDO firstReadyQueueItem = queueMapper.getBedFirstQueueItemByStatus(roomId, bedNo, QueueStatusEnum.READY.getStatus());
- // 璇ュ伐浣� 娌℃湁 [鍊欒瘖涓腑] 浜哄憳
- if (null == firstReadyQueueItem) {
+ // 鈸� 銆愬苟鍙戝姞鍥郝锋湰闇�姹傘�戞湰宸ヤ綅**宸叉湁銆屽氨璇婁腑(30)銆嶆偅鑰呮椂涓嶅啀鍙笅涓�浣�**銆�
+ //
+ // 鍘熷厛杩欎釜鍒ゆ柇鍙湪 `QueueServiceImpl#finishNextPatient` 閲屽仛杩囷紝鑰屽畠浣嶄簬
+ // singleThreadExecutor 涓茶鍖�**涔嬪**锛氫袱涓苟鍙戣姹傦紙鍙屽嚮 / 澶氱锛夐兘鍙兘璇诲埌 0锛�
+ // 闅忓悗鍚勮嚜鎻愪氦涓�娆� nextPatient锛屼覆琛屾墽琛屾椂浼氬悇鎺ㄨ繘涓�鏉� READY 鈬�
+ // 鍚屼竴宸ヤ綅鍑虹幇 2 涓�屽氨璇婁腑銆嶏紝鎮h�呰"鍗�"鍦ㄥ氨璇婁腑銆佸伐浣嶄篃涓嶅啀琛ヤ汉銆�
+ // 杩欓噷鍦ㄤ覆琛屽尯鍐呭啀鍒や竴娆★紙鏈柟娉曞彧鐢辫涓茶绾跨▼姹犺皟鐢級銆�
+ List<Integer> onstageStatusList = new ArrayList<>();
+ onstageStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
+ Integer onstageNum = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, onstageStatusList);
+ if (null != onstageNum && onstageNum > 0) {
+ log.warn("[nextPatient] 鏈伐浣嶅凡鏈� {} 涓�屽氨璇婁腑銆嶆偅鑰咃紝璺宠繃鏈鍙彿锛堥槻骞跺彂鍙屽氨璇婁腑锛�. 宸ヤ綅={}/{}",
+ onstageNum, roomId, bedNo);
+ return GlobalErrorCodeConstants.SUCCESS;
+ }
+
+ // 鈶� 鍊欒瘖涓�(20) 浼樺厛
+ QueueDO firstQueueItem = queueMapper.getBedFirstQueueItemByStatus(
+ roomId, bedNo, QueueStatusEnum.READY.getStatus());
+ boolean fromRecalled = false;
+
+ // 鈶� 鍊欒瘖鍖烘病浜烘椂锛屽洖閫�鍙栥�屽凡鍙洖(15)銆嶉噷鍙锋渶灏忕殑涓�浣�
+ //
+ // 銆愮己闄蜂慨澶嶃�戣繃鍙锋偅鑰�"鍙洖"鍚庝細鍏堢疆涓� RECALLED(15)锛屽啀闈� hurryupOneBed 鐨勮ˉ浜哄惊鐜�
+ // 鎻愬崌鎴� READY(20)銆備絾琛ヤ汉寰幆鏈変笁閬撻棬闂革紙openingFlag=0 / stopReady=true / 鍊欒瘖鍖哄凡婊★級锛�
+ // 浠讳竴鏉℃垚绔嬫偅鑰呭氨**涓�鐩村仠鍦� 15**锛涜�屽彨鍙锋鍓嶅彧璁� READY 鈬� 鍑虹幇姝荤粨锛�
+ // 鐜板満琛ㄧ幇涓�"鎺掗槦鍙� A2/A3 鐘舵�佹槸宸插彫鍥烇紝鐐瑰彨鍙峰姞杞戒笉鍑烘偅鑰呬俊鎭紝鏃犳硶妫�鏌�"锛�2026-10-29 鍙嶉锛夈��
+ // 杩欓噷鎸変笌 nextInstallPatient锛堝凡鍚� RECALLED_INSTALL锛変竴鑷寸殑鎬濊矾鐩存帴鍙埌锛�
+ // 涓嶅啀渚濊禆琛ヤ汉鏄惁鎴愬姛銆�
+ if (null == firstQueueItem) {
+ firstQueueItem = queueMapper.getBedFirstQueueItemByStatus(
+ roomId, bedNo, QueueStatusEnum.RECALLED.getStatus());
+ fromRecalled = null != firstQueueItem;
+ if (fromRecalled) {
+ log.info("[nextPatient] 鍊欒瘖鍖烘棤浜猴紝鏀瑰彨銆屽凡鍙洖銆嶆偅鑰�. 宸ヤ綅={}/{} patId={} seqNum={}",
+ roomId, bedNo, firstQueueItem.getPatId(), firstQueueItem.getSeqNum());
+ }
+ }
+
+ // 璇ュ伐浣嶆棦娌℃湁 [鍊欒瘖涓璢 涔熸病鏈� [宸插彫鍥瀅 浜哄憳
+ if (null == firstQueueItem) {
return QUEUE_NOT_READY_PATIENT;
}
- // QueueStatusEnum.READY => QueueStatusEnum.ONSTAGE
- firstReadyQueueItem.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
- queueMapper.updateById( firstReadyQueueItem );
+ // 鈶� READY / RECALLED => ONSTAGE锛氱敤銆屼富閿� + 褰撳墠鐘舵�併�嶆潯浠舵洿鏂帮紙骞跺彂鍔犲浐锛夛紝
+ // 0 琛岃鏄庤琛屽凡琚彟涓�璇锋眰鎺ㄨ繘锛屾湰娆℃斁寮冿紙涓嬫鍐嶅彇锛夈��
+ int curStatus = fromRecalled
+ ? QueueStatusEnum.RECALLED.getStatus() : QueueStatusEnum.READY.getStatus();
+ Integer updated = queueMapper.updateStatusByIdIfCurrent(
+ firstQueueItem.getId(), curStatus, QueueStatusEnum.ONSTAGE.getStatus());
+ if (null == updated || 0 == updated) {
+ log.warn("[nextPatient] 鍊欒瘖琛屽凡琚苟鍙戞帹杩涳紝鏀惧純鏈鍙彿. 宸ヤ綅={}/{} queueId={} 鏈熸湜鐘舵��={}",
+ roomId, bedNo, firstQueueItem.getId(), curStatus);
+ return QUEUE_NOT_READY_PATIENT;
+ }
+ firstQueueItem.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
// 鍒嗘祦闃熷垪涓� 璇ュ伐浣� 銆愬�欒瘖涓�戞偅鑰呮暟閲� 鍑忎竴
- BedBO bo = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) );
- bo.readyPatNum--; // 鍙兘宸茬粡鍦� hurry-up 涓敼鍙樹簡鍊�
-
- refreshBedPriorityLevelInRoutingQueue(bo);
+ // 娉ㄦ剰锛氬彫鍥炵殑杩欎綅鏈潵灏变笉鍦ㄥ�欒瘖璁℃暟閲岋紝涓嶈兘鍑忥紱鍙﹀ bo 鍙兘涓� null锛堝伐浣嶄笉鍦ㄥ紑璇婂垪琛級锛�
+ // 鍘熷疄鐜扮洿鎺� bo.readyPatNum-- 浼� NPE銆�
+ BedBO bo = mapOpeningBed.get(Utils.formatRoomBed(roomId, bedNo));
+ if (null != bo) {
+ if (!fromRecalled) {
+ bo.readyPatNum--; // 鍙兘宸茬粡鍦� hurry-up 涓敼鍙樹簡鍊�
+ }
+ refreshBedPriorityLevelInRoutingQueue(bo);
+ } else {
+ log.warn("[nextPatient] 宸ヤ綅涓嶅湪寮�璇婂垪琛紝璺宠繃鍐呭瓨璁℃暟涓庡垎娴佸埛鏂�. 宸ヤ綅={}/{}", roomId, bedNo);
+ }
return GlobalErrorCodeConstants.SUCCESS;
}
@@ -396,9 +637,8 @@
}
});
- Integer num = queueMapper.getMaxSeqNum();
- curSeqNum = new AtomicInteger(null == num ? 0 : num);
-
+ // 銆愬彿缁熶竴锛堟湰闇�姹傦級銆戜笉鍐嶅垵濮嬪寲鍐呭瓨璁℃暟鍣� curSeqNum锛�
+ // 鎺掗槦鍙锋潵鑷鍒版椂鐨� queue.seq_num锛屽垎娴佷笉鍐嶅垎閰嶅彿銆�
return GlobalErrorCodeConstants.SUCCESS;
}
@@ -428,10 +668,29 @@
* 鎶婂尰鐢熷�欒瘖鐨勯槦鍒楀婊�
*/
public void hurryupOneBed(Long roomId, String bedNo) {
- if (0 == openingFlag.get())
+ if (0 == openingFlag.get()) {
+ // 銆愮幇鍦烘帓鏌ャ�戞湭寮�璇婃椂**鏁翠釜鑷姩琛ヤ汉閮芥槸鍏抽棴鐨�**锛堟帓闃熶腑鐨勭梾浜轰笉浼氳鎼繘鍊欒瘖鍖猴級銆�
+ // 鍘熷疄鐜版槸闈欓粯 return锛岀幇鍦哄彧鑳界湅鍒�"浜洪兘鍦紝灏辨槸涓嶈繘鏉�"锛屾晠杩欓噷鏄庣‘璁颁竴鏉°��
+ log.warn("[琛ヤ汉] 绯荤粺鏈浜庛�愬紑璇娿�戠姸鎬侊紙openingFlag=0锛夛紝璺宠繃鑷姩琛ヤ汉. 宸ヤ綅={}/{}锛堝彲鍦ㄧ洃鎺ч〉鐐广�屽紑璇娿�嶏級",
+ roomId, bedNo);
return;
+ }
BedBO bedBO = getBedQueueBO(roomId, bedNo);
+ if (null == bedBO) {
+ log.warn("[琛ヤ汉] 宸ヤ綅涓嶅湪銆屽凡寮�璇婂伐浣嶃�嶅垪琛ㄤ腑锛岃烦杩�. 宸ヤ綅={}/{}", roomId, bedNo);
+ return;
+ }
+
+ // 銆愭湰娆″姞鍥恒�戠敤搴撻噷鐨勭湡瀹炲�欒瘖浜烘暟鏍℃鍐呭瓨璁℃暟锛�
+ // readyPatNum 鏄唴瀛樺�硷紝鑻ユ煇鏉¤矾寰勶紙鎾ら攢/鏀惧純/杩囧彿绛夛級娌″悓姝ワ紝瀹冧細铏氶珮锛�
+ // 浜庢槸 "鍊欒瘖鍖哄凡婊�" 鐨勫垽鏂竴鐩存垚绔嬨�佹案杩滀笉琛ヤ汉锛堣�岀晫闈笂鍊欒瘖鍖哄叾瀹炴槸绌虹殑锛夈��
+ int realReadyNum = countReadyInDb(roomId, bedNo);
+ if (realReadyNum != bedBO.getReadyPatNum()) {
+ log.warn("[琛ヤ汉] 鍐呭瓨鍊欒瘖浜烘暟({}) 涓庡簱鍐�({}) 涓嶄竴鑷达紝宸叉寜搴撳唴鏍℃. 宸ヤ綅={}/{}",
+ bedBO.getReadyPatNum(), realReadyNum, roomId, bedNo);
+ bedBO.setReadyPatNum(realReadyNum);
+ }
// 銆愰渶姹�3銆戙�屽仠姝㈠�欒瘖銆嶆椂涓嶅啀鎶娿�愬凡鍙洖銆戞偅鑰呮斁鍏ュ�欒瘖鍖恒��
// 娉ㄦ剰锛氳繖**涓嶅奖鍝�**宸叉湁鍊欒瘖鎮h�呰姝e父鍙彿锛坣extPatient 涓嶆鏌ユ湰寮�鍏筹級锛�
@@ -440,26 +699,24 @@
// 澶勭悊 杩囧彿-鍥炴潵 鐨勪汉
while (!stopReady && bedBO.getReadyPatNum() < bedBO.getMaxReadyPatNum()) {
- // 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夎繃鍙�-鍥炴潵鐨勬偅鑰�
- Integer updateNum = queueMapper.queueRecalledPatient(
- bedBO.getRoomId(),
- bedBO.getRoomName(),
- bedBO.getBedNo(),
- curSeqNum.get() + 1, // 杩囧彿鍥炴潵锛屾帓鍒板綋鍓嶇殑涓嬩竴浣�
- QueueStatusEnum.RECALLED.getStatus(), // 涓嶉渶瑕佸鐞� [瀹夎鍙洖], 鍘熷洜: 瀹夎宸ヤ綅 涓嶈繘鍏ュ垎娴侀槦鍒�
- QueueStatusEnum.READY.getStatus());
- if (null == updateNum || 0 == updateNum)
+ // 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夈�屽凡鍙洖(15)銆嶇殑鎮h�咃紙鎺掗槦鍙锋渶灏忕殑閭d竴浣嶏級
+ QueueDO recalledQueueItem = queueMapper.getBedFirstQueueItemByStatus(
+ bedBO.getRoomId(), bedBO.getBedNo(), QueueStatusEnum.RECALLED.getStatus());
+ if (null == recalledQueueItem)
break;
- // [杩囧彿] 鎮h�� => [鍊欒瘖涓璢 锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
- QueueDO recalledQueueItem = queueMapper.getQueueItemBySeqNum(curSeqNum.get() + 1);
+ // 銆愬彿缁熶竴锛堟湰闇�姹傦級銆戣繃鍙峰彫鍥�**涓嶅啀閲嶆帓闃熷彿**锛氬彿鏄鍒版椂瀹氱殑锛�
+ // 鎮h�呮寜鍘熷彿鍥炲埌鍊欒瘖搴忓垪锛堥渶姹傦細銆岀梾浜鸿繃鍙蜂簡锛屼篃鎺掔潃銆嶏級銆�
+ // 鏃у疄鐜帮紙seq_num = 褰撳墠鍙�+1锛屾帓鍒伴槦灏撅級浼氳浠栦笌灞忓箷涓�/鎮h�呮墜閲岀殑鍙峰涓嶄笂銆�
+ // 涓嶉渶瑕佸鐞� [瀹夎鍙洖], 鍘熷洜: 瀹夎宸ヤ綅 涓嶈繘鍏ュ垎娴侀槦鍒�
+ recalledQueueItem.setStatus(QueueStatusEnum.READY.getStatus());
+ queueMapper.updateById(recalledQueueItem);
+ // [杩囧彿] 鎮h�� => [鍊欒瘖涓璢 锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
CheckTypeDO checkTypeDO = getCheckTypeItem( recalledQueueItem.getBookCheckType() );
if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
procAffinityWhenRecalled(recalledQueueItem, checkTypeDO.getAffinityCheckTypes());
}
-
- curSeqNum.getAndIncrement();
// 鍙兘宸茬粡鍦� nextPatient 涓敼鍙樹簡鍊�
bedBO.readyPatNum++;
@@ -516,29 +773,45 @@
return;
// 鏌ョ湅 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
- Integer updateNum = queueMapper.preemptWaitingPatientWithBedCheckTypes(
- bedBO.getRoomId(),
- bedBO.getRoomName(),
- bedBO.getBedNo(),
- curSeqNum.get() + 1,
+ //
+ // 銆愬彿缁熶竴锛堟湰闇�姹傦級銆戝垎娴佸彧鍋氥�屾帓闃熶腑(10) 鈫� 鍊欒瘖涓�(20)銆嶇殑鎼縼锛�**涓嶅啀鍒嗛厤鎺掗槦鍙�**锛�
+ // 鍙峰湪绛惧埌鏃跺凡鍐欏叆 seq_num锛涘姞鎬ュ彧褰卞搷杩欓噷鐨勫彇浜洪『搴忥紙SQL 鍐� jump_flag 浼樺厛锛夈��
+ // 鏃у疄鐜版槸銆孶PDATE ... 椤哄甫 seq_num=褰撳墠鍙�+1锛屽啀鎸夊彿鏌ュ洖璇ヨ銆嶁�斺��
+ // 鍙蜂笉鍐嶅敮涓�鍚�"鎸夊彿鏌ュ洖"浼氬彇閿欎汉锛屾晠鏀逛负锛氬厛鍙栬 鈫� 鎸� id 鏉′欢鏇存柊銆�
+ QueueDO preemptQueueItem = queueMapper.getFirstWaitingByCheckTypes(
QueueStatusEnum.WAITING.getStatus(),
- QueueStatusEnum.READY.getStatus(),
bedBO.checkTypes); //鍏抽敭鐐� 鍏抽敭鐐� 鍏抽敭鐐� checkType
- // 娌℃湁鎶㈠埌鎺掗槦鎮h��
- if (null == updateNum || 0 == updateNum) {
+ // 娌℃湁鎺掗槦涓殑鎮h��
+ if (null == preemptQueueItem) {
return;
}
- QueueDO preemptQueueItem = queueMapper.getQueueItemBySeqNum(curSeqNum.get() + 1);
+ // 鏉′欢鏇存柊锛歴tatus 蹇呴』浠嶆槸銆屾帓闃熶腑銆嶏紝淇濊瘉骞跺彂涓嬪彧鏈変竴鏂规姠鍒拌琛�
+ Integer updateNum = queueMapper.preemptWaitingPatientById(
+ preemptQueueItem.getId(),
+ bedBO.getRoomId(),
+ bedBO.getRoomName(),
+ bedBO.getBedNo(),
+ QueueStatusEnum.WAITING.getStatus(),
+ QueueStatusEnum.READY.getStatus());
+ if (null == updateNum || 0 == updateNum) {
+ // 琚叾瀹冨伐浣嶆姠鍏堬細鏈疆鏀惧純锛岀瓑涓嬩竴娆¤ˉ榻愯Е鍙�
+ return;
+ }
+
+ // 鍐呭瓨瀵硅薄涓庡簱鍐呬繚鎸佷竴鑷� 鈥斺�� 浜插拰椤硅璺熼殢涓婚」鐨勮瘖瀹�/宸ヤ綅
+ preemptQueueItem.setStatus(QueueStatusEnum.READY.getStatus());
+ preemptQueueItem.setRoomId(bedBO.getRoomId());
+ preemptQueueItem.setRoomName(bedBO.getRoomName());
+ preemptQueueItem.setBedNo(bedBO.getBedNo());
+
CheckTypeDO checkTypeDO = getCheckTypeItem( preemptQueueItem.getBookCheckType() );
// 鎶㈠埌鎺掗槦鎮h�呭悗锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
procAffinityWhenPreempt(preemptQueueItem, checkTypeDO.getAffinityCheckTypes());
}
-
- curSeqNum.getAndIncrement();
// 鍙兘宸茬粡鍦� nextPatient 涓敼鍙樹簡鍊�
bedBO.readyPatNum++;
@@ -587,25 +860,51 @@
// 銆愰渶姹�3銆戙�屽仠姝㈠�欒瘖銆嶇殑宸ヤ綅涓嶅啀鏂板鍊欒瘖鎮h�呫��
// 宸叉湁鍊欒瘖鎮h�呬粛鍙甯稿彨鍙凤紙鏈柟娉曞彧璐熻矗"琛ラ綈鍊欒瘖"锛屼笉鍙備笌鍙彿锛夈��
if (Boolean.TRUE.equals(bedBO.getStopReady())) {
+ // 銆愮幇鍦烘帓鏌ャ�戞槑纭涓�鏉★細宸ヤ綅寮�浜嗐�屽仠姝㈠�欒瘖銆嶆椂涓嶄細鑷姩琛ヤ汉
+ log.warn("[琛ヤ汉] 宸ヤ綅澶勪簬銆愬仠姝㈠�欒瘖銆戯紝璺宠繃鑷姩琛ヤ汉. 宸ヤ綅={}/{}锛堝闇�鎺ユ敹璇峰叧闂寮�鍏筹級",
+ bedBO.getRoomId(), bedBO.getBedNo());
return;
}
+ if (bedBO.getReadyPatNum() >= bedBO.getMaxReadyPatNum()) {
+ // 銆愮幇鍦烘帓鏌ャ�戝�欒瘖鍖哄凡杈句笂闄愶紙涓婇檺=鍚勬鏌ラ」鐩� check_type.ready_num 鐨勬渶澶у�硷級
+ log.info("[琛ヤ汉] 鍊欒瘖鍖哄凡杈句笂闄愶紝璺宠繃. 宸ヤ綅={}/{} 褰撳墠鍊欒瘖={} 涓婇檺={}",
+ bedBO.getRoomId(), bedBO.getBedNo(), bedBO.getReadyPatNum(), bedBO.getMaxReadyPatNum());
+ refreshBedPriorityLevelInRoutingQueue(bedBO);
+ return;
+ }
+ int pulledNum = 0;
while (bedBO.getReadyPatNum() < bedBO.getMaxReadyPatNum()) {
// 鎶㈠崰 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
- Integer updateNum = queueMapper.preemptWaitingPatientWithBedCheckTypes(
- bedBO.getRoomId(),
- bedBO.getRoomName(),
- bedBO.getBedNo(),
- curSeqNum.get() + 1,
+ //
+ // 銆愬彿缁熶竴锛堟湰闇�姹傦級銆戜笌 hurryupOneCheckType 鐩稿悓锛氬彧鎼縼鐘舵�侊紝**涓嶅啀鍒嗛厤鎺掗槦鍙�**銆�
+ QueueDO preemptQueueItem = queueMapper.getFirstWaitingByCheckTypes(
QueueStatusEnum.WAITING.getStatus(),
- QueueStatusEnum.READY.getStatus(),
bedBO.checkTypes);
- // 娌℃湁鎶㈠埌鎺掗槦鎮h��
- if (null == updateNum || 0 == updateNum) {
+ // 娌℃湁鎺掗槦涓殑鎮h��
+ if (null == preemptQueueItem) {
return;
}
- QueueDO preemptQueueItem = queueMapper.getQueueItemBySeqNum(curSeqNum.get() + 1);
+ // 鏉′欢鏇存柊锛歴tatus 蹇呴』浠嶆槸銆屾帓闃熶腑銆嶏紝淇濊瘉骞跺彂涓嬪彧鏈変竴鏂规姠鍒拌琛�
+ Integer updateNum = queueMapper.preemptWaitingPatientById(
+ preemptQueueItem.getId(),
+ bedBO.getRoomId(),
+ bedBO.getRoomName(),
+ bedBO.getBedNo(),
+ QueueStatusEnum.WAITING.getStatus(),
+ QueueStatusEnum.READY.getStatus());
+ if (null == updateNum || 0 == updateNum) {
+ // 琚叾瀹冨伐浣嶆姠鍏堬細鏈疆鏀惧純锛岀瓑涓嬩竴娆¤ˉ榻愯Е鍙�
+ return;
+ }
+
+ // 鍐呭瓨瀵硅薄涓庡簱鍐呬繚鎸佷竴鑷� 鈥斺�� 浜插拰椤硅璺熼殢涓婚」鐨勮瘖瀹�/宸ヤ綅
+ preemptQueueItem.setStatus(QueueStatusEnum.READY.getStatus());
+ preemptQueueItem.setRoomId(bedBO.getRoomId());
+ preemptQueueItem.setRoomName(bedBO.getRoomName());
+ preemptQueueItem.setBedNo(bedBO.getBedNo());
+
CheckTypeDO checkTypeDO = getCheckTypeItem( preemptQueueItem.getBookCheckType() );
// 鎶㈠埌鎺掗槦鎮h�呭悗锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
@@ -613,17 +912,91 @@
procAffinityWhenPreempt(preemptQueueItem, checkTypeDO.getAffinityCheckTypes());
}
- curSeqNum.getAndIncrement();
-
bedBO.readyPatNum++;
+ pulledNum++;
+ }
+
+ if (pulledNum > 0) {
+ log.info("[琛ヤ汉] 宸茶ˉ鍏� {} 浜�. 宸ヤ綅={}/{} 褰撳墠鍊欒瘖={} 涓婇檺={}",
+ pulledNum, bedBO.getRoomId(), bedBO.getBedNo(),
+ bedBO.getReadyPatNum(), bedBO.getMaxReadyPatNum());
}
// 鏀瑰彉浜嗗垎娴侀槦鍒楅『搴�
refreshBedPriorityLevelInRoutingQueue(bedBO);
}
+ /** 搴撻噷璇ュ伐浣嶅綋鍓嶃�屽噯澶囦腑(20)銆嶇殑鐪熷疄浜烘暟锛堢敤浜庢牎姝e唴瀛樿鏁颁笌鐜板満璇婃柇锛� */
+ private int countReadyInDb(Long roomId, String bedNo) {
+ List<Integer> readyStatus = new ArrayList<>();
+ readyStatus.add(QueueStatusEnum.READY.getStatus());
+ List<QueueDO> readyList = queueMapper.getBedQueueByStatus(roomId, bedNo, readyStatus);
+ return null == readyList ? 0 : readyList.size();
+ }
+
/**
- * 鏈夋鏌ラ」鍒嗘祦鍒拌瘖瀹ゅ悗锛屼篃灏辨槸杩涘叆[鍊欒瘖涓璢鍚庯紝鎷� [鎺掗槦涓璢 + 鍏锋湁浜插拰鎬х殑 妫�鏌ラ」 鏉ヤ緷闄勮妫�鏌ラ」
+ * 绔嬪嵆琛ヤ汉锛堢幇鍦鸿嚜鏁� + 鑷姪璇婃柇锛夛細鎵嬪姩瑙﹀彂涓�娆¤宸ヤ綅鐨勮嚜鍔ㄥ垎娴侊紝骞舵妸"涓轰粈涔堟病琛�/琛ヤ簡鍑犱汉"涓�璧疯繑鍥炪��
+ *
+ * <p>鐢ㄤ簬宸ヤ綔鍙板�欒瘖鍖轰负绌烘椂鐨勩�岀珛鍗宠ˉ浜恒�嶆寜閽細涓嶅繀绛夊畾鏃朵换鍔°�佷篃涓嶇敤閲嶅惎鍘荤寽鏄摢閬撻棬闂告尅浣忕殑銆�
+ */
+ public Map<String, Object> hurryUpNow(Long roomId, String bedNo) {
+ Map<String, Object> data = new LinkedHashMap<>();
+ int flag = openingFlag.get();
+ data.put("绯荤粺寮�璇婄姸鎬�", 0 == flag ? "宸查棴璇婏紙姝ゆ椂涓嶄細鑷姩琛ヤ汉锛岃鍏堝湪鐩戞帶椤电偣銆屽紑璇娿�嶏級" : "寮�璇婁腑");
+
+ BedBO bedBO = getBedQueueBO(roomId, bedNo);
+ if (null == bedBO) {
+ data.put("缁撹", "璇ュ伐浣嶄笉鍦ㄣ�屽凡寮�璇婂伐浣嶃�嶅垪琛ㄩ噷锛堝彲鑳藉凡鍏抽棴/鏈鏈紑璇婏級锛屾棤娉曡ˉ浜猴紱璇峰厛鍒伴�夊伐浣嶉〉鍏ュ骇鎴栬绠$悊鍛樺紑璇�");
+ log.warn("[琛ヤ汉] hurryUpNow 宸ヤ綅涓嶅瓨鍦�. 宸ヤ綅={}/{}", roomId, bedNo);
+ return data;
+ }
+
+ boolean stopReady = Boolean.TRUE.equals(bedBO.getStopReady());
+ int before = countReadyInDb(roomId, bedNo);
+ int memoryBefore = bedBO.getReadyPatNum();
+ // 鍏堟寜搴撳唴鐪熷疄鍊兼牎姝e唴瀛橈紙鍐呭瓨铏氶珮浼氬鑷存案涔�"宸叉弧"锛�
+ bedBO.setReadyPatNum(before);
+
+ data.put("宸ヤ綅", bedBO.getRoomName() + " " + bedNo);
+ data.put("妫�鏌ラ」鐩�", null == bedBO.getCheckTypes() ? "[]" : java.util.Arrays.toString(bedBO.getCheckTypes()));
+ data.put("鍋滄鍊欒瘖", stopReady);
+ data.put("鍊欒瘖涓婇檺", bedBO.getMaxReadyPatNum());
+ data.put("琛ヤ汉鍓嶅�欒瘖浜烘暟", before + (memoryBefore == before ? "" : "锛堝唴瀛樻浘涓� " + memoryBefore + "锛屽凡鏍℃锛�"));
+
+ if (0 == flag) {
+ data.put("缁撹", "绯荤粺宸查棴璇婏紝鏈鏈ˉ浜猴紱璇峰厛鍦ㄧ洃鎺ч〉鐐广�屽紑璇娿��");
+ return data;
+ }
+ if (stopReady) {
+ data.put("缁撹", "鏈伐浣嶅紑浜嗐�屽仠姝㈠�欒瘖銆嶏紝鏈鏈ˉ浜猴紱濡傞渶鎺ユ敹鎮h�呰鍏抽棴璇ュ紑鍏�");
+ return data;
+ }
+
+ hurryupOneBed(roomId, bedNo);
+
+ int after = countReadyInDb(roomId, bedNo);
+ int pulled = Math.max(0, after - before);
+ data.put("琛ヤ汉鍚庡�欒瘖浜烘暟", after);
+ data.put("鏈琛ュ叆", pulled);
+ if (pulled > 0) {
+ data.put("缁撹", "宸茶ˉ鍏� " + pulled + " 浜�");
+ } else if (after >= bedBO.getMaxReadyPatNum()) {
+ data.put("缁撹", "鍊欒瘖鍖哄凡杈句笂闄愶紙" + after + "/" + bedBO.getMaxReadyPatNum() + "锛夛紝涓嶅啀琛ヤ汉");
+ } else {
+ data.put("缁撹", "娌℃湁鍖归厤鏈伐浣嶆鏌ラ」鐩殑銆屾帓闃熶腑銆嶆偅鑰咃紙鍙埌宸ヤ綔鍙版煡鐪嬨�屾湰璇婂鎺掗槦涓紙鏈垎閰嶏級銆嶅垎鍖猴級");
+ }
+ log.info("[琛ヤ汉] hurryUpNow 宸ヤ綅={}/{} 鍓�={} 鍚�={} 缁撹={}", roomId, bedNo, before, after, data.get("缁撹"));
+ return data;
+ }
+
+ /**
+ * 鏈夋鏌ラ」鍒嗘祦鍒拌瘖瀹ゅ悗锛屼篃灏辨槸杩涘叆[鍊欒瘖涓璢鍚庯紝鎷� [鎺掗槦涓璢 + 鍏锋湁浜插拰鎬х殑 妫�鏌ラ」 鏉ヤ緷闄勮妫�鏌ラ」銆�
+ *
+ * <p>銆愪翰鍜岄」涓庢帓闃熷彿銆戜翰鍜岄」鐩紙鍚屼竴鎮h�呫�佸彲鍦ㄤ竴涓伐浣嶄竴璧峰仛鐨勫涓鏌ラ」锛夊湪鍊欒瘖鍖�
+ * <b>璺熼殢涓婚」鏄剧ず</b>锛氳繖閲屾妸浜插拰椤圭殑鎺掗槦鍙锋敼鎴�**涓婚」鐨勫彿**銆佸苟鎼埌涓婚」鎵�鍦ㄨ瘖瀹�/宸ヤ綅锛�
+ * 鐣岄潰锛堝伐浣滃彴/璇婇棿灞�/澶у睆锛夋墠鑳芥妸涓よ�呮帓鍦ㄤ竴璧枫��
+ * <p>娉ㄦ剰杩�**涓嶆槸**"閲嶆柊璧嬪彿"锛氬彿浠嶆槸绛惧埌鏃跺畾鐨勯偅涓紝鍙槸浜插拰椤规部鐢ㄤ富椤圭殑鍙凤紝
+ * 涓�"鍒嗘祦/鍙彿/鍙洖涓嶅啀鏀瑰彿"骞朵笉鍐茬獊銆�
*/
private void procAffinityWhenPreempt(QueueDO preemptQueueItem, Integer[] affinityCheckTypes) {
List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
@@ -635,33 +1008,91 @@
queueItem.setRoomId(preemptQueueItem.getRoomId());
queueItem.setRoomName(preemptQueueItem.getRoomName());
queueItem.setBedNo(preemptQueueItem.getBedNo());
- queueItem.setSeqNum( preemptQueueItem.getSeqNum()); // 浣跨敤鍚屼竴涓� 鍐呴儴搴忓彿
+ queueItem.setSeqNum( preemptQueueItem.getSeqNum()); // 浜插拰椤规部鐢ㄤ富椤圭殑鎺掗槦鍙凤紙璺熼殢鏄剧ず锛�
queueMapper.updateById(queueItem);
}
}
/**
- * [杩囧彿] 鎮h�� => [鍊欒瘖涓璢 锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫
+ * [杩囧彿] 鎮h�� => [鍊欒瘖涓璢 锛屽鐞� 妫�鏌ラ」鐩�.浜插拰鎬� 閫昏緫銆�
+ *
+ * <p>鍙洖鏃朵富椤圭殑鍙蜂笉鍙橈紝鍥犳鍙渶璁╁凡缁忚窡闅忕殑浜插拰椤逛繚鎸佷竴鑷达紙淇濇寔鍚屽彿 鈫� 鐣岄潰浠嶆帓鍦ㄤ竴璧凤級銆�
*/
private void procAffinityWhenRecalled(QueueDO recalledQueueItem, Integer[] affinityCheckTypes) {
List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
recalledQueueItem.getPatId(), affinityCheckTypes, QueueStatusEnum.AFFINITY.getStatus());
for (int i = 0; i < affinityItems.size(); i++) {
QueueDO queueItem = affinityItems.get(i);
- queueItem.setSeqNum( recalledQueueItem.getSeqNum() ); // [杩囧彿] 鎮h�� => [鍊欒瘖涓璢锛屽師鍐呴儴搴忓彿鏇存柊
+ queueItem.setSeqNum( recalledQueueItem.getSeqNum() ); // 浜插拰椤逛笌涓婚」淇濇寔鍚屼竴涓彿
queueMapper.updateById(queueItem);
}
}
+ /**
+ * 宸ヤ綅銆屽�欒瘖鍖哄閲忎笂闄愩��= 璇ュ伐浣嶅紑灞曠殑**鍚勬鏌ラ」鐩�** {@code check_type.ready_num}
+ * 锛堥〉闈㈠瓧娈碉細銆屾鏌ョ被鍨嬬鐞嗐�嶁啋銆屽�欒瘖鍑嗗浜烘暟銆嶏級鐨�**鏈�澶у��**銆�
+ *
+ * <p><b>杩斿洖 0 琛ㄧず"涓嶈嚜鍔ㄥ垎娴�"</b>锛氭鏃舵帓闃熶腑(10) 鐨勬偅鑰�**涓嶄細**琚富鍔ㄦ惉杩涘�欒瘖鍖�(20)锛�
+ * 闇�瑕佸尰鐢熷湪鍊欒瘖鍖虹敤銆屾媺鍏ャ�嶆墜鍔ㄨˉ浜猴紙鐜板満纭鐨勫彛寰勶級銆�
+ *
+ * <p>銆愭湰娆″姞鍥恒��
+ * <ul>
+ * <li><b>瀹炴椂璇诲簱</b>锛氬師鏉ヨ繖浠介厤缃彧鍦ㄦ湇鍔″惎鍔ㄦ椂鍔犺浇涓�娆�
+ * 锛坽@code MySpringEventListener} 鈫� {@code initCheckType()}锛夛紝
+ * 鍦ㄩ〉闈笂鏀逛簡銆屽�欒瘖鍑嗗浜烘暟銆嶅繀椤�**閲嶅惎鏈嶅姟**鎵嶇敓鏁堬紱</li>
+ * <li><b>瀹归敊</b>锛氭鏌ラ」鐩湪閰嶇疆閲屾煡涓嶅埌銆佹垨 {@code ready_num} 涓虹┖ 鈫� **璺宠繃骞惰璀﹀憡**锛�
+ * 涓嶅啀鎶� NPE銆傚師鍏堣繖涓� NPE 鍙戠敓鍦� {@code addBedToRoutingQueue}锛堝叆搴�/寮�璇�/閲嶈浇閮戒細璧帮級锛�
+ * 浼氳繛甯︽妸鍏ュ骇寮勫け璐ャ��</li>
+ * </ul>
+ */
private Integer getBedReadyMax(BedBO bedBO) {
Integer[] checkTypes = bedBO.getCheckTypes();
+ if (null == checkTypes || 0 == checkTypes.length) {
+ return 0;
+ }
+ Map<Integer, CheckTypeDO> fresh = readCheckTypeMapFresh();
int ret = 0;
for (Integer checkType : checkTypes) {
- CheckTypeDO checkTypeDO = mapCheckTypeVsReadyMax.get(checkType);
+ CheckTypeDO checkTypeDO = fresh.get(checkType);
+ if (null == checkTypeDO) {
+ // 鍏煎锛氬疄鏃惰澶辫触鏃跺洖钀藉埌鍚姩缂撳瓨锛屼袱杈归兘娌℃湁灏辫烦杩囷紙涓嶅啀 NPE锛�
+ checkTypeDO = getCheckTypeItem(checkType);
+ }
+ if (null == checkTypeDO) {
+ log.warn("[getBedReadyMax] 妫�鏌ラ」鐩湪 check_type 閲屼笉瀛樺湪锛岃烦杩囷紙鎸� 0 璁★級. checkType={} 宸ヤ綅={}/{}",
+ checkType, bedBO.getRoomId(), bedBO.getBedNo());
+ continue;
+ }
Integer tmp = checkTypeDO.getReadyNum();
- ret = ret < tmp ? tmp : ret; //銆愬�欒瘖涓�戞暟閲� 鍙栧ぇ鍊�
+ if (null == tmp) {
+ log.warn("[getBedReadyMax] 妫�鏌ラ」鐩甗鍊欒瘖鍑嗗浜烘暟]涓虹┖锛岃烦杩�. checkType={} name={}",
+ checkType, checkTypeDO.getName());
+ continue;
+ }
+ ret = Math.max(ret, tmp); //銆愬�欒瘖涓�戞暟閲� 鍙栧ぇ鍊�
}
return ret;
+ }
+
+ /**
+ * 瀹炴椂璇诲彇銆屾鏌ラ」鐩�� 鈫� 妫�鏌ラ」鐩厤缃�嶆槧灏勶紙姣忔瑁呴厤宸ヤ綅鏃惰涓�娆″叏琛紝妫�鏌ラ」鐩彧鏈夊崄鍑犱釜锛岄噺绾у緢灏忥級銆�
+ * 杩欐牱绠$悊鍛樺湪銆屾鏌ョ被鍨嬬鐞嗐�嶉噷鏀逛簡銆屽�欒瘖鍑嗗浜烘暟銆�**绔嬪埢鐢熸晥锛屼笉鐢ㄩ噸鍚湇鍔�**銆�
+ * 璇诲簱澶辫触鏃跺洖钀藉埌鍚姩鏃跺姞杞界殑缂撳瓨锛坽@link #initCheckType()}锛夈��
+ */
+ private Map<Integer, CheckTypeDO> readCheckTypeMapFresh() {
+ try {
+ List<CheckTypeDO> list = checkTypeMapper.simpleCheckTypeList();
+ Map<Integer, CheckTypeDO> map = new HashMap<>();
+ for (CheckTypeDO item : list) {
+ if (null != item && null != item.getValue()) {
+ map.put(item.getValue(), item);
+ }
+ }
+ return map;
+ } catch (Exception e) {
+ log.warn("[readCheckTypeMapFresh] 瀹炴椂璇绘鏌ラ」鐩け璐ワ紝鏀圭敤鍚姩鏃剁紦瀛�", e);
+ return null == mapCheckTypeVsReadyMax ? new HashMap<>() : mapCheckTypeVsReadyMax;
+ }
}
private void addBedToRoutingQueue(BedBO bedBO) {
@@ -687,6 +1118,14 @@
List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(bedBO.getRoomId(), bedBO.getBedNo(), queueStatusList);
bedBO.setMaxReadyPatNum( getBedReadyMax(bedBO) );
bedBO.setReadyPatNum( queueDOList.size() );
+
+ // 銆愮幇鍦烘帓鏌ャ�戞妸"鍊欒瘖鍖轰笂闄� / 褰撳墠浜烘暟 / 鏉ユ簮"鎵撳嚭鏉ワ細
+ // 涓婇檺=0 琛ㄧず**涓嶈嚜鍔ㄥ垎娴�**锛堟帓闃熶腑鐨勬偅鑰呬笉浼氳涓诲姩鎼繘鍊欒瘖鍖猴紝闇�鍦ㄥ�欒瘖鍖烘墜鍔ㄣ�屾媺鍏ャ�嶏級銆�
+ // 鐜板満鍙嶉杩�"鏈夎繖涔堝鎺掗槦鐥呬汉锛屼负浠�涔堟病涓诲姩鍔犺浇鍒板�欒瘖鍖�"锛屼竴鏉℃棩蹇楀嵆鍙嚜璇併��
+ log.info("[addBedToRoutingQueue] 宸ヤ綅 {}/{} 鍊欒瘖涓婇檺={} 褰撳墠鍊欒瘖={} 妫�鏌ラ」鐩�={}"
+ + "锛堜笂闄�=鍚勬鏌ラ」鐩� check_type.ready_num 鐨勬渶澶у�硷紱0=涓嶈嚜鍔ㄥ垎娴侊紝闈犲伐浣嶆墜鍔ㄣ�屾媺鍏ャ�嶏級",
+ bedBO.getRoomId(), bedBO.getBedNo(), bedBO.getMaxReadyPatNum(), bedBO.getReadyPatNum(),
+ null == bedBO.getCheckTypes() ? "[]" : java.util.Arrays.toString(bedBO.getCheckTypes()));
Integer[] checkTypes = bedBO.getCheckTypes();
Arrays.stream(checkTypes).forEach(checkType -> {
@@ -802,6 +1241,19 @@
item.getStatus() == BedStatusEnum.DOCTOR_ON.getStatus() ||
item.getStatus() == BedStatusEnum.DOCTOR_PAUSE.getStatus())
.count());
+ // 銆愭湰闇�姹偮风粺璁℃寜浜哄悎骞躲�戝湪搴�**鍖荤敓鏁�**锛氫竴浜哄宸ヤ綅鏃朵笂闈㈢殑 docBedNum 浼氭寜宸ヤ綅绱锛�
+ // 杩欓噷鎸� doc_id 鍘婚噸锛岀粰鐩戞帶椤典竴涓�"鍒板簳鍑犱釜鍖荤敓鍦ㄥ矖"鐨勬寚鏍囥��
+ List<Integer> seatedStatusList = new ArrayList<>();
+ seatedStatusList.add(BedStatusEnum.DOCTOR_ON.getStatus());
+ seatedStatusList.add(BedStatusEnum.DOCTOR_PAUSE.getStatus());
+ try {
+ Integer docNum = roomMapper.countSeatedDoctors(seatedStatusList);
+ monitorInfoVO.setDocNum(null == docNum ? 0 : docNum);
+ } catch (Exception e) {
+ // 缁熻澶辫触涓嶅奖鍝嶇洃鎺ч〉鍏跺畠鏁版嵁
+ log.warn("[roomBedStatistic] 缁熻鍦ㄥ骇鍖荤敓鏁板け璐ワ紙涓嶅奖鍝嶅叾瀹冩寚鏍囷級", e);
+ monitorInfoVO.setDocNum(0);
+ }
monitorInfoVO.setRoutingBedNum( hashSetOperatingBedQueue.size() );
monitorInfoVO.setMapBedVsQueue(mapOpeningBed);
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queuesequence/QueueSequenceService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queuesequence/QueueSequenceService.java
index 366e5d5..68bcd42 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queuesequence/QueueSequenceService.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queuesequence/QueueSequenceService.java
@@ -86,5 +86,20 @@
Integer distributeSeqNoByRule(Integer checkType, Integer timeslot,
Integer existingSeqNo, boolean urgent);
+ /**
+ * 銆愭湰闇�姹傘�戝悓涓婏紝浣嗗鍔犮�屾槸鍚� VIP / 涓存椂鍔犲彿銆嶆爣璁般��
+ *
+ * <p>鎸夋椂娈甸绾︼紙瑙勫垯 2锛変笅鐨勪袱鏉¢�氶亾锛�
+ * <ul>
+ * <li>VIP / 鍔犲彿鎮h�咃細**鐩存帴鍙栨湰娈甸鐣欏彿**锛涙湰娈甸鐣欎篃婊� 鈫� 鎬婚鐣欐睜锛坽@code time_slot=0}锛夛紱</li>
+ * <li>鏅�氭偅鑰咃細鏈鏅�氬彿 鈫� 鏈棰勭暀鍙� 鈫� 鎬婚鐣欐睜銆�</li>
+ * </ul>
+ * 涓ゆ潯閫氶亾鏈�缁堥兘鑳借惤鍒般�屾�婚鐣欐睜銆嶏紝鑰屾�婚鐣欐睜**涓嶈涓婇檺** 鈬� 涓嶄細鍑虹幇绛惧埌澶辫触銆�
+ *
+ * @param vip 鏄惁 VIP / 涓存椂鍔犲彿锛坽@code appointment.is_vip=1} 鎴� HIS 鍔犳�� {@code jjbz=J}锛�
+ */
+ Integer distributeSeqNoByRule(Integer checkType, Integer timeslot,
+ Integer existingSeqNo, boolean urgent, boolean vip);
+
void initNumber();
}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queuesequence/QueueSequenceServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queuesequence/QueueSequenceServiceImpl.java
index ebfc4db..1305092 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queuesequence/QueueSequenceServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queuesequence/QueueSequenceServiceImpl.java
@@ -100,7 +100,16 @@
validateTimeslotNotDuplicated(createReqVO.getCheckType(), createReqVO.getTimeSlot(), null);
// 鎻掑叆
QueueSequenceDO queueSequence = BeanUtils.toBean(createReqVO, QueueSequenceDO.class);
+ if (null == queueSequence.getTimeSlot() || 0 != queueSequence.getTimeSlot()) {
+ // 銆愭湰闇�姹傘�戝彿娈佃捣鐐� / 棰勭暀璧风偣鐢辩郴缁熻绠楋紝涓嶆帴鍙楀墠绔殢鎰忎紶鍊硷紙鍚﹀垯鍙锋浼氶噸鍙狅級
+ queueSequence.setQueueSet(null);
+ queueSequence.setQueueVipSet(null);
+ }
queueSequenceMapper.insert(queueSequence);
+ // 銆愭湰闇�姹傘�戞柊澧�/缂栬緫鍚庣粺涓�閲嶆帓璇ユ鏌ョ被鍨嬬殑鍙锋锛堜繚璇�"娈典笌娈甸灏剧浉鎺�"锛�
+ if (null != createReqVO.getCheckType()) {
+ recalcSegmentBounds(createReqVO.getCheckType());
+ }
// 杩斿洖
return queueSequence.getId();
}
@@ -114,7 +123,104 @@
updateReqVO.getId());
// 鏇存柊
QueueSequenceDO updateObj = BeanUtils.toBean(updateReqVO, QueueSequenceDO.class);
+ // 銆愭湰闇�姹傘�戣捣濮嬪簭鍙风敱绯荤粺閲嶆帓锛屽拷鐣ュ墠绔紶鍊硷紙鍓嶇宸茬疆涓哄彧璇伙級
+ updateObj.setQueueSet(null);
+ updateObj.setQueueVipSet(null);
queueSequenceMapper.updateById(updateObj);
+ if (null != updateReqVO.getCheckType()) {
+ recalcSegmentBounds(updateReqVO.getCheckType());
+ }
+ }
+
+ /**
+ * 銆愭湰闇�姹傘�戞寜銆屾椂娈靛崌搴忋�嶉噸鎺掓煇妫�鏌ョ被鍨嬬殑鍙锋锛�
+ * <pre>
+ * 娈� i锛歲ueue_set = 涓婁竴娈电殑 queue_vip_full锛堥娈� 0锛�
+ * queue_full = queue_set + P
+ * queue_vip_set = queue_full
+ * queue_vip_full = queue_vip_set + V
+ * 鍏朵腑 P / V = 璇ヨ褰撳墠鐨勶紙queue_full - queue_set锛夈�侊紙queue_vip_full - queue_full锛夛紝
+ * 鍗冲悇娈电殑"棰濆害"淇濇寔涓嶅彉锛屽彧鎶婅捣鐐逛覆璧锋潵銆�
+ * </pre>
+ * 杩欐牱鏃犺鏂板/鍒犻櫎/缂栬緫鏃舵锛岄兘涓嶄細鍑虹幇鍙锋閲嶅彔鎴栫┖娲為敊浣嶃��
+ * <p>鎬婚鐣欐睜锛坱ime_slot = 0锛変笉鍙備笌閲嶆帓锛屽彧鎶婅捣鐐瑰榻愬埌鏈�鍚庝竴娈典箣鍚庛��
+ */
+ private void recalcSegmentBounds(Integer checkType) {
+ if (null == checkType) {
+ return;
+ }
+ List<QueueSequenceDO> all = queueSequenceMapper.selectTimeslotByCheckType(checkType);
+ if (null == all || all.isEmpty()) {
+ return;
+ }
+ all.sort(Comparator.comparingInt(r -> null == r.getTimeSlot() ? 0 : r.getTimeSlot()));
+
+ CheckTypeDO ct = checkTypeMapper.getCheckTypeByValue(checkType);
+
+ int cursor = 0;
+ int slotCount = 0;
+ for (QueueSequenceDO row : all) {
+ int slot = null == row.getTimeSlot() ? 0 : row.getTimeSlot();
+ if (0 == slot) {
+ continue; // 鎬婚鐣欐睜鏈�鍚庡崟鐙鐞�
+ }
+ slotCount++;
+
+ // 棰濆害锛堝锛夛細浼樺厛娌跨敤璇ヨ鐜版湁鍙锋瀹藉害锛涙湭鐭�/闈炴鏃跺洖閫�鍒版鏌ョ被鍨嬮厤缃�
+ int p = width(row.getQueueSet(), row.getQueueFull());
+ if (p <= 0) {
+ p = (null == ct || null == ct.getTimeslotBookNum()) ? 0 : ct.getTimeslotBookNum();
+ }
+ int v = width(row.getQueueFull(), row.getQueueVipFull());
+ if (v < 0) {
+ v = (null == ct || null == ct.getTimeslotReservedNum()) ? 0 : ct.getTimeslotReservedNum();
+ }
+
+ QueueSequenceDO update = new QueueSequenceDO();
+ update.setId(row.getId());
+ update.setQueueSet(cursor);
+ update.setQueueFull(cursor + p);
+ update.setQueueVipSet(cursor + p);
+ update.setQueueVipFull(cursor + p + v);
+ // 娓告爣鍙�**涓婃姮**鍒板彿娈佃捣鐐癸紝缁濅笉**涓嬭皟**锛�
+ // 涓嬭皟浼氳宸插彂鍑虹殑鍙疯鍐嶆鍙戝嚭锛堥噸鍙凤級銆傝嫢娓告爣宸茶秴杩囦笂闄愶紝璇存槑璇ユ宸茶秴鍙戯紝
+ // 鍙栧彿鏃惰嚜鐒朵細钀藉埌銆岄鐣欏彿 鈫� 鎬婚鐣欐睜銆嶃��
+ update.setQueueNo(raiseAtLeast(row.getQueueNo(), cursor));
+ update.setQueueVipNo(raiseAtLeast(row.getQueueVipNo(), cursor + p));
+ queueSequenceMapper.updateById(update);
+
+ cursor = cursor + p + v;
+ }
+
+ // 鎬婚鐣欐睜锛氳捣鐐瑰榻愬埌鏈�鍚庝竴娈典箣鍚�
+ QueueSequenceDO pool = queueSequenceMapper.selectTotalPool(checkType);
+ if (null != pool) {
+ int poolFull = Math.max(null == pool.getQueueVipFull() ? 0 : pool.getQueueVipFull(), cursor);
+ QueueSequenceDO update = new QueueSequenceDO();
+ update.setId(pool.getId());
+ update.setQueueVipSet(cursor);
+ update.setQueueVipFull(poolFull);
+ update.setQueueVipNo(raiseAtLeast(pool.getQueueVipNo(), cursor));
+ queueSequenceMapper.updateById(update);
+ }
+ log.info("[recalcSegmentBounds] 宸查噸鎺掑彿娈�. checkType={} 娈垫暟={} 鏈熬鏈�澶у彿={}",
+ checkType, slotCount, cursor);
+ }
+
+ /** 鍙锋瀹藉害锛堢粓姝� - 璧峰锛夛紝浠讳竴涓� null 杩斿洖 -1 琛ㄧず"鏈煡" */
+ private int width(Integer from, Integer to) {
+ if (null == from || null == to) {
+ return -1;
+ }
+ return to - from;
+ }
+
+ /**
+ * 娓告爣鍙笂鎶�佷笉涓嬭皟锛堜笅璋冧細瀵艰嚧宸插彂鍑虹殑鍙疯鍐嶆鍙戝嚭 鈬� 閲嶅彿锛夈��
+ */
+ private Integer raiseAtLeast(Integer value, int min) {
+ int v = null == value ? min : value;
+ return Math.max(v, min);
}
/**
@@ -140,9 +246,14 @@
@Override
public void deleteQueueSequence(Integer id) {
// 鏍¢獙瀛樺湪
- validateQueueSequenceExists(id);
+ QueueSequenceDO exist = queueSequenceMapper.selectById(id);
+ if (null == exist) {
+ throw exception(QUEUE_SEQUENCE_NOT_EXISTS);
+ }
// 鍒犻櫎
queueSequenceMapper.deleteById(id);
+ // 銆愭湰闇�姹傘�戝垹闄ゅ悗閲嶆帓鍙锋锛堝惁鍒欏悗缁椂娈电殑璧风偣浼氱暀绌烘礊锛�
+ recalcSegmentBounds(exist.getCheckType());
}
private void validateQueueSequenceExists(Integer id) {
@@ -199,64 +310,118 @@
@Override
@Transactional
public Integer distributeSeqNo(Integer checkType, Integer timeslot) {
+ // 銆愭湰闇�姹傦細鎸夋椂娈甸绾︺�戞櫘閫氭偅鑰呬笁绾у彇鍙凤紝**涓嶅啀璺ㄦ鍊熷彿**锛�
+ // 鈶� 鏈椂娈垫櫘閫氬彿锛坬ueue_no < queue_full锛�
+ // 鈶� 鏈椂娈甸鐣欏彿锛坬ueue_vip_no < queue_vip_full锛�
+ // 鈶� 鎬婚鐣欐睜锛坱ime_slot=0锛�**涓嶈涓婇檺**锛�
+ // 浠讳綍涓�绾ф垚鍔熷嵆杩斿洖锛涒憿 姘镐笉澶辫触 鈬� 涓嶅瓨鍦�"绛句笉涓�"銆�
+ // 鏃犻绾︽椂娈碉紙timeslot 涓� null/0/瀛楀吀澶栫殑鍊硷級鏃� 鈶犫憽 鑷劧鏌ヤ笉鍒拌锛岀洿鎺ヨ惤鍒� 鈶€��
+
+ // 鈶� 鏈鏅�氬彿
Integer curSeqNo = queueSequenceMapper.selectQueueNoForUpdate(checkType, timeslot);
- if (null == curSeqNo) {
- // 銆愪慨澶嶃�屾椂娈典笉鍏�/宸叉弧瀵艰嚧娌℃硶绛惧埌銆嶃��
- // 鍘熼�昏緫锛氬彧鍙�"瀛楀吀閲岀殑绱ч偦涓嬩竴涓椂娈�"锛屼笖瑕佹眰璇ユ椂娈靛湪 queue_sequence 涓瓨鍦ㄣ��
- // 鐜板疄闂锛堝疄娴嬶級锛�
- // 路 瀛楀吀 ecg_book_timeslot 鏈� 21 涓椂娈碉紝浣� queue_sequence 涓� checkType=400
- // 鍙湁 13 涓�乧heckType=100 鍙湁 17 涓� 鈥斺�� 閮ㄥ垎鏃舵鏍规湰娌℃湁鍙锋睜琛岋紱
- // 路 HIS 浼氫笅鍙� 60 鍒嗛挓绮掑害鐨� bookTimeslot锛堝 10001100锛夛紝瀛楀吀閲屾病鏈夎鍊硷紝
- // getNextTimeSlot 鐩存帴 return null锛�
- // 路 涓埆鏃舵瀹归噺寰堝皬锛堝钩鏉胯繍鍔� timeslot_book_num=3锛夛紝寰堝揩閿�瀹屻��
- // 涓夎�呬换涓�鍛戒腑 鈫� 鎶� QUEUE_SEQUENCE_TIMESLOT_FULL 鈫� **鎮h�呮病娉曠鍒�**銆�
- //
- // 鐜板湪鏀逛负锛�**鍚戝悗鏈�澶氭壘 N 涓椂娈碉紝鍙栫涓�涓粛鏈変綑閲忕殑**锛堜笅闈� findAvailableTimeslot 鍐呭疄鐜帮級锛�
- // 澶у箙闄嶄綆"鍥犱釜鍒椂娈电己澶�/宸叉弧灏辩鍒板け璐�"鐨勬鐜囷紱纭疄閮芥弧浜嗘墠鎶涢敊銆�
- Integer nextTimeslot = findAvailableTimeslot(checkType, timeslot, false);
- if (null == nextTimeslot) {
- log.error("[distributeSeqNo] 璇ユ鏌ョ被鍨嬪悜鍚� {} 涓椂娈靛唴鍧囨棤鍙彇鍙锋椂娈�. checkType={} timeslot={}",
- MAX_TIMESLOT_LOOKAHEAD, checkType, timeslot);
- throw exception(QUEUE_SEQUENCE_TIMESLOT_FULL);
+ if (null != curSeqNo) {
+ Integer updateNum = queueSequenceMapper.updateGivenCheckTypeTimeslotSeqNo(checkType, timeslot, curSeqNo);
+ if (null != updateNum && updateNum > 0) {
+ return curSeqNo + 1;
}
-
- curSeqNo = queueSequenceMapper.selectQueueNoForUpdate(checkType, nextTimeslot);
- if (null == curSeqNo) {
- // 鎺㈡祴涓庡彇鍙蜂箣闂磋骞跺彂鎶㈢┖锛屼繚瀹堟姤閿欙紙鐢卞墠绔彁绀洪噸鏂扮鍒帮級
- log.warn("[distributeSeqNo] 鎺㈡祴鍒扮殑鏃舵闅忓嵆琚崰婊�. checkType={} timeslot={}",
- checkType, nextTimeslot);
- throw exception(QUEUE_SEQUENCE_TIMESLOT_FULL);
- }
-
- Integer updateRowNum = queueSequenceMapper.updateGivenCheckTypeTimeslotSeqNo(checkType, nextTimeslot, curSeqNo);
- if (null == updateRowNum || updateRowNum == 0) {
- throw exception(QUEUE_SEQUENCE_TIMESLOT_EXCEPTION);
- }
-
- } else {
- Integer updateRowNum = queueSequenceMapper.updateGivenCheckTypeTimeslotSeqNo(checkType, timeslot, curSeqNo);
- if (null == updateRowNum || updateRowNum == 0) {
- throw exception(QUEUE_SEQUENCE_TIMESLOT_EXCEPTION);
- }
+ // 骞跺彂琚姠绌� 鈫� 钀藉埌 鈶�
+ log.info("[distributeSeqNo] 鏈鏅�氬彿骞跺彂琚姠绌猴紝闄嶇骇鍒伴鐣欏彿. checkType={} timeslot={}", checkType, timeslot);
}
- return curSeqNo + 1;
- }
+ // 鈶� 鏈棰勭暀鍙�
+ Integer curVipNo = queueSequenceMapper.selectQueueVipNoForUpdate(checkType, timeslot);
+ if (null != curVipNo) {
+ Integer updateNum = queueSequenceMapper.updateGivenCheckTypeTimeslotVipSeqNo(checkType, timeslot, curVipNo);
+ if (null != updateNum && updateNum > 0) {
+ log.info("[distributeSeqNo] 鏅�氬彿宸叉弧锛屾敼鍙戞湰娈甸鐣欏彿. checkType={} timeslot={} seqNo={}",
+ checkType, timeslot, curVipNo + 1);
+ return curVipNo + 1;
+ }
+ log.info("[distributeSeqNo] 鏈棰勭暀鍙峰苟鍙戣鎶㈢┖锛岄檷绾у埌鎬婚鐣欐睜. checkType={} timeslot={}", checkType, timeslot);
+ }
+ // 鈶� 鎬婚鐣欐睜锛堜笉璁句笂闄愶紝淇濊瘉涓�瀹氳兘绛惧埌锛�
+ return nextTotalPoolSeqNo(checkType, timeslot);
+ }
+ /**
+ * 銆愭湰闇�姹傘�慥IP / 涓存椂鍔犲彿鎮h�呭彇鍙凤細**鐩存帴鍙栨湰娈甸鐣欏彿**锛涙湰娈甸鐣欎篃婊� 鈫� 鎬婚鐣欐睜銆�
+ * <p>
+ * 涓庢櫘閫氶�氶亾鐨勫樊鍒彧鍦ㄤ簬"璺宠繃鏈鏅�氬彿"锛屽叾浣欙紙棰勭暀鍙枫�佹�绘睜鍏滃簳锛夊畬鍏ㄤ竴鑷淬��
+ */
@Override
@Transactional
public Integer distributeVipSeqNo(Integer checkType, Integer timeslot) {
Integer curVipSeqNo = queueSequenceMapper.selectQueueVipNoForUpdate(checkType, timeslot);
- if (null == curVipSeqNo) {
- throw exception(QUEUE_SEQUENCE_TIMESLOT_FULL);
+ if (null != curVipSeqNo) {
+ Integer updateRowNum = queueSequenceMapper.updateGivenCheckTypeTimeslotVipSeqNo(checkType, timeslot, curVipSeqNo);
+ if (null != updateRowNum && updateRowNum > 0) {
+ return curVipSeqNo + 1;
+ }
+ log.info("[distributeVipSeqNo] 鏈棰勭暀鍙峰苟鍙戣鎶㈢┖锛岄檷绾у埌鎬婚鐣欐睜. checkType={} timeslot={}", checkType, timeslot);
+ }
+ return nextTotalPoolSeqNo(checkType, timeslot);
+ }
+
+ /**
+ * 銆愭湰闇�姹傘�戞�婚鐣欐睜鍙栧彿锛坽@code time_slot = 0} 閭d竴琛岋級鈥斺�� **姘镐笉澶辫触**銆�
+ *
+ * <h3>涓轰粈涔堜笉浼氭弧</h3>
+ * 鎬绘睜鐨� {@code queue_vip_full} 鍦ㄥ彂鍙锋椂鍚屾"椤堕珮"锛堣 Mapper 鐨�
+ * {@code advanceTotalPoolVipNo}锛夛紝鍥犳 {@code queue_vip_no} 姘歌繙鍙互缁х画 +1銆�
+ * 杩欐槸"缁濅笉鍑虹幇绛句笉涓�"鐨勬渶鍚庝竴閬撳厹搴曘��
+ *
+ * <h3>鎬绘睜琛岀己澶辨椂鑷姩琛�</h3>
+ * 鍙锋鏀惧湪褰撳ぉ鎵�鏈夋椂娈电殑鏈�澶у彿涔嬪悗锛坽@code max(queue_vip_full)}锛夛紝
+ * 淇濊瘉鎬绘睜鍙� **澶т簬鎵�鏈夋椂娈靛彿** 鈬� 鎺掑簭澶╃劧鎺掑湪鍏ㄥぉ鏈�鍚庛��
+ */
+ private Integer nextTotalPoolSeqNo(Integer checkType, Integer timeslot) {
+ Integer curVipNo = null;
+ try {
+ curVipNo = queueSequenceMapper.selectTotalPoolVipNo(checkType);
+ } catch (Exception e) {
+ log.warn("[nextTotalPoolSeqNo] 璇诲彇鎬婚鐣欐睜寮傚父锛屾寜缂哄け澶勭悊. checkType={}", checkType, e);
}
- Integer updateRowNum = queueSequenceMapper.updateGivenCheckTypeTimeslotVipSeqNo(checkType, timeslot, curVipSeqNo);
- if (null == updateRowNum || updateRowNum == 0) {
+ if (null == curVipNo) {
+ // 鐜板満鍏滃簳锛氳嚜鍔ㄨˉ涓�琛屾�婚鐣欐睜锛堝箓绛夛細浠� 妫�鏌ョ被鍨� + time_slot=0 鍞竴锛�
+ Integer base = queueSequenceMapper.selectMaxVipFullOfCheckType(checkType);
+ if (null == base) {
+ base = 0;
+ }
+ QueueSequenceDO pool = new QueueSequenceDO();
+ pool.setCheckType(checkType);
+ pool.setTimeSlot(0);
+ pool.setQueueSet(0);
+ pool.setQueueNo(0);
+ pool.setQueueFull(0);
+ pool.setQueueVipSet(base);
+ pool.setQueueVipNo(base);
+ pool.setQueueVipFull(base);
+ try {
+ queueSequenceMapper.insert(pool);
+ } catch (Exception e) {
+ // 骞跺彂涓嬪彲鑳藉凡琚埆鐨勭嚎绋嬫彃鍏ワ紝蹇界暐鍚庣户缁
+ log.warn("[nextTotalPoolSeqNo] 琛ユ�婚鐣欐睜琛屽け璐ワ紙鍙兘骞跺彂宸叉彃鍏ワ級锛岀户缁彇鍙�. checkType={}", checkType, e);
+ }
+ if (null == queueSequenceMapper.selectTotalPoolVipNo(checkType)) {
+ // 鎻掑叆鍚庝粛璇讳笉鍒帮紙鏋佺鎯呭喌锛夆啋 鐢ㄥ綋澶╂渶澶у彿鍏滃簳锛屼繚璇佽兘绛惧埌
+ Integer maxFull = queueSequenceMapper.selectMaxVipFullOfCheckType(checkType);
+ log.error("[nextTotalPoolSeqNo] 鎬婚鐣欐睜涓嶅彲鐢紝浣跨敤鏈�澶у彿鍏滃簳. checkType={} maxFull={}", checkType, maxFull);
+ return (null == maxFull ? 0 : maxFull) + 1;
+ }
+ }
+
+ Integer updateNum = queueSequenceMapper.advanceTotalPoolVipNo(checkType);
+ if (null == updateNum || updateNum == 0) {
throw exception(QUEUE_SEQUENCE_TIMESLOT_EXCEPTION);
}
-
- return curVipSeqNo + 1;
+ Integer after = queueSequenceMapper.selectTotalPoolVipNo(checkType);
+ if (null == after) {
+ throw exception(QUEUE_SEQUENCE_TIMESLOT_EXCEPTION);
+ }
+ log.info("[nextTotalPoolSeqNo] 宸蹭粠鎬婚鐣欐睜鍙栧彿锛堟湰娈靛凡婊℃垨娌℃湁鏃舵锛�. checkType={} timeslot={} seqNo={}",
+ checkType, timeslot, after);
+ return after;
}
/**
@@ -283,6 +448,21 @@
@Transactional
public Integer distributeSeqNoByRule(Integer checkType, Integer timeslot,
Integer existingSeqNo, boolean urgent) {
+ // 鍏煎鏃ц皟鐢ㄦ柟锛氭湭浼� VIP 鏍囪鏃舵寜"闈� VIP"澶勭悊
+ return distributeSeqNoByRule(checkType, timeslot, existingSeqNo, urgent, false);
+ }
+
+ /**
+ * 銆愭湰闇�姹傘�戝甫 VIP/鍔犲彿鏍囪鐨勫彇鍙峰叆鍙c��
+ * <p>
+ * 涓庡洓鍙傜増鏈殑鍞竴宸埆锛氭寜鏃舵棰勭害锛圱IMESLOT锛変笅锛孷IP/鍔犲彿鎮h��**鐩存帴鍙栨湰娈甸鐣欏彿**
+ * 锛堣 {@link #distributeVipSeqNo}锛夛紝鑰屼笉鏄厛鍙栨櫘閫氬彿锛涚鍒板簭鍙凤紙CHECKIN锛変笅
+ * VIP/鍔犲彿鍚屾牱鍙崰鐢ㄩ鐣欏彿锛堟瘡 9 鐣� 1 鐨勯鐣欎綅锛夈��
+ */
+ @Override
+ @Transactional
+ public Integer distributeSeqNoByRule(Integer checkType, Integer timeslot,
+ Integer existingSeqNo, boolean urgent, boolean vip) {
SeqRuleEnum rule = resolveRule(checkType);
switch (rule) {
@@ -295,15 +475,18 @@
}
log.warn("[distributeSeqNoByRule] 瑙勫垯=棰勭害鍙凤紝浣嗛绾︾郴缁熸湭涓嬪彂鍙凤紝鍥為��鍒扮鍒板簭鍙�. checkType={}",
checkType);
- return nextCheckInSeqNo(checkType, urgent);
+ return nextCheckInSeqNo(checkType, urgent || vip);
case CHECKIN:
// 鈶� 绛惧埌搴忓彿锛氬綋澶╁悓妫�鏌ョ被鍨嬭繛缁�掑锛屾瘡 9 涓鐣� 1 涓�
- return nextCheckInSeqNo(checkType, urgent);
+ return nextCheckInSeqNo(checkType, urgent || vip);
case TIMESLOT:
default:
- // 鈶� 鏃舵鍙凤細淇濇寔鏀归�犲墠鐨勮涓猴紙鍚椂娈靛閲忔帶鍒讹級
+ // 鈶� 鏃舵鍙凤細VIP/鍔犲彿璧般�屾湰娈甸鐣欏彿 鈫� 鎬婚鐣欐睜銆嶏紱鏅�氳蛋銆屾櫘閫� 鈫� 棰勭暀 鈫� 鎬绘睜銆�
+ if (vip) {
+ return distributeVipSeqNo(checkType, timeslot);
+ }
return distributeSeqNo(checkType, timeslot);
}
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java
index b42fa27..f214eed 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java
@@ -6,6 +6,8 @@
import cn.lihu.jh.module.ecg.controller.admin.room.vo.MonitorInfoVO;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomSaveReqVO;
+import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomSeatRespVO;
+import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomSelectBedRespVO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomProfile;
@@ -50,6 +52,137 @@
RoomProfile getRoomByIP(String ip, Long roomId);
/**
+ * 銆岄�夋嫨宸ヤ綅妯″紡銆�- 鎸夋湰鏈篒P鍖归厤宸ヤ綅锛氳繑鍥炶IP涓嬬殑鍊欓�夊伐浣嶏紙鏈汉宸插崰鐢� 鈫� 绌洪棽 鈫� 琚粬浜哄崰鐢級銆�
+ * <p>浠呮煡璇€�佷笉鏀瑰彉浠讳綍鐘舵�侊紱鑷姩鍏ュ骇鐢卞墠绔嬁鍒扮粨鏋滃悗娌跨敤鍘熸湁鐨� bedDoctorOn 娴佺▼瀹屾垚銆�</p>
+ *
+ * @param ip 鏉ヨIP
+ * @param docId 褰撳墠鐧诲綍浜篒D锛堝彲鑳戒负绌猴級
+ */
+ List<RoomSelectBedRespVO.RoomSelectBedItem> matchBedsByIp(String ip, Long docId);
+
+ /**
+ * 銆岄�夋嫨宸ヤ綅妯″紡銆�- 鎶婃湰鏈篒P鍐欏埌鎸囧畾宸ヤ綅锛堝彧鏀� clinic_room.ip 涓�涓瓧娈碉級銆�
+ *
+ * @param id 宸ヤ綅涓婚敭
+ * @param ip 鏉ヨIP
+ * @return 鍙楀奖鍝嶈鏁�
+ */
+ Integer bindIpToBed(Integer id, String ip);
+
+ /**
+ * 璇P鏄惁宸茬粡缁戝湪鍒殑宸ヤ綅涓婏紙鍐茬獊妫�娴嬶紝渚涘墠绔脊纭鍚庡啀瑕嗙洊锛夈��
+ *
+ * @param ip 寰呯粦瀹欼P
+ * @param excludeId 鎺掗櫎鐨勫伐浣嶄富閿紝鍙负绌�
+ */
+ List<RoomDO> listIpBindings(String ip, Integer excludeId);
+
+ /**
+ * 銆岄�夋嫨宸ヤ綅妯″紡銆�- 涓�閿嚜鍔ㄥ叆搴э細鎸夋潵璁� IP 鍖归厤宸ヤ綅骞�**鐩存帴钀藉骇**锛堟ā寮� 1/3 鐢級銆�
+ *
+ * <p>涓轰粈涔堣鏈夎繖涓帴鍙o細鍓嶇鍘熸潵鎶娿�寋@code get-ip-bed} 鍖归厤 鈫� {@code bind-ip} 鍐� IP 鈫�
+ * {@code bed-doctor-on} 鍏ュ骇銆嶆媶鎴愪笁涓姹傝嚜宸辨嫾锛屼换涓�姝ュけ璐ラ兘鍙兘鍥炶惤鍒�"鎵嬮�夊伐浣�"锛�
+ * 鐜板満琛ㄧ幇灏辨槸"鐧诲綍鍚庢病鏈夎嚜鍔ㄥ叆搴�"涓旂湅涓嶅嚭鍘熷洜銆傝繖閲屾敹鏁涙垚涓�娆¤皟鐢紝骞惰繑鍥�**璇嗗埆鍒扮殑 IP**
+ * 涓�**鏈叆搴у師鍥�**锛坕p_invalid / nomatch / multi / occupied / error锛夈��
+ *
+ * <p>绛栫暐涓庡師鏈夊墠绔�昏緫淇濇寔涓�鑷达細
+ * 鈶� 宸叉槸鎴戠殑宸ヤ綅 鈫� 骞傜瓑鎭㈠锛涒憽 **鎭板ソ涓�涓�**绌洪棽宸ヤ綅 鈫� 鍗犵敤锛涒憿 澶氫釜绌洪棽 鈫� 涓嶆搮鑷叆搴э紙multi锛夛紱
+ * 鈶� 鍏ㄨ浠栦汉鍗犵敤 鈫� 涓嶆尋鎺夛紙occupied + 鍗犵敤浜哄鍚嶏級銆�
+ *
+ * @param ip 鏉ヨ IP锛堣皟鐢ㄦ柟宸茬敤 {@code IpUtils.normalize} 瑙勮寖鍖栵級
+ * @param docId 褰撳墠鐧诲綍浜�
+ * @param docName 褰撳墠鐧诲綍浜哄鍚�
+ */
+ RoomSeatRespVO autoSeatByIp(String ip, Long docId, String docName);
+
+ /**
+ * 鏌ヨ褰撳墠鐧诲綍浜�**宸插叆搴�**鐨勫伐浣嶏紙缁欑郴缁熼《鏍忔樉绀�"褰撳墠宸ヤ綅"鐢級銆�
+ *
+ * @param docId 褰撳墠鐧诲綍浜�
+ * @return 鏈叆搴ф椂杩斿洖 {@code seated=false} 鐨勭┖缁撴灉
+ */
+ RoomSeatRespVO getMySeat(Long docId);
+
+ /**
+ * 銆愭湰闇�姹偮蜂竴浜哄宸ヤ綅銆戞煡璇㈠綋鍓嶇櫥褰曚汉**鍗犳嵁鐨勫叏閮ㄥ伐浣�**锛堣妭鍋囨棩鍊肩彮澶氬矖浣嶏級銆�
+ *
+ * <p>杩斿洖銆屽尰鐢熷湪搴� / 鍖荤敓鏆傚仠銆嶇姸鎬佺殑宸ヤ綅锛屾寜 roomId + bedNo 鍗囧簭锛�
+ * 鏈崰浠讳綍宸ヤ綅鏃惰繑鍥炵┖鍒楄〃锛堝墠绔嵁姝ゆ樉绀�"鏈叆搴�"锛夈��
+ *
+ * @param docId 褰撳墠鐧诲綍浜�
+ */
+ List<RoomSeatRespVO> getMySeats(Long docId);
+
+ /**
+ * 銆愭湰闇�姹偮锋帴鐝嚜鍔╂帴绠°�戞妸鎸囧畾宸ヤ綅浠�"鍒汉鍗犵敤"鏀逛负"褰撳墠鐧诲綍浜哄崰鐢�"銆�
+ *
+ * <p>浣跨敤鍦烘櫙锛氫笂涓�鐝尰鐢熶笅鐝湭鐐广�岀搴с�嶏紝涓嬩竴鐝尰鐢熷湪鍚屼竴鍙扮數鑴�/鍚屼竴宸ヤ綅鎺ョ彮銆�
+ * 琛屼负锛�
+ * <ol>
+ * <li>宸ヤ綅涓嶅瓨鍦� 鈫� 鎶ラ敊锛�</li>
+ * <li>宸ヤ綅绌洪棽锛屾垨鏈潵灏卞睘浜庡綋鍓嶇櫥褰曚汉 鈫� **骞傜瓑鎴愬姛**锛堜笉鎶ラ敊锛夛紱</li>
+ * <li>琚粬浜哄崰鐢� 鈫� 璁板綍瀹¤鏃ュ織锛堝伐浣嶃�佸師鍗犵敤浜恒�佹搷浣滀汉锛夆啋 寮哄埗娓呯┖鍘熷崰鐢ㄤ汉 鈫� **绔嬪嵆璁╁綋鍓嶇櫥褰曚汉鍏ュ骇**銆�</li>
+ * </ol>
+ *
+ * @param roomId 璇婂缂栧彿
+ * @param bedNo 宸ヤ綅缂栧彿
+ */
+ void takeOverBed(Long roomId, String bedNo);
+
+ /**
+ * 鏍¢獙銆屽綋鍓嶇櫥褰曚汉蹇呴』鏄宸ヤ綅鐨勪富浜恒�嶏紝鍚﹀垯鎶�
+ * {@link cn.lihu.jh.module.ecg.enums.ErrorCodeConstants#ROOM_NOT_OWNER}銆�
+ *
+ * <p>鐢ㄤ簬"涓�/鍥磋"妯″瀷鐨勫啓鎿嶄綔閴存潈锛氬洿瑙備汉鍙兘鐪嬶紝涓嶈兘鏀规暟鎹��
+ * {@code @RequireBedOwner} 鍒囬潰浼氳皟鐢ㄥ畠锛涘彧甯� rentId 涔嬬被鐨勬帴鍙i渶瑕佽嚜琛岃皟鐢ㄣ��
+ *
+ * @param roomId 璇婂缂栧彿
+ * @param bedNo 宸ヤ綅鍙�
+ */
+ void assertBedOwner(Long roomId, String bedNo);
+
+ /**
+ * 鍚屼笂锛屼絾**鎸夋偅鑰呭弽鏌ュ伐浣�**锛氱敤浜庡彧甯︽偅鑰呬俊鎭�佹病鏈� roomId/bedNo 鐨勫啓鎺ュ彛
+ * 锛堟斁寮冩鏌� / 鏀惧純棰嗙敤 / 鏀惧純瑁呮満锛夈��
+ *
+ * <p>鍙嶆煡渚濇嵁锛歿@code queue} 琛ㄥ綋鍓嶈鎮h�� + 妫�鏌ラ」鐩殑閭d竴琛屼笂鐨� room_id / bed_no銆�
+ * 鏌ヤ笉鍒板伐浣嶆椂**鎷掔粷**锛堝畞鍙嫆缁濅篃涓嶆斁琛岋級銆�
+ */
+ void assertBedOwnerByPatient(String patId, Integer checkType);
+
+ /**
+ * 鍚屼笂锛屼絾鏌ヤ笉鍒板伐浣嶆椂**璁拌鍛婃斁琛�**銆�
+ *
+ * <p>鐢ㄤ簬纭垂/鍙栨秷纭垂锛氳繖涓ゆ甯稿湪娴佺▼鏈璋冪敤锛屾偅鑰呭彲鑳藉凡缁忎笉鍦ㄥ伐浣嶉槦鍒椾笂锛�
+ * 涓�寰嬫嫆缁濅細鎶婃甯镐笟鍔℃尅鎺夛紝鏁呰繖閲屽彧璁拌鍛婏紙鍓嶇鍦ㄥ洿瑙傛ā寮忎笅宸茬鐢ㄦ寜閽級銆�
+ */
+ void assertBedOwnerByPatientSoft(String patId, Integer checkType);
+
+ /**
+ * 鏍¢獙銆岃宸ヤ綅褰撳墠鐨勪富浜哄氨鏄� ownerDocId銆嶃��
+ *
+ * <p>鐢ㄤ簬鍥磋浜烘煡鐪�**宸ヤ綅涓讳汉鐨勫凡瀹屾垚妫�鏌ヨ褰�**锛氫笉瑕佹眰璋冪敤鑰呭叆搴э紙鍥磋鏈潵灏辨槸涓嶅叆搴т篃鑳界湅锛夛紝
+ * 浣嗗繀椤荤‘璁よ繖涓� docId 纭疄鏄宸ヤ綅鐜板湪鐨勪富浜猴紝閬垮厤琚綋鎴�"浠绘剰鏌ュ埆浜鸿褰�"鐨勫叆鍙c��
+ *
+ * @param roomId 璇婂缂栧彿
+ * @param bedNo 宸ヤ綅鍙�
+ * @param ownerDocId 鏈熸湜鐨勫伐浣嶄富浜�
+ */
+ void assertBedOwnerIs(Long roomId, String bedNo, Long ownerDocId);
+
+ /**
+ * 宸ヤ綅鐘舵�佽瘖鏂紙鎺掓煡"鍏ュ骇鎶ョ姸鎬佸紓甯�/鎵句笉鍒板伐浣�"锛夈��
+ *
+ * <p>鎶婂簱閲岀殑**鍘熷琛�**鎽婂紑锛歚id / room_id / bed_no(鍚暱搴︿笌 HEX锛岀敤浜庡彂鐜扮粨灏剧┖鏍�/鍏ㄨ) /
+ * status / doc_id / doc_name / deleted / update_time`锛屽苟缁欏嚭涓�鍙ョ粨璁恒��
+ *
+ * @param id 宸ヤ綅涓婚敭锛堜紭鍏堬紝鍚凡鍒犻櫎琛岋級
+ * @param roomId 璇婂缂栧彿锛坕d 涓虹┖鏃剁敤锛�
+ * @param bedNo 宸ヤ綅鍙凤紙id 涓虹┖鏃剁敤锛屾寜 TRIM 瀹芥澗鍖归厤锛�
+ */
+ Map<String, Object> diagnoseBed(Integer id, Long roomId, String bedNo);
+
+ /**
* 鑾峰緱璇婂鍜岃瘖鐤楀簥鍒嗛〉
*
* @param pageReqVO 鍒嗛〉鏌ヨ
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java
index 532d6de..01e9c09 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java
@@ -3,9 +3,14 @@
import java.util.*;
import javax.annotation.Resource;
+import cn.lihu.jh.framework.common.exception.ErrorCode;
+import cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants;
import cn.lihu.jh.framework.common.pojo.PageResult;
+import cn.lihu.jh.module.ecg.utils.IpUtils;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.MonitorInfoVO;
+import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomSeatRespVO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
+import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomProfile;
import cn.lihu.jh.module.ecg.enums.RoomCallingScreenEnum;
import cn.lihu.jh.module.ecg.service.queue.QueueService;
@@ -15,12 +20,16 @@
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomSaveReqVO;
+import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomSelectBedRespVO;
import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
import cn.lihu.jh.module.ecg.enums.BedStatusEnum;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
+import lombok.extern.slf4j.Slf4j;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.ROOM_INVALID_STATUS;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.ROOM_NOT_EXISTS;
+import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.ROOM_NOT_OWNER;
/**
* 璇婂鍜岃瘖鐤楀簥 Service 瀹炵幇绫�
@@ -29,6 +38,7 @@
*/
@Service
@Validated
+@Slf4j
public class RoomServiceImpl implements RoomService {
@Resource
@@ -39,6 +49,10 @@
@Resource
QueueService queueService;
+
+ /** 銆愪富/鍥磋銆戞寜鎮h�呭弽鏌ュ伐浣嶅仛涓讳汉鏍¢獙鏃堕渶瑕佽 queue 琛� */
+ @Resource
+ private cn.lihu.jh.module.ecg.dal.mysql.queue.QueueMapper queueMapper;
@Override
public Integer createRoom(RoomSaveReqVO createReqVO) {
@@ -141,6 +155,395 @@
return roomMapper.selectPage(pageReqVO);
}
+ /**
+ * 銆岄�夋嫨宸ヤ綅妯″紡銆�- 鎸夋湰鏈篒P鍖归厤宸ヤ綅銆�
+ * <p>鎺掑簭锛堝喅瀹氳嚜鍔ㄥ叆搴ч�夊摢涓�涓級锛氣憼 鏈汉宸插崰鐢紙鍒锋柊/閲嶈繘鐩存帴鎭㈠锛夆啋 鈶� 绌洪棽涓斿伐浣嶅彿鏈�灏�
+ * 鈫� 鈶� 琚粬浜哄崰鐢紙鍓嶇浼氭彁绀�"璇P瀵瑰簲宸ヤ綅宸茶XX鍗犵敤"锛岃浜哄伐澶勭悊锛夈��</p>
+ */
+ @Override
+ public List<RoomSelectBedRespVO.RoomSelectBedItem> matchBedsByIp(String ip, Long docId) {
+ String normalized = IpUtils.normalize(ip);
+ if (!IpUtils.isBindableIp(normalized)) {
+ return Collections.emptyList();
+ }
+ List<RoomDO> list = roomMapper.queueByIp(normalized);
+ if (list == null || list.isEmpty()) {
+ return Collections.emptyList();
+ }
+ List<RoomSelectBedRespVO.RoomSelectBedItem> items = new ArrayList<>(list.size());
+ for (RoomDO roomDO : list) {
+ RoomSelectBedRespVO.RoomSelectBedItem item = new RoomSelectBedRespVO.RoomSelectBedItem();
+ item.setId(roomDO.getId());
+ item.setRoomId(roomDO.getRoomId());
+ item.setRoomName(roomDO.getRoomName());
+ item.setBedNo(roomDO.getBedNo());
+ item.setIp(roomDO.getIp());
+ item.setDocId(roomDO.getDocId());
+ item.setDocName(roomDO.getDocName());
+ item.setOpType(roomDO.getOpType());
+ item.setCheckTypes(roomDO.getCheckTypes());
+ item.setStatus(roomDO.getStatus());
+ item.setOccupied(roomDO.getDocId() != null);
+ item.setMine(docId != null && docId.equals(roomDO.getDocId()));
+ items.add(item);
+ }
+ // 鎺掑簭锛氭湰浜哄凡鍗犵敤(0) 鈫� 绌洪棽(1) 鈫� 琚粬浜哄崰鐢�(2)锛涘悓妗f寜宸ヤ綅鍙�
+ items.sort(Comparator
+ .comparingInt((RoomSelectBedRespVO.RoomSelectBedItem i) -> {
+ if (Boolean.TRUE.equals(i.getMine())) return 0;
+ if (!Boolean.TRUE.equals(i.getOccupied())) return 1;
+ return 2;
+ })
+ .thenComparing(RoomSelectBedRespVO.RoomSelectBedItem::getBedNo,
+ Comparator.nullsLast(Comparator.naturalOrder())));
+ return items;
+ }
+
+ @Override
+ public Integer bindIpToBed(Integer id, String ip) {
+ // 鍥炵幆/鏈寚瀹�/闈炴硶鍦板潃缁戜笂鍘绘病鏈夋剰涔夛紙127.x銆�::1銆�0.0.0.0锛夛紝杩樹細璁╁悗缁尮閰嶅け鏁�
+ if (!IpUtils.isBindableIp(ip)) {
+ return 0;
+ }
+ Integer rows = roomMapper.updateIpById(id, IpUtils.normalize(ip));
+ log.info("[bindIpToBed][鎶婃湰鏈篒P缁戝畾鍒板伐浣峕 id={} ip={} 褰卞搷琛屾暟={}", id, ip, rows);
+ return rows;
+ }
+
+ @Override
+ public List<RoomDO> listIpBindings(String ip, Integer excludeId) {
+ if (!IpUtils.isBindableIp(ip)) {
+ return Collections.emptyList();
+ }
+ List<RoomDO> list = roomMapper.listByIpExcludeId(IpUtils.normalize(ip), excludeId);
+ return list == null ? Collections.emptyList() : list;
+ }
+
+ @Override
+ public RoomSeatRespVO autoSeatByIp(String ip, Long docId, String docName) {
+ RoomSeatRespVO resp = new RoomSeatRespVO();
+ String clientIp = IpUtils.normalize(ip);
+ resp.setClientIp(clientIp);
+
+ // 鈶� 鏈満IP涓嶅彲鐢紙鍥炵幆 / IPv6 / 鏈寚瀹� / 闈炴硶 / **鏈嶅姟鍣ㄨ嚜韬湴鍧�**锛夆啋 涓嶈兘浣滀负宸ヤ綅鏍囪瘑
+ if (!IpUtils.isBindableIp(clientIp)) {
+ // 鍖哄垎"璇嗗埆鍒扮殑鏄湇鍔″櫒鑷韩鍦板潃"涓庡叾瀹冧笉鍙敤鎯呭喌锛氬墠鑰呯幇鍦烘渶甯歌锛堝湪鏈嶅姟鍣ㄤ笂/杩滅▼妗岄潰閲岃闂級锛�
+ // 鎻愮ず璇鑳界洿鎺ユ寚鍚戣В鍐冲姙娉曪紝鑰屼笉鏄鎺掓煡鐨勪汉浠ヤ负鏄唬鐮佸潖浜嗐��
+ resp.setReason(IpUtils.isLocalAddress(clientIp) ? "ip_is_server" : "ip_invalid");
+ log.info("[autoSeatByIp] 鏈満IP涓嶅彲鐢紝涓嶈嚜鍔ㄥ叆搴�. clientIp={} docId={} 鏄湇鍔″櫒鑷韩鍦板潃={}",
+ clientIp, docId, IpUtils.isLocalAddress(clientIp));
+ return resp;
+ }
+
+ // 宸叉寜銆屾湰浜哄凡鍗犵敤 鈫� 绌洪棽 鈫� 琚粬浜哄崰鐢ㄣ�嶆帓搴�
+ List<RoomSelectBedRespVO.RoomSelectBedItem> beds = matchBedsByIp(clientIp, docId);
+ if (beds.isEmpty()) {
+ // 璇� IP 娌℃湁瀵瑰簲浠讳綍宸ヤ綅锛氬伐浣嶆病褰� IP锛堢幇鍦哄涓� 0.0.0.0锛夛紝鎴栧伐浣嶅凡鍏抽棴
+ resp.setReason("nomatch");
+ log.info("[autoSeatByIp] 璇P娌℃湁鍖归厤鍒板伐浣嶏紙宸ヤ綅鏈綍IP / 宸插叧闂級. clientIp={} docId={}", clientIp, docId);
+ return resp;
+ }
+
+ // 鈶� 宸茬粡鏄垜鐨勫伐浣� 鈫� 骞傜瓑鎭㈠锛堝埛鏂�/閲嶈繘/涓婃娌℃甯哥搴ч兘璧拌繖鏉★級
+ RoomSelectBedRespVO.RoomSelectBedItem mine = beds.stream()
+ .filter(b -> Boolean.TRUE.equals(b.getMine())).findFirst().orElse(null);
+ if (null != mine) {
+ return doSeat(mine.getId(), mine.getRoomId(), mine.getBedNo(), docId, docName, resp, "mine");
+ }
+
+ // 鈶� 绌洪棽宸ヤ綅锛�**鎭板ソ涓�涓�**鎵嶈嚜鍔ㄥ叆搴�
+ List<RoomSelectBedRespVO.RoomSelectBedItem> free = beds.stream()
+ .filter(b -> !Boolean.TRUE.equals(b.getOccupied())).toList();
+ if (free.size() == 1) {
+ return doSeat(free.get(0).getId(), free.get(0).getRoomId(), free.get(0).getBedNo(),
+ docId, docName, resp, "free");
+ }
+ if (free.size() > 1) {
+ // 杩欏彴鏈哄櫒瀵瑰簲澶氫釜绌洪棽宸ヤ綅 鈫� 鍧愰敊鐨勯闄╁ぇ浜庝究鍒╋紝浜や汉宸ョ偣閫�
+ resp.setReason("multi");
+ log.info("[autoSeatByIp] 璇P瀵瑰簲 {} 涓┖闂插伐浣嶏紝鏃犳硶纭畾鏄摢涓�涓紝浜や汉宸ラ�夋嫨. clientIp={}", free.size(), clientIp);
+ return resp;
+ }
+
+ // 鈶� 鍏ㄨ浠栦汉鍗犵敤 鈫� **涓嶈嚜鍔ㄦ尋鎺�**锛屼絾鎶婂�欓�夊伐浣嶄笌鍗犵敤浜哄甫鍥炲幓锛�
+ // 渚涘墠绔脊銆岃宸ヤ綅鐢� xxx 鍗犵敤锛屾槸鍚︽帴绠★紵銆嶏紙鏈渶姹傦細鎺ョ彮鍖荤敓鑷姪鎺ョ锛夈��
+ RoomSelectBedRespVO.RoomSelectBedItem occupied = beds.get(0);
+ resp.setReason("occupied");
+ resp.setOwnerName(occupied.getDocName());
+ // 銆愭湰闇�姹傘�戣ˉ榻愬�欓�夊伐浣嶄俊鎭細鍓嶇鍑繖浜涘瓧娈佃皟 /clinic/room/take-over-bed
+ resp.setId(occupied.getId());
+ resp.setRoomId(occupied.getRoomId());
+ resp.setRoomName(occupied.getRoomName());
+ resp.setBedNo(occupied.getBedNo());
+ resp.setIp(occupied.getIp());
+ resp.setDocId(occupied.getDocId());
+ resp.setDocName(occupied.getDocName());
+ resp.setCheckTypes(occupied.getCheckTypes());
+ resp.setOpType(occupied.getOpType());
+ log.info("[autoSeatByIp] 璇P瀵瑰簲鐨勫伐浣嶅凡琚粬浜哄崰鐢紝绛夊緟鍓嶇纭鏄惁鎺ョ. clientIp={} 宸ヤ綅={}/{} 鍗犵敤浜�={}({})",
+ clientIp, occupied.getRoomId(), occupied.getBedNo(), occupied.getDocName(), occupied.getDocId());
+ return resp;
+ }
+
+ /** 鎵ц鍏ュ骇骞跺洖濉粨鏋滐紙鍐呴儴鏂规硶锛屼緵 autoSeatByIp 鍚勫垎鏀鐢級 */
+ private RoomSeatRespVO doSeat(Integer bedId, Long roomId, String bedNo, Long docId, String docName,
+ RoomSeatRespVO resp, String branch) {
+ // 浼� bedId锛氬叆搴т紭鍏堟寜涓婚敭瀹氫綅锛岄伩鍏� bed_no 涓庡簱鍐呭�兼湁鑲夌溂闅捐鲸宸紓鏃舵洿鏂� 0 琛�
+ ErrorCode ec = queueService.startBedDoctorOn(roomId, bedNo, docId, docName, bedId);
+ if (!GlobalErrorCodeConstants.SUCCESS.equals(ec)) {
+ resp.setReason("error");
+ log.warn("[autoSeatByIp] 鍏ュ骇鏈敓鏁堬紙{}锛�. roomId={} bedNo={} docId={}", branch, roomId, bedNo, docId);
+ return resp;
+ }
+ fillSeatInfo(resp, roomMapper.getRoom(roomId, bedNo));
+ resp.setSeated(true);
+ log.info("[autoSeatByIp] 鑷姩鍏ュ骇鎴愬姛锛坽}锛�. docId={} roomId={} bedNo={}", branch, docId, roomId, bedNo);
+ return resp;
+ }
+
+ @Override
+ public RoomSeatRespVO getMySeat(Long docId) {
+ RoomSeatRespVO resp = new RoomSeatRespVO();
+ if (null == docId) {
+ return resp;
+ }
+ List<RoomDO> beds = roomMapper.getRoomByDocId(docId);
+ if (null == beds || beds.isEmpty()) {
+ return resp;
+ }
+ if (beds.size() > 1) {
+ // 銆愭湰闇�姹偮蜂竴浜哄宸ヤ綅銆戝�肩彮鍖荤敓鍙悓鏃跺崰澶氫釜宸ヤ綅锛岃繖閲屼笉鍐嶆槸寮傚父鍦烘櫙锛�
+ // 鏈帴鍙e彧涓哄吋瀹规棫鍓嶇/鍏跺畠璋冪敤锛堣繑鍥炵涓�涓級锛屽畬鏁村垪琛ㄧ敤 getMySeats()銆�
+ log.info("[getMySeat] 璇ュ尰鐢熷崰鐢ㄤ簡 {} 涓伐浣嶏紝鏈帴鍙h繑鍥炵涓�涓紙瀹屾暣鍒楄〃瑙� /my-seats锛�. docId={}",
+ beds.size(), docId);
+ }
+ fillSeatInfo(resp, beds.get(0));
+ resp.setSeated(true);
+ return resp;
+ }
+
+ @Override
+ public List<RoomSeatRespVO> getMySeats(Long docId) {
+ List<RoomSeatRespVO> result = new ArrayList<>();
+ if (null == docId) {
+ return result;
+ }
+ // 鍙彇銆屽尰鐢熷湪搴� / 鍖荤敓鏆傚仠銆嶄笖鏈垹闄ょ殑宸ヤ綅锛堟帓闄ゅ巻鍙叉畫鐣欙級
+ List<Integer> statusList = new ArrayList<>();
+ statusList.add(BedStatusEnum.DOCTOR_ON.getStatus());
+ statusList.add(BedStatusEnum.DOCTOR_PAUSE.getStatus());
+ List<RoomDO> beds = roomMapper.getMyActiveBeds(docId, statusList);
+ if (null == beds || beds.isEmpty()) {
+ return result;
+ }
+ for (RoomDO bed : beds) {
+ RoomSeatRespVO resp = new RoomSeatRespVO();
+ fillSeatInfo(resp, bed);
+ resp.setSeated(true);
+ result.add(resp);
+ }
+ return result;
+ }
+
+ /**
+ * 銆愭湰闇�姹偮锋帴鐝嚜鍔╂帴绠°�戞妸宸ヤ綅浠�"鍒汉鍗犵敤"鏀逛负"褰撳墠鐧诲綍浜哄崰鐢�"銆�
+ *
+ * <p>杩欐槸"鐧诲嚭涓嶉噴鏀惧伐浣�"鍦烘櫙涓嬶紝鎺ョ彮鍖荤敓绔嬪嵆鐢ㄤ笂宸ヤ綅鐨勫敮涓�鍏ュ彛锛堜笉闇�瑕佺鐞嗗憳锛夈��
+ * 鍘熷崰鐢ㄤ汉閭e彴鐢佃剳浼氬湪涓嬩竴娆� 5s 杞鏀跺埌銆岃閲嶆柊灏卞潗銆嶅苟杞彧璇伙紙鐜版湁閫昏緫锛夈��
+ *
+ * <p>銆屽己鍒舵竻绌� 鈫� 鎴戝叆搴с�嶅湪鍚屼竴浜嬪姟鍐呭畬鎴愶紝閬垮厤涓棿鎬佽绗笁鏂规姠鍒般��
+ */
+ @Override
+ @org.springframework.transaction.annotation.Transactional(rollbackFor = Exception.class)
+ public void takeOverBed(Long roomId, String bedNo) {
+ Long userId = cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname();
+ if (null == userId) {
+ throw exception(ROOM_NOT_OWNER);
+ }
+ if (null == roomId || null == bedNo || bedNo.isEmpty()) {
+ throw exception(ROOM_NOT_EXISTS);
+ }
+ RoomDO bed = roomMapper.getRoom(roomId, bedNo);
+ if (null == bed) {
+ throw exception(ROOM_NOT_EXISTS);
+ }
+
+ // 鈶� 鏈潵灏卞睘浜庢垜 鈫� 骞傜瓑鎴愬姛
+ if (null != bed.getDocId() && bed.getDocId().equals(userId)) {
+ log.info("[takeOverBed] 宸ヤ綅鏈氨灞炰簬褰撳墠鐧诲綍浜猴紝鏃犻渶鎺ョ. 宸ヤ綅={}/{} docId={}", roomId, bedNo, userId);
+ return;
+ }
+
+ // 鈶� 绌洪棽 鈫� 鐩存帴鍏ュ骇锛�"鎺ョ"绛変环浜�"鍧愪笂鍘�"锛岀渷鎺夊墠绔啀鐐逛竴娆″叆搴э級
+ if (null == bed.getDocId()) {
+ ErrorCode onRet = queueService.startBedDoctorOn(roomId, bedNo, userId, userNickname, bed.getId());
+ if (!GlobalErrorCodeConstants.SUCCESS.equals(onRet)) {
+ log.warn("[takeOverBed] 绌洪棽宸ヤ綅鍏ュ骇澶辫触. 宸ヤ綅={}/{} ret={}", roomId, bedNo, onRet);
+ throw exception(ROOM_INVALID_STATUS);
+ }
+ return;
+ }
+
+ // 鈶� 琚粬浜哄崰鐢� 鈫� 瀹¤鏃ュ織 + 寮哄埗娓呯┖ + 绔嬪嵆鍏ュ骇
+ log.warn("[takeOverBed][鎺ョ彮鎺ョ] 宸ヤ綅={}/{} 鍘熷崰鐢ㄤ汉={}({}) 鈫� 鎺ョ浜�={}({})",
+ roomId, bedNo, bed.getDocName(), bed.getDocId(), userNickname, userId);
+ ErrorCode offRet = queueService.startBedDoctorOffByAdmin(roomId, bedNo);
+ if (!GlobalErrorCodeConstants.SUCCESS.equals(offRet)) {
+ log.warn("[takeOverBed] 鎺ョ鏃舵竻绌哄師鍗犵敤浜哄け璐�. 宸ヤ綅={}/{} ret={}", roomId, bedNo, offRet);
+ throw exception(ROOM_INVALID_STATUS);
+ }
+ ErrorCode onRet = queueService.startBedDoctorOn(roomId, bedNo, userId, userNickname, bed.getId());
+ if (!GlobalErrorCodeConstants.SUCCESS.equals(onRet)) {
+ log.warn("[takeOverBed] 鎺ョ鍚庡叆搴уけ璐�. 宸ヤ綅={}/{} ret={}", roomId, bedNo, onRet);
+ throw exception(ROOM_INVALID_STATUS);
+ }
+ log.info("[takeOverBed][鎺ョ彮鎺ョ] 瀹屾垚. 宸ヤ綅={}/{} 鏂板崰鐢ㄤ汉={}({})", roomId, bedNo, userNickname, userId);
+ }
+
+ @Override
+ public void assertBedOwner(Long roomId, String bedNo) {
+ Long userId = cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId();
+ RoomDO bed = (null == roomId || null == bedNo || bedNo.isEmpty())
+ ? null : roomMapper.getRoom(roomId, bedNo);
+ if (null == bed) {
+ log.warn("[assertBedOwner] 宸ヤ綅涓嶅瓨鍦紝鎷掔粷鍐欐搷浣�. roomId={} bedNo={} docId={}", roomId, bedNo, userId);
+ throw exception(ROOM_NOT_OWNER);
+ }
+ if (null == bed.getDocId() || !bed.getDocId().equals(userId)) {
+ log.warn("[assertBedOwner] 闈炲伐浣嶄富浜猴紝鎷掔粷鍐欐搷浣滐紙鍥磋妯″紡锛�. roomId={} bedNo={} 鎴�={} 涓讳汉={}({})",
+ roomId, bedNo, userId, bed.getDocName(), bed.getDocId());
+ throw exception(ROOM_NOT_OWNER);
+ }
+ }
+
+ @Override
+ public void assertBedOwnerByPatient(String patId, Integer checkType) {
+ QueueDO queue = resolvePatientBedQueue(patId, checkType);
+ if (null == queue) {
+ log.warn("[assertBedOwnerByPatient] 鎵句笉鍒拌鎮h�呭綋鍓嶆墍鍦ㄥ伐浣嶏紝鎷掔粷鍐欐搷浣�. patId={} checkType={}",
+ patId, checkType);
+ throw exception(ROOM_NOT_OWNER);
+ }
+ assertBedOwner(queue.getRoomId(), queue.getBedNo());
+ }
+
+ @Override
+ public void assertBedOwnerByPatientSoft(String patId, Integer checkType) {
+ QueueDO queue = resolvePatientBedQueue(patId, checkType);
+ if (null == queue) {
+ // 纭垂/鍙栨秷纭垂甯稿湪娴佺▼鏈璋冪敤锛屾偅鑰呭彲鑳藉凡涓嶅湪宸ヤ綅闃熷垪涓婏紱
+ // 涓�寰嬫嫆缁濅細璇激姝e父涓氬姟锛岃繖閲屽彧璁拌鍛婃斁琛岋紙鍓嶇鍥磋妯″紡涓嬫寜閽凡绂佺敤锛夈��
+ log.warn("[assertBedOwnerByPatientSoft] 鎵句笉鍒拌鎮h�呭綋鍓嶆墍鍦ㄥ伐浣嶏紝鏀捐锛堜粎璁拌鍛婏級. patId={} checkType={}",
+ patId, checkType);
+ return;
+ }
+ assertBedOwner(queue.getRoomId(), queue.getBedNo());
+ }
+
+ @Override
+ public void assertBedOwnerIs(Long roomId, String bedNo, Long ownerDocId) {
+ RoomDO bed = (null == roomId || null == bedNo || bedNo.isEmpty())
+ ? null : roomMapper.getRoom(roomId, bedNo);
+ if (null == bed || null == bed.getDocId() || !bed.getDocId().equals(ownerDocId)) {
+ log.warn("[assertBedOwnerIs] 宸ヤ綅褰撳墠涓讳汉涓庤姹傜殑 ownerDocId 涓嶄竴鑷达紝鎷掔粷. roomId={} bedNo={} 璇锋眰={} 瀹為檯={}",
+ roomId, bedNo, ownerDocId, null == bed ? null : bed.getDocId());
+ throw exception(ROOM_NOT_OWNER);
+ }
+ }
+
+ /** 鎸夈�屾偅鑰� + 妫�鏌ラ」鐩�嶆壘褰撳墠鎵�鍦ㄥ伐浣嶇殑閭f潯闃熷垪琛岋紱鎵句笉鍒板伐浣嶈繑鍥� null */
+ private QueueDO resolvePatientBedQueue(String patId, Integer checkType) {
+ if (null == patId) {
+ return null;
+ }
+ QueueDO queue = queueMapper.getQueueByPatId(patId, checkType);
+ if (null == queue || null == queue.getRoomId() || null == queue.getBedNo()
+ || queue.getBedNo().trim().isEmpty()) {
+ return null;
+ }
+ return queue;
+ }
+
+ @Override
+ public Map<String, Object> diagnoseBed(Integer id, Long roomId, String bedNo) {
+ Map<String, Object> data = new LinkedHashMap<>();
+ String condition = String.format("id=%s, roomId=%s, bedNo=[%s](len=%s)",
+ id, roomId, bedNo, null == bedNo ? null : bedNo.length());
+ data.put("鏌ヨ鏉′欢", condition);
+
+ List<Map<String, Object>> rows = roomMapper.selectBedRawState(id, roomId, bedNo);
+ data.put("鍖归厤鍒扮殑琛屾暟", rows.size());
+ data.put("琛屾槑缁�", rows);
+
+ String verdict;
+ if (rows.isEmpty()) {
+ verdict = "搴撻噷銆愭煡涓嶅埌銆戣繖涓伐浣嶏紙鎸� id 涓� room_id+TRIM(bed_no) 閮芥病鍖归厤鍒帮級鈫� "
+ + "鎸� roomId+bedNo 鍏ュ骇蹇呯劧鏇存柊 0 琛屻�佹姤鈥滆瘖瀹ゅ拰璇婄枟搴婄姸鎬佸紓甯糕�濄��"
+ + "鏂扮増宸叉敮鎸佹寜 id 鍏ュ骇锛涜嫢浠嶅け璐ワ紝璇锋妸鏈粨鏋滃彂鍥炪��";
+ } else {
+ Map<String, Object> row = rows.get(0);
+ Integer rowStatus = toInt(row.get("status"));
+ Integer rowDeleted = toInt(row.get("deleted"));
+ Integer bedNoLen = toInt(row.get("bed_no_len"));
+ Object rowDocId = row.get("doc_id");
+ if (null != rowDeleted && 0 != rowDeleted) {
+ verdict = "璇ュ伐浣嶅湪搴撻噷鏄�愬凡鍒犻櫎銆�(deleted=1) 鈫� 鍏ュ骇涓嶄細鍛戒腑锛岃鎭㈠鏁版嵁鎴栭噸寤哄伐浣嶃��";
+ } else if (null != bedNoLen && null != bedNo && bedNoLen != bedNo.length()) {
+ verdict = String.format("搴撻噷 bed_no 鐨勯暱搴�(%d)涓庤姹傚��(%d)涓嶄竴鑷� 鈫� 璇锋眰閲岀殑宸ヤ綅缂栧彿涓庡簱鍐呬笉鍚�"
+ + "锛堝父瑙佹槸缁撳熬绌烘牸/鍏ㄨ锛夛紝HEX=%s銆傛柊鐗堝凡鏀逛负鎸� id 鍏ュ骇锛屽彲缁曞紑璇ラ棶棰樸��",
+ bedNoLen, bedNo.length(), row.get("bed_no_hex"));
+ } else if (null == rowStatus || (10 != rowStatus && 20 != rowStatus && 30 != rowStatus)) {
+ verdict = "璇ュ伐浣嶇姸鎬�=" + rowStatus + "锛�0=宸插叧闂級锛涗笉鍦ㄥ彲鍏ュ骇鐘舵�侊紙鍙叆搴х殑涓� 10/20/30锛夛紝"
+ + "璇峰厛鍦ㄥ紑璇婅缃�/鐩戞帶椤垫妸瀹冨紑閫氥��";
+ } else if (null != rowDocId) {
+ verdict = "璇ュ伐浣嶅綋鍓嶇殑涓讳汉鏄��" + row.get("doc_name") + "銆�(doc_id=" + rowDocId + ")锛�"
+ + "鑻ヨ繖灏辨槸浣犳湰浜猴紝璇存槑涓婃娌℃甯哥搴� 鈥斺�� 鏂扮増宸叉敮鎸佸箓绛夋仮澶嶅叆搴э紱"
+ + "鑻ユ槸鍒汉锛屽垯涓嶈兘鍏ュ骇锛堜笉鎸ゆ帀姝e湪鎿嶄綔鐨勪汉锛夈��";
+ } else {
+ verdict = "璇ュ伐浣嶅綋鍓嶃�愬彲鍏ュ骇銆戙�傝嫢涔嬪墠浠嶆姤鈥滅姸鎬佸紓甯糕�濓紝璇锋妸鏈粨鏋滆繛鍚岄偅娆¤姹傚弬鏁颁竴璧峰彂鍥炪��";
+ }
+ }
+ data.put("璇婃柇缁撹", verdict);
+ log.info("[diagnoseBed][宸ヤ綅鐘舵�佽瘖鏂璢 {} 鈫� {}", condition, verdict);
+ return data;
+ }
+
+ /** 鍏煎 bit(1)/Boolean/Number 鐨勫彇鍊硷紙璇婃柇鎺ュ彛鐢級 */
+ private Integer toInt(Object v) {
+ if (null == v) {
+ return null;
+ }
+ if (v instanceof Boolean) {
+ return ((Boolean) v) ? 1 : 0;
+ }
+ if (v instanceof Number) {
+ return ((Number) v).intValue();
+ }
+ try {
+ return Integer.valueOf(String.valueOf(v).trim());
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ /** 鎶婂伐浣嶅瓧娈垫嫹杩涘搷搴斾綋 */
+ private void fillSeatInfo(RoomSeatRespVO resp, RoomDO bed) {
+ if (null == bed) {
+ return;
+ }
+ resp.setId(bed.getId());
+ resp.setRoomId(bed.getRoomId());
+ resp.setRoomName(bed.getRoomName());
+ resp.setBedNo(bed.getBedNo());
+ resp.setIp(bed.getIp());
+ resp.setStatus(bed.getStatus());
+ resp.setDocId(bed.getDocId());
+ resp.setDocName(bed.getDocName());
+ resp.setCheckTypes(bed.getCheckTypes());
+ resp.setOpType(bed.getOpType());
+ }
+
@Override
public List<RoomDO> simpleRoomList() {
List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>();
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/utils/IpUtils.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/utils/IpUtils.java
new file mode 100644
index 0000000..413d215
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/utils/IpUtils.java
@@ -0,0 +1,258 @@
+package cn.lihu.jh.module.ecg.utils;
+
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+/**
+ * 璁块棶鏂� IP 鐨勮鑼冨寲涓庢牎楠岋紙渚涖�岄�夋嫨宸ヤ綅妯″紡銆嶄娇鐢級銆�
+ *
+ * <h3>鍦板潃鏃忕瓥鐣ワ細鍙噰鐢� IPv4</h3>
+ * 鏈郴缁熺幇鍦哄伐浣嶇粦瀹氱粺涓�浣跨敤 IPv4锛坄clinic_room.ip` 閲屽瓨鐨勫氨鏄� `32.88.65.x` 杩欑被鍦板潃锛夈��
+ * 鍥犳锛�
+ * <ul>
+ * <li>{@link #isBindableIp(String)} **鍙帴鍙� IPv4**锛汭Pv6锛堝惈鍥炵幆 {@code ::1}锛変竴寰嬩笉鍙備笌鍖归厤涓庣粦瀹氾紝
+ * 鍙敤浜庤瘖鏂彁绀猴紱</li>
+ * <li>涓哄吋瀹�"娴忚鍣� 鈫� 鏈嶅姟鍣ㄥ悓鏈鸿闂�"涓�"瀹瑰櫒/缃戝叧鎶� IPv4 琛ㄧず鎴� IPv4-mapped IPv6"杩欎袱绉嶆儏鍐碉紝
+ * 瑙勮寖鍖栨椂浼氬仛涓や欢浜嬶細鎶� {@code ::ffff:32.88.65.208} **杩樺師鎴� {@code 32.88.65.208}**锛堣繕鍘熷悗鍙敤锛夛紝
+ * 鎶� {@code ::1} / {@code 0:0:0:0:0:0:0:1} 璇嗗埆涓�<b>鍥炵幆</b>锛堜笉鍙敤锛屼絾鎻愮ず璇璇存竻"鏈満璁块棶"锛夛紱
+ * <li>鍘绘帀 IPv6 鐨勬柟鎷彿涓庡尯鍩熷彿锛坽@code %eth0}锛夈�佺粺涓�灏忓啓銆佷唬鐞嗚浆鍙戦摼鍙栫涓�涓��</li>
+ * </ul>
+ *
+ * <h3>銆屾湇鍔″櫒鑷韩鍦板潃銆嶄笉浣滀负宸ヤ綅鏍囪瘑锛堟湰娆℃柊澧烇級</h3>
+ * 鐜板満鍙嶉杩�"鎶婄櫥褰曠郴缁熺殑缃戝潃涓婄殑 IP 褰撴垚浜嗘湰鏈� IP"銆傛牴鍥犻�氬父鏄細**鍦ㄦ湇鍔″櫒涓� / 閫氳繃杩滅▼妗岄潰璁块棶绯荤粺**锛�
+ * 鎴栧墠缃唬鐞嗘病閫忎紶瀹㈡埛绔湴鍧� 鈥斺�� 姝ゆ椂鍚庣鐪嬪埌鐨�"瀹㈡埛绔�"鍏跺疄灏辨槸鏈嶅姟鍣ㄨ嚜宸便��
+ * 杩欑鍦板潃蹇呴』鎷掔粷锛堝惁鍒欎細鎶婃湇鍔″櫒 IP 鍐欒繘 `clinic_room.ip`锛岄偅涓伐浣嶄互鍚庢案杩滃尮閰嶄笉鍒板尰鐢熺數鑴戯級锛�
+ * 骞剁敱 {@link #isLocalAddress(String)} 璇嗗埆銆佺粰鍑哄彲鎿嶄綔鎻愮ず銆�
+ *
+ * <h3>杩愮淮椤荤煡锛氬浣曢伩鍏嶅鎴风璧� IPv6</h3>
+ * 鑻ユ湇鍔″櫒鎵�鍦ㄦ満鍣ㄥ悓鏃剁洃鍚� IPv6锛屽鎴风鍙兘浼樺厛鐢� IPv6 璁块棶锛堟鏃跺悗绔湅鍒扮殑灏辨槸 IPv6 鍦板潃锛�
+ * 鏃犳硶閫氳繃浠g爜"閫�鍖栨垚"IPv4锛屽洜涓鸿繛鎺ユ湰韬氨鏄� IPv6 寤虹珛鐨勶級銆傝В鍐冲姙娉曟槸璁╂湇鍔″彧鐩戝惉 IPv4锛�
+ * <pre>
+ * # 鏂瑰紡涓�锛欽VM 鍙傛暟锛堟帹鑽愶紝jarboot/鍚姩鑴氭湰閲屽姞锛�
+ * -Djava.net.preferIPv4Stack=true
+ * # 鏂瑰紡浜岋細Tomcat 鍙粦 IPv4 鍦板潃
+ * server.address=0.0.0.0 + 绯荤粺鍏抽棴 IPv6锛屾垨鐩存帴缁戞湰鏈� IPv4 鍦板潃
+ * </pre>
+ * 鑻ヤ笂杩伴兘涓嶄究璋冩暣锛岃纭繚鍖荤敓绔敤鏈嶅姟鍣ㄧ殑 **IPv4 鍦板潃** 璁块棶锛堜笉瑕佺敤 IPv6 鍦板潃鎴栧煙鍚嶈В鏋愬埌 IPv6锛夈��
+ *
+ * <p>娉ㄦ剰锛氬寘鍚嶇敤 {@code utils}锛堝皬鍐欙級鈥斺�� 妯″潡閲屽凡鏈� {@code cn.lihu.jh.module.ecg.Utils} 杩欎釜绫伙紝
+ * 鑻ュ缓鍚屽悕鐨� {@code Utils} 鍖呬細涓庣被鍚嶅啿绐侊紙瀹炴祴缂栬瘧鎶�"绫讳笌绋嬪簭鍖呭啿绐�"锛夈��
+ * 鍙︽敞鎰� Windows 璺緞澶у皬鍐欎笉鏁忔劅锛屽垹闄� {@code Utils} 鐩綍浼氳繛甯﹀垹鎺� {@code utils}銆�</p>
+ */
+public final class IpUtils {
+
+ /** 鏄惁鍙噰鐢� IPv4锛堢幇鍦虹害瀹氾級銆傛敼涓� false 鍗冲彲鏀惧紑 IPv6锛屾棤闇�鏀瑰姩璋冪敤鏂广�� */
+ public static final boolean IPV4_ONLY = true;
+
+ /** 鏈嶅姟鍣ㄦ湰鏈� IPv4 缃戝崱鍦板潃鐨勭紦瀛橈紙瑙� {@link #localIpv4Addresses()}锛� */
+ private static volatile Set<String> localIpv4Cache = null;
+
+ private IpUtils() {
+ }
+
+ /**
+ * 瑙勮寖鍖栨潵璁� IP銆�
+ *
+ * @return 瑙勮寖鍖栧悗鐨勫瓧绗︿覆锛涘叆鍙備负绌烘椂杩斿洖 null
+ */
+ public static String normalize(String ip) {
+ if (ip == null) {
+ return null;
+ }
+ String v = ip.trim();
+ if (v.isEmpty()) {
+ return null;
+ }
+ // ServletUtil 鍙兘杩斿洖閫楀彿鍒嗛殧鐨勮浆鍙戦摼锛屽彇绗竴涓紙鏈�闈犺繎瀹㈡埛绔殑鍦板潃锛�
+ if (v.contains(",")) {
+ v = v.split(",")[0].trim();
+ }
+ // 鍘绘帀 IPv6 鐨勬柟鎷彿涓庡尯鍩熷彿锛屼緥濡� [fe80::1%eth0] 鈫� fe80::1
+ if (v.startsWith("[")) {
+ v = v.substring(1);
+ }
+ if (v.endsWith("]")) {
+ v = v.substring(0, v.length() - 1);
+ }
+ int zoneIdx = v.indexOf('%');
+ if (zoneIdx > 0) {
+ v = v.substring(0, zoneIdx);
+ }
+ v = v.toLowerCase();
+ // IPv4-mapped IPv6锛�::ffff:32.88.65.208 鈫� 32.88.65.208
+ if (v.startsWith("::ffff:") && isIpv4(v.substring(7))) {
+ return v.substring(7);
+ }
+ return v;
+ }
+
+ /**
+ * 鏄惁鏄彲鐢ㄤ簬缁戝畾宸ヤ綅鐨� IP锛�**鍙噰鐢� IPv4**锛夛細
+ * 蹇呴』鏄悎娉� IPv4锛屼笖涓嶆槸鍥炵幆锛�127.x锛夋垨鏈寚瀹氾紙0.0.0.0锛夈��
+ *
+ * <p>IPv6 涓�寰嬭繑鍥� false 鈥斺�� 鍖呮嫭鍥炵幆 {@code ::1} 涓庣湡瀹� IPv6 鍦板潃銆�
+ * 娉ㄦ剰锛歿@code ::ffff:32.88.65.208} 杩欑被 IPv4-mapped 鍦板潃浼氬厛琚鑼冨寲杩樺師鎴�
+ * {@code 32.88.65.208}锛屽洜姝�**浠嶇劧鍙敤**锛堣繖鏄� IPv4 瀹㈡埛绔湪鍙屾爤鐜涓嬫渶瀹规槗琚鍒ょ殑鎯呭喌锛夈��</p>
+ */
+ public static boolean isBindableIp(String ip) {
+ String v = normalize(ip);
+ if (v == null || v.isEmpty()) {
+ return false;
+ }
+ if (isLoopback(v) || isUnspecified(v)) {
+ return false;
+ }
+ // 銆愭湰娆℃柊澧炪�戞湇鍔″櫒鑷韩鍦板潃涓嶄綔涓哄伐浣嶆爣璇嗭細鐜板満鑻ュ湪鏈嶅姟鍣ㄤ笂锛堟垨杩滅▼妗岄潰閲岋級璁块棶绯荤粺锛�
+ // 鍚庣鐪嬪埌鐨�"瀹㈡埛绔�"灏辨槸鏈嶅姟鍣ㄨ嚜宸憋紝鍐欒繘 clinic_room.ip 鍚庤宸ヤ綅姘歌繙鍖归厤涓嶅埌鍖荤敓鐢佃剳銆�
+ if (isLocalAddress(v)) {
+ return false;
+ }
+ boolean usable = isIpv4(v);
+ if (IPV4_ONLY && isIpv6(v)) {
+ usable = false; // 鍙噰鐢� IPv4锛欼Pv6 涓嶅弬涓庣粦瀹氫笌鍖归厤
+ }
+ return usable;
+ }
+
+ /**
+ * 鏈嶅姟鍣ㄦ湰鏈烘墍鏈� IPv4 缃戝崱鍦板潃锛堥娆¤皟鐢ㄥ悗缂撳瓨锛夈��
+ *
+ * <p>鍙栦笉鍒扮綉鍗′俊鎭椂杩斿洖**绌洪泦鍚�**锛屾鏃� {@link #isLocalAddress} 鎭掍负 false 鈥斺��
+ * 瀹佸彲灏戞嫤锛屼篃涓嶈鍥犱负鐜鍙栦笉鍒扮綉鍗″氨璇垽鎵�鏈夊湴鍧�閮芥槸鏈嶅姟鍣ㄧ殑銆�
+ */
+ public static Set<String> localIpv4Addresses() {
+ Set<String> cached = localIpv4Cache;
+ if (null != cached) {
+ return cached;
+ }
+ Set<String> result = new LinkedHashSet<>();
+ try {
+ Enumeration<NetworkInterface> nis = NetworkInterface.getNetworkInterfaces();
+ while (null != nis && nis.hasMoreElements()) {
+ NetworkInterface ni = nis.nextElement();
+ Enumeration<InetAddress> addrs = ni.getInetAddresses();
+ while (addrs.hasMoreElements()) {
+ InetAddress addr = addrs.nextElement();
+ if (addr instanceof Inet4Address) {
+ String ip = normalize(addr.getHostAddress());
+ if (null != ip && !ip.isEmpty()) {
+ result.add(ip);
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ // 蹇界暐锛氭嬁涓嶅埌缃戝崱淇℃伅鏃朵笉鍋�"鏈嶅姟鍣ㄥ湴鍧�"鍒ゅ畾锛堣繑鍥炵┖闆嗗悎锛�
+ }
+ localIpv4Cache = result;
+ return result;
+ }
+
+ /**
+ * 璇ュ湴鍧�鏄惁鏄�**鏈嶅姟鍣ㄨ嚜韬�**鐨� IPv4 鍦板潃銆�
+ *
+ * <p>鐢ㄩ�旓細璇嗗埆"鍦ㄦ湇鍔″櫒涓�/杩滅▼妗岄潰閲岃闂郴缁�"杩欑璁块棶鏂瑰紡锛堟鏃跺悗绔湅鍒扮殑瀹㈡埛绔氨鏄湇鍔″櫒鑷繁锛夛紝
+ * 骞剁粰鍑哄彲鎿嶄綔鎻愮ず锛岃�屼笉鏄妸瀹冨綋鎴愬尰鐢熺殑鏈満 IP銆�
+ * <p>娉ㄦ剰锛氬洖鐜� {@code 127.0.0.1} 閫氬父涔熷湪缃戝崱鍒楄〃閲岋紝浣嗚皟鐢ㄦ柟涓�鑸厛鐢� {@link #isLoopback} 鍒ゅ畾锛�
+ * 鎻愮ず璇細鏇磋创鍒囷紙"鏈満璁块棶"锛夈��
+ */
+ public static boolean isLocalAddress(String ip) {
+ String v = normalize(ip);
+ return null != v && !v.isEmpty() && localIpv4Addresses().contains(v);
+ }
+
+ /** 璇ュ湴鍧�鏄惁涓� IPv6锛堣鑼冨寲涔嬪悗鍒ゆ柇锛汭Pv4-mapped 宸茶繕鍘熸垚 IPv4锛屼笉浼氬懡涓繖閲岋級 */
+ public static boolean isIpv6Address(String ip) {
+ return isIpv6(normalize(ip));
+ }
+
+ /** 鍥炵幆鍦板潃锛�127.0.0.0/8銆�::1 */
+ public static boolean isLoopback(String ip) {
+ String v = normalize(ip);
+ if (v == null) {
+ return false;
+ }
+ if (v.startsWith("127.")) {
+ return true;
+ }
+ return "::1".equals(v) || "0:0:0:0:0:0:0:1".equals(v);
+ }
+
+ /** 鏈寚瀹氬湴鍧�锛�0.0.0.0銆�::锛堝惈鍏ㄩ浂鍐欐硶锛� */
+ public static boolean isUnspecified(String ip) {
+ String v = normalize(ip);
+ if (v == null) {
+ return false;
+ }
+ if ("0.0.0.0".equals(v) || "::".equals(v)) {
+ return true;
+ }
+ // 0:0:0:0:0:0:0:0
+ return v.matches("^0(:0){2,7}$");
+ }
+
+ /** IPv4 鐐瑰垎鍗佽繘鍒� */
+ public static boolean isIpv4(String ip) {
+ String v = normalize(ip);
+ if (v == null || !v.matches("^(\\d{1,3}\\.){3}\\d{1,3}$")) {
+ return false;
+ }
+ for (String seg : v.split("\\.")) {
+ int n;
+ try {
+ n = Integer.parseInt(seg);
+ } catch (NumberFormatException e) {
+ return false;
+ }
+ if (n > 255) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * IPv6锛堝惈鍘嬬缉鍐欐硶锛夈�傝繖閲屽仛"缁撴瀯绾�"鏍¢獙锛氬繀椤绘槸鍗佸叚杩涘埗鍒嗘 + 鍐掑彿锛�
+ * 鍏佽鍘嬬缉 {@code ::}锛屽厑璁哥粨灏� IPv4-mapped锛坽@code ::ffff:1.2.3.4}锛夈��
+ * 涓嶅仛涓ユ牸鐨勫叏灞曞紑鏍¢獙锛堝伐涓氱幇鍦哄湴鍧�褰㈡�佸锛屽鏉炬牎楠屾洿瀹炵敤锛夈��
+ */
+ public static boolean isIpv6(String ip) {
+ String v = normalize(ip);
+ if (v == null || v.isEmpty() || !v.contains(":")) {
+ return false;
+ }
+ if (v.contains(":::")) {
+ return false;
+ }
+ int doubleColon = v.indexOf("::");
+ if (doubleColon >= 0 && v.indexOf("::", doubleColon + 1) >= 0) {
+ return false; // 鍙兘鍑虹幇涓�娆� "::"
+ }
+ String body = v.endsWith("::") ? v.substring(0, v.length() - 2) : v;
+ if (body.isEmpty()) {
+ return true; // 灏辨槸 "::"
+ }
+ for (String seg : body.split("::", -1)) {
+ if (seg.isEmpty()) {
+ continue;
+ }
+ for (String part : seg.split(":", -1)) {
+ if (part.isEmpty()) {
+ return false;
+ }
+ if (part.contains(".")) {
+ if (!isIpv4(part)) {
+ return false;
+ }
+ } else if (!part.matches("[0-9a-f]{1,4}")) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/dal/mysql/queuesequence/SeqCounterInterceptorIgnoreTest.java b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/dal/mysql/queuesequence/SeqCounterInterceptorIgnoreTest.java
new file mode 100644
index 0000000..1ca308e
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/dal/mysql/queuesequence/SeqCounterInterceptorIgnoreTest.java
@@ -0,0 +1,76 @@
+package cn.lihu.jh.module.ecg.dal.mysql.queuesequence;
+
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import org.apache.ibatis.annotations.Update;
+import org.junit.Test;
+
+import java.lang.reflect.Method;
+import java.time.LocalDate;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * 銆愬洖褰掓祴璇曘�戦槻姝� {@code seq_counter} 鐨勫師瀛愭帹杩涜鍙ュ啀娆¤Е鍙戠嚎涓婃晠闅溿��
+ *
+ * <h4>鑳屾櫙锛堢湡瀹炴晠闅滐紝2026-10-01锛�</h4>
+ * 棰勭害纭鎺ュ彛 500锛屾棩蹇楋細
+ * <pre>
+ * org.mybatis.spring.MyBatisSystemException: ... UnsupportedOperationException
+ * at JsqlParserSupport.processInsert(JsqlParserSupport.java:107)
+ * at DataPermissionInterceptor.beforePrepare(DataPermissionInterceptor.java:86)
+ * ### The error may involve QueueSequenceMapper.advanceNormalSeq
+ * </pre>
+ * <b>鏍瑰洜</b>锛歁yBatis-Plus 鐨� {@code DataPermissionInterceptor} 浼氱敤 JSqlParser 瑙f瀽姣忎竴鏉� SQL锛�
+ * 鑰� JSqlParser 鐨� {@code processInsert} <b>涓嶆敮鎸� MySQL 鐨�
+ * {@code INSERT ... ON DUPLICATE KEY UPDATE}</b> 璇硶锛岀洿鎺ユ姏 {@code UnsupportedOperationException}銆�
+ *
+ * <b>淇</b>锛氬湪杩欎袱涓柟娉曚笂鏍囨敞 {@code @InterceptorIgnore(dataPermission = "true")}
+ * 锛坽@code seq_counter} 琛ㄦ病鏈� dept_id/user_id锛屾暟鎹潈闄愬瀹冩湰鏃犳剰涔夛級銆�
+ *
+ * <h4>鏈祴璇曢槻鐨勬槸浠�涔�</h4>
+ * 鑻ユ湁浜哄悗缁�"娓呯悊娉ㄨВ"鎴栨敼鍐� SQL 鏃舵妸杩欎釜娉ㄨВ鍒犳帀锛�
+ * <b>缂栬瘧涓庡父瑙勫崟娴嬮兘涓嶄細鎶ラ敊</b>锛堝彧鏈夌湡瀹炶蛋 MyBatis 鎷︽埅鍣ㄩ摼鎵嶄細瑙﹀彂锛夛紝
+ * 鐩村埌绾夸笂绛惧埌鏃舵墠鐐搞�傛晠鍦ㄦ<b>鏄惧紡鏂█娉ㄨВ瀛樺湪</b>銆�
+ */
+public class SeqCounterInterceptorIgnoreTest {
+
+ private static final String IGNORE_MSG =
+ "seq_counter 鐨勫師瀛愭帹杩涜鍙ヤ娇鐢� MySQL 涓撴湁鐨� INSERT ... ON DUPLICATE KEY UPDATE 璇硶锛�"
+ + "JSqlParser 鏃犳硶瑙f瀽銆傚繀椤讳繚鐣� @InterceptorIgnore(dataPermission=\"true\")锛�"
+ + "鍚﹀垯 DataPermissionInterceptor 浼氭姏 UnsupportedOperationException锛�"
+ + "瀵艰嚧棰勭害纭(绛惧埌)鐩存帴 500銆傝瑙佽娉ㄨВ涓婃柟鐨勬晠闅滆褰曘��";
+
+ @Test
+ public void advanceNormalSeq_mustIgnoreDataPermission() throws Exception {
+ assertIgnorePresent("advanceNormalSeq");
+ }
+
+ @Test
+ public void advanceReservedSeq_mustIgnoreDataPermission() throws Exception {
+ assertIgnorePresent("advanceReservedSeq");
+ }
+
+ @Test
+ public void advanceSql_shouldStillUseOnDuplicateKeyUpdate() throws Exception {
+ for (String name : new String[]{"advanceNormalSeq", "advanceReservedSeq"}) {
+ Method m = QueueSequenceMapper.class.getMethod(name, Integer.class, LocalDate.class);
+ Update up = m.getAnnotation(Update.class);
+ assertNotNull(name + " 搴斾繚鐣� @Update 娉ㄨВ", up);
+ String sql = String.join(" ", up.value()).toUpperCase();
+ assertTrue(name + " 搴斾娇鐢� ON DUPLICATE KEY UPDATE 瀹炵幇鍘熷瓙鎺ㄨ繘锛堝綋鍓� SQL=" + sql + "锛�",
+ sql.contains("ON DUPLICATE KEY UPDATE"));
+ assertTrue(name + " 搴斾綔鐢ㄤ簬 seq_counter 琛紙褰撳墠 SQL=" + sql + "锛�",
+ sql.contains("SEQ_COUNTER"));
+ }
+ }
+
+ private void assertIgnorePresent(String name) throws Exception {
+ Method m = QueueSequenceMapper.class.getMethod(name, Integer.class, LocalDate.class);
+ InterceptorIgnore ignore = m.getAnnotation(InterceptorIgnore.class);
+ assertNotNull(name + " 缂哄皯 @InterceptorIgnore銆俓n" + IGNORE_MSG, ignore);
+ assertEquals(name + " 鐨� @InterceptorIgnore.dataPermission 蹇呴』涓� \"true\"銆俓n" + IGNORE_MSG,
+ "true", ignore.dataPermission());
+ }
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/enums/HisCheckStatusEnumTest.java b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/enums/HisCheckStatusEnumTest.java
new file mode 100644
index 0000000..1678b05
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/enums/HisCheckStatusEnumTest.java
@@ -0,0 +1,108 @@
+package cn.lihu.jh.module.ecg.enums;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * 妫�鏌ョ姸鎬佺紪鐮佸綊涓�鍖栦笌蹇冪數涓氬姟鍗曞垽瀹氱殑鍥炲綊娴嬭瘯銆�
+ *
+ * <p>娴嬭瘯鏁版嵁鍙栬嚜 2026-09-17 鐢熶骇鏃ュ織涓殑鐪熷疄鎶ユ枃鍊硷紝鐢ㄤ簬閿佸畾鏈淇鐨勮涓猴細
+ * <ul>
+ * <li>{@code S0405} 鐨� {@code processStep.code} 鍦ㄦ姤鏂囦腑瀛樺湪 {@code "3"}/{@code "03"}/
+ * {@code "7"}/{@code "08"}/{@code "10"} 绛変笉鍚屽啓娉曪紝蹇呴』褰掍竴鍒板悓涓�缂栫爜锛�</li>
+ * <li>鐥呯悊涓撶敤鐘舵�� {@code 21}/{@code 22}/{@code 23} 涓嶅睘浜庡績鐢电紪鐮佽〃锛屽簲琚嫆缁濓紱</li>
+ * <li>{@code AppointmentTypeEnum} 鍘� type 鍊煎惈绌烘牸/鍒惰〃绗︼紙{@code " 1"}銆亄@code " 3\t"}锛夛紝
+ * 瀵艰嚧 {@code getByType("3")} 鍖归厤澶辫触锛屾澶勫浐鍖栦慨澶嶇粨鏋滐紱</li>
+ * <li>蹇冪數涓氬姟鍗曞垽瀹氶渶姝g‘璇嗗埆蹇冪數鍗曚笌鏀惧皠/瓒呭0鍗曘��</li>
+ * </ul>
+ *
+ * @author 蹇冪數鎺掗槦瑁呮満绯荤粺
+ */
+public class HisCheckStatusEnumTest {
+
+ // ==================== HisCheckStatusEnum.normalize ====================
+
+ @Test
+ public void testNormalize_shouldStripLeadingZero() {
+ // 鏃ュ織瀹炴祴锛�"03" 涓� "3" 閮藉嚭鐜拌繃锛屽繀椤诲綊涓�涓哄悓涓�涓��
+ assertEquals("3", HisCheckStatusEnum.normalize("3"));
+ assertEquals("3", HisCheckStatusEnum.normalize("03"));
+ assertEquals("8", HisCheckStatusEnum.normalize("08"));
+ assertEquals("1", HisCheckStatusEnum.normalize("01"));
+ }
+
+ @Test
+ public void testNormalize_shouldTrimWhitespace() {
+ assertEquals("7", HisCheckStatusEnum.normalize(" 7 "));
+ assertEquals("10", HisCheckStatusEnum.normalize("\t10"));
+ }
+
+ @Test
+ public void testNormalize_shouldKeepTwoDigitCodes() {
+ // char(2) 鍒楀彲瀹圭撼 "10"
+ assertEquals("10", HisCheckStatusEnum.normalize("10"));
+ assertEquals("9", HisCheckStatusEnum.normalize("9"));
+ }
+
+ @Test
+ public void testNormalize_shouldRejectPathologyCodes() {
+ // 21 鏍囨湰閫佹 / 22 鍙栨秷鏍囨湰閫佹 / 23 宸茬即璐� 灞炵梾鐞嗕笓鐢紝蹇冪數涓嶆秹鍙�
+ assertNull(HisCheckStatusEnum.normalize("21"));
+ assertNull(HisCheckStatusEnum.normalize("22"));
+ assertNull(HisCheckStatusEnum.normalize("23"));
+ }
+
+ @Test
+ public void testNormalize_shouldRejectInvalidInput() {
+ assertNull(HisCheckStatusEnum.normalize(null));
+ assertNull(HisCheckStatusEnum.normalize(""));
+ assertNull(HisCheckStatusEnum.normalize(" "));
+ assertNull(HisCheckStatusEnum.normalize("abc"));
+ assertNull(HisCheckStatusEnum.normalize("0")); // 涓嶅湪缂栫爜琛ㄥ唴
+ assertNull(HisCheckStatusEnum.normalize("99"));
+ }
+
+ @Test
+ public void testContains() {
+ assertTrue(HisCheckStatusEnum.contains(1));
+ assertTrue(HisCheckStatusEnum.contains(10));
+ assertFalse(HisCheckStatusEnum.contains(0));
+ assertFalse(HisCheckStatusEnum.contains(21));
+ assertFalse(HisCheckStatusEnum.contains(null));
+ }
+
+ @Test
+ public void testGetNameByCode() {
+ assertEquals("鐢宠鍗曞紑绔�", HisCheckStatusEnum.getNameByCode(1));
+ assertEquals("妫�鏌ョ櫥璁�", HisCheckStatusEnum.getNameByCode(3));
+ assertEquals("鎶ュ憡瀹℃牳", HisCheckStatusEnum.getNameByCode(10));
+ assertNull(HisCheckStatusEnum.getNameByCode(21));
+ }
+
+ // ==================== AppointmentTypeEnum锛堜慨澶嶇┖鏍兼薄鏌撳悗锛� ====================
+
+ @Test
+ public void testAppointmentTypeEnum_shouldMatchWithoutWhitespaceIssue() {
+ // 鍘熷疄鐜� type 鍊间负 " 1" / " 3\t"锛実etByType("1") 浼氳繑鍥� null銆備慨澶嶅悗蹇呴』鑳藉尮閰嶃��
+ assertEquals("鐢宠鍗曞紑绔�", AppointmentTypeEnum.getByType("1"));
+ assertEquals("妫�鏌ョ櫥璁�", AppointmentTypeEnum.getByType("3"));
+ assertEquals("妫�鏌ョ粨鏉�", AppointmentTypeEnum.getByType("7"));
+ assertEquals("鎶ュ憡瀹℃牳", AppointmentTypeEnum.getByType("10"));
+ }
+
+ @Test
+ public void testAppointmentTypeEnum_shouldTolerateLeadingZeroAndSpace() {
+ assertEquals("妫�鏌ョ櫥璁�", AppointmentTypeEnum.getByType("03"));
+ assertEquals("妫�鏌ョ櫥璁�", AppointmentTypeEnum.getByType(" 3 "));
+ assertEquals("鎶ュ憡瀹℃牳", AppointmentTypeEnum.getByType("010"));
+ }
+
+ @Test
+ public void testAppointmentTypeEnum_shouldRejectPathologyAndInvalid() {
+ assertNull(AppointmentTypeEnum.getByType("21"));
+ assertNull(AppointmentTypeEnum.getByType("23"));
+ assertNull(AppointmentTypeEnum.getByType(null));
+ assertNull(AppointmentTypeEnum.getByType("abc"));
+ }
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/enums/SeqRuleEnumTest.java b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/enums/SeqRuleEnumTest.java
new file mode 100644
index 0000000..7355218
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/enums/SeqRuleEnumTest.java
@@ -0,0 +1,232 @@
+package cn.lihu.jh.module.ecg.enums;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.*;
+
+/**
+ * 鍥炲綊娴嬭瘯锛氭帓闃熷簭鍙疯鍒欐灇涓� {@link SeqRuleEnum}銆�
+ *
+ * <h3>鑳屾櫙</h3>
+ * 銆岀鍒版椂濡備綍缁欐偅鑰呮帓闃熷簭鍙枫�嶆寜妫�鏌ラ」鐩厤缃紝涓夌瑙勫垯锛�
+ * <ol>
+ * <li>棰勭害鍙� 鈥斺�� 鐢ㄩ绾︾郴缁熶笅鍙戠殑鍙�</li>
+ * <li>绛惧埌搴忓彿 鈥斺�� 褰撳ぉ鍚屾鏌ョ被鍨嬪唴杩炵画閫掑锛�<b>姣� 9 涓彿棰勭暀 1 涓粰鍔犳��</b></li>
+ * <li>鏃舵鍙� 鈥斺�� 鎸夐绾︽椂闂存缁欏彿锛堟敼閫犲墠鐨勫師鏈夎涓猴紝涔熸槸鏈厤缃椂鐨勯粯璁わ級</li>
+ * </ol>
+ *
+ * <h3>鏈祴璇曢攣瀹氱殑鍏抽敭琛屼负</h3>
+ * <ul>
+ * <li>{@code parse(null)} 鍥為��鍒� {@code TIMESLOT} 鈥斺�� 瀛橀噺鏁版嵁 {@code seq_rule} 涓� NULL 鏃�
+ * 鍗囩骇鍚�**琛屼负涓庢敼閫犲墠涓�鑷�**锛�</li>
+ * <li>鏅�氬彿搴忓垪璺宠繃 10 鐨勫�嶆暟锛堥鐣欏彿锛夛紝涓�**涓嶈烦鍙枫�佷笉閲嶅彿**锛�</li>
+ * <li>棰勭暀鍙峰簭鍒� = 10 鐨勫�嶆暟锛�</li>
+ * <li>涓ょ被鍙烽泦鍚�**涓嶇浉浜�**锛堣繖鏄�"涓や釜鐙珛璁℃暟鍣�"璁捐鐨勭洰鐨勶級銆�</li>
+ * </ul>
+ *
+ * <h3>鏇炬崟鑾风殑鐪熷疄缂洪櫡锛堜繚鐣欒褰曪級</h3>
+ * 鍒濈増鎶娿�屽垎閰嶅彿銆嶅啓鎴� {@code nextNormalSeq(++counter)} 骞舵湡鏈涘畠鍦� 10 鏃惰烦鍒� 11锛�
+ * <pre>
+ * counter: 9 鈫� 鍒嗛厤 9
+ * counter: 10 鈫� nextNormalSeq(10) 鏈熸湜 11锛燂紙閿欙級
+ * counter: 11 鈫� 鍒嗛厤 11 鈫� 涓庝笂涓�琛屾挒杞�
+ * </pre>
+ * 姝g‘璇箟鏄細**鍒嗛厤鍙� = {@code nextNormalSeq(counter)}锛屼笖璁℃暟鍣ㄥ湪"涓嬩竴涓彿鏄鐣欏彿"鏃堕澶� +1**锛�
+ * 鍗� {@code normal_next = normal_next + 1 + (normal_next + 1 鏄� 10 鐨勫�嶆暟 ? 1 : 0)}銆�
+ */
+public class SeqRuleEnumTest {
+
+ // ---------------------------------------------------------------- 瑙f瀽
+
+ @Test
+ public void testParse_null_shouldFallbackToTimeslot() {
+ assertEquals(SeqRuleEnum.TIMESLOT, SeqRuleEnum.parse(null));
+ }
+
+ @Test
+ public void testParse_unknownValue_shouldFallbackToTimeslot() {
+ assertEquals(SeqRuleEnum.TIMESLOT, SeqRuleEnum.parse(99));
+ assertEquals(SeqRuleEnum.TIMESLOT, SeqRuleEnum.parse(-1));
+ }
+
+ @Test
+ public void testParse_knownValues() {
+ assertEquals(SeqRuleEnum.APPOINT, SeqRuleEnum.parse(0));
+ assertEquals(SeqRuleEnum.CHECKIN, SeqRuleEnum.parse(1));
+ assertEquals(SeqRuleEnum.TIMESLOT, SeqRuleEnum.parse(2));
+ }
+
+ // ------------------------------------------------------- 瀹归噺璇箟宸紓
+
+ @Test
+ public void testIsCapacityLimited_onlyTimeslot() {
+ assertFalse(SeqRuleEnum.APPOINT.isCapacityLimited());
+ assertFalse(SeqRuleEnum.CHECKIN.isCapacityLimited());
+ assertTrue(SeqRuleEnum.TIMESLOT.isCapacityLimited());
+ }
+
+ // ---------------------------------------------------------- 棰勭暀鍙峰垽瀹�
+
+ @Test
+ public void testIsReservedSeq() {
+ assertTrue(SeqRuleEnum.isReservedSeq(10));
+ assertTrue(SeqRuleEnum.isReservedSeq(20));
+ assertTrue(SeqRuleEnum.isReservedSeq(100));
+ assertFalse(SeqRuleEnum.isReservedSeq(1));
+ assertFalse(SeqRuleEnum.isReservedSeq(9));
+ assertFalse(SeqRuleEnum.isReservedSeq(11));
+ assertFalse(SeqRuleEnum.isReservedSeq(0));
+ assertFalse(SeqRuleEnum.isReservedSeq(-10));
+ }
+
+ @Test
+ public void testRoundSize_matchesReservedRule() {
+ assertEquals(10, SeqRuleEnum.ROUND_SIZE);
+ assertEquals(1, SeqRuleEnum.RESERVED_PER_ROUND);
+ // 銆屾瘡 9 涓彿棰勭暀 1 涓��= 9 鏅�� + 1 棰勭暀 = 涓�杞� 10 涓�
+ assertEquals(SeqRuleEnum.ROUND_SIZE, 9 + SeqRuleEnum.RESERVED_PER_ROUND);
+ }
+
+ // -------------------------------------------------------- 鏅�氬彿搴忓垪
+
+ @Test
+ public void testNextNormalSeq_shouldReturnNonReservedValue() {
+ // 鐩存帴璇箟锛氳繑鍥� from 璧风涓�涓潪棰勭暀鍙凤紙10 鏈韩鏄鐣欏彿 鈫� 杩斿洖 11锛�
+ assertEquals(1, SeqRuleEnum.nextNormalSeq(1));
+ assertEquals(9, SeqRuleEnum.nextNormalSeq(9));
+ assertEquals("10 鏄鐣欏彿锛屽簲璺冲埌 11", 11, SeqRuleEnum.nextNormalSeq(10));
+ assertEquals(11, SeqRuleEnum.nextNormalSeq(11));
+ assertEquals(19, SeqRuleEnum.nextNormalSeq(19));
+ assertEquals(21, SeqRuleEnum.nextNormalSeq(20));
+ assertEquals("99 鏈韩涓嶆槸棰勭暀鍙凤紝鍘熸牱杩斿洖", 99, SeqRuleEnum.nextNormalSeq(99));
+ assertEquals("100 鏄鐣欏彿锛岃烦鍒� 101", 101, SeqRuleEnum.nextNormalSeq(100));
+ }
+
+ /**
+ * 绔埌绔ā鎷� Mapper 鐨勬帹杩涘叕寮忥紝楠岃瘉**杩炵画 30 娆℃櫘閫氬彇鍙蜂笉閲嶅彿銆佷笉璺冲彿**銆�
+ *
+ * <p>鍏紡涓� {@code QueueSequenceMapper#advanceNormalSeq} 瀹屽叏涓�鑷达細
+ * <pre>
+ * INSERT 鏃� normal_next = 1
+ * UPDATE 鏃� normal_next = normal_next + 1 + IF((normal_next + 1) % 10 = 0, 1, 0)
+ * 鍒嗛厤鍙� = nextNormalSeq(normal_next - 涓婃鎺ㄨ繘閲�)锛� 鈥斺�� 涓嶅锛�
+ * 瀹為檯鏄細鍒嗛厤鍙风敱銆岃鍥炲悗鐨� normal_next銆嶇粡 nextNormalSeq 寰楀埌
+ * </pre>
+ * 杩欓噷鐢ㄦ渶鐩寸櫧鐨勬柟寮忚繕鍘燂細缁存姢 {@code lastAssigned}锛屾瘡娆�
+ * {@code next = lastAssigned + 1}锛岃嫢鏄鐣欏彿鍒� {@code next++}锛堣烦杩囷級锛�
+ * 鐒跺悗 {@code lastAssigned = next}銆�
+ */
+ @Test
+ public void testNormalSequence_isContiguousAndSkipsReserved() {
+ List<Integer> assigned = new ArrayList<>();
+ int lastAssigned = 0;
+ for (int i = 0; i < 30; i++) {
+ int next = lastAssigned + 1;
+ next = SeqRuleEnum.nextNormalSeq(next); // 璺宠繃棰勭暀鍙�
+ assigned.add(next);
+ lastAssigned = next;
+ }
+
+ // 鏈熸湜锛�1..9, 11..19, 21..29, 31..39 鐨勫墠 30 涓�
+ int[] expected = {
+ 1, 2, 3, 4, 5, 6, 7, 8, 9,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 31, 32, 33
+ };
+ for (int i = 0; i < expected.length; i++) {
+ assertEquals("绗� " + (i + 1) + " 涓櫘閫氬彿", expected[i], (int) assigned.get(i));
+ }
+
+ // 鏃犻噸鍙�
+ Set<Integer> uniq = new HashSet<>(assigned);
+ assertEquals("鏅�氬彿涓嶅緱閲嶅", assigned.size(), uniq.size());
+
+ // 鏃� 10 鐨勫�嶆暟
+ for (Integer v : assigned) {
+ assertFalse("鏅�氬彿涓嶅簲钀藉湪棰勭暀鍙蜂笂: " + v, SeqRuleEnum.isReservedSeq(v));
+ }
+ }
+
+ @Test
+ public void testNextNormalSeq_withZeroOrNegative_shouldStartFromOne() {
+ assertEquals(1, SeqRuleEnum.nextNormalSeq(0));
+ assertEquals(1, SeqRuleEnum.nextNormalSeq(-5));
+ }
+
+ // -------------------------------------------------------- 棰勭暀鍙峰簭鍒�
+
+ @Test
+ public void testNextReservedSeq_shouldLandOnMultiplesOfTen() {
+ assertEquals(10, SeqRuleEnum.nextReservedSeq(1));
+ assertEquals(10, SeqRuleEnum.nextReservedSeq(9));
+ assertEquals("宸叉槸棰勭暀鍙峰垯鍘熸牱杩斿洖", 10, SeqRuleEnum.nextReservedSeq(10));
+ assertEquals(20, SeqRuleEnum.nextReservedSeq(11));
+ assertEquals(20, SeqRuleEnum.nextReservedSeq(19));
+ assertEquals(20, SeqRuleEnum.nextReservedSeq(20));
+ assertEquals(30, SeqRuleEnum.nextReservedSeq(21));
+ }
+
+ @Test
+ public void testNextReservedSeq_withZeroOrNegative() {
+ assertEquals(10, SeqRuleEnum.nextReservedSeq(0));
+ assertEquals(10, SeqRuleEnum.nextReservedSeq(-3));
+ }
+
+ // ------------------------------------------------- 涓ょ被鍙蜂笉鐩镐氦锛堟牳蹇冿級
+
+ @Test
+ public void testNormalAndReservedSequences_shouldNotIntersect() {
+ // 妯℃嫙锛�100 娆℃櫘閫� + 10 娆″姞鎬�
+ Set<Integer> normalSet = new HashSet<>();
+ int last = 0;
+ for (int i = 0; i < 100; i++) {
+ last = SeqRuleEnum.nextNormalSeq(last + 1);
+ normalSet.add(last);
+ }
+
+ Set<Integer> reservedSet = new HashSet<>();
+ int reservedNext = 10;
+ for (int i = 0; i < 10; i++) {
+ reservedSet.add(SeqRuleEnum.nextReservedSeq(reservedNext));
+ reservedNext += SeqRuleEnum.ROUND_SIZE;
+ }
+
+ assertEquals("鏅�氬彿涓嶅緱閲嶅", 100, normalSet.size());
+ assertEquals("棰勭暀鍙蜂笉寰楅噸澶�", 10, reservedSet.size());
+
+ Set<Integer> intersection = new HashSet<>(normalSet);
+ intersection.retainAll(reservedSet);
+ assertTrue("鏅�氬彿涓庨鐣欏彿闆嗗悎涓嶅緱鏈変氦闆嗭紝瀹為檯浜ら泦=" + intersection, intersection.isEmpty());
+ }
+
+ /**
+ * 鍙嶈瘉锛氫负浠�涔堝繀椤�"涓や釜鐙珛璁℃暟鍣�"銆�
+ *
+ * <p>鑻ュ彧鐢ㄤ竴涓�掑璁℃暟鍣ㄣ�佸苟鎶�"璺宠繃棰勭暀鍙�"鍚庣殑鍊肩洿鎺ュ綋鍙风爜鐢紝
+ * 浼氬湪 counter=10 涓� counter=11 涓ゆ鍒嗛厤涓緱鍒板悓涓�涓彿 11銆�
+ */
+ @Test
+ public void testSingleCounterNaiveApproach_wouldCollide_documentingWhyTwoCounters() {
+ assertEquals("counter=10 鏃惰烦杩囬鐣欏彿寰楀埌 11", 11, SeqRuleEnum.nextNormalSeq(10));
+ assertEquals("counter=11 鏃剁洿鎺ュ緱鍒� 11", 11, SeqRuleEnum.nextNormalSeq(11));
+ assertEquals("涓よ�呯浉鍚� 鈫� 鏈寸礌鍋氭硶蹇呯劧閲嶅彿",
+ SeqRuleEnum.nextNormalSeq(10), SeqRuleEnum.nextNormalSeq(11));
+ }
+
+ // ------------------------------------------------------------- 鏁扮粍
+
+ @Test
+ public void testArrays_containsAllRules() {
+ int[] arrays = SeqRuleEnum.ARRAYS;
+ assertEquals(3, arrays.length);
+ assertEquals(0, arrays[0]);
+ assertEquals(1, arrays[1]);
+ assertEquals(2, arrays[2]);
+ }
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/HisCheckAppointmentCheckTypeTest.java b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/HisCheckAppointmentCheckTypeTest.java
new file mode 100644
index 0000000..bfff66d
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/HisCheckAppointmentCheckTypeTest.java
@@ -0,0 +1,110 @@
+package cn.lihu.jh.module.ecg.service.appointment;
+
+import org.junit.Test;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+/**
+ * 閿佸畾 S050401/S050501锛堟鏌ラ绾︼級鎶ユ枃涓鏌ョ被鍨嬬殑瑙f瀽琛屼负銆�
+ *
+ * <h3>鑳屾櫙锛�2026-10 鎺掓煡缁撹锛�</h3>
+ * 浣撴/闂ㄨ瘖鐨� S050401 鍗曡嫢**鍏堜簬** S0201ECG 鍒拌揪锛屼細璧�
+ * {@code insertAppointmentFromCheckAppointment} 瀹归敊鏂板锛�
+ * 鑰岃璺緞鍘熷厛**瀹屽叏涓嶈В鏋愭鏌ョ被鍨�**锛屽鑷� {@code appointment.book_check_type} 姘歌繙涓虹┖銆�
+ * <p>瀹炴祴锛歿@code id=213466 / apply_no=8826092420371106}锛�2026-10-08 07:15 瀹归敊鏂板锛夛紝
+ * 鎶ユ枃 {@code ZDY} 閲屾槑鏄庢湁 {@code jcxmcode=201652, jcxmname=骞虫澘杩愬姩璇曢獙}锛�
+ * 搴旀槧灏勪负鏈湴 {@code book_check_type=400}锛堝钩鏉胯繍鍔ㄥ績鐢碉級銆�
+ * 鍏ㄥ簱鍚岀被璁板綍 279 鏉★紙2026-09-29 ~ 10-09锛夈��
+ *
+ * <p>鏈淇鏂板 {@code resolveBookCheckTypeFromZdy(ZDY, applyNo)}锛屽苟鎺ュ叆涓ゆ潯璺緞锛�
+ * <ol>
+ * <li>瀹归敊鏂板锛坽@code insertAppointmentFromCheckAppointment}锛夛紱</li>
+ * <li>鏇存柊宸叉湁璁板綍锛坽@code handleCheckAppointmentUpdate}锛夈��</li>
+ * </ol>
+ * 涓ゆ潯璺緞鍧囬伒寰�**浠呭湪涓虹┖鏃惰ˉ**锛堜笉瑕嗙洊宸叉湁鍊硷級銆�
+ */
+public class HisCheckAppointmentCheckTypeTest {
+
+ private Integer invokeResolve(Map<String, Object> zdy) throws Exception {
+ AppointmentServiceImpl svc = new AppointmentServiceImpl();
+ Method m = AppointmentServiceImpl.class.getDeclaredMethod(
+ "resolveBookCheckTypeFromZdy", Map.class, String.class);
+ m.setAccessible(true);
+ return (Integer) m.invoke(svc, zdy, "TEST-APPLY-NO");
+ }
+
+ private Map<String, Object> zdy(String name, String code) {
+ Map<String, Object> m = new HashMap<>();
+ if (name != null) {
+ m.put("jcxmname", name);
+ }
+ if (code != null) {
+ m.put("jcxmcode", code);
+ }
+ return m;
+ }
+
+ /** 鐪熷疄鏁呴殰鏍锋湰锛氬钩鏉胯繍鍔ㄨ瘯楠� 鈫� 400锛堣蛋鍚嶇О鏄犲皠锛� */
+ @Test
+ public void testRealCase_pingBanYunDong_shouldMapTo400() throws Exception {
+ Integer v = invokeResolve(zdy("骞虫澘杩愬姩璇曢獙", "201652"));
+ assertNotNull("鐪熷疄鏁呴殰鍗曠殑妫�鏌ョ被鍨嬪繀椤昏兘瑙f瀽鍑烘潵", v);
+ assertEquals("骞虫澘杩愬姩璇曢獙 搴旀槧灏勪负 400锛堝钩鏉胯繍鍔ㄥ績鐢碉級", Integer.valueOf(400), v);
+ System.out.println("[鐪熷疄鏍锋湰] jcxmname=骞虫澘杩愬姩璇曢獙 jcxmcode=201652 -> " + v);
+ }
+
+ /** HIS 鏀瑰悕鍦烘櫙锛氫粎缁欎唬鐮� 201652 涔熻鑳芥槧灏勶紙鍚嶇О鏄犲皠涓嶅埌鏃舵寜浠g爜鍏滃簳锛� */
+ @Test
+ public void testNameUnmappable_shouldFallbackToCode() throws Exception {
+ Integer v = invokeResolve(zdy("鏌愪釜HIS鏂板彨娉曟湭鏀跺綍", "201652"));
+ assertEquals("鍚嶇О鏄犲皠涓嶅埌鏃跺簲鎸変唬鐮佸厹搴曚负 400", Integer.valueOf(400), v);
+ System.out.println("[浠g爜鍏滃簳] jcxmname=鏈敹褰� jcxmcode=201652 -> " + v);
+ }
+
+ /** 浠g爜甯� Y 鍓嶇紑锛圫0201ECG 褰㈡�侊級涔熻鍏煎 */
+ @Test
+ public void testCodeWithYPrefix_shouldBeCompatible() throws Exception {
+ assertEquals(Integer.valueOf(400), invokeResolve(zdy(null, "Y201652")));
+ System.out.println("[鍓嶇紑鍏煎] jcxmcode=Y201652 -> 400");
+ }
+
+ /** 澶氬�硷細鍙栫涓�涓兘鏄犲皠鎴愬姛鐨勶紙瀹炴祴 S0405 瀛樺湪 jcxmcode=1080,3016,3014 褰㈡�侊級 */
+ @Test
+ public void testMultiValue_shouldPickFirstMappable() throws Exception {
+ // 绗竴涓槸鏃犲叧浠g爜锛岀浜屼釜鎵嶆槸蹇冪數椤圭洰
+ Integer v = invokeResolve(zdy(null, "999999,201652"));
+ assertEquals("澶氬�煎簲鍙栫涓�涓兘鏄犲皠鐨�", Integer.valueOf(400), v);
+ System.out.println("[澶氬�糫 jcxmcode=999999,201652 -> " + v);
+ }
+
+ /** 鍚嶇О澶氬�硷紙涓枃閫楀彿锛変篃瑕佹敮鎸� */
+ @Test
+ public void testMultiValueName_shouldPickFirstMappable() throws Exception {
+ Integer v = invokeResolve(zdy("鑳搁儴CT骞虫壂锛屽钩鏉胯繍鍔ㄨ瘯楠�", null));
+ assertEquals("鍚嶇О澶氬�煎簲鍙栫涓�涓兘鏄犲皠鐨�", Integer.valueOf(400), v);
+ System.out.println("[澶氬�煎悕绉癩 jcxmname=鑳搁儴CT骞虫壂锛屽钩鏉胯繍鍔ㄨ瘯楠� -> " + v);
+ }
+
+ /** 鍏跺畠蹇冪數椤圭洰涔熷簲姝g‘鏄犲皠锛堥槻鍙湅涓�涓牱鏈級 */
+ @Test
+ public void testOtherCheckTypes_shouldMapCorrectly() throws Exception {
+ assertEquals(Integer.valueOf(100), invokeResolve(zdy("甯歌蹇冪數鍥�", "691133607")));
+ assertEquals(Integer.valueOf(200), invokeResolve(zdy("24灏忔椂鍔ㄦ�佸績鐢靛浘", "201605")));
+ assertEquals(Integer.valueOf(300), invokeResolve(zdy("鍔ㄦ�佽鍘�", "200327")));
+ assertEquals(Integer.valueOf(1100), invokeResolve(zdy("甯歌蹇冪數鍥�-蹇冪數鍚戦噺鍥�", "559542128")));
+ System.out.println("[澶氶」鐩甝 100/200/300/1100 鍧囨槧灏勬纭�");
+ }
+
+ /** 鏃犳硶鏄犲皠鏃惰繑鍥� null锛堣皟鐢ㄦ柟淇濇寔鍘熷�硷紝涓嶅啓鍧忔暟鎹級涓斾笉鎶涘紓甯� */
+ @Test
+ public void testUnmappable_shouldReturnNullQuietly() throws Exception {
+ assertNull("闈炲績鐢甸」鐩簲杩斿洖 null", invokeResolve(zdy("鑳搁儴CT骞虫壂", "1080")));
+ assertNull("绌� ZDY 搴旇繑鍥� null", invokeResolve(new HashMap<>()));
+ assertNull("null ZDY 搴旇繑鍥� null 涓斾笉鎶涘紓甯�", invokeResolve(null));
+ System.out.println("[鍋ュ.鎬 鏃犳硶鏄犲皠/绌�/null 鍧囪繑鍥� null 涓斾笉鎶涘紓甯�");
+ }
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/HisDoctorTimeParseTest.java b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/HisDoctorTimeParseTest.java
new file mode 100644
index 0000000..ca8d93c
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/HisDoctorTimeParseTest.java
@@ -0,0 +1,93 @@
+package cn.lihu.jh.module.ecg.service.appointment;
+
+import org.junit.Test;
+
+import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+
+import static org.junit.Assert.*;
+
+/**
+ * 閿佸畾 HIS銆屽紑鍗曟椂闂淬��({@code author/time/value}) 鐨勮В鏋愯涓恒��
+ *
+ * <h3>鑳屾櫙锛�2026-10 鎺掓煡缁撹锛�</h3>
+ * 搴撲腑绾� 61% 鐨� {@code appointment.doctor_time} 涓� {@code yyyy-MM-dd 00:00:00}銆�
+ * 缁忔牳鏌�**涓嶆槸**鏈」鐩殑鏍煎紡鍖栫己闄凤紙鍒楁槸 datetime銆佸啓鍏� java.util.Date銆�
+ * 鐪熷疄鎶ユ枃鏍蜂緥甯︽椂鍒嗙锛夛紝鑰屾槸 **HIS 渚ф妸璇ュ瓧娈电殑鏃跺垎绉掑彂鎴愪簡 {@code 000000}**銆�
+ * 璇佹嵁锛氭湁鐪熷疄鏃跺埢鐨勮褰曞憟姝e父宸ヤ綔鏃舵鍒嗗竷锛�06:00鈫�08:00 楂樺嘲锛夛紝
+ * 钀藉湪寮�璇婂墠 00:00-05:59 鐨勪粎 15 鏉★紱闂ㄨ瘖(book_src=1) 99.6%銆佷綇闄�(book_src=2) 90.5% 涓� 0 鐐广��
+ *
+ * <p>鍥犳鏈淇**涓嶆敼鍙樺啓鍏ュ��**锛堜繚鐣� HIS 鍘熷�硷紝鏃ユ湡浠嶆湁鎰忎箟锛夛紝鍙仛涓や欢浜嬶細
+ * <ol>
+ * <li>鎶婂師鍏堛�岄潤榛樹涪寮冦�嶇殑瑙f瀽澶辫触鏀逛负甯�<b>鎶ユ枃鍘熷�� + 鐢宠鍗曞彿</b>鐨� WARN 鏃ュ織锛�</li>
+ * <li>璇嗗埆銆屾棩鏈熷�笺�嶅舰鎬佸苟鎵� WARN锛屼究浜庡悜 HIS 渚у弽棣堛��</li>
+ * </ol>
+ *
+ * <p>鏈祴璇曢�氳繃鍙嶅皠鐩存帴楠岃瘉绉佹湁瑙f瀽鏂规硶锛屼繚璇佷笂杩拌涓轰笉琚洖閫�銆�
+ */
+public class HisDoctorTimeParseTest {
+
+ /** 鍙嶅皠璋冪敤绉佹湁鏂规硶 parseHisDoctorTime(String, String) */
+ private Object invokeParse(String raw) throws Exception {
+ AppointmentServiceImpl svc = new AppointmentServiceImpl();
+ Method m = AppointmentServiceImpl.class.getDeclaredMethod(
+ "parseHisDoctorTime", String.class, String.class);
+ m.setAccessible(true);
+ return m.invoke(svc, raw, "TEST-APPLY-NO");
+ }
+
+ /** 鍙嶅皠璋冪敤绉佹湁鏂规硶 isHisTimeOnlyDate(String) */
+ private boolean invokeIsDateOnly(String raw) throws Exception {
+ AppointmentServiceImpl svc = new AppointmentServiceImpl();
+ Method m = AppointmentServiceImpl.class.getDeclaredMethod("isHisTimeOnlyDate", String.class);
+ m.setAccessible(true);
+ return (Boolean) m.invoke(svc, raw);
+ }
+
+ /** 姝e父褰㈡�侊細14 浣嶄笖甯︽椂鍒嗙 鈥斺�� 蹇呴』鍘熸牱瑙f瀽鍑虹湡瀹炴椂鍒� */
+ @Test
+ public void testNormalTime_shouldParseExactMoment() throws Exception {
+ Object parsed = invokeParse("20260917005255");
+ assertNotNull("14 浣嶅甫鏃跺垎绉掔殑鍊煎繀椤昏В鏋愭垚鍔�", parsed);
+ String s = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(parsed);
+ assertEquals("2026-09-17 00:52:55", s);
+ System.out.println("[姝e父褰㈡�乚 20260917005255 -> " + s);
+ }
+
+ /** 銆屾棩鏈熷�笺�嶅舰鎬侊細鏃跺垎绉�=000000 鈥斺�� 浠嶈鍐欏叆锛堜繚鐣欐棩鏈燂級锛屽彧鏄細鎵� WARN */
+ @Test
+ public void testDateOnlyValue_shouldStillParseAndKeepDate() throws Exception {
+ Object parsed = invokeParse("20261001000000");
+ assertNotNull("鏃ユ湡鍊煎舰鎬佷粛搴旇В鏋愭垚鍔燂紙鏃ユ湡鏈夋剰涔夛紝涓嶈兘涓級", parsed);
+ String s = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(parsed);
+ assertEquals("2026-10-01 00:00:00", s);
+ assertTrue("搴旇璇嗗埆涓烘棩鏈熷��", invokeIsDateOnly("20261001000000"));
+ System.out.println("[鏃ユ湡鍊煎舰鎬乚 20261001000000 -> " + s + "锛堟棩鏈熶繚鐣欙紝鏃跺埢涓� HIS 鎵�鍙戝師鍊硷級");
+ }
+
+ /** 鐪熷疄鏃跺埢涓嶅簲琚鍒や负鏃ユ湡鍊� */
+ @Test
+ public void testRealTime_shouldNotBeTreatedAsDateOnly() throws Exception {
+ assertFalse(invokeIsDateOnly("20260917005255"));
+ assertFalse(invokeIsDateOnly("20261001120000"));
+ assertFalse(invokeIsDateOnly("20261001000001"));
+ System.out.println("[璇垽闃叉姢] 甯︾湡瀹炴椂鍒嗙鐨勫�煎潎鏈鍒ゅ畾涓烘棩鏈熷��");
+ }
+
+ /** 闈� 14 浣嶏紙HIS 鏂囨。鏍蜂緥涓嚭鐜拌繃 12 浣� yyyyMMddHHmm锛夆�斺�� 杩斿洖 null锛屼笉鍐欏簱 */
+ @Test
+ public void testNonFourteenDigit_shouldReturnNull() throws Exception {
+ assertNull("12 浣嶄笉搴旇瑙f瀽锛堝師瀹炵幇浼氶潤榛樹涪寮冿紝鐜版敼涓� WARN锛�", invokeParse("201205061000"));
+ assertNull("绌轰覆涓嶅簲琚В鏋�", invokeParse(""));
+ assertNull("null 涓嶅簲琚В鏋�", invokeParse(null));
+ System.out.println("[闈�14浣峕 12 浣�/绌�/null 鍧囪繑鍥� null锛堝苟鎵� WARN锛夛紝涓嶄細鍐欏潖鏁版嵁");
+ }
+
+ /** 闈炴硶鏍煎紡涓嶅簲鎶涘紓甯革紙閬垮厤褰卞搷鏁存潯鎶ユ枃钀藉簱锛� */
+ @Test
+ public void testInvalidFormat_shouldNotThrow() throws Exception {
+ assertNull(invokeParse("abc"));
+ assertNull(invokeParse("20261301000000")); // 13 鏈�
+ System.out.println("[鍋ュ.鎬 闈炴硶鏍煎紡杩斿洖 null 涓斾笉鎶涘紓甯�");
+ }
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/HisParseSafetyTest.java b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/HisParseSafetyTest.java
new file mode 100644
index 0000000..24709aa
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/HisParseSafetyTest.java
@@ -0,0 +1,388 @@
+package cn.lihu.jh.module.ecg.service.appointment;
+
+import org.junit.Test;
+
+import java.lang.reflect.Method;
+import java.util.*;
+
+import static org.junit.Assert.*;
+
+/**
+ * 鍥炲綊娴嬭瘯锛欻IS 鎶ユ枃瑙f瀽鐨�**绫诲瀷瀹夊叏瀵艰埅**銆�
+ *
+ * <h3>鑳屾櫙</h3>
+ * 2026-09-28 鐢熶骇鏃ュ織鍑虹幇 **287 娆�** {@code ClassCastException:
+ * class java.lang.String cannot be cast to class java.util.Map}锛�
+ * 闆嗕腑鍦� {@code extractCheckCodeFromComponent2} 绛夋柟娉曠殑閾惧紡寮哄埗杞崲涓娿��
+ *
+ * <p>鍘熷洜鏄� HIS 鎶ユ枃缁� Jackson 鍙嶅簭鍒楀寲鍚�**鍚屼竴瀛楁绫诲瀷骞朵笉绋冲畾**锛�
+ * {@code observationRequest.code} 鍦ㄩ儴鍒嗘姤鏂囦腑鏄� {@code Map}
+ * 锛坽@code code={code=7,...}}锛夛紝鍦ㄥ彟涓�浜涙姤鏂囦腑鏄�**绌哄瓧绗︿覆**锛坽@code code=}锛夈��
+ * 閾惧紡 {@code .map(m -> (Map<String,Object>) m.get("code"))} 閬囧埌瀛楃涓插嵆鎶涘紓甯革紝
+ * **瀵艰嚧鏁存潯娑堟伅澶勭悊涓柇**锛堥绾︽椂闂淬�佹埧闂寸瓑瀛楁鍐欎笉杩涘簱锛夈��
+ *
+ * <p>鏈祴璇曢攣瀹氫慨澶嶅悗鐨勮涓猴細閬囧埌浠绘剰绫诲瀷娣峰悎閮借繑鍥� null 鑰�**涓嶆姏寮傚父**銆�
+ */
+public class HisParseSafetyTest {
+
+ /** 鏋勯�犲吀鍨嬫姤鏂囩墖娈碉細{@code code=} 涓虹┖瀛楃涓� */
+ private static Map<String, Object> payloadWithEmptyStringCode() {
+ Map<String, Object> codeLeaf = new LinkedHashMap<>();
+ codeLeaf.put("code", ""); // 鈫� 鍏抽敭锛氱┖瀛楃涓茶�岄潪 Map
+ codeLeaf.put("displayName", mapOf("value", "妫�鏌ョ粨鏉�"));
+
+ Map<String, Object> obs = new LinkedHashMap<>();
+ obs.put("id", mapOf("item", mapOf("extension", "2126092800574")));
+ obs.put("code", ""); // 鈫� 鍏抽敭锛歰bservationRequest.code 鏄┖瀛楃涓�
+ obs.put("component1", mapOf("processStep", mapOf("code", codeLeaf)));
+ obs.put("component2", mapOf("observationRequest", mapOf("code", "")));
+
+ return mapOf("controlActProcess",
+ mapOf("subject", mapOf("placerGroup", mapOf("component2", obs))));
+ }
+
+ /** 姝e父褰㈡�侊細{@code code} 鏄� Map锛堟寜 S0201ECG 鐪熷疄缁撴瀯鏋勯�狅級 */
+ private static Map<String, Object> payloadWithMapCode() {
+ // 妫�鏌ョ姸鎬侊細component2.observationRequest.component1.processStep.code.code
+ Map<String, Object> statusCode = mapOf(
+ "code", "7",
+ "codeSystem", "2.16.156.10011.2.5.1.12",
+ "displayName", mapOf("value", "妫�鏌ョ粨鏉�"));
+ Map<String, Object> processStep = mapOf("code", statusCode);
+ Map<String, Object> component1 = mapOf("processStep", processStep);
+
+ // 妫�鏌ラ」鐩細component2.observationRequest.code.code
+ Map<String, Object> checkCode = mapOf(
+ "code", "Y1202065",
+ "displayName", mapOf("value", "搴婅竟蹇冪數鍥�(甯歌+棰戣氨)"));
+
+ Map<String, Object> innerObs = mapOf(
+ "id", mapOf("item", mapOf("root", "2.16.156.10011.1.28", "extension", "113034157")),
+ "code", checkCode,
+ "component1", component1);
+
+ Map<String, Object> component2 = mapOf("observationRequest", innerObs);
+
+ Map<String, Object> outerObs = mapOf("component2", component2);
+
+ return mapOf("controlActProcess",
+ mapOf("subject",
+ mapOf("observationRequest", outerObs)));
+ }
+
+ private static Map<String, Object> mapOf(Object... kv) {
+ Map<String, Object> m = new LinkedHashMap<>();
+ for (int i = 0; i + 1 < kv.length; i += 2) {
+ m.put((String) kv[i], kv[i + 1]);
+ }
+ return m;
+ }
+
+ /** 鍙嶅皠璋冪敤绉佹湁鐨� dig 鏂规硶 */
+ private static Map<String, Object> invokeDig(Map<String, Object> root, String... path) throws Exception {
+ Method m = AppointmentServiceImpl.class.getDeclaredMethod("dig", Map.class, String[].class);
+ m.setAccessible(true);
+ @SuppressWarnings("unchecked")
+ Map<String, Object> r = (Map<String, Object>) m.invoke(null, root, path);
+ return r;
+ }
+
+ /** 鍙嶅皠璋冪敤绉佹湁鐨� digText 鏂规硶 */
+ private static String invokeDigText(Map<String, Object> root, String... path) throws Exception {
+ Method m = AppointmentServiceImpl.class.getDeclaredMethod("digText", Map.class, String[].class);
+ m.setAccessible(true);
+ return (String) m.invoke(null, root, path);
+ }
+
+ // ==================== 鏍稿績锛氫笉寰楁姏 ClassCastException ====================
+
+ @Test
+ public void testDigText_emptyStringInPath_shouldReturnNullNotThrow() throws Exception {
+ Map<String, Object> payload = payloadWithEmptyStringCode();
+ // code 鏄┖瀛楃涓� 鈫� 搴斿畨鍏ㄨ繑鍥� null锛岃�屼笉鏄姏 ClassCastException
+ String v = invokeDigText(payload, "controlActProcess", "subject", "placerGroup",
+ "component2", "observationRequest", "code", "code");
+ assertNull(v);
+ }
+
+ @Test
+ public void testDigText_stringWhereMapExpected_shouldNotThrow() throws Exception {
+ // 鏁存潯璺緞涓婃斁瀛楃涓诧紝妯℃嫙鏈�鎭跺姡鐨勫舰鎬�
+ Map<String, Object> payload = mapOf("controlActProcess", "I-AM-A-STRING");
+ assertNull(invokeDigText(payload, "controlActProcess", "subject", "placerGroup"));
+ }
+
+ @Test
+ public void testDig_emptyStringInPath_shouldReturnNullNotThrow() throws Exception {
+ Map<String, Object> payload = payloadWithEmptyStringCode();
+ assertNull(invokeDig(payload, "controlActProcess", "subject", "placerGroup",
+ "component2", "observationRequest", "component1", "processStep", "code", "ZDY"));
+ }
+
+ @Test
+ public void testDig_nullInPath_shouldReturnNull() throws Exception {
+ assertNull(invokeDig(mapOf("a", null), "a", "b"));
+ assertNull(invokeDig(new LinkedHashMap<>(), "notExist"));
+ }
+
+ @Test
+ public void testDigText_listInPath_shouldTakeFirstElement() throws Exception {
+ // item=[{code=X}] 褰㈡�侊細digText 搴旇嚜鍔ㄥ彇棣栧厓绱犵户缁笅閽�
+ Map<String, Object> payload = mapOf("methodCode",
+ mapOf("item", Collections.singletonList(mapOf("code", "M001"))));
+ assertEquals("M001", invokeDigText(payload, "methodCode", "item", "code"));
+ }
+
+ @Test
+ public void testDigText_emptyListInPath_shouldReturnNull() throws Exception {
+ Map<String, Object> payload = mapOf("methodCode", mapOf("item", Collections.emptyList()));
+ assertNull(invokeDigText(payload, "methodCode", "item", "code"));
+ }
+
+ @Test
+ public void testDigText_shouldStillReadNormalValues() throws Exception {
+ Map<String, Object> payload = payloadWithMapCode();
+ // 姝e父褰㈡�佸繀椤荤収甯歌鍑猴紝涓嶈兘鍥犲姞浜嗛槻寰¤�屽け鏁�
+ // 涓庣敓浜т唬鐮� extractCheckCodeFromComponent2 浣跨敤鐨勬槸**鍚屾牱鐨勮矾寰勫啓娉�**
+ assertEquals("Y1202065", invokeDigText(payload, "controlActProcess", "subject",
+ "observationRequest", "component2", "observationRequest", "code", "code"));
+ }
+
+ @Test
+ public void testDigText_shouldReadProcessStepStatus() throws Exception {
+ // 妫�鏌ョ姸鎬佺爜锛歝ontrolActProcess.subject.observationRequest.component2
+ // .observationRequest.component1.processStep.code.code
+ Map<String, Object> payload = payloadWithMapCode();
+ assertEquals("7", invokeDigText(payload, "controlActProcess", "subject",
+ "observationRequest", "component2", "observationRequest",
+ "component1", "processStep", "code", "code"));
+ }
+
+ @Test
+ public void testDigText_basicTraversal() throws Exception {
+ // 鏈�鍩虹锛氫笁灞� Map 鍙栧��
+ Map<String, Object> payload = mapOf("a", mapOf("b", mapOf("c", "VALUE")));
+ assertEquals("VALUE", invokeDigText(payload, "a", "b", "c"));
+ // 涓ゅ眰
+ assertEquals("X", invokeDigText(mapOf("a", mapOf("b", "X")), "a", "b"));
+ // 涓�灞�
+ assertEquals("Y", invokeDigText(mapOf("a", "Y"), "a"));
+ // Map 鏈鍙� value
+ assertEquals("Z", invokeDigText(mapOf("a", mapOf("b", mapOf("value", "Z"))), "a", "b"));
+ }
+
+ @Test
+ public void testDigText_blankString_shouldReturnNull() throws Exception {
+ // 绌�/绾┖鐧藉瓧绗︿覆搴旇涓�"鏃犲��"锛屼究浜庝笂灞傜敤 isEmpty 鍒ゆ柇
+ Map<String, Object> payload = mapOf("k", " ");
+ assertNull(invokeDigText(payload, "k"));
+ assertNull(invokeDigText(mapOf("k", ""), "k"));
+ }
+
+ // ==================== 鍖诲槺鍙锋彁鍙栵紙findExtensionByRoot锛� ====================
+ //
+ // 渚濇嵁 HIS銆婁氦浜掓湇鍔¢�氱敤鎺ュ彛鏂囨。銆嬶細
+ // 6.1 鐢宠鍗曟柊澧炴湇鍔� 鈫� observationRequest.id.item[root=2.16.156.10011.1.28] 娉ㄩ噴涓恒�屽尰鍢盜D銆�
+ // 6.4 妫�鏌ラ绾︾姸鎬佹湇鍔� 鈫� 鍚屼竴 root 娉ㄩ噴涓恒�屽尰鍢卞彿銆�
+ // 瀹炴祴 S0201ECG 220 鏉°�丼0202ECG 29 鏉″潎鎼哄甫璇ュ�硷紙褰㈠ 112663505锛夈��
+ //
+ // 鍏抽敭椋庨櫓锛歩d.item 鍦ㄩ儴鍒嗘湇鍔′腑鏄�**鏁扮粍**锛屽悓鏃跺惈
+ // 1.24 鐢宠鍗曞彿 涓� 1.28 鍖诲槺鍙�
+ // 鑻ョ敤 digText锛堥亣 List 鍙彇棣栧厓绱狅級浼氭妸**鐢宠鍗曞彿褰撴垚鍖诲槺鍙�**銆�
+ // 涓嬪垪鐢ㄤ緥閿佸畾銆屾寜 root 鍖归厤銆嶇殑姝g‘琛屼负銆�
+
+ private static final String ROOT_ORDER_NO = "2.16.156.10011.1.28";
+ private static final String ROOT_APPLY_NO = "2.16.156.10011.1.24";
+
+ /** 鍙嶅皠璋冪敤绉佹湁鐨� findExtensionByRoot 鏂规硶 */
+ private static String invokeFindExtensionByRoot(Object idNode, String root) throws Exception {
+ Method m = AppointmentServiceImpl.class.getDeclaredMethod("findExtensionByRoot", Object.class, String.class);
+ m.setAccessible(true);
+ return (String) m.invoke(null, idNode, root);
+ }
+
+ @Test
+ public void testFindExtensionByRoot_singleMap_shouldReturnExtension() throws Exception {
+ // 瀹炴祴 S0201ECG 鐨勭湡瀹炲舰鎬侊細id={item={root=1.28, extension=112663505}}
+ Object idNode = mapOf("item", mapOf("root", ROOT_ORDER_NO, "extension", "112663505"));
+ assertEquals("112663505", invokeFindExtensionByRoot(idNode, ROOT_ORDER_NO));
+ }
+
+ @Test
+ public void testFindExtensionByRoot_listWithBothRoots_shouldPickOrderNo() throws Exception {
+ // 鍏抽敭鐢ㄤ緥锛氭暟缁勫悓鏃跺惈 1.24(鐢宠鍗曞彿) 涓� 1.28(鍖诲槺鍙�)
+ // digText 浼氬彇棣栧厓绱狅紙鐢宠鍗曞彿锛夆啋 閿欙紱findExtensionByRoot 蹇呴』鎸� root 鍛戒腑 1.28
+ List<Object> items = Arrays.asList(
+ mapOf("root", ROOT_APPLY_NO, "extension", "2126091700011"),
+ mapOf("root", ROOT_ORDER_NO, "extension", "112663505"));
+ Object idNode = mapOf("item", items);
+ assertEquals("112663505", invokeFindExtensionByRoot(idNode, ROOT_ORDER_NO));
+ }
+
+ @Test
+ public void testFindExtensionByRoot_listWithBothRoots_reverseOrder_shouldStillPickOrderNo() throws Exception {
+ // 椤哄簭棰犲�掍篃蹇呴』鍛戒腑锛堜笉鑳戒緷璧�"鎭板ソ绗竴涓槸鍖诲槺鍙�"锛�
+ List<Object> items = Arrays.asList(
+ mapOf("root", ROOT_ORDER_NO, "extension", "112663700"),
+ mapOf("root", ROOT_APPLY_NO, "extension", "2126091700012"));
+ assertEquals("112663700", invokeFindExtensionByRoot(mapOf("item", items), ROOT_ORDER_NO));
+ }
+
+ @Test
+ public void testFindExtensionByRoot_listWithoutOrderNo_shouldReturnNull() throws Exception {
+ // 鍙湁鐢宠鍗曞彿鏃讹紝缁濅笉鑳芥妸鐢宠鍗曞彿褰撳尰鍢卞彿杩斿洖
+ List<Object> items = Collections.singletonList(
+ mapOf("root", ROOT_APPLY_NO, "extension", "2126091700011"));
+ assertNull(invokeFindExtensionByRoot(mapOf("item", items), ROOT_ORDER_NO));
+ }
+
+ @Test
+ public void testFindExtensionByRoot_emptyOrBlankExtension_shouldReturnNull() throws Exception {
+ // 瑙勮寖涓鑺傜偣 extension 鍙负绌猴紙6.1 绀轰緥鍗� extension=""锛夆啋 搴旇繑鍥� null 鑰岄潪绌轰覆
+ assertNull(invokeFindExtensionByRoot(
+ mapOf("item", mapOf("root", ROOT_ORDER_NO, "extension", "")), ROOT_ORDER_NO));
+ assertNull(invokeFindExtensionByRoot(
+ mapOf("item", mapOf("root", ROOT_ORDER_NO, "extension", " ")), ROOT_ORDER_NO));
+ assertNull(invokeFindExtensionByRoot(
+ mapOf("item", mapOf("root", ROOT_ORDER_NO)), ROOT_ORDER_NO));
+ }
+
+ @Test
+ public void testFindExtensionByRoot_nullAndMalformed_shouldReturnNullNotThrow() throws Exception {
+ assertNull(invokeFindExtensionByRoot(null, ROOT_ORDER_NO));
+ assertNull(invokeFindExtensionByRoot(new LinkedHashMap<>(), ROOT_ORDER_NO));
+ assertNull(invokeFindExtensionByRoot(mapOf("item", null), ROOT_ORDER_NO));
+ assertNull(invokeFindExtensionByRoot(mapOf("item", Collections.emptyList()), ROOT_ORDER_NO));
+ // item 鏄瓧绗︿覆锛堢被鍨嬩笉绋冲畾锛夆啋 涓嶅緱鎶涘紓甯�
+ assertNull(invokeFindExtensionByRoot(mapOf("item", "I-AM-A-STRING"), ROOT_ORDER_NO));
+ // root 缂哄け
+ assertNull(invokeFindExtensionByRoot(mapOf("item", mapOf("extension", "X")), ROOT_ORDER_NO));
+ // root 涓� null
+ assertNull(invokeFindExtensionByRoot(mapOf("item", mapOf("root", null, "extension", "X")), ROOT_ORDER_NO));
+ }
+
+ @Test
+ public void testFindExtensionByRoot_listContainingNonMap_shouldSkipGracefully() throws Exception {
+ List<Object> items = Arrays.asList(
+ "NOT-A-MAP",
+ mapOf("root", ROOT_ORDER_NO, "extension", "112663932"));
+ assertEquals("112663932", invokeFindExtensionByRoot(mapOf("item", items), ROOT_ORDER_NO));
+ }
+
+ @Test
+ public void testFindExtensionByRoot_rootWithWhitespace_shouldStillMatch() throws Exception {
+ // 鎶ユ枃閲� root 鍙兘甯︾┖鐧斤紝闇� trim 鍚庢瘮杈�
+ Object idNode = mapOf("item", mapOf("root", " " + ROOT_ORDER_NO + " ", "extension", "112664036"));
+ assertEquals("112664036", invokeFindExtensionByRoot(idNode, ROOT_ORDER_NO));
+ }
+
+ // ======================================================================
+ // 闇�姹�2锛欼SCB銆屾槸鍚﹀簥杈广�嶈В鏋愶紙zdy 鑷畾涔夊瓧娈靛尯锛�
+ // ======================================================================
+
+ /** 鍙嶅皠璋冪敤绉佹湁鐨� findBedsideFlag(dataMap) */
+ private static String invokeFindBedsideFlag(Map<String, Object> dataMap) throws Exception {
+ Method m = AppointmentServiceImpl.class.getDeclaredMethod("findBedsideFlag", Map.class);
+ m.setAccessible(true);
+ return (String) m.invoke(null, dataMap);
+ }
+
+ /** 鎸夌湡瀹� S0201ECG 缁撴瀯鏋勯�犲惈 zdy 鐨勬姤鏂� */
+ private static Map<String, Object> payloadWithZdy(Map<String, Object> zdyContent) {
+ Map<String, Object> obs = new LinkedHashMap<>();
+ obs.put("zdy", zdyContent);
+ return mapOf("controlActProcess", mapOf("subject", mapOf("observationRequest", obs)));
+ }
+
+ @Test
+ public void testFindBedsideFlag_presentZero_shouldReturnZero() throws Exception {
+ // 瀹炴祴鐪熷疄鎶ユ枃涓� ISCB 鎭掍负 "0"
+ Map<String, Object> zdy = new LinkedHashMap<>();
+ zdy.put("ISCB", "0");
+ zdy.put("ISDN", "0");
+ assertEquals("0", invokeFindBedsideFlag(payloadWithZdy(zdy)));
+ }
+
+ @Test
+ public void testFindBedsideFlag_presentOne_shouldReturnOne() throws Exception {
+ Map<String, Object> zdy = new LinkedHashMap<>();
+ zdy.put("ISCB", "1");
+ assertEquals("1", invokeFindBedsideFlag(payloadWithZdy(zdy)));
+ }
+
+ @Test
+ public void testFindBedsideFlag_absent_shouldReturnNull() throws Exception {
+ // 瀹樻柟鏂囨。瀹氫箟鐨� 19 涓瓧娈甸噷娌℃湁 ISCB 鈥斺�� 杩欑被鎶ユ枃搴旇繑鍥� null锛堜笉鍐欏簱锛�
+ Map<String, Object> zdy = new LinkedHashMap<>();
+ zdy.put("jjbz", "N");
+ zdy.put("babyFlag", "0");
+ assertNull(invokeFindBedsideFlag(payloadWithZdy(zdy)));
+ }
+
+ @Test
+ public void testFindBedsideFlag_emptyString_shouldReturnNull() throws Exception {
+ Map<String, Object> zdy = new LinkedHashMap<>();
+ zdy.put("ISCB", "");
+ assertNull("绌哄瓧绗︿覆搴旇浣滄湭鎻愪緵", invokeFindBedsideFlag(payloadWithZdy(zdy)));
+
+ Map<String, Object> zdy2 = new LinkedHashMap<>();
+ zdy2.put("ISCB", " ");
+ assertNull("绾┖鐧藉簲瑙嗕綔鏈彁渚�", invokeFindBedsideFlag(payloadWithZdy(zdy2)));
+ }
+
+ @Test
+ public void testFindBedsideFlag_nonStringValue_shouldToString() throws Exception {
+ // Jackson 鍙嶅簭鍒楀寲鍚庢爣閲忕被鍨嬪彲鑳芥槸 Integer/Boolean锛岄渶绋冲Ε toString
+ Map<String, Object> zdy = new LinkedHashMap<>();
+ zdy.put("ISCB", 1);
+ assertEquals("1", invokeFindBedsideFlag(payloadWithZdy(zdy)));
+
+ Map<String, Object> zdy2 = new LinkedHashMap<>();
+ zdy2.put("ISCB", 0);
+ assertEquals("0", invokeFindBedsideFlag(payloadWithZdy(zdy2)));
+ }
+
+ @Test
+ public void testFindBedsideFlag_whitespaceAroundValue_shouldTrim() throws Exception {
+ Map<String, Object> zdy = new LinkedHashMap<>();
+ zdy.put("ISCB", " 1 ");
+ assertEquals("1", invokeFindBedsideFlag(payloadWithZdy(zdy)));
+ }
+
+ @Test
+ public void testFindBedsideFlag_nullOrMalformedPayload_shouldReturnNullWithoutThrow() throws Exception {
+ // 绫诲瀷涓嶇ǔ瀹氭槸 HIS 鎶ユ枃鐨勫父鎬侊紙鍘嗗彶涓婃浘鍥犳鎶� ClassCastException 涓柇鏁存潯娑堟伅锛夛紝
+ // 杩欓噷蹇呴』**涓嶆姏寮傚父**
+ assertNull(invokeFindBedsideFlag(null));
+ assertNull(invokeFindBedsideFlag(mapOf()));
+ assertNull("controlActProcess 鏄瓧绗︿覆", invokeFindBedsideFlag(mapOf("controlActProcess", "x")));
+ assertNull("subject 鏄┖瀛楃涓�", invokeFindBedsideFlag(
+ mapOf("controlActProcess", mapOf("subject", ""))));
+ assertNull("observationRequest 缂哄け", invokeFindBedsideFlag(
+ mapOf("controlActProcess", mapOf("subject", mapOf()))));
+ assertNull("zdy 鏄瓧绗︿覆鑰岄潪 Map", invokeFindBedsideFlag(
+ mapOf("controlActProcess", mapOf("subject",
+ mapOf("observationRequest", mapOf("zdy", "not-a-map"))))));
+ }
+
+ @Test
+ public void testFindBedsideFlag_realisticFullZdy_shouldReturnValue() throws Exception {
+ // 鐪熷疄鎶ユ枃鐨� zdy 鏈� 26 涓瓧娈碉紙鏂囨。鍙畾涔� 19 涓級锛屾寜鏃ュ織鍘熸牱鏋勯�犲叧閿儴鍒�
+ Map<String, Object> zdy = new LinkedHashMap<>();
+ zdy.put("ApplyTotalFee", "19");
+ zdy.put("Urgency", "");
+ zdy.put("PayStatus", "1");
+ zdy.put("HospitalCode", "01");
+ zdy.put("HospitalName", "閲戝崕甯備汉姘戝尰闄�");
+ zdy.put("jjbz", "N");
+ zdy.put("babyFlag", "0");
+ zdy.put("ISCB", "1"); // 鈫� 闇�姹�2 鍏虫敞鐨勫瓧娈�
+ zdy.put("ISDN", "0");
+ zdy.put("BLLSH", "3054365");
+ zdy.put("SWCJBS", "0");
+ zdy.put("KDYSSJH", "15158660102");
+ zdy.put("KLX", "");
+ zdy.put("VTEGWBZ", "0");
+ assertEquals("1", invokeFindBedsideFlag(payloadWithZdy(zdy)));
+ }
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/RegisterDateTruncationTest.java b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/RegisterDateTruncationTest.java
new file mode 100644
index 0000000..a026239
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/appointment/RegisterDateTruncationTest.java
@@ -0,0 +1,139 @@
+package cn.lihu.jh.module.ecg.service.appointment;
+
+import cn.lihu.jh.framework.common.util.object.BeanUtils;
+import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.AppointmentSaveReqVO;
+import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO;
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+
+import static org.junit.Assert.*;
+
+/**
+ * 閿佸畾 {@code register_date}銆屾椂闂磋鎴柇涓� 00:00:00銆嶇殑鎴愬洜涓庝慨澶嶃��
+ *
+ * <h3>鐜拌薄</h3>
+ * 2026-09-27 璧� {@code appointment.register_date} 澶ч噺鍙樻垚 {@code yyyy-MM-dd 00:00:00}锛�
+ * 鑰� 09-26 涔嬪墠鏄� {@code 2026-09-26 16:58:53} 杩欐牱鐨勫畬鏁存椂闂淬��
+ *
+ * <h3>鎴愬洜锛堢粡瀹為獙纭畾锛�</h3>
+ * {@code java.sql.Date} 鏄�**鍙〃绀烘棩鏈�**鐨� JDBC 绫诲瀷锛涙妸瀹冨啓鍏� {@code DATETIME} 鍒楁椂锛�
+ * 鏃堕棿閮ㄥ垎蹇呯劧鍙樻垚 {@code 00:00:00}銆傚疄娴嬶紙鍚岃繛鎺ヤ覆銆佸悓鍒楋級锛�
+ * <pre>
+ * setObject(java.util.Date) 鈫� 2026-09-26 16:58:53 淇濈暀
+ * setObject(java.sql.Date) 鈫� 2026-09-26 00:00:00 涓㈠純
+ * </pre>
+ * 鑰� {@code AppointmentSaveReqVO}/{@code AppointmentRespVO}/{@code AppointmentPageReqVO}
+ * 鍘熷厛閮芥妸 {@code registerDate}/{@code doctorTime} 澹版槑涓� {@code java.sql.Date}
+ * 锛堢粡 {@code import java.sql.Date;}锛夛紝瀵瑰簲鐨� {@code AppointmentDO} 鍗存槸
+ * {@code java.util.Date} 鈥斺�� 绫诲瀷涓嶄竴鑷村鑷村線杩旇繃绋嬩腑鏃堕棿涓㈠け銆�
+ *
+ * <h3>淇</h3>
+ * 涓変釜 VO 缁熶竴鏀逛负 {@code java.util.Date}銆傛湰娴嬭瘯閿佸畾銆岀被鍨嬩竴鑷淬�嶈繖涓�绾︽潫銆�
+ */
+public class RegisterDateTruncationTest {
+
+ private static final String SAMPLE = "2026-09-26 16:58:53";
+
+ /** 鐢熶骇/娴嬭瘯搴撹繛鎺ヤ覆锛堜笌 application-local.yaml 涓�鑷达級 */
+ private static final String JDBC_URL =
+ "jdbc:mysql://47.93.127.38:3308/lihu?useSSL=false&serverTimezone=Asia/Shanghai"
+ + "&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true";
+
+ /**
+ * 鏍稿績绾︽潫锛歏O 涓� DO 鐨� registerDate/doctorTime 蹇呴』鏄�**鍚屼竴绉�** Date 绫诲瀷锛�
+ * 涓旈兘涓嶆槸 {@code java.sql.Date}锛堝惁鍒欐椂闂翠細琚涪寮冿級銆�
+ */
+ @Test
+ public void testRegisterDateTypes_shouldBeConsistentAndNotSqlDate() throws Exception {
+ Class<?> voReg = AppointmentSaveReqVO.class.getDeclaredField("registerDate").getType();
+ Class<?> voDoc = AppointmentSaveReqVO.class.getDeclaredField("doctorTime").getType();
+ Class<?> doReg = AppointmentDO.class.getDeclaredField("registerDate").getType();
+ Class<?> doDoc = AppointmentDO.class.getDeclaredField("doctorTime").getType();
+
+ System.out.println("[绫诲瀷] VO.registerDate = " + voReg.getName());
+ System.out.println("[绫诲瀷] VO.doctorTime = " + voDoc.getName());
+ System.out.println("[绫诲瀷] DO.registerDate = " + doReg.getName());
+ System.out.println("[绫诲瀷] DO.doctorTime = " + doDoc.getName());
+
+ assertNotEquals("VO.registerDate 涓嶅緱涓� java.sql.Date锛堜細涓㈠純鏃跺垎绉掞級",
+ "java.sql.Date", voReg.getName());
+ assertNotEquals("VO.doctorTime 涓嶅緱涓� java.sql.Date",
+ "java.sql.Date", voDoc.getName());
+ assertEquals("VO 涓� DO 鐨� registerDate 绫诲瀷蹇呴』涓�鑷�",
+ doReg.getName(), voReg.getName());
+ assertEquals("VO 涓� DO 鐨� doctorTime 绫诲瀷蹇呴』涓�鑷�",
+ doDoc.getName(), voDoc.getName());
+ }
+
+ /** 寰�杩旇浆鎹笉寰椾涪澶辨椂闂� */
+ @Test
+ public void testDoToVoToDo_keepsTime() throws Exception {
+ AppointmentDO source = new AppointmentDO();
+ source.setApplyNo("TEST_TRUNC_1");
+ source.setRegisterDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(SAMPLE));
+ source.setDoctorTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(SAMPLE));
+
+ AppointmentSaveReqVO vo = BeanUtils.toBean(source, AppointmentSaveReqVO.class);
+ AppointmentDO back = BeanUtils.toBean(vo, AppointmentDO.class);
+
+ String reg = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(back.getRegisterDate());
+ String doc = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(back.getDoctorTime());
+ System.out.println("[寰�杩擼 registerDate = " + reg + " doctorTime = " + doc);
+
+ assertEquals("registerDate 缁� VO 寰�杩斿悗涓嶅簲涓㈠け鏃堕棿", SAMPLE, reg);
+ assertEquals("doctorTime 缁� VO 寰�杩斿悗涓嶅簲涓㈠け鏃堕棿", SAMPLE, doc);
+ }
+
+ /**
+ * 澶嶇幇瀹為獙锛堥渶瑕佹祴璇曞簱鍙闂級锛氳瘉鏄庛�宩ava.sql.Date 鈫� DATETIME 鍒椼�嶅繀鐒舵埅鏂��
+ * <p>鑻ユ暟鎹簱涓嶅彲杈惧垯璺宠繃锛堜笉褰卞搷鍏跺畠鏂█鐨勪环鍊硷級銆�
+ */
+ @Test
+ public void testJdbcWrite_sqlDateTruncates_utilDateKeeps() throws Exception {
+ Connection c = null;
+ try {
+ c = DriverManager.getConnection(JDBC_URL, "smartor", "Smartor.2016");
+ } catch (Exception e) {
+ System.out.println("[璺宠繃] 鏁版嵁搴撲笉鍙揪: " + e.getMessage());
+ return;
+ }
+ try {
+ c.setAutoCommit(false);
+ try (Statement s = c.createStatement()) {
+ s.execute("DROP TABLE IF EXISTS _probe_regdate_test");
+ s.execute("CREATE TABLE _probe_regdate_test (id INT PRIMARY KEY AUTO_INCREMENT, "
+ + "d_util DATETIME NULL, d_sql DATETIME NULL)");
+ }
+ java.util.Date utilDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(SAMPLE);
+ java.sql.Date sqlDate = new java.sql.Date(utilDate.getTime());
+ try (PreparedStatement ps = c.prepareStatement(
+ "INSERT INTO _probe_regdate_test (d_util, d_sql) VALUES (?,?)")) {
+ ps.setObject(1, utilDate);
+ ps.setObject(2, sqlDate);
+ ps.executeUpdate();
+ }
+ try (Statement s = c.createStatement();
+ ResultSet r = s.executeQuery("SELECT d_util, d_sql FROM _probe_regdate_test")) {
+ assertTrue(r.next());
+ String util = r.getString(1);
+ String sql = r.getString(2);
+ System.out.println("[瀹為獙] java.util.Date 鈫� " + util);
+ System.out.println("[瀹為獙] java.sql.Date 鈫� " + sql);
+
+ assertEquals("java.util.Date 搴斾繚鐣欐椂鍒嗙", SAMPLE, util);
+ assertEquals("java.sql.Date 蹇呯劧涓㈡垚 00:00:00",
+ "2026-09-26 00:00:00", sql);
+ }
+ try (Statement s = c.createStatement()) { s.execute("DROP TABLE _probe_regdate_test"); }
+ c.rollback();
+ } finally {
+ if (c != null) { try { c.close(); } catch (Exception ignore) { } }
+ }
+ }
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/his/HisEcgFilterTest.java b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/his/HisEcgFilterTest.java
new file mode 100644
index 0000000..ee14cd8
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/test/java/cn/lihu/jh/module/ecg/service/his/HisEcgFilterTest.java
@@ -0,0 +1,328 @@
+package cn.lihu.jh.module.ecg.service.his;
+
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.junit.Assert.*;
+
+/**
+ * 蹇冪數涓氬姟鍗曞垽瀹氾紙{@link HisEcgFilter}锛夊洖褰掓祴璇曘��
+ *
+ * <p>鍏ㄩ儴娴嬭瘯鏁版嵁鍙栬嚜 2026-09-17 鐢熶骇鏃ュ織涓殑鐪熷疄鎶ユ枃鍊硷細
+ * <ul>
+ * <li><b>蹇冪數鍗�</b>锛歿@code S0201ECG} / {@code S0405} 涓睘蹇冪數鐨勫彿涓庢鏌ラ」鐩紱</li>
+ * <li><b>闈炲績鐢靛崟</b>锛氬悓涓�鏃堕棿绐楀唴 {@code S0405} 鎺ㄩ�佺殑鏀惧皠/瓒呭0鍗�
+ * 锛堝疄娴嬪崰 96.5%锛屾槸鏈杩囨护瑕佹嫤鎺夌殑涓讳綋锛夈��</li>
+ * </ul>
+ *
+ * @author 蹇冪數鎺掗槦瑁呮満绯荤粺
+ */
+public class HisEcgFilterTest {
+
+ private HisEcgFilter filter = new HisEcgFilter();
+
+ // ==================== 渚濇嵁 A锛氱敵璇峰崟鍙峰悗缂� ====================
+
+ @Test
+ public void testSuffix_shouldMatchEcgApplyNo() {
+ // 鏃ュ織瀹炴祴鐨勫績鐢电敵璇峰崟鍙凤紙S0201ECG 鍒涘缓锛�
+ assertTrue(filter.matchApplyNoSuffix("8826091720001101"));
+ assertTrue(filter.matchApplyNoSuffix("8826081120716401"));
+ assertTrue(filter.matchApplyNoSuffix("8826091520521101"));
+ assertTrue(filter.matchApplyNoSuffix("8826091420571101"));
+ }
+
+ @Test
+ public void testSuffix_shouldNotMatchRadiologyApplyNo() {
+ // 鏃ュ織瀹炴祴鐨勬斁灏�/瓒呭0鐢宠鍗曞彿锛圫0405 鎺ㄩ�侊紝绾暟瀛楁祦姘村彿锛屾棤蹇冪數鍚庣紑锛�
+ assertFalse(filter.matchApplyNoSuffix("2126091602867"));
+ assertFalse(filter.matchApplyNoSuffix("2126091700001"));
+ assertFalse(filter.matchApplyNoSuffix("2126091700038"));
+ assertFalse(filter.matchApplyNoSuffix("2126091700190"));
+ }
+
+ @Test
+ public void testSuffix_shouldHandleBlank() {
+ assertFalse(filter.matchApplyNoSuffix(null));
+ assertFalse(filter.matchApplyNoSuffix(""));
+ assertFalse(filter.matchApplyNoSuffix(" "));
+ }
+
+ // ==================== 渚濇嵁 B锛氭鏌ラ」鐩唬鐮� / 鍚嶇О ====================
+
+ @Test
+ public void testCheckCode_shouldMatchWithAndWithoutPrefix() {
+ // 鏃ュ織瀹炴祴锛歋0201ECG 鎶ユ枃鐨� component2...code.code = "Y1202065"锛堝簥杈瑰績鐢靛浘锛�
+ // HisCheckCodeEnum 鐨� code 涓哄幓鍓嶇紑鍚庣殑 "1202065"
+ assertTrue(filter.matchCheckCode("Y1202065"));
+ assertTrue(filter.matchCheckCode("1202065"));
+ // 鍏朵粬瀹炲績鐢甸」鐩�
+ assertTrue(filter.matchCheckCode("Y691133607"));
+ assertTrue(filter.matchCheckCode("Y559542128"));
+ }
+
+ @Test
+ public void testCheckCode_shouldNotMatchRadiologyCode() {
+ // 鏃ュ織瀹炴祴锛氭斁灏�/瓒呭0椤圭洰鐨� jcxmcode锛堜笉鍦ㄥ績鐢垫灇涓惧唴锛�
+ assertFalse(filter.matchCheckCode("1080")); // 鑳搁儴CT骞虫壂
+ assertFalse(filter.matchCheckCode("1393")); // 鍙宠倶姝d晶浣�
+ assertFalse(filter.matchCheckCode("1006")); // 涓婁笅棰岄
+ assertFalse(filter.matchCheckCode("35689493")); // 褰╄秴瀛愬闄勪欢
+ }
+
+ @Test
+ public void testCheckName_shouldMatchEcgNames() {
+ // S0201ECG 鎶ユ枃涓嚭鐜扮殑蹇冪數妫�鏌ラ」鐩悕绉�
+ assertTrue(filter.matchCheckName("甯歌蹇冪數鍥�"));
+ assertTrue(filter.matchCheckName("24灏忔椂鍔ㄦ�佸績鐢靛浘"));
+ assertTrue(filter.matchCheckName("搴婅竟蹇冪數鍥�(甯歌+棰戣氨)"));
+ assertTrue(filter.matchCheckName("甯歌蹇冪數鍥�-蹇冪數鍚戦噺鍥�"));
+ }
+
+ @Test
+ public void testCheckName_shouldNotMatchRadiologyNames() {
+ // S0405 涓嚭鐜扮殑鍏朵粬绉戝椤圭洰鍚嶇О
+ assertFalse(filter.matchCheckName("鑳搁儴CT骞虫壂"));
+ assertFalse(filter.matchCheckName("棰呰剳MRI骞虫壂锛堝惈DWI锛�"));
+ assertFalse(filter.matchCheckName("褰╄秴鑲濊儐鑳拌劸"));
+ assertFalse(filter.matchCheckName("楠ㄥ瘑搴�"));
+ assertFalse(filter.matchCheckName("鍙宠厱鍏宠妭姝d晶浣�"));
+ }
+
+ // ==================== 渚濇嵁 C锛氭墽琛岀瀹わ紙鍙厤缃櫧鍚嶅崟锛� ====================
+
+ @Test
+ public void testDeptCode_notConfigured_shouldNotFilter() {
+ // 鏈厤缃櫧鍚嶅崟鏃讹紝渚濇嵁 C 涓嶅弬涓庡垽瀹氾紝閬垮厤璇垽
+ assertFalse(filter.matchDeptCode("YJ001"));
+ assertFalse(filter.matchDeptCode("YJ002"));
+ }
+
+ @Test
+ public void testDeptCode_configured_shouldMatch() {
+ filter.setEcgDeptCodes(Arrays.asList("YJECG01", "YJECG02"));
+ assertTrue(filter.matchDeptCode("YJECG01"));
+ assertTrue(filter.matchDeptCode("yjecg02")); // 蹇界暐澶у皬鍐�
+ assertFalse(filter.matchDeptCode("YJ001")); // 鏀惧皠绉戝涓嶅湪鐧藉悕鍗�
+ }
+
+ @Test
+ public void testDeptCode_shouldHandleEmptyWhitelistAndBlank() {
+ filter.setEcgDeptCodes(Collections.emptyList());
+ assertFalse(filter.matchDeptCode("YJ001"));
+ filter.setEcgDeptCodes(Arrays.asList("YJECG01"));
+ assertFalse(filter.matchDeptCode(null));
+ assertFalse(filter.matchDeptCode(""));
+ }
+
+ // ==================== 缁煎悎鍒ゅ畾 ====================
+
+ @Test
+ public void testJudge_ecgOrderBySuffix() {
+ HisEcgFilter.Result r = filter.judge("8826091720001101", null, null, null);
+ assertTrue(r.isEcg());
+ assertTrue("搴斿懡涓緷鎹� A锛屽疄闄�=" + r.getReason(), r.getReason().startsWith("A:"));
+ }
+
+ @Test
+ public void testJudge_ecgOrderByCheckCode() {
+ // 鐢宠鍗曞彿涓嶆槸蹇冪數鍚庣紑锛屼絾妫�鏌ラ」鐩槸蹇冪數 鈫� 浠嶅簲鍒ゅ畾涓哄績鐢靛崟
+ HisEcgFilter.Result r = filter.judge("2126091700001", "Y1202065", null, null);
+ assertTrue(r.isEcg());
+ assertTrue("搴斿懡涓緷鎹� B锛屽疄闄�=" + r.getReason(), r.getReason().startsWith("B:"));
+ }
+
+ @Test
+ public void testJudge_nonEcgRadiologyOrder() {
+ // 鍏稿瀷鏀惧皠鍗曪細CT 骞虫壂 + 鎬ヨ瘖CT瀹� 鈫� 涓夐」閮戒笉鍛戒腑
+ HisEcgFilter.Result r = filter.judge("2126091602867", "1080", "鑳搁儴CT骞虫壂", "YJ002");
+ assertFalse("鏀惧皠鍗曚笉搴旇鍒や负蹇冪數鍗�", r.isEcg());
+ }
+
+ @Test
+ public void testJudge_nonEcgUltrasoundOrder() {
+ // 鍏稿瀷瓒呭0鍗�
+ HisEcgFilter.Result r = filter.judge("2126091700038", "35711720", "褰╄秴瀹绠¢暱搴�", "YJ001");
+ assertFalse(r.isEcg());
+ }
+
+ @Test
+ public void testIsEcgOrder_convenience() {
+ assertTrue(filter.isEcgOrder("S0405", "8826091720001101", null, null, null));
+ assertFalse(filter.isEcgOrder("S0405", "2126091602867", "1080", "鑳搁儴CT骞虫壂", "YJ002"));
+ }
+
+ // ==================== 澶氬�兼鏌ラ」鐩紙S050401/S050501 鐨� ZDY.jcxmcode / jcxmname锛� ====================
+
+ @Test
+ public void testMatchCheckItems_shouldSplitCommaSeparated() {
+ // 瀹炴祴 S050401锛氶潪蹇冪數锛圖R 姝d晶浣嶏級
+ assertFalse(filter.matchCheckItems("1393,1506", "鍙宠倶姝d晶浣�,宸﹁偐鍏宠妭姝d晶浣�"));
+ // 瀹炴祴 S050501锛氶潪蹇冪數锛堝僵瓒咃級
+ assertFalse(filter.matchCheckItems("35672306,35672504,35672544,35672596",
+ "褰╄秴鍙充笅鑲㈠姩鑴�,褰╄秴鍙充笅鑲㈤潤鑴�,褰╄秴宸︿笅鑲㈠姩鑴�,褰╄秴宸︿笅鑲㈤潤鑴�"));
+ }
+
+ @Test
+ public void testMatchCheckItems_shouldMatchWhenAnyIsEcg() {
+ // 娣峰悎鍦烘櫙锛氬彧瑕佹湁涓�涓槸蹇冪數灏辩畻蹇冪數鍗�
+ assertTrue(filter.matchCheckItems("1393", "鍙宠倶姝d晶浣�,甯歌蹇冪數鍥�"));
+ assertTrue(filter.matchCheckItems("Y1202065", "褰╄秴鑲濊儐鑳拌劸"));
+ }
+
+ // ==================== 鍏抽敭瀛楀厹搴曪紙蹇冪數椤圭洰鍚嶅潎鍚�屽績鐢点�嶏級 ====================
+
+ @Test
+ public void testCheckName_keywordFallback() {
+ // 鏈敹褰曡繘鏋氫妇鐨勫巻鍙�/鏂板闀垮熬鍚嶇О锛屽彧瑕佸惈銆屽績鐢点�嶅嵆璁ゅ彲
+ assertTrue(filter.matchCheckName("鍗佷簩瀵艰仈蹇冪數妫�鏌�"));
+ assertTrue(filter.matchCheckName("蹇冪數鐩戞姢"));
+ assertTrue(filter.matchCheckName("杩愬姩蹇冪數"));
+ // 鏋氫妇宸叉敹褰曠殑浠嶆甯�
+ assertTrue(filter.matchCheckName("甯歌蹇冪數鍥�"));
+ }
+
+ /**
+ * 鈿狅笍 鍏抽敭鍥炲綊锛�**涓嶅惈銆屽績鐢点�嶄簩瀛楃殑蹇冪數妫�鏌ュ繀椤讳粛琚垽涓哄績鐢�**銆�
+ *
+ * <p>鐢ㄦ埛鎸囧嚭鐨勫弽渚嬨�傛牳瀵� {@code check_type} 琛ㄧ‘璁わ紝鏈櫌 15 涓績鐢电被鍨嬩腑
+ * 鏈� 4 涓悕绉颁笉鍚�屽績鐢点�嶏紝搴撲腑鍚堣 2 涓囦綑鏉$湡瀹炶褰曪細
+ * <pre>
+ * 300 鍔ㄦ�佽鍘嬶紙9083 鏉★級 500 鍔ㄨ剦纭寲妫�娴嬶紙11205 鏉★級
+ * 600 椋熼亾鐢电敓鐞嗭紙60 鏉★級 900 蹇冨鏅氱數浣嶏紙0 鏉★級
+ * </pre>
+ * 鑻ヤ粎鐢�"鍚績鐢�"鍒ゅ畾锛岃繖浜涘崟浼氳**璇垽涓洪潪蹇冪數鑰屼涪寮�**銆�
+ */
+ @Test
+ public void testCheckName_ecgWithoutKeyword_shouldStillBeAccepted() {
+ // 鈥斺�� 鐢ㄦ埛涓剧殑鍙嶄緥 鈥斺��
+ assertTrue("鍔ㄦ�佽鍘嬶紙check_type=300锛屽簱涓� 9083 鏉★級涓嶅簲琚涪寮�",
+ filter.matchCheckName("鍔ㄦ�佽鍘�"));
+ assertTrue("鍔ㄨ剦纭寲锛坈heck_type=500锛屽簱涓� 11205 鏉★級涓嶅簲琚涪寮�",
+ filter.matchCheckName("鍔ㄨ剦纭寲"));
+ assertTrue("杩愬姩璇曢獙锛坈heck_type=400锛変笉搴旇涓㈠純",
+ filter.matchCheckName("杩愬姩璇曢獙"));
+ assertTrue("椋熼亾鐢电敓鐞嗭紙check_type=600锛変笉搴旇涓㈠純",
+ filter.matchCheckName("椋熼亾鐢电敓鐞�"));
+ // 鈥斺�� check_type 琛ㄤ腑鐨勫噯纭悕绉� 鈥斺��
+ assertTrue(filter.matchCheckName("鍔ㄨ剦纭寲妫�娴�"));
+ assertTrue(filter.matchCheckName("蹇冨鏅氱數浣�"));
+ assertTrue(filter.matchCheckName("骞虫澘杩愬姩蹇冪數"));
+ assertTrue(filter.matchCheckName("蹇冪數鍥捐嵂鐗╄礋鑽疯瘯楠�"));
+ assertTrue(filter.matchCheckName("鍔ㄦ�佸績鐢靛浘+琛�鍘�"));
+ // 鈥斺�� 鐢熶骇鏃ュ織涓殑瀹為檯鍚嶇О鍙樹綋锛圫050401 瀹炴祴锛夆�斺��
+ assertTrue("瀹炴祴 S050401 涓� '24灏忔椂鍔ㄦ�佽鍘嬬洃娴�' 涓嶅惈銆屽績鐢点�嶏紝闈犵櫧鍚嶅崟閫氳繃",
+ filter.matchCheckName("24灏忔椂鍔ㄦ�佽鍘嬬洃娴�"));
+ assertTrue(filter.matchCheckName("24灏忔椂鍔ㄦ�佸績鐢靛浘"));
+ assertTrue(filter.matchCheckName("24灏忔椂鍔ㄦ�佸績鐢电洃娴�"));
+ assertTrue("瀹炴祴 S050401 涓� '蹇冪數鍥捐繍鍔ㄨ瘯楠�' 搴斿搴� check_type=400",
+ filter.matchCheckName("蹇冪數鍥捐繍鍔ㄨ瘯楠�"));
+ // 骞虫澘杩愬姩鐨勫悇绉嶅啓娉�
+ assertTrue(filter.matchCheckName("骞虫澘杩愬姩璇曢獙"));
+ assertTrue(filter.matchCheckName("骞虫澘杩愬姩蹇冪數鍥�"));
+ assertTrue(filter.matchCheckName("娲诲姩骞虫澘璇曢獙"));
+ }
+
+ /**
+ * 闈炲績鐢垫帓闄よ瘝锛氬悕绉板惈銆屽績鑴忋�嶄絾灞炲叾浠栫瀹よ�咃紝蹇呴』鍒ゅ惁銆�
+ * 锛�"褰╄秴鑳庡効蹇冭剰""瓒呭0閫犲奖绔嬩綋鎴愬儚锛堝彸蹇冿級"鍧囨潵鑷疄娴嬫棩蹇楋級
+ */
+ @Test
+ public void testCheckName_nonEcgExcludeKeywords() {
+ assertFalse("褰╄秴鑳庡効蹇冭剰灞炶秴澹扮锛屼笉搴旇褰撲綔蹇冪數",
+ filter.matchCheckName("褰╄秴鑳庡効蹇冭剰"));
+ assertFalse(filter.matchCheckName("瓒呭0閫犲奖绔嬩綋鎴愬儚锛堝彸蹇冿級"));
+ assertFalse(filter.matchCheckName("褰╄秴蹇冭剰锛堝父瑙勶級"));
+ assertFalse(filter.matchCheckName("褰╄秴蹇冭剰锛�14宀佷互涓嬶級"));
+ assertFalse(filter.matchCheckName("褰╄秴搴婃梺蹇冨寘鑵�"));
+ }
+
+ /**
+ * 鐢ㄥ疄娴嬫棩蹇椾腑鍑虹幇鐨� 111 涓潪蹇冪數椤圭洰鍚嶇О鍋氬洖褰掞細
+ * 杩欎簺鏄� S0405 / S050401 / S050501 閲屾帹閫佺殑鏀惧皠銆佽秴澹般�佸唴闀滅瓑椤圭洰锛�
+ * 蹇呴』**鍏ㄩ儴**鍒や负闈炲績鐢碉紝鍚﹀垯浼氳璇綋浣滃績鐢电敵璇峰崟閲囬泦銆�
+ */
+ @Test
+ public void testRealNonEcgNames_shouldAllBeRejected() {
+ String[] nonEcgNames = {
+ "褰╄秴鑲濊儐鑳拌劸", "褰╄秴浜ф锛堝崟鑳庯級", "褰╄秴蹇冭剰锛堝父瑙勶級", "褰╄秴棰堝姩鑴�",
+ "褰╄秴鐢茬姸鑵哄強棰堥儴娣嬪反缁�", "褰╄秴鏃╁瓡锛堢粡闃�5-11w锛�", "褰╄秴浜ф1",
+ "褰╄壊澶氭櫘鍕掕秴澹版鏌ワ紙寮规�ф垚鍍忥級", "褰╄秴鏃╁瓡锛堢粡鑵�5-11w锛�", "褰╄秴瀛愬闄勪欢锛堢粡鑵癸級",
+ "褰╄秴瀛愬闄勪欢锛堢粡闃撮亾锛�", "褰╄秴鍙岃偩杈撳翱绠¤唨鑳�", "褰╄秴妞庡姩鑴�", "褰╄秴鑲句笂鑵�",
+ "褰╄秴鑲惧姩鑴�", "褰╄秴浜ф锛堝弻鑳庯級", "褰╄秴鍙屼钩鍙婅厠绐濇穻宸寸粨", "褰╄秴闃戝熬",
+ "褰╄秴瀹绠¢暱搴�", "瓒呭0閫犲奖绔嬩綋鎴愬儚锛堝彸蹇冿級", "褰╄秴鍙充笅鑲㈠姩鑴�", "褰╄秴鐫句父",
+ "褰╄秴鍗垫场鐩戞祴锛堢粡闃撮亾锛�", "褰╄秴搴婃梺鑳歌厰", "褰╄秴搴婃梺宸︿笅鑲㈤潤鑴�",
+ "褰╄秴搴婃梺蹇冨寘鑵�", "褰╄秴搴婃梺鍙岃偩杈撳翱绠¤唨鑳�", "褰╄秴鑵硅啘鍚庢穻宸寸粨",
+ "褰╄秴搴婃梺鑲濊儐鑳拌劸", "褰╄秴鑳歌厰", "褰╄秴鑳庡効绯荤粺鎬х瓫鏌�", "褰╄秴鐩嗚厰瓒呭0锛堢粡闃撮亾锛�",
+ "褰╄秴娑庤吅锛堥涓嬭吅銆佽叜鑵猴級", "褰╄秴蹇冭剰锛堢粡椋熺-鍗靛渾瀛旓級", "褰╄秴瀛愬鍔ㄨ剦锛堢粡闃撮亾锛�",
+ "褰╄秴鐢茬姸鑵�", "褰╄秴鑵硅偂娌熸穻宸寸粨锛堝弻渚э級", "褰╄秴蹇冭剰锛�14宀佷互涓嬶級",
+ "褰╄秴浣撹〃鍖呭潡1锛堣鏍囨敞1鍧楀寘鍧楀叿浣撲綅缃級",
+ "鑳搁儴骞虫壂", "鑳搁儴CT骞虫壂", "棰呰剳CT骞虫壂", "涓婅吂閮–T骞虫壂", "鍙h厰CT",
+ "涓嬭吂閮–T骞虫壂", "鐩嗚厰CT骞虫壂", "鑳搁儴楂樺垎杈紙HRCT)", "鑳搁儴CT澧炲己",
+ "棰呰剳MRI骞虫壂锛堝惈DWI锛�", "棰呰剳MRI骞虫壂", "棰呰剳骞虫壂", "棰呰剳骞虫壂+DWI",
+ "鑵版骞虫壂", "棰堟骞虫壂", "鑵版+浜屻�佷笁缁�", "鍙宠偐鍏宠妭骞虫壂", "宸﹁啙鍏宠妭骞虫壂",
+ "鍙宠啙鍏宠妭骞虫壂", "鍙宠冻骞虫壂", "鍏ㄨ吂閮ㄥ钩鎵�+澧炲己", "鍏ㄨ吂閮ㄥ钩鎵�(骞虫壂涓変釜閮ㄤ綅锛�",
+ "涓婅吂閮ㄥ寮�", "鍓嶅垪鑵哄寮�", "鑲濊剰澧炲己", "涔宠吅澧炲己", "鐩嗚厰澧炲己",
+ "鍐犺剦CTA", "鑴慍TA", "棰圕TA", "棰呰剳TOF MRA",
+ "鑳搁儴姝d綅", "鑳搁儴姝d晶浣�", "鑳搁儴姝f枩浣嶏紙璧锋悘鍣級", "灏忓効鑳哥墖",
+ "鍙宠啙鍏宠妭", "宸﹁啙鍏宠妭姝d晶浣�", "鍙宠啙鍏宠妭姝d晶浣�", "鍙宠偂楠ㄥ叏闀挎渚т綅",
+ "宸﹁儷鑵撻鍏ㄩ暱姝d晶浣�", "楠ㄧ泦姝d綅", "鑵版姝d晶浣�", "鑵版杩囧眻杩囦几",
+ "鍙宠倶姝d晶浣�", "鍙虫墜鎸囨渚т綅", "鍙宠厱鍏宠妭姝d晶浣�", "鍙宠厱鍏宠妭",
+ "鍙宠笣鍏宠妭姝d晶浣�", "宸﹁偐鍏宠妭姝f枩浣�", "鍙冲昂妗¢姝d晶浣�", "鍙宠偙楠ㄦ渚т綅",
+ "鍏ㄤ笅鑲㈡浣�", "宸﹁儷鑵撻", "涓婁笅棰岄", "涔崇獊姘村钩", "棰堟", "鑵版",
+ "鑵归儴骞崇墖(鍗т綅)KUB", "鍙岃偩杈撳翱绠″叏闀�", "楠ㄥ瘑搴�",
+ "鑲洪�氭皵鍔熻兘妫�鏌�", "鑲哄讥鏁e姛鑳芥鏌�", "鏀皵绠℃縺鍙戣瘯楠屾鏌�", "鏀皵绠¤垝寮犺瘯楠�",
+ "涓�姘у寲姘懠姘旀祴瀹�", "鏃犵棝鑳冮暅", "鐢靛瓙鑳冮暅妫�鏌�", "鏃犵棝鑲犻暅",
+ "鏃犲垱鑲濆脊鎬ф祴瀹�", "蹇冭剰鍔熻兘"
+ };
+ java.util.List<String> wrong = new java.util.ArrayList<>();
+ for (String name : nonEcgNames) {
+ if (filter.matchCheckName(name)) {
+ wrong.add(name);
+ }
+ }
+ assertTrue("浠ヤ笅闈炲績鐢甸」鐩璇垽涓哄績鐢�: " + wrong, wrong.isEmpty());
+ }
+
+ // ==================== judgeWithZdy锛圫050401/S050501 涓撶敤鍏ュ彛锛� ====================
+
+ @Test
+ public void testJudgeWithZdy_shouldRejectRadiology() {
+ java.util.Map<String, Object> zdy = new java.util.HashMap<>();
+ zdy.put("jcxmcode", "1393,1506");
+ zdy.put("jcxmname", "鍙宠倶姝d晶浣�,宸﹁偐鍏宠妭姝d晶浣�");
+ zdy.put("roomname", "2鍙锋満鎴�(DR)");
+ HisEcgFilter.Result r = filter.judgeWithZdy("2126091700001", "ZY012", zdy);
+ assertFalse("DR 姝d晶浣嶄笉搴斿垽涓哄績鐢靛崟: " + r.getReason(), r.isEcg());
+ }
+
+ @Test
+ public void testJudgeWithZdy_shouldRejectUltrasound() {
+ java.util.Map<String, Object> zdy = new java.util.HashMap<>();
+ zdy.put("jcxmcode", "35672306,35672504");
+ zdy.put("jcxmname", "褰╄秴鍙充笅鑲㈠姩鑴�,褰╄秴鍙充笅鑲㈤潤鑴�");
+ zdy.put("roomname", "5鍙疯瘖瀹�");
+ assertFalse(filter.judgeWithZdy("2126091700038", "ZY012", zdy).isEcg());
+ }
+
+ @Test
+ public void testJudgeWithZdy_shouldAcceptEcgOrder() {
+ // 蹇冪數鍗曪細鍚嶇О鍚�屽績鐢点��
+ java.util.Map<String, Object> zdy = new java.util.HashMap<>();
+ zdy.put("jcxmcode", "1202065");
+ zdy.put("jcxmname", "搴婅竟蹇冪數鍥�(甯歌+棰戣氨)");
+ zdy.put("roomname", "蹇冪數妫�鏌ュ");
+ HisEcgFilter.Result r = filter.judgeWithZdy("2126091700001", "ZY012", zdy);
+ assertTrue("蹇冪數椤圭洰搴斿垽涓哄績鐢靛崟: " + r.getReason(), r.isEcg());
+ }
+
+ @Test
+ public void testJudgeWithZdy_shouldAcceptByApplyNoSuffix() {
+ // 鍗充究妫�鏌ラ」鐩彇涓嶅埌锛屽彧瑕佺敵璇峰崟鍙峰甫蹇冪數鍚庣紑涔熻鍙�
+ java.util.Map<String, Object> zdy = new java.util.HashMap<>();
+ assertTrue(filter.judgeWithZdy("8826091720001101", null, zdy).isEcg());
+ assertTrue(filter.judgeWithZdy("8826081120716401", null, null).isEcg());
+ }
+}
diff --git a/jh-server/src/main/java/cn/lihu/jh/server/ecg/FrontendAuthorizeRequestsCustomizer.java b/jh-server/src/main/java/cn/lihu/jh/server/ecg/FrontendAuthorizeRequestsCustomizer.java
new file mode 100644
index 0000000..1d61ae2
--- /dev/null
+++ b/jh-server/src/main/java/cn/lihu/jh/server/ecg/FrontendAuthorizeRequestsCustomizer.java
@@ -0,0 +1,106 @@
+package cn.lihu.jh.server.ecg;
+
+import cn.lihu.jh.framework.security.config.AuthorizeRequestsCustomizer;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
+
+/**
+ * 鍓嶇闈欐�佽祫婧愪笌 SPA 椤甸潰澶栧3鐨勫厤鐧诲綍瑙勫垯銆�
+ *
+ * <h3>涓轰粈涔堥渶瑕佽繖涓被</h3>
+ * 鎶婂墠绔墦杩涗簡 jar 涔嬪悗锛屽悗绔紑濮嬫壙鎷�"鎻愪緵椤甸潰涓庨潤鎬佽祫婧�"鐨勮亴璐o紝
+ * 浣嗚妺閬撴鏋堕粯璁ょ殑闈欐�佽祫婧愮櫧鍚嶅崟鍙鐩栬剼鏈笌鏍峰紡锛�
+ *
+ * <pre>
+ * JhWebSecurityConfigurerAdapter#filterChain:
+ * .antMatchers(GET, "/*.html", "/**/*.html", "/**/*.css", "/**/*.js").permitAll()
+ * </pre>
+ *
+ * 鍥犳涓嬪垪璇锋眰浼氬懡涓厹搴曡鍒� {@code anyRequest().authenticated()} 骞惰繑鍥�
+ * {@code 401 璐﹀彿鏈櫥褰晑锛岃〃鐜颁负**娴忚鍣ㄧ櫧灞忔垨鎺夌嚎**锛�
+ * <ul>
+ * <li>{@code /logo.gif}銆亄@code /favicon.ico} 鈥斺�� 鐧诲綍椤典笌鍔犺浇鍔ㄧ敾渚濊禆鐨勫浘鐗�</li>
+ * <li>{@code /assets/*.svg|png|woff} 鈥斺�� 鍥炬爣涓庡瓧浣擄紙js/css 鎭板ソ琚笂闈㈣鍒欐斁琛岋紝
+ * 鎵�浠ユ渶鍒濈棁鐘舵槸"鎺ュ彛閮介�氥�侀〉闈㈢櫧灞�"锛屾瀬鍏疯糠鎯戞�э級</li>
+ * <li>椤甸潰璺緞 鈥斺�� 鐢ㄦ埛鍒锋柊鎴栫洿鎺ヨ闂椂娴忚鍣ㄥ皻鏈惡甯� token锛�
+ * 鑻ヨ姹傝璇佷細鐩存帴 401锛屽鑷�"涓�鍒锋柊灏辨帀绾�"</li>
+ * </ul>
+ *
+ * <h3>椤甸潰璺緞娓呭崟鐨勬潵婧�</h3>
+ * 鍙栬嚜 {@code ecg_web/src/router/modules/remaining.ts} 鐨勯《灞傞潤鎬佽矾鐢�
+ * 锛坧ath 涓嶅惈鍔ㄦ�佸弬鏁拌�咃級锛屼互鍙婂姩鎬佽彍鍗曪紙{@code system_menu} 琛級鍙兘鍑虹幇鐨�
+ * 涓氬姟鍓嶇紑锛�
+ * <pre>
+ * / /user /dict /codegen /job /login /roomselect
+ * /redirect /sso /social-login /403 /404 /500
+ * /calling-screen-big /calling-screen-room
+ * /ecg/** /clinic/** /system/** /infra/**
+ * </pre>
+ *
+ * <h3>瀹夊叏鎬�</h3>
+ * 鏀捐鐨�**鍙槸鍓嶇椤甸潰澶栧3涓庨潤鎬佽祫婧�**锛屼笉娑夊強浠讳綍鏁版嵁锛�
+ * <ul>
+ * <li>{@code /admin-api/**} 鍏ㄩ儴涓氬姟鎺ュ彛浠嶈蛋 token 閴存潈锛屾湭鎺堟潈鎷夸笉鍒版暟鎹�</li>
+ * <li>椤甸潰澶栧3鏈韩涓嶅惈浠讳綍鎮h�呬俊鎭紝鍐呭鐢卞墠绔嬁鍒� token 鍚庡彟琛岃姹�</li>
+ * <li>{@code /system/**}銆亄@code /infra/**} 绛夋斁琛岀殑鏄�**椤甸潰**锛�
+ * 鍏舵暟鎹帴鍙d綅浜� {@code /admin-api/system/**}銆亄@code /admin-api/infra/**}锛�
+ * 浠嶅湪閴存潈淇濇姢涔嬩笅</li>
+ * <li>杩欎笌鍚堝苟鍓� nginx 鎶婇潤鎬侀〉闈㈠叕寮�鎵樼鐨勮涓轰竴鑷达紝鏈檷浣庡畨鍏ㄧ瓑绾�</li>
+ * </ul>
+ * 娉ㄦ剰 {@code /admin-api/**} 鐗规剰涓嶅湪鏀捐涔嬪垪锛岄伩鍏嶈浼ゆ帴鍙i壌鏉冦��
+ *
+ * @author 蹇冪數鎺掗槦瑁呮満绯荤粺
+ */
+public class FrontendAuthorizeRequestsCustomizer extends AuthorizeRequestsCustomizer {
+
+ /** 闈欐�佽祫婧愩�備笉鍚� html/css/js 鈥斺�� 妗嗘灦宸叉斁琛岋紝姝ゅ琛ラ綈鍏朵綑绫诲瀷 */
+ private static final String[] STATIC_RESOURCE_PATTERNS = {
+ "/favicon.ico", "/logo.gif", "/logo.png", "/logo0.png",
+ "/assets/**", "/static/**",
+ };
+
+ /**
+ * SPA 椤甸潰澶栧3銆�
+ * 蹇呴』涓� {@link SpaForwardController} 鐨勬槧灏勪繚鎸佸悓姝ワ紝
+ * 鍚﹀垯浼氬嚭鐜�"杞彂鑳藉埌銆佷絾琚畨鍏ㄥ眰鎷︿笅 401"鐨勪笉涓�鑷寸幇璞°��
+ *
+ * <h4>鈿狅笍 涓轰粈涔� ECG 蹇呴』閫愭潯绮剧‘鏋氫妇锛屼笉鑳界敤 /ecg/**</h4>
+ * ECG 鐨勫悗绔帴鍙d笌鍓嶇椤甸潰鍏辩敤 {@code /ecg/} 鍛藉悕绌洪棿锛屼緥濡傦細
+ * <pre>
+ * 鎺ュ彛: /ecg/screen/big-screen-data銆�/ecg/queue/page銆�/ecg/call/next
+ * 椤甸潰: /ecg/queue銆�/ecg/room銆�/ecg/check-type
+ * </pre>
+ * 鑻ユ澶勬斁琛� {@code /ecg/**}锛屽垯**鎵�鏈� ECG 鎺ュ彛閮戒細鍙樻垚鍏嶉壌鏉�**锛�
+ * 灞炰簬涓ラ噸鐨勫畨鍏ㄦ紡娲烇紙鏈櫥褰曞嵆鍙鍐欐帓闃熸暟鎹級銆�
+ * 绮剧‘璺緞鍦� Spring 涓笉浼氬尮閰嶅甫瀛愯矾寰勭殑鎺ュ彛锛屽洜姝ゆ槸瀹夊叏鐨勩��
+ */
+ private static final String[] SPA_PAGE_PATTERNS = {
+ "/", "/index.html",
+ // 鏉ヨ嚜 remaining.ts 鐨勯《灞傞潤鎬佽矾鐢�
+ "/user/**", "/dict/**", "/codegen/**", "/job/**",
+ "/login", "/roomselect",
+ "/redirect/**", "/sso", "/social-login",
+ "/403", "/404", "/500",
+ "/calling-screen-big", "/calling-screen-room",
+ // 鈥斺�� ECG 涓氬姟椤碉細蹇呴』绮剧‘锛岀姝� /ecg/** 鈥斺��
+ "/ecg/appointment", "/ecg/appointment-confirm", "/ecg/alter",
+ "/ecg/queue", "/ecg/roomselect",
+ "/ecg/doc/routine", "/ecg/doc/dev-ready", "/ecg/doc/dev-install",
+ "/ecg/dev-dismantle", "/ecg/dev-rent",
+ "/ecg/doctor/dev-data-entry",
+ "/ecg/job-statistic", "/ecg/dev-statistic",
+ "/ecg/room", "/ecg/roomstatus", "/ecg/dev-model",
+ "/ecg/device", "/ecg/check-type",
+ // 鈥斺�� 璇婂椤碉紙鎺ュ彛 /clinic/room/* 甯﹀瓙璺緞锛屼笉鍐茬獊锛夆�斺��
+ "/clinic/room",
+ // 鈥斺�� 绯荤粺绠$悊涓庡熀纭�璁炬柦椤碉紙鍏舵帴鍙e潎浣嶄簬 /admin-api 涓嬶紝涓嶅啿绐侊級鈥斺��
+ "/system/**", "/infra/**",
+ };
+
+ @Override
+ public void customize(ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry registry) {
+ registry.antMatchers(STATIC_RESOURCE_PATTERNS).permitAll();
+ registry.antMatchers(SPA_PAGE_PATTERNS).permitAll();
+ }
+
+}
diff --git a/jh-server/src/main/java/cn/lihu/jh/server/ecg/FrontendResourceConfig.java b/jh-server/src/main/java/cn/lihu/jh/server/ecg/FrontendResourceConfig.java
new file mode 100644
index 0000000..f231867
--- /dev/null
+++ b/jh-server/src/main/java/cn/lihu/jh/server/ecg/FrontendResourceConfig.java
@@ -0,0 +1,109 @@
+package cn.lihu.jh.server.ecg;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * 鍓嶇闈欐�佽祫婧愭槧灏勶紙閰嶅悎"鍓嶇鎵撹繘 jar"鐨勫悎骞堕儴缃叉柟妗堬級銆�
+ *
+ * <h3>浣滅敤</h3>
+ * 鎶� jar 鍐� {@code META-INF/resources/frontend/} 涓嬬殑鍓嶇鏋勫缓浜х墿鏄犲皠鍒扮珯鐐规牴璺緞銆�
+ *
+ * <pre>
+ * URL 鏉ユ簮
+ * /assets/index-xxx.js -> classpath:/META-INF/resources/frontend/assets/index-xxx.js
+ * /logo.gif -> classpath:/META-INF/resources/frontend/logo.gif
+ * /favicon.ico -> classpath:/META-INF/resources/frontend/favicon.ico
+ * /static/jquery.min.js -> classpath:/META-INF/resources/frontend/static/jquery.min.js
+ * </pre>
+ *
+ * <h3>鈿� 涓轰粈涔堛�愪笉鑳姐�戠敤 {@code /**} 閫氶厤锛堥噸瑕侊級</h3>
+ * 鍒濈増鏇惧啓鎴� {@code registry.addResourceHandler("/**")}锛岃繖鏄�**閿欒**鐨勶細
+ * 涓�鏃︽妸 {@code /**} 鎸囧悜鍓嶇鐩綍锛屼互涓嬪悗绔嚜甯︾殑璺緞浼氳闈欐�佽祫婧愬鐞嗗櫒
+ * 鎶㈠厛鍖归厤锛屽鑷撮潤鎬佹枃浠舵壘涓嶅埌鑰�**鐩存帴 404**锛屾帶鍒跺櫒涓嶅啀鏈夋満浼氬鐞嗭細
+ * <ul>
+ * <li>{@code /doc.html}銆亄@code /swagger-ui/**}銆亄@code /v3/api-docs/**}
+ * 鈥斺�� Knife4j / springdoc 鎺ュ彛鏂囨。</li>
+ * <li>{@code /druid/**} 鈥斺�� Druid 鐩戞帶鍙帮紙鍏� Servlet 宸插惎鐢級</li>
+ * <li>{@code /actuator/**} 鈥斺�� Spring Boot 鐩戞帶绔偣</li>
+ * <li>{@code /jmreport/**} 鈥斺�� 绉湪鎶ヨ〃锛堣嫢灏嗘潵鍚敤锛�</li>
+ * <li>{@code /admin-api/**} 鈥斺�� 鍏ㄩ儴涓氬姟鎺ュ彛</li>
+ * <li>{@code /profile/**} 鈥斺�� 蹇冪數妯″潡
+ * {@code WebConfig} 鏄犲皠鍒版枃浠剁郴缁熶笂浼犵洰褰�</li>
+ * </ul>
+ * 鍥犳杩欓噷鏀逛负**鏄惧紡鏋氫妇鍓嶇鐪熷疄瀛樺湪鐨勮祫婧愬墠缂�**锛屾妸鏍硅矾寰勭暀缁欏悗绔嚜宸便��
+ *
+ * <h3>鍓嶇浜х墿瀹為檯鍖呭惈鍝簺椤跺眰鏉$洰</h3>
+ * 渚濇嵁 {@code dist-prod} 鐨勫疄闄呮瀯寤虹粨鏋滐細
+ * <pre>
+ * index.html, favicon.ico, logo.gif 鈫� 鏂囦欢
+ * bigCall.html, smallCall.html 鈫� kiosk 椤碉紙寤鸿鍒犻櫎锛岃閮ㄧ讲鎸囧崡锛�
+ * assets/ 鈫� 甯﹀唴瀹瑰搱甯岀殑 js/css/瀛椾綋/鍥剧墖
+ * static/ 鈫� jquery銆乤xios銆乿ue 绛夌涓夋柟闈欐�佸簱
+ * </pre>
+ *
+ * <h3>SPA 娣卞眰璺敱鐨勫厹搴�</h3>
+ * 鏈被**涓嶈礋璐�** SPA 鍏滃簳锛堝墠绔敤 {@code createWebHistory()}锛屽埛鏂版繁灞傝矾鐢�
+ * 浼� 404锛夈�傚厹搴曠敱 {@link SpaForwardController} 鏄惧紡鏋氫妇 5 绫婚〉闈㈣矾寰勫畬鎴愶紝
+ * 杩欐牱鏃慨澶嶅埛鏂� 404锛屽張涓嶄細鎶婂悗绔湡瀹炵殑 404 鍚炴垚 index.html銆�
+ *
+ * @author 蹇冪數鎺掗槦瑁呮満绯荤粺
+ */
+@Configuration
+public class FrontendResourceConfig implements WebMvcConfigurer {
+
+ /** 鍓嶇浜х墿鍦� jar 鍐呯殑浣嶇疆锛岄渶涓� jh-server/pom.xml 涓� targetPath 淇濇寔涓�鑷� */
+ private static final String FRONTEND_LOCATION = "classpath:/META-INF/resources/frontend/";
+
+ /** 甯﹀唴瀹瑰搱甯岀殑璧勬簮鍙暱缂撳瓨锛�30 澶╋級 */
+ private static final long CACHE_HASHED = 3600L * 24 * 30;
+
+ /** 鏃犲搱甯岀殑鏍圭骇鏂囦欢锛坙ogo.gif 绛夛級鐭紦瀛橈紝閬垮厤鏇存柊鍚庢祻瑙堝櫒涓嶅埛鏂帮紙1 灏忔椂锛� */
+ private static final long CACHE_UNHASHED = 3600L;
+
+ @Override
+ public void addResourceHandlers(ResourceHandlerRegistry registry) {
+ // Vite 浜у嚭鐨勫甫鍝堝笇璧勬簮鐩綍
+ registry.addResourceHandler("/assets/**")
+ .addResourceLocations(FRONTEND_LOCATION + "assets/")
+ .setCachePeriod((int) CACHE_HASHED);
+
+ // public/ 涓嬪師鏍锋嫹璐濈殑绗笁鏂归潤鎬佸簱锛坖query銆乤xios銆乿ue銆乪lement-ui 绛夛級
+ // 杩欎簺鏂囦欢鍚嶄笉鍚搱甯岋紝鐢ㄧ煭缂撳瓨
+ registry.addResourceHandler("/static/**")
+ .addResourceLocations(FRONTEND_LOCATION + "static/")
+ .setCachePeriod((int) CACHE_UNHASHED);
+
+ // 鏍圭骇闈欐�佹枃浠躲�傞�愪釜鍒楀嚭锛岄伩鍏� /doc.html銆�/druid/** 绛夎璇嫤鎴�
+ // 鏂囦欢鍚嶄笉鍚搱甯岋紝鐢ㄧ煭缂撳瓨
+ registry.addResourceHandler(
+ "/favicon.ico",
+ "/logo.gif",
+ "/logo.png",
+ "/logo0.png")
+ .addResourceLocations(FRONTEND_LOCATION)
+ .setCachePeriod((int) CACHE_UNHASHED);
+
+ // 娉ㄦ剰锛歩ndex.html 涓嶅湪姝ゅ鏄犲皠銆�
+ // 瀹冨彧搴旈�氳繃 SpaForwardController 鐨� forward:/frontend/index.html 璁块棶锛�
+ // 閬垮厤鍑虹幇"涓や釜鍏ュ彛閮借兘鎷垮埌棣栭〉"鐨勬涔夈��
+ }
+
+ /**
+ * 娉ㄥ唽鍓嶇鍏嶇櫥褰曡鍒欍��
+ * <p>
+ * 蹇呴』鏄惧紡澹版槑涓� Bean锛屾鏋舵墠浼氶�氳繃
+ * {@code JhWebSecurityConfigurerAdapter} 鏀堕泦骞剁敓鏁堛��
+ * 缂哄皯姝� Bean 鐨勫吀鍨嬬棁鐘讹細鎺ュ彛閮芥甯革紝浣嗘祻瑙堝櫒鎵撳紑鏄櫧灞�
+ * 锛坽@code /logo.gif}銆亄@code /favicon.ico}銆侀〉闈㈣矾寰勫潎杩斿洖
+ * {@code 401 璐﹀彿鏈櫥褰晑锛夈��
+ *
+ * @see FrontendAuthorizeRequestsCustomizer
+ */
+ @Bean
+ public FrontendAuthorizeRequestsCustomizer frontendAuthorizeRequestsCustomizer() {
+ return new FrontendAuthorizeRequestsCustomizer();
+ }
+}
diff --git a/jh-server/src/main/java/cn/lihu/jh/server/ecg/SpaForwardController.java b/jh-server/src/main/java/cn/lihu/jh/server/ecg/SpaForwardController.java
new file mode 100644
index 0000000..26eb3dc
--- /dev/null
+++ b/jh-server/src/main/java/cn/lihu/jh/server/ecg/SpaForwardController.java
@@ -0,0 +1,143 @@
+package cn.lihu.jh.server.ecg;
+
+import io.swagger.v3.oas.annotations.Hidden;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import javax.annotation.security.PermitAll;
+
+/**
+ * 鍓嶇 SPA 杞彂鎺у埗鍣紙閰嶅悎"鍓嶇鎵撹繘 jar"鐨勫悎骞堕儴缃叉柟妗堬級
+ *
+ * <h3>浣滅敤</h3>
+ * 鍓嶇鏄� Vue Router 鍗曢〉搴旂敤銆傜敤鎴风洿鎺ヨ闂垨鎸� F5 鍒锋柊涓�涓繁灞傝矾鐢�
+ * 锛堜緥濡� {@code /ecg/queue}锛夋椂锛宩ar 閲屽苟涓嶅瓨鍦ㄥ搴旂殑鐗╃悊鏂囦欢锛岄渶瑕佹妸璇锋眰
+ * 杞彂鍥� {@code index.html}锛岀敱鍓嶇璺敱鎺ョ锛屽惁鍒欎細 404銆�
+ * <p>
+ * 鍘熷厛杩欐閫昏緫鐢� nginx 鐨� {@code try_files $uri $uri/ /index.html} 鎵挎媴锛�
+ * 鍓嶇骞跺叆 jar 涔嬪悗鏀圭敱鍚庣璐熻矗锛宯ginx 鍙渶淇濈暀 {@code /admin-api/} 鍙嶅悜浠g悊銆�
+ *
+ * <h3>涓轰粈涔堟樉寮忔灇涓捐矾寰勶紝鑰屼笉鏄敤閫氶厤鍏滃簳</h3>
+ * 鍙槧灏勫墠绔疄闄呭瓨鍦ㄧ殑 5 绫婚〉闈㈣矾寰勶紙瑙� {@code src/router/modules/remaining.ts}
+ * 涓庡姩鎬佽彍鍗曡〃 {@code system_menu}锛夛細
+ * <ul>
+ * <li>{@code /} 棣栭〉</li>
+ * <li>{@code /ecg/**} 蹇冪數涓氬姟锛堥绾︺�佹帓闃熴�佸尰鐢熷伐浣滃彴銆佽瘖瀹ゃ�佽澶囥�佽褰曗�︼級</li>
+ * <li>{@code /clinic/**} 璇婂鐩稿叧</li>
+ * <li>{@code /system/**} 绯荤粺绠$悊锛堢敤鎴枫�佽鑹层�佽彍鍗曘�佸瓧鍏搞�佹棩蹇椻�︼級</li>
+ * <li>{@code /infra/**} 鍩虹璁炬柦锛堟枃浠躲�佸畾鏃朵换鍔°�佷唬鐮佺敓鎴愩�佺洃鎺р�︼級</li>
+ * </ul>
+ * 杩欐牱鍙伩鍏�"鎶婃墍鏈� 404 閮藉悶鎴� index.html"锛屼繚鐣欏悗绔湡瀹炵殑 404 璇箟
+ * 锛堜緥濡� {@code /admin-api/typo} 浠嶄細姝g‘杩斿洖 404锛夈��
+ *
+ * <h3>瀹夊叏鎬ц鏄�</h3>
+ * {@code @PermitAll} 鏄繀椤荤殑锛氬埛鏂伴〉闈㈡椂娴忚鍣ㄥ皻鏈惡甯� token锛岃嫢瑕佹眰璁よ瘉
+ * 浼氱洿鎺ヨ繑鍥� 401锛屽鑷寸敤鎴�"涓�鍒锋柊灏辨帀绾�"銆傛澶勬斁琛岀殑浠呮槸**鍓嶇椤甸潰澶栧3**锛�
+ * 鐪熷疄鏁版嵁浠嶇敱 {@code /admin-api/**} 璧� token 閴存潈锛屾湭鎺堟潈鎷夸笉鍒颁换浣曟暟鎹紝
+ * 涓庡師鍏� nginx 鍏紑闈欐�侀〉闈㈢殑琛屼负涓�鑷达紝鏈檷浣庡畨鍏ㄧ瓑绾с��
+ *
+ * <h3>涓庨潤鎬佽祫婧愮殑浼樺厛绾�</h3>
+ * 闈欐�佽祫婧愮敱 {@link FrontendResourceConfig#addResourceHandlers} 娉ㄥ唽锛�
+ * 鍏朵紭鍏堢骇楂樹簬 Controller 鏄犲皠锛屽洜姝� {@code /assets/*.js}銆亄@code /logo.gif}
+ * 绛夌湡瀹炲瓨鍦ㄧ殑鏂囦欢涓嶄細琚湰鎺у埗鍣ㄦ嫤鎴��
+ *
+ * @author 蹇冪數鎺掗槦瑁呮満绯荤粺
+ */
+@Hidden // 涓嶅湪 Swagger 鏂囨。涓睍绀�
+@Controller
+@PermitAll
+public class SpaForwardController {
+
+ /** 鍓嶇椤甸潰澶栧3銆備綅浜� jar 鍐� META-INF/resources/frontend/ 涓� */
+ private static final String SPA_INDEX = "forward:/frontend/index.html";
+
+ @GetMapping("/")
+ public String index() {
+ return SPA_INDEX;
+ }
+
+ /**
+ * remaining.ts 涓殑椤跺眰鍗曢〉璺敱锛�
+ * /login銆�/roomselect銆�/sso銆�/social-login銆�/403銆�/404銆�/500銆�
+ * /calling-screen-big銆�/calling-screen-room銆�
+ * <p>
+ * 蹇呴』涓� {@link FrontendAuthorizeRequestsCustomizer#SPA_PAGE_PATTERNS}
+ * 淇濇寔鍚屾锛屽惁鍒欎細鍑虹幇"鎺у埗鍣ㄦ湁鏄犲皠銆佸嵈琚畨鍏ㄥ眰鎷︽垚 401"鐨勪笉涓�鑷�
+ * 锛堟浘瀹炴祴婕忔帀 /roomselect 鏃跺嵆涓鸿鐥囩姸锛夈��
+ */
+ @GetMapping({"/index.html", "/login", "/roomselect",
+ "/sso", "/social-login", "/403", "/404", "/500",
+ "/calling-screen-big", "/calling-screen-room"})
+ public String simplePages() {
+ return SPA_INDEX;
+ }
+
+ /** 妗嗘灦鑷甫鐨勫姛鑳介〉锛堜釜浜轰腑蹇冦�佸瓧鍏搞�佷唬鐮佺敓鎴愩�佸畾鏃朵换鍔°�侀噸瀹氬悜涓浆锛� */
+ @GetMapping({"/user/**", "/dict/**", "/codegen/**", "/job/**", "/redirect/**"})
+ public String modulePages() {
+ return SPA_INDEX;
+ }
+
+ /**
+ * 鈿狅笍 ECG 涓氬姟椤甸潰锛氬繀椤汇�愰�愭潯绮剧‘鏋氫妇銆戯紝缁濅笉鑳界敤 {@code /ecg/**} 閫氶厤锛�
+ *
+ * <h4>涓轰粈涔堜笉鑳介�氶厤锛堣繖鏄竴涓凡瀹炴祴澶嶇幇鐨勭湡瀹炴晠闅滐級</h4>
+ * ECG 鐨勫悗绔帴鍙d笌鍓嶇椤甸潰**鍏辩敤 /ecg/ 鍛藉悕绌洪棿**锛�
+ * <pre>
+ * 鎺ュ彛锛坖avax @RestController锛� 鍓嶇椤甸潰锛堣彍鍗� path锛�
+ * /ecg/screen/big-screen-data /ecg/queue
+ * /ecg/queue/page /ecg/room
+ * /ecg/call/next /ecg/check-type
+ * /ecg/doctor/finish-next-patient /ecg/device
+ * /ecg/appointment/page /ecg/appointment
+ * </pre>
+ * 鑻ョ敤 {@code /ecg/**} 杞彂鍒� index.html锛屽垯澶у睆/璇婇棿灞忚姹�
+ * {@code /ecg/screen/big-screen-data} 浼氭嬁鍒�**HTML 鑰屼笉鏄� JSON**锛�
+ * 鍙彿灞忕洿鎺ュけ鏁堬紙HTTP 浠嶆槸 200锛屾瀬鍏疯糠鎯戞�э級銆�
+ *
+ * <h4>绮剧‘璺緞涓轰綍瀹夊叏</h4>
+ * 鍦� Spring 涓� {@code /ecg/queue} 涓� {@code /ecg/queue/page} 鏄袱涓笉鍚屾槧灏勶紝
+ * 绮剧‘璺緞涓嶄細鍖归厤甯﹀瓙璺緞鐨勬帴鍙o紝鍥犳浜岃�呭ぉ鐒跺尯鍒嗐��
+ *
+ * <h4>璺緞鏉ユ簮</h4>
+ * 鍙栬嚜 {@code system_menu} 琛ㄤ腑 parent_id 涓� ECG 鏍�(1254)鎴栫郴缁熺鐞�(1)
+ * 鐨勯〉闈� path锛屼互鍙� {@code ecg_web/src/router} 涓殑闈欐�佽矾鐢便��
+ */
+ @GetMapping({
+ // 鈥斺�� ECG 鏍�(1254) 涓嬬殑涓氬姟椤� 鈥斺��
+ "/ecg/appointment", "/ecg/appointment-confirm", "/ecg/alter",
+ "/ecg/queue", "/ecg/roomselect",
+ "/ecg/doc/routine", "/ecg/doc/dev-ready", "/ecg/doc/dev-install",
+ "/ecg/dev-dismantle", "/ecg/dev-rent",
+ "/ecg/doctor/dev-data-entry",
+ "/ecg/job-statistic", "/ecg/dev-statistic",
+ // 鈥斺�� 鎸傜郴缁熺鐞�(1) 涓嬩絾璺緞鍦� /ecg 鐨勯〉闈� 鈥斺��
+ "/ecg/room", "/ecg/roomstatus", "/ecg/dev-model",
+ "/ecg/device", "/ecg/check-type",
+ })
+ public String ecgPages() {
+ return SPA_INDEX;
+ }
+
+ /**
+ * 璇婂鐩稿叧椤甸潰銆傛敞鎰忥細鎺ュ彛 {@code /clinic/room/page} 绛夊甫瀛愯矾寰勶紝
+ * 涓庣簿纭矾寰� {@code /clinic/room} 涓嶅啿绐併��
+ */
+ @GetMapping({"/clinic/room"})
+ public String clinicPages() {
+ return SPA_INDEX;
+ }
+
+ /**
+ * 绯荤粺绠$悊涓庡熀纭�璁炬柦椤甸潰銆�
+ * <p>
+ * 杩欎袱涓墠缂�**鍙互**鐢ㄩ�氶厤锛屽洜涓� {@code /admin-api/**} 鎵嶆槸鎺ュ彛鍛藉悕绌洪棿锛�
+ * {@code /system/**}銆亄@code /infra/**} 浠呯敤浜庨〉闈紝涓嶅瓨鍦ㄥ悓鍚嶆帴鍙c��
+ * 锛堟浘鏍告煡锛歴ystem/infra 妯″潡鎵�鏈� Controller 鍧囦负 {@code @RequestMapping("/system/...")} 褰㈠紡锛�
+ * 浣嗗疄闄呰姹傝矾寰勯兘甯� {@code /admin-api} 鍓嶇紑锛屾晠涓嶅啿绐併�傦級
+ */
+ @GetMapping({"/system/**", "/infra/**"})
+ public String adminPages() {
+ return SPA_INDEX;
+ }
+}
--
Gitblit v1.9.3