From 376c1f1782fda955d0344dbcc1305dd5fb750448 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 10 六月 2025 17:30:41 +0800
Subject: [PATCH] 代码提交
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++-------
1 files changed, 69 insertions(+), 15 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 6ec2cc4..79a8a8e 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,29 @@
//妫�鏌ュ畬鎴愬悗锛屾鏃舵鏌ョ櫥璁板啓鎴愪簡锛岄渶瑕佸皢杩欎釜鍥炲啓缁欓泦鎴愬钩鍙�(绾夸笂鐜鎵嶅洖鍐�)
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("鏇存柊鎴愬姛")) {
+ 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");
+ }
+ } 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(), "3");
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "4");
+
+ } else {
+ //妫�鏌ョ被鍨嬫槸搴婅竟鐨勬垨甯歌鐨勶紝闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚7
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "7");
}
}
@@ -211,6 +225,9 @@
//闇�瑕佹牴鎹產pplyNo,灏哸ppiontment琛ㄩ噷鐨剆tatus鏀规垚3
appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3");
}
+ } else {
+ appointmentMapper.updateStatusByApplyNo(createReqVO.getApplyNo(), "3");
+
}
List<Integer> jobTypeList = new ArrayList<Integer>();
jobTypeList.add(DevRentStateEnum.RECEIVED.getState());
@@ -471,15 +488,29 @@
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("鏇存柊鎴愬姛")) {
+ 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");
+ }
+ } 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");
}
}
@@ -509,6 +540,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);
}
@@ -553,6 +589,15 @@
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");
}
}
@@ -628,6 +673,15 @@
//闇�瑕佹牴鎹產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");
+ }
}
JobRecordSaveReqVO jobRecordSaveReqVO = new JobRecordSaveReqVO();
--
Gitblit v1.9.3