From e1f8da66fc4648870331f9cbe18079bbd83a2ee8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 10 六月 2025 16:35:20 +0800
Subject: [PATCH] 代码提交
---
/dev/null | 1 -
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java | 5 +++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 51 +++++++++++++++++++++++++++++++++------------------
3 files changed, 38 insertions(+), 19 deletions(-)
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 ffe0bca..a9c331c 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
@@ -214,6 +214,11 @@
""")
QueueDO getBedFirstQueueItemByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus);
+ @Select("""
+ SELECT * from lihu.queue where apply_no = #{applyNo} and status = #{curStatus} order by seq_num, book_timeslot limit 1
+ """)
+ QueueDO getBedFirstQueueItemByApplyNo(@Param("applyNo")String applyNo, @Param("curStatus")Integer curStatus);
+
// 鏌愪釜璇婂鑼冨洿鍐� [宸查鐢╙ [宸插彫鍥�-瀹夎] 浜哄憳 鎶㈠崰, 浼氭洿鏂� [宸ヤ綅鍙穄
// 娌℃湁闄愬畾妫�鏌ョ被鍨嬶紝涓嶈浣跨敤鏃堕棿妲�
@Select("<script> " +
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 6ec2cc4..784eb6e 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
@@ -163,15 +163,20 @@
//妫�鏌ュ畬鎴愬悗锛屾鏃舵鏌ョ櫥璁板啓鎴愪簡锛岄渶瑕佸皢杩欎釜鍥炲啓缁欓泦鎴愬钩鍙�(绾夸笂鐜鎵嶅洖鍐�)
if (active.equals("prod")) {
- AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
- ApplicationTemplate app = new ApplicationTemplate();
- String action = "S0405";
- String message = app.getXML(createReqVO.getApplyNo(), "3", "妫�鏌ョ櫥璁�", createReqVO.getOperater(), appointmentDO.getPatDeptCode(), appointmentDO.getPatDeptDesc(), appointmentDO.getPatWardCode(), appointmentDO.getPatWardDesc(), appointmentDO.getPatBedNo(), appointmentDO.getEpisodeId(), "" + appointmentDO.getBookSrc(), appointmentDO.getPatId(), appointmentDO.getPatName());
- String s = webServiceClient.callJHFWTYRK(action, "", message);
- log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
- if (s.contains("鏇存柊鎴愬姛")) {
- //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3");
+ 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();
+ String action = "S0405";
+ String message = app.getXML(createReqVO.getApplyNo(), "4", "鍙栨秷妫�鏌�", createReqVO.getOperater(), appointmentDO.getPatDeptCode(), appointmentDO.getPatDeptDesc(), appointmentDO.getPatWardCode(), appointmentDO.getPatWardDesc(), appointmentDO.getPatBedNo(), appointmentDO.getEpisodeId(), "" + appointmentDO.getBookSrc(), appointmentDO.getPatId(), appointmentDO.getPatName());
+ String s = webServiceClient.callJHFWTYRK(action, "", message);
+ log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
+ if (s.contains("鏇存柊鎴愬姛")) {
+ //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
+ }
+ } else {
+ //妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7");
}
}
@@ -471,15 +476,20 @@
updateDevRent(createReqVO);
if (active.equals("prod")) {
- AppointmentDO appointmentDO = appointmentMapper.getByApplyNo(createReqVO.getApplyNo());
- ApplicationTemplate app = new ApplicationTemplate();
- String action = "S0405";
- String message = app.getXML(createReqVO.getApplyNo(), "4", "鍙栨秷妫�鏌�", createReqVO.getOperater(), appointmentDO.getPatDeptCode(), appointmentDO.getPatDeptDesc(), appointmentDO.getPatWardCode(), appointmentDO.getPatWardDesc(), appointmentDO.getPatBedNo(), appointmentDO.getEpisodeId(), "" + appointmentDO.getBookSrc(), appointmentDO.getPatId(), appointmentDO.getPatName());
- String s = webServiceClient.callJHFWTYRK(action, "", message);
- log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
- if (s.contains("鏇存柊鎴愬姛")) {
- //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
- appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
+ 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();
+ String action = "S0405";
+ String message = app.getXML(createReqVO.getApplyNo(), "4", "鍙栨秷妫�鏌�", createReqVO.getOperater(), appointmentDO.getPatDeptCode(), appointmentDO.getPatDeptDesc(), appointmentDO.getPatWardCode(), appointmentDO.getPatWardDesc(), appointmentDO.getPatBedNo(), appointmentDO.getEpisodeId(), "" + appointmentDO.getBookSrc(), appointmentDO.getPatId(), appointmentDO.getPatName());
+ String s = webServiceClient.callJHFWTYRK(action, "", message);
+ log.info("routineFinishWebServiceClient鐨勮繑鍥炲�间负锛歿}", s);
+ if (s.contains("鏇存柊鎴愬姛")) {
+ //闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
+ }
+ } else {
+ //妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7");
}
}
@@ -509,6 +519,11 @@
jobRecordDO.setUpdateTime(LocalDateTime.now());
jobRecordMapper.updateById(jobRecordDO);
}
+ QueueDO firstOnStageQueueItem = queueMapper.getBedFirstQueueItemByApplyNo(createReqVO.getApplyNo(), QueueStatusEnum.ONSTAGE.getStatus());
+ // QueueStatusEnum.ONSTAGE => QueueStatusEnum.FINISH
+ firstOnStageQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus()); // 榛樿鐘舵�� 璁剧疆
+ firstOnStageQueueItem.setUpdateTime(LocalDateTime.now());
+ queueMapper.updateById(firstOnStageQueueItem);
return CommonResult.success(rent_id);
}
diff --git a/jh-module-webservice/pom.xml b/jh-module-webservice/pom.xml
deleted file mode 100644
index 0519ecb..0000000
--- a/jh-module-webservice/pom.xml
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
--
Gitblit v1.9.3