From d23a6a1722af159dddb3b2e485901a35dd721034 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期六, 14 九月 2024 11:36:43 +0800
Subject: [PATCH] buf fix: 准备中 没有 诊室名的 问题
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 3 ++-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 2 ++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java | 10 +++++-----
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java | 4 ++--
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedOpenCallable.java | 6 ++++--
5 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
index 4956792..09456bb 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java
@@ -185,6 +185,8 @@
public CommonResult<String> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
//TODO 鍏堜粠棰勭害琛ㄥ彇鏁版嵁锛屽悗缁鎺ユ暟鎹钩鍙版煡棰勭害鏁版嵁
AppointmentDO appointment = appointmentService.getAppointment(confirmReqVO.getId());
+ if (null == appointment)
+ return error(PATIENT_NOT_EXISTS);
if ( !DateUtils.isToday(appointment.getBookDate()) )
return error( APPOINTMENT_NOT_TODAY);
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java
index 5997673..68d7ce2 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java
@@ -110,9 +110,10 @@
@PreAuthorize("@ss.hasPermission('ecg:queue:bedcontrol')")
public CommonResult<Integer> bedOpen(
@RequestParam("roomId") Long roomId,
+ @RequestParam("roomName") String roomName,
@RequestParam("bedNo") String bedNo)
{
- ErrorCode result = queueService.startBedOpen(roomId, bedNo);
+ ErrorCode result = queueService.startBedOpen(roomId, roomName, bedNo);
if (result.equals(SUCCESS))
return success(0);
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedOpenCallable.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedOpenCallable.java
index d42faaf..1fa9ac0 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedOpenCallable.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedOpenCallable.java
@@ -9,18 +9,20 @@
QueueService queueService;
private Long roomId;
+ private String roomName;
private String bedNo;
- public BedOpenCallable(QueueService queueService, Long roomId, String bedNo)
+ public BedOpenCallable(QueueService queueService, Long roomId, String roomName, String bedNo)
{
super();
this.roomId = roomId;
+ this.roomName = roomName;
this.bedNo = bedNo;
this.queueService = queueService;
}
public ErrorCode call() throws Exception {
- ErrorCode ec = queueService.bedOpen(roomId, bedNo);
+ ErrorCode ec = queueService.bedOpen(roomId, roomName, bedNo);
if (GlobalErrorCodeConstants.SUCCESS.equals(ec)) {
queueService.hurryup();
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
index 6c6136a..8efdddd 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
@@ -89,8 +89,8 @@
}
@Override
- public ErrorCode startBedOpen(Long roomId, String bedNo) {
- Future<ErrorCode> future = singleThreadExecutor.submit( new BedOpenCallable(this, roomId, bedNo));
+ public ErrorCode startBedOpen(Long roomId, String roomName, String bedNo) {
+ Future<ErrorCode> future = singleThreadExecutor.submit( new BedOpenCallable(this, roomId, roomName, bedNo));
try {
ErrorCode ret = future.get();
@@ -249,7 +249,7 @@
* @return
*/
@Override
- public ErrorCode bedOpen(Long roomId, String bedNo) {
+ public ErrorCode bedOpen(Long roomId, String roomName, String bedNo) {
BedQueueBO bedQueueBO2 = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
if (null != bedQueueBO2) {
log.error("bedOpen mapBedVsQueue has existed. " + roomId + " " + bedNo);
@@ -272,6 +272,7 @@
// 鏂板宸ヤ綅 浼樺厛闃熷垪
BedQueueBO bedQueueBO = new BedQueueBO();
bedQueueBO.setRoomId(roomId);
+ bedQueueBO.setRoomName(roomName);
bedQueueBO.setBedNo(bedNo);
bedQueueBO.setMaxQueueNum(queueReadyMax);
bedQueueBO.setQueueNum(new AtomicInteger(queueDOList.size()));
@@ -502,8 +503,7 @@
}
/**
- * TODO 鏂板紑闃熷垪鏃讹紝闇�瑕佹妸鎺掗槦涓殑浜� 杞埌 灏辫瘖鍑嗗 鐘舵��
- * 绛夊埌鍙栦笅涓�涓� 鎺掗槦涓汉鍛� 鐨勯�昏緫瀹屾垚鍚庯紝鍐嶅洖鏉ヤ笉閿�
+ *
*/
public void hurryup() {
if (0 == openingFlag.get())
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java
index c671170..4d3db85 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java
@@ -52,7 +52,7 @@
void startBedReload();
MonitorInfoVO getMonitorInfo();
- ErrorCode startBedOpen(Long roomId, String bedNo);
+ ErrorCode startBedOpen(Long roomId, String roomName, String bedNo);
ErrorCode startBedClose(Long roomId, String bedNo);
ErrorCode startBedDoctorPause(Long roomId, String bedNo, Long docId, String docName);
ErrorCode startBedDoctorResume(Long roomId, String bedNo, Long docId, String docName);
@@ -60,7 +60,7 @@
ErrorCode startBedDoctorOff(Long roomId, String bedNo, Long docId, String docName);
ErrorCode startNextPatient(Long roomId, String bedNo);
- ErrorCode bedOpen(Long roomId, String bedNo);
+ ErrorCode bedOpen(Long roomId, String roomName, String bedNo);
ErrorCode bedClose(Long roomId, String bedNo);
ErrorCode bedDoctorPause(Long roomId, String bedNo, Long docId, String docName);
ErrorCode bedDoctorResume(Long roomId, String bedNo, Long docId, String docName);
--
Gitblit v1.9.3