From fce96ef468291fb9a0e6a4d34ab371315e9485d4 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 03 十月 2026 00:59:44 +0800
Subject: [PATCH] ai优化
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 247 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 173 insertions(+), 74 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 0c50338..c987e9d 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;
@@ -36,6 +39,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -75,11 +79,11 @@
@Resource
CheckTypeMapper checkTypeMapper;
+ @Resource
+ private ConfigService configService;
+
@Autowired
private WebServiceClient webServiceClient;
-
- @Value("${spring.profiles.active}")
- private String active;
@Override
@@ -111,7 +115,7 @@
throw exception(DEV_INSTALL_EXCEPTION);
}
- rent_id = devRentDOList.getFirst().getId();
+ rent_id = devRentDOList.get(0).getId();
createReqVO.setId(rent_id);
createReqVO.setState(DevRentStateEnum.ROUTINE_FINISH.getState());
updateDevRent(createReqVO);
@@ -150,19 +154,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();
@@ -172,20 +225,17 @@
log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
if (s.contains("鏇存柊鎴愬姛")) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3");
+ // 銆愯瘖鏂棩蹇椼�戝悓 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");
- }
- } 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");
-
- } else {
- //妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
}
}
@@ -214,7 +264,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";
@@ -223,11 +274,13 @@
log.info("webservice鐨勮繑鍥炲�间负锛歿}", s);
if (s.contains("鏇存柊鎴愬姛")) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3");
+ // 銆愯瘖鏂棩蹇椼�戝悓涓婏細鎵撳嵃鏃ユ湡瀵硅薄绫诲瀷涓庡��
+ 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");
-
}
List<Integer> jobTypeList = new ArrayList<Integer>();
jobTypeList.add(DevRentStateEnum.RECEIVED.getState());
@@ -240,7 +293,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);
@@ -328,7 +381,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);
@@ -482,12 +535,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();
@@ -497,20 +551,11 @@
log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
if (s.contains("鏇存柊鎴愬姛")) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
}
} else {
//妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7");
- }
- } 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");
-
- } else {
- //妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7", null);
}
}
@@ -574,12 +619,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";
@@ -588,16 +634,7 @@
log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
if (s.contains("鏇存柊鎴愬姛")) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
- }
- } 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");
-
- } else {
- //妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
}
}
@@ -657,12 +694,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";
@@ -671,16 +709,7 @@
log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
if (s.contains("鏇存柊鎴愬姛")) {
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
- }
- } 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");
-
- } else {
- //妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4", null);
}
}
@@ -801,13 +830,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,7 +849,9 @@
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;
}
@Override
@@ -824,7 +859,9 @@
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 +870,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 +880,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