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/service/devrent/DevRentServiceImpl.java | 466 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 376 insertions(+), 90 deletions(-)
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 5d9f40e..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
@@ -25,6 +25,9 @@
import cn.lihu.jh.module.ecg.feign.FeeConfirmFeignService;
import cn.lihu.jh.module.ecg.service.queue.QueueServiceTxFunctions;
import cn.lihu.jh.module.ecg.webservice.WebServiceClient;
+import cn.lihu.jh.module.infra.dal.dataobject.config.ConfigDO;
+import cn.lihu.jh.module.infra.dal.mysql.config.ConfigMapper;
+import cn.lihu.jh.module.infra.service.config.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -76,11 +79,14 @@
@Resource
CheckTypeMapper checkTypeMapper;
+ @Resource
+ private ConfigService configService;
+
@Autowired
private WebServiceClient webServiceClient;
- @Value("${spring.profiles.active}")
- private String active;
+ /** 銆愭湰闇�姹傘�戠揣鎬ュ姞鍋氱殑澶囨敞鏍囪锛屼究浜庡湪瀹屾垚鍒楄〃/鎶ヨ〃閲屽尯鍒嗚繖绫�"涓嶆帓闃熺洿鎺ユ鏌�"鐨勮褰� */
+ private static final String EMERGENCY_REMARK = "绱ф�ュ姞鍋�";
@Override
@@ -98,6 +104,13 @@
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
+ // 銆愭湰闇�姹傦細绱ф�ユ偅鑰呬笉鎺掗槦鐩存帴妫�鏌ャ��
+ // 姝ｅ父鎮ｈ�呯殑銆屽緟妫�鏌�(0)銆嶆鏌ュ崟鏄鍒板缓闃熷垪鏃朵竴璧锋彃鐨勶紱绱ф�ュ姞鍋氱殑鎮ｈ�呮病璧扮鍒帮紝
+ // 鍥犳杩欓噷鍏堟妸杩欐潯鍗曡ˉ鍑烘潵锛屽悗缁�昏緫锛堝啓浣滀笟璁板綍銆佹洿鏂伴槦鍒椼�佸洖鍐欓泦鎴愬钩鍙帮級瀹屽叏澶嶇敤銆�
+ if (Boolean.TRUE.equals(routineFinishReqVO.getEmergency())) {
+ prepareEmergencyDevRent(routineFinishReqVO, createReqVO);
+ }
+
// 鍦ㄩ绾︾‘璁ゆ椂 灏辫繘鍏� [dev_rent] 琛ㄤ簡
Long rent_id = createReqVO.getId();
@@ -107,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.getFirst().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);
@@ -151,19 +195,68 @@
//queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
// QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
- QueueDO firstOnStageQueueItem = queueMapper.getBedFirstQueueItemByStatus(createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus());
- // QueueStatusEnum.ONSTAGE => QueueStatusEnum.FINISH
- firstOnStageQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus()); // 榛樿鐘舵�� 璁剧疆
- queueMapper.updateById(firstOnStageQueueItem);
+ // 銆愮己闄蜂慨澶嶃�戝師瀹炵幇锛�
+ // QueueDO firstOnStageQueueItem = queueMapper.getBedFirstQueueItemByStatus(
+ // roomId, bedNo, ONSTAGE);
+ // firstOnStageQueueItem.setStatus(FINISH); // 鈫� 鍙栦笉鍒版椂涓� null锛岀洿鎺� NPE
+ //
+ // 涓や釜闂锛�
+ // 1) NPE锛氳宸ヤ綅褰撳墠娌℃湁"灏辫瘖涓�(30)"鎮ｈ�呮椂杩斿洖 null锛堜緥濡傚尰鐢熷厛鐐逛簡"鏀惧純妫�鏌�"锛�
+ // cancelRoutineOperation 宸叉妸璇ユ偅鑰呯疆涓� 40锛夛紝绗� 159 琛岀┖鎸囬拡 鈫� 鏁翠釜浜嬪姟鍥炴粴銆�
+ // 2) 璇激锛氬彧鎸�"宸ヤ綅 + 鐘舵�佸彇 seq_num 鏈�灏忕殑涓�鏉�"锛岃嫢鏈熼棿宸插彨浜嗕笅涓�浣嶆偅鑰咃紝
+ // 浼氭妸**涓嬩竴浣嶆偅鑰�**璇疆涓�"宸插氨璇�(40)"銆�
+ //
+ // 淇绛栫暐锛堟寜鍙潬鎬т粠楂樺埌浣庯級锛�
+ // 鈶� 浼樺厛鎸� patId + checkType 绮剧‘鍖归厤锛堝墠绔� submitForm 浼犵殑 formData 鍚繖涓や釜瀛楁锛夛紱
+ // 鈶� 閫�鍖栧埌"宸ヤ綅 + 鐘舵�� + 浠婃棩"鍙� update_time 鏈�鏂扮殑涓�鏉★紙姣� seq_num 鏈�灏忔洿璐村悎褰撳墠鎮ｈ�咃級锛�
+ // 鈶� 浠嶅彇涓嶅埌 鈫� 璁拌鍛婂苟**璺宠繃闃熷垪鏇存柊**锛岃�屼笉鏄姏 NPE 璁╂暣涓�"妫�鏌ュ畬鎴�"澶辫触銆�
+ // 姝ゆ椂璁惧褰掕繕銆佷綔涓氳褰曠瓑浠嶄細姝ｅ父淇濆瓨锛堟暟鎹笉涓級锛屼粎闃熷垪鐘舵�佹湭鍙樸��
+ QueueDO onStageQueueItem = null;
- // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
- CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem(firstOnStageQueueItem.getBookCheckType());
- if (checkTypeDO.getAffinityCheckTypes().length > 0) {
- procAffinityWhenRoutineFinish(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes());
+ // 鈶� 绮剧‘瀹氫綅锛堢敤 Spring 鐨� StringUtils锛岄伩鍏嶉澶栦緷璧栵紱
+ // 鏈ā鍧楁湭寮曞叆 commons-lang3锛屽嬁鐢� org.apache.commons.lang3.StringUtils锛�
+ if (org.springframework.util.StringUtils.hasText(createReqVO.getPatId())
+ && null != createReqVO.getCheckType()) {
+ onStageQueueItem = queueMapper.getBedQueueItemByPatAndStatus(
+ createReqVO.getRoomId(), createReqVO.getBedNo(),
+ createReqVO.getPatId(), createReqVO.getCheckType(),
+ QueueStatusEnum.ONSTAGE.getStatus());
+ }
+
+ // 鈶� 閫�鍖栵細鍙栬宸ヤ綅浠婃棩鏈�杩戞洿鏂扮殑涓�鏉�"灏辫瘖涓�"
+ if (null == onStageQueueItem) {
+ onStageQueueItem = queueMapper.getBedLatestQueueItemByStatus(
+ createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus());
+ if (null != onStageQueueItem) {
+ log.warn("[routineFinish] 鏈寜 patId 鍛戒腑锛岄��鍖栦负鎸夊伐浣嶅彇鏈�杩戝氨璇婁腑鎮ｈ��. "
+ + "roomId={} bedNo={} reqPatId={} reqCheckType={} 瀹為檯patId={} checkType={}",
+ createReqVO.getRoomId(), createReqVO.getBedNo(), createReqVO.getPatId(),
+ createReqVO.getCheckType(), onStageQueueItem.getPatId(),
+ onStageQueueItem.getBookCheckType());
+ }
+ }
+
+ // 鈶� 浠嶅彇涓嶅埌锛氳烦杩囬槦鍒楁洿鏂帮紝涓嶆姏寮傚父锛堜繚璇�"妫�鏌ュ畬鎴�"鏈韩鍙敤锛�
+ if (null == onStageQueueItem) {
+ log.warn("[routineFinish] 璇ュ伐浣嶆棤[灏辫瘖涓璢鎮ｈ�咃紝璺宠繃闃熷垪鐘舵�佹洿鏂�. roomId={} bedNo={} patId={} applyNo={}",
+ createReqVO.getRoomId(), createReqVO.getBedNo(),
+ createReqVO.getPatId(), createReqVO.getApplyNo());
+ } else {
+ // QueueStatusEnum.ONSTAGE => QueueStatusEnum.FINISH
+ onStageQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus());
+ queueMapper.updateById(onStageQueueItem);
+
+ // 妫�鏌ラ」鐩�.浜插拰鎬� 澶勭悊閫昏緫
+ CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem(onStageQueueItem.getBookCheckType());
+ if (null != checkTypeDO && null != checkTypeDO.getAffinityCheckTypes()
+ && checkTypeDO.getAffinityCheckTypes().length > 0) {
+ procAffinityWhenRoutineFinish(onStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes());
+ }
}
//妫�鏌ュ畬鎴愬悗锛屾鏃舵鏌ョ櫥璁板啓鎴愪簡锛岄渶瑕佸皢杩欎釜鍥炲啓缁欓泦鎴愬钩鍙�(绾夸笂鐜鎵嶅洖鍐�)
- if (active.equals("prod")) {
+ ConfigDO configDO = configService.getConfigByKey("ecg.back.data");
+ if (configDO.getValue().equals("1")) {
if (createReqVO.getCheckType() != 100 && createReqVO.getCheckType() != 1000 && createReqVO.getCheckType() != 1100 && createReqVO.getCheckType() != 1400 && createReqVO.getCheckType() != 1500) {
AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
ApplicationTemplate app = new ApplicationTemplate();
@@ -173,17 +266,14 @@
log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
if (s.contains("鏇存柊鎴愬姛")) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3", new Date());
+ // 銆愯瘖鏂棩蹇椼�戝悓 AppointmentServiceImpl#handleAppointmentStatusUpdate锛�
+ // 鎵撳嵃鏃ユ湡瀵硅薄绫诲瀷涓庡�硷紝渚夸簬瀹氫綅 register_date 琚啓鎴� 00:00:00 鐨勫啓鍏ユ柟銆�
+ java.util.Date regNow = new Date();
+ log.info("[devRentCreate][鐧昏鏃堕棿鍐欏叆] applyNo={} 鏃ユ湡瀵硅薄绫诲瀷={} 鍊�={}",
+ createReqVO.getApplyNo(), regNow.getClass().getName(),
+ new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(regNow));
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3", regNow);
}
- } else {
- //妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
- }
- } else {
- if (createReqVO.getCheckType() != 100 && createReqVO.getCheckType() != 1000 && createReqVO.getCheckType() != 1100 && createReqVO.getCheckType() != 1400 && createReqVO.getCheckType() != 1500) {
- //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
-
} else {
//妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
@@ -191,6 +281,106 @@
}
return CommonResult.success(rent_id);
+ }
+
+ /**
+ * 銆愭湰闇�姹傦細绱ф�ユ偅鑰呬笉鎺掗槦鐩存帴妫�鏌ャ�戜负銆岀揣鎬ュ姞鍋氥�嶇殑鎮ｈ�呭噯澶囥�屽緟妫�鏌�(0)銆嶆鏌ュ崟銆�
+ *
+ * <h3>涓轰粈涔堥渶瑕佸畠</h3>
+ * 姝ｅ父鎮ｈ�呯殑 {@code dev_rent(state=0)} 琛屾槸**绛惧埌寤洪槦鍒�**鏃朵竴璧锋彃鍏ョ殑锛堣
+ * {@code QueueServiceImpl#queue}锛夈�傜揣鎬ュ姞鍋氱殑鎮ｈ�呬笉璧扮鍒�/鎺掗槦锛屾墍浠ュ畬鎴愭椂鎵句笉鍒拌繖琛岋紝
+ * 鍘熼�昏緫浼氱洿鎺ユ姏 {@code DEV_INSTALL_NOT_APPOINTMENT}锛�"璇峰厛棰勭害纭"锛夈��
+ *
+ * <h3>鍋氭硶</h3>
+ * <ol>
+ * <li>浠婂ぉ宸叉湁璇ユ偅鑰� + 妫�鏌ラ」鐩殑銆屽緟妫�鏌ャ�嶈 鈫� 浠�涔堥兘涓嶅仛锛堣蛋姝ｅ父娴佺▼锛夛紱</li>
+ * <li>鍚﹀垯鎸�**棰勭害鍗�**锛堢敵璇峰崟鍙蜂紭鍏堬紝鍏舵鎮ｈ�呯紪鍙� + 妫�鏌ラ」鐩紝杩� 卤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] 浠婃棩宸叉湁寰呮鏌ュ崟锛屾寜姝ｅ父娴佺▼瀹屾垚. 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);
+
+ // 璁╁悗缁�屾寜鎮ｈ�� + 妫�鏌ラ」鐩� + 浠婃棩 + 寰呮鏌ャ�嶈兘姝ｅ父瀹氫綅鍒�
+ 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;
}
/**
@@ -215,7 +405,8 @@
}
//璁惧棰嗗彇瀹屾垚鍚庯紝姝ゆ椂妫�鏌ョ櫥璁板啓鎴愪簡锛岄渶瑕佸皢杩欎釜鍥炲啓缁欓泦鎴愬钩鍙�(绾夸笂鐜鎵嶅洖鍐�)
- if (active.equals("prod")) {
+ ConfigDO configDO = configService.getConfigByKey("ecg.back.data");
+ if (configDO.getValue().equals("1")) {
AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
ApplicationTemplate app = new ApplicationTemplate();
String action = "S0405";
@@ -224,11 +415,13 @@
log.info("webservice鐨勮繑鍥炲�间负锛歿}", s);
if (s.contains("鏇存柊鎴愬姛")) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3", new Date());
+ // 銆愯瘖鏂棩蹇椼�戝悓涓婏細鎵撳嵃鏃ユ湡瀵硅薄绫诲瀷涓庡��
+ java.util.Date regNow2 = new Date();
+ log.info("[devRentOther][鐧昏鏃堕棿鍐欏叆] applyNo={} 鏃ユ湡瀵硅薄绫诲瀷={} 鍊�={}",
+ createReqVO.getApplyNo(), regNow2.getClass().getName(),
+ new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(regNow2));
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3", regNow2);
}
- } else {
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3", new Date());
-
}
List<Integer> jobTypeList = new ArrayList<Integer>();
jobTypeList.add(DevRentStateEnum.RECEIVED.getState());
@@ -241,7 +434,7 @@
throw exception(DEV_INSTALL_EXCEPTION);
}
- rent_id = devRentDOList.getFirst().getId();
+ rent_id = devRentDOList.get(0).getId();
createReqVO.setId(rent_id);
createReqVO.setState(DevRentStateEnum.RECEIVED.getState());
updateDevRent(createReqVO);
@@ -329,7 +522,7 @@
throw exception(DEV_INSTALL_EXCEPTION);
}
- rent_id = devRentDOList.getFirst().getId();
+ rent_id = devRentDOList.get(0).getId();
createReqVO.setId(rent_id);
createReqVO.setState(DevRentStateEnum.INSTALLED.getState());
updateDevRent(createReqVO);
@@ -483,12 +676,13 @@
List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() != 1) throw exception(ROUTINE_CHECK_EXIST);
- rent_id = devRentDOList.getFirst().getId();
+ rent_id = devRentDOList.get(0).getId();
createReqVO.setId(rent_id);
createReqVO.setState(DevRentStateEnum.ROUTINE_CANCELLED.getState());
updateDevRent(createReqVO);
- if (active.equals("prod")) {
+ ConfigDO configDO = configService.getConfigByKey("ecg.back.data");
+ if (configDO.getValue().equals("1")) {
if (cancelReqVO.getCheckType() != 100 && cancelReqVO.getCheckType() != 1000 && cancelReqVO.getCheckType() != 1100 && cancelReqVO.getCheckType() != 1400 && cancelReqVO.getCheckType() != 1500) {
AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
ApplicationTemplate app = new ApplicationTemplate();
@@ -500,15 +694,6 @@
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
}
- } else {
- //妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
- }
- } else {
- if (cancelReqVO.getCheckType() != 100 && cancelReqVO.getCheckType() != 1000 && cancelReqVO.getCheckType() != 1100 && cancelReqVO.getCheckType() != 1400 && cancelReqVO.getCheckType() != 1500) {
- //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
-
} else {
//妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
@@ -575,12 +760,13 @@
List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.FREE.getState());
if (devRentDOList.size() != 1) throw exception(DEV_INSTALL_EXIST);
- rent_id = devRentDOList.getFirst().getId();
+ rent_id = devRentDOList.get(0).getId();
createReqVO.setId(rent_id);
createReqVO.setState(DevRentStateEnum.RECEIVED_CANCELLED.getState());
updateDevRent(createReqVO);
- if (active.equals("prod")) {
+ ConfigDO configDO = configService.getConfigByKey("ecg.back.data");
+ if (configDO.getValue().equals("1")) {
AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
ApplicationTemplate app = new ApplicationTemplate();
String action = "S0405";
@@ -590,15 +776,6 @@
if (s.contains("鏇存柊鎴愬姛")) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
- }
- } else {
- if (cancelReqVO.getCheckType() != 100 && cancelReqVO.getCheckType() != 1000 && cancelReqVO.getCheckType() != 1100 && cancelReqVO.getCheckType() != 1400 && cancelReqVO.getCheckType() != 1500) {
- //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
-
- } else {
- //妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
}
}
@@ -658,12 +835,13 @@
List<DevRentDO> devRentDOList = devRentMapper.selectByPatAndChecktypeAndState(createReqVO.getPatId(), createReqVO.getCheckType(), DevRentStateEnum.RECEIVED.getState());
if (devRentDOList.size() != 1) throw exception(DEV_INSTALL_EXIST);
- rent_id = devRentDOList.getFirst().getId();
+ rent_id = devRentDOList.get(0).getId();
createReqVO.setId(rent_id);
createReqVO.setState(DevRentStateEnum.INSTALL_CANCELLED.getState());
updateDevRent(createReqVO);
- if (active.equals("prod")) {
+ ConfigDO configDO = configService.getConfigByKey("ecg.back.data");
+ if (configDO.getValue().equals("1")) {
AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
ApplicationTemplate app = new ApplicationTemplate();
String action = "S0405";
@@ -673,14 +851,6 @@
if (s.contains("鏇存柊鎴愬姛")) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
- }
- } else {
- //杩欓噷鏄祴璇曟湰鍦颁慨鏀�
- if (cancelReqVO.getCheckType() != 100 && cancelReqVO.getCheckType() != 1000 && cancelReqVO.getCheckType() != 1100 && cancelReqVO.getCheckType() != 1400 && cancelReqVO.getCheckType() != 1500) {
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
-
- } else {
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
}
}
@@ -801,13 +971,17 @@
@Override
public DevRentDO getDevRent(Long id) {
- return devRentMapper.selectById(id);
+ DevRentDO devRentDO = devRentMapper.selectById(id);
+ fillPatientInfo(devRentDO);
+ return devRentDO;
}
@Override
public PageResult<DevRentDO> getDevRentPage(DevRentPageReqVO pageReqVO) {
pageReqVO.setState(0);
- return devRentMapper.selectPage(pageReqVO);
+ PageResult<DevRentDO> pageResult = devRentMapper.selectPage(pageReqVO);
+ fillPatientInfo(pageResult.getList());
+ return pageResult;
}
@Override
@@ -816,15 +990,65 @@
stateList.add(DevRentStateEnum.INSTALLED.getState());
stateList.add(DevRentStateEnum.RECEIVED.getState());
searchReqVO.setStateList(stateList);
- return devRentMapper.getRentByState(searchReqVO);
+ DevRentDO devRentDO = devRentMapper.getRentByState(searchReqVO);
+ fillPatientInfo(devRentDO);
+ return devRentDO;
+ }
+
+ /**
+ * 鎾ら攢銆屾鏌ュ畬鎴愩�嶅悗鐨勫洖婊氾細妫�鏌ュ崟 60(甯歌妫�鏌ュ畬鎴�) 鈫� 0(寰呮鏌�)锛屽苟鍙栨秷纭垂銆�
+ *
+ * <p>銆愭湰娆′慨澶嶇殑鏍瑰洜銆戞挙閿�鍘熷厛鍙妸闃熷垪琛� 40鈫�20锛宍dev_rent` 浠嶆槸 60锛�
+ * 鍓嶇鍐嶆瀹屾垚鏃� `getFreeRent`锛堝彧鏌� state=0锛夊彇涓嶅埌鍗� 鈫� `formData.id` 涓虹┖
+ * 鈫� 鍚庣 `routineFinishOperation` 鎸� (patId, checkType, state=0) 涔熸壘涓嶅埌 鈫� 鎶ャ�岃鍏堥绾︾‘璁ゃ�嶃��
+ * 鎶婄姸鎬佸洖婊氬埌 0 鍚庯紝鏁存潯閾捐矾鎭㈠姝ｅ父銆�
+ *
+ * <p>澶辫触绛栫暐锛氬叏绋� try/catch锛屽洖婊�/鍙栨秷璐瑰け璐ラ兘鍙鏃ュ織锛�**涓嶅奖鍝�"鎾ら攢"鏈韩鐨勭粨鏋�**銆�
+ */
+ @Override
+ 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] 鏈壘鍒颁粖鏃ヨ鎮ｈ�呯殑銆屽父瑙勬鏌ュ畬鎴愩�嶆鏌ュ崟锛岃烦杩囧洖婊�. 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<>();
+ public DevRentDO getFreeRent(DevRentSearchReqVO searchReqVO) { List<Integer> stateList = new ArrayList<>();
stateList.add(DevRentStateEnum.FREE.getState());
searchReqVO.setStateList(stateList);
- return devRentMapper.getRentByState(searchReqVO);
+ DevRentDO devRentDO = devRentMapper.getRentByState(searchReqVO);
+ fillPatientInfo(devRentDO);
+ return devRentDO;
}
@Override
@@ -833,7 +1057,9 @@
stateList.add(DevRentStateEnum.RECEIVED.getState());
stateList.add(DevRentStateEnum.RECEIVED_CANCELLED.getState());
searchReqVO.setStateList(stateList);
- return devRentMapper.getRentByState(searchReqVO);
+ DevRentDO devRentDO = devRentMapper.getRentByState(searchReqVO);
+ fillPatientInfo(devRentDO);
+ return devRentDO;
}
@Override
@@ -841,7 +1067,67 @@
List<Integer> stateList = new ArrayList<>();
stateList.add(DevRentStateEnum.DISMANTLED.getState());
searchReqVO.setStateList(stateList);
- return devRentMapper.getRentByState(searchReqVO);
+ DevRentDO devRentDO = devRentMapper.getRentByState(searchReqVO);
+ fillPatientInfo(devRentDO);
+ return devRentDO;
+ }
+
+ // ==================== 闇�姹�1锛氬洖濉偅鑰呬俊鎭� 18 椤� ====================
+ // dev_rent 琛ㄥ彧瀛樹簡 applyNo / patName / patDetails锛�
+ // 鍏朵綑鎮ｈ�呬俊鎭紙鎬у埆銆佸嚭鐢熸棩鏈熴�佺梾鍖恒�佸簥鍙枫�佺數璇濄�佹潵婧愩�佸氨璇婂崱鍙枫��
+ // 鐧昏鏃堕棿銆佸紑鍗曞尰甯堛�佸紑鍗曟棩鏈熴�佸鑰愯嵂锛夐兘鍦� appointment 琛ㄣ��
+ //
+ // 鍙傜収 QueueServiceImpl#fillAppointmentInfo 鐨勫仛娉曪細鏌ヨ鍚庢寜 applyNo 鍥炴煡棰勭害鍗曡ˉ榻愩��
+ // 杩欐牱棰嗙敤/瑁呮満/鎷嗘満/鏁版嵁褰曞叆/妫�鏌ヨ褰� 5 涓晫闈㈡墠鑳藉睍绀哄畬鏁存偅鑰呬俊鎭��
+
+ /**
+ * 鍥炲～鍗曚釜瀵硅薄鐨勬偅鑰呬俊鎭紙瀵硅薄涓� null 鎴� applyNo 涓虹┖鏃跺畨鍏ㄨ烦杩囷級銆�
+ */
+ private void fillPatientInfo(DevRentDO devRentDO) {
+ if (null == devRentDO || !org.springframework.util.StringUtils.hasText(devRentDO.getApplyNo())) {
+ return;
+ }
+ AppointmentDO appointment = appointmentMapper.getByApplyNo(devRentDO.getApplyNo());
+ if (null == appointment) {
+ return;
+ }
+ applyAppointmentToDevRent(devRentDO, appointment);
+ }
+
+ /**
+ * 鎵归噺鍥炲～锛堥伩鍏� N+1 涔嬪鐨勯澶栧紑閿�鐢辫皟鐢ㄦ柟鎺у埗锛涙澶勯�愭潯鍥炴煡锛�
+ * 涓� QueueServiceImpl#fillAppointmentInfo 淇濇寔涓�鑷寸殑鍋氭硶锛夈��
+ */
+ private void fillPatientInfo(List<DevRentDO> devRentDOList) {
+ if (null == devRentDOList || devRentDOList.isEmpty()) {
+ return;
+ }
+ devRentDOList.forEach(this::fillPatientInfo);
+ }
+
+ /**
+ * 鎶婇绾﹀崟涓殑鎮ｈ�呬俊鎭鍒跺埌 dev_rent 瀵硅薄銆�
+ * <p>
+ * 娉ㄦ剰锛氬彧瑕嗙洊**涓虹┖鐨�**骞抽摵瀛楁锛熲�斺�斾笉锛岃繖閲岀洿鎺ヨ鐩栵細
+ * 杩欎簺瀛楁鍧囨爣璁颁负 {@code @TableField(exist=false)}锛屼笉鍙備笌鍐欏簱锛�
+ * 鏈鏌ヨ杩斿洖鐨勫氨鏄渶鏂版暟鎹紝涓嶅瓨鍦�"瑕嗙洊鎺夌敤鎴峰垰褰曞叆鐨勫��"鐨勯闄┿��
+ */
+ private void applyAppointmentToDevRent(DevRentDO target, AppointmentDO source) {
+ target.setPatGender(source.getPatGender());
+ target.setPatBirthday(source.getPatBirthday());
+ target.setRegisterDate(source.getRegisterDate());
+ target.setDoctor(source.getDoctor());
+ target.setDoctorTime(source.getDoctorTime());
+ target.setPatSrc(source.getPatSrc());
+ target.setPatMobile(source.getPatMobile());
+ target.setPatPhone(source.getPatPhone());
+ target.setPatWardDesc(source.getPatWardDesc());
+ target.setPatBedNo(source.getPatBedNo());
+ target.setMedicalCard(source.getMedicalCard());
+ if (target.getDoctorAdviceNo() == null) target.setDoctorAdviceNo(source.getDoctorAdviceNo());
+ target.setOutpatientNo(source.getOutpatientNo());
+ target.setPatIdentityId(source.getPatIdentityId());
+ target.setTolerance(source.getTolerance());
}
// 纭垂澶勭悊
--
Gitblit v1.9.3