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 | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 211 insertions(+), 24 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 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();
+ // 銆愭湰闇�姹傦細绱ф�ユ偅鑰呬笉鎺掗槦鐩存帴妫�鏌ャ��
+ // 姝ｅ父鎮ｈ�呯殑銆屽緟妫�鏌�(0)銆嶆鏌ュ崟鏄鍒板缓闃熷垪鏃朵竴璧锋彃鐨勶紱绱ф�ュ姞鍋氱殑鎮ｈ�呮病璧扮鍒帮紝
+ // 鍥犳杩欓噷鍏堟妸杩欐潯鍗曡ˉ鍑烘潵锛屽悗缁�昏緫锛堝啓浣滀笟璁板綍銆佹洿鏂伴槦鍒椼�佸洖鍐欓泦鎴愬钩鍙帮級瀹屽叏澶嶇敤銆�
+ 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);
+ }
+
+ /**
+ * 銆愭湰闇�姹傦細绱ф�ユ偅鑰呬笉鎺掗槦鐩存帴妫�鏌ャ�戜负銆岀揣鎬ュ姞鍋氥�嶇殑鎮ｈ�呭噯澶囥�屽緟妫�鏌�(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;
}
/**
@@ -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 鍚庯紝鏁存潯閾捐矾鎭㈠姝ｅ父銆�
+ *
+ * <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] 鏈壘鍒颁粖鏃ヨ鎮ｈ�呯殑銆屽父瑙勬鏌ュ畬鎴愩�嶆鏌ュ崟锛岃烦杩囧洖婊�. 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);
--
Gitblit v1.9.3