From 3e696d457f13338a7eb5ad0935a7d2c7affcf605 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 23 八月 2024 11:02:36 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java | 4 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java | 33 ++--------
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java | 3
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/queueDO.java | 3
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java | 4 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueSaveReqVO.java | 3
sql/mysql/jh.sql | 4
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/queueMapper.java | 6 +-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java | 5 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 18 ++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 1
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueRespVO.java | 13 +++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java | 1
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 23 ++++---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queuePageReqVO.java | 5 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java | 4
16 files changed, 80 insertions(+), 50 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 b21195c..ead467e 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
@@ -193,6 +193,7 @@
queueSaveReqVO.setPatId( appointment.getPatId());
queueSaveReqVO.setPatName( appointment.getPatName() );
queueSaveReqVO.setPatGender( appointment.getPatGender());
+ queueSaveReqVO.setBookDate( appointment.getBookDate() );
queueSaveReqVO.setBookTimeslot( appointment.getBookTimeslot() );
queueSaveReqVO.setBookCheckType( appointment.getBookCheckType() );
queueSaveReqVO.setPassed((byte)0);
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java
index 551d6d4..4859fbe 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java
@@ -5,6 +5,7 @@
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Schema(description = "绠＄悊鍚庡彴 - 棰勭害纭 Request VO")
@@ -31,7 +32,7 @@
@Schema(description = "棰勭害鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
//@NotNull(message = "棰勭害鏃ユ湡涓嶈兘涓虹┖")
- private LocalDateTime bookDate;
+ private LocalDate bookDate;
@Schema(description = "棰勭害鏃堕棿娈�", requiredMode = Schema.RequiredMode.REQUIRED)
//@NotNull(message = "棰勭害鏃堕棿娈典笉鑳戒负绌�")
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java
index 75f7209..7decdd2 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java
@@ -1,6 +1,8 @@
package cn.lihu.jh.module.ecg.controller.admin.appointment.vo;
import lombok.*;
+
+import java.time.LocalDate;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.lihu.jh.framework.common.pojo.PageParam;
@@ -58,7 +60,7 @@
private String bookId;
@Schema(description = "棰勭害鏃ユ湡")
- private LocalDateTime bookDate;
+ private LocalDate bookDate;
@Schema(description = "棰勭害鏃堕棿娈�")
private Integer bookTimeslot;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java
index 5210361..530da17 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentRespVO.java
@@ -2,6 +2,8 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
+
+import java.time.LocalDate;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@@ -75,7 +77,7 @@
@Schema(description = "棰勭害鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("棰勭害鏃ユ湡")
- private LocalDateTime bookDate;
+ private LocalDate bookDate;
@Schema(description = "棰勭害鏃堕棿娈�", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("棰勭害鏃堕棿娈�")
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java
index 162612b..417ecc8 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java
@@ -5,6 +5,7 @@
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Schema(description = "绠＄悊鍚庡彴 - 棰勭害鏂板/淇敼 Request VO")
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java
index ce97709..fa91b33 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java
@@ -1,15 +1,10 @@
package cn.lihu.jh.module.ecg.controller.admin.doctor;
-import cn.lihu.jh.framework.apilog.core.annotation.ApiAccessLog;
+import cn.lihu.jh.framework.common.exception.ErrorCode;
import cn.lihu.jh.framework.common.pojo.CommonResult;
-import cn.lihu.jh.framework.common.pojo.PageParam;
-import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
-import cn.lihu.jh.framework.excel.core.util.ExcelUtils;
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.PatientStatisticVO;
-import cn.lihu.jh.module.ecg.controller.admin.queue.vo.QueuePageReqVO;
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.QueueRespVO;
-import cn.lihu.jh.module.ecg.controller.admin.queue.vo.QueueSaveReqVO;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
import cn.lihu.jh.module.ecg.service.queue.QueueService;
@@ -21,13 +16,10 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
@Tag(name = "绠＄悊鍚庡彴 - 鍖荤敓鍙彿")
@@ -107,30 +99,21 @@
return success(patientStatisticVO);
}
- @GetMapping("/passed-patient-return")
- @Operation(summary = "杩囨湡鐥呬汉鍥炴潵")
+ @GetMapping("/recall-patient")
+ @Operation(summary = "杩囨湡鐥呬汉鍙洖")
@Parameter(name = "roomId", description = "璇婂缂栧彿", required = true, example = "116")
@Parameter(name = "bedNo", description = "宸ヤ綅缂栧彿", required = true, example = "B2")
@Parameter(name = "patId", description = "鎮ｈ�呯紪鍙�", required = true, example = "B2")
@PreAuthorize("@ss.hasPermission('ecg:doctor:patient')")
- public CommonResult<String> passedPatientReturn(
+ public CommonResult<String> recallPatient(
@RequestParam("roomId") Long roomId,
@RequestParam("bedNo") String bedNo,
@RequestParam("patId") String patId )
{
- Integer result = queueService.passedPatientReturn(roomId, bedNo, patId);
- return success("success");
- }
+ Integer result = queueService.recallPatient(roomId, bedNo, patId);
+ if (null == result || 0 == result)
+ return error( new ErrorCode(201, "鎵句笉鍒版偅鑰�") );
- @GetMapping("/queuejump")
- @Operation(summary = "鎻掗槦")
- @Parameter(name = "patId", description = "鎮ｈ�呯紪鍙�", required = true, example = "B2")
- @PreAuthorize("@ss.hasPermission('ecg:doctor:patient')")
- public CommonResult<String> queueJump(
- @RequestParam("patId") String patId,
- @RequestParam("jumpFlag") Byte jumpFlag)
- {
- Integer result = queueService.queueJump(patId, jumpFlag);
return success("success");
}
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 12c988c..9cf0b70 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
@@ -1,5 +1,6 @@
package cn.lihu.jh.module.ecg.controller.admin.queue;
+import cn.lihu.jh.framework.common.exception.ErrorCode;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,6 +15,8 @@
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.pojo.CommonResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
+
+import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
import cn.lihu.jh.framework.excel.core.util.ExcelUtils;
@@ -109,4 +112,19 @@
return success(0);
}
+ @GetMapping("/patient-jump")
+ @Operation(summary = "鎻掗槦")
+ @Parameter(name = "patId", description = "鎮ｈ�呯紪鍙�", required = true, example = "B2")
+ @PreAuthorize("@ss.hasPermission('ecg:queue:jump')")
+ public CommonResult<String> queueJump(
+ @RequestParam("patId") String patId,
+ @RequestParam("jumpFlag") Byte jumpFlag)
+ {
+ Integer result = queueService.patientJump(patId, jumpFlag);
+ if (null == result || 0 == result)
+ return error( new ErrorCode(201, "鎵句笉鍒版偅鑰�") );
+
+ return success("success");
+ }
+
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queuePageReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queuePageReqVO.java
index d0f2915..f13f37d 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queuePageReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queuePageReqVO.java
@@ -4,6 +4,8 @@
import io.swagger.v3.oas.annotations.media.Schema;
import cn.lihu.jh.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
import java.time.LocalDateTime;
import static cn.lihu.jh.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -23,6 +25,9 @@
@Schema(description = "鎮ｈ�呮�у埆")
private Boolean patGender;
+ @Schema(description = "棰勭害鏃ユ湡")
+ private LocalDate bookDate;
+
@Schema(description = "棰勭害鏃堕棿娈�")
private Integer bookTimeslot;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueRespVO.java
index 666f44c..02dfd7b 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueRespVO.java
@@ -3,6 +3,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@@ -27,6 +28,10 @@
@ExcelProperty("鎮ｈ�呮�у埆")
private Byte patGender;
+ @Schema(description = "棰勭害鏃ユ湡")
+ @ExcelProperty("棰勭害鏃ユ湡")
+ private LocalDate bookDate;
+
@Schema(description = "棰勭害鏃堕棿娈�", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("棰勭害鏃堕棿娈�")
private Integer bookTimeslot;
@@ -45,11 +50,15 @@
@Schema(description = "杩囧彿鏍囪", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("杩囧彿鏍囪")
- private Boolean passed;
+ private Byte passed;
@Schema(description = "棰勭害杩囨湡鏍囪", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("棰勭害杩囨湡鏍囪")
- private Boolean expired;
+ private Byte expired;
+
+ @Schema(description = "鎻掗槦鏍囪", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鎻掗槦鏍囪")
+ private Byte jumpFlag;
@Schema(description = "璇婂缂栧彿")
@ExcelProperty("璇婂缂栧彿")
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueSaveReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueSaveReqVO.java
index aef75c0..33922ba 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueSaveReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueSaveReqVO.java
@@ -5,6 +5,7 @@
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -28,7 +29,7 @@
@Schema(description = "棰勭害鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "棰勭害鏃ユ湡涓嶈兘涓虹┖")
- private LocalDateTime bookDate;
+ private LocalDate bookDate;
@Schema(description = "棰勭害鏃堕棿娈�", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "棰勭害鏃堕棿娈典笉鑳戒负绌�")
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java
index b86182b..ead461f 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java
@@ -1,8 +1,9 @@
package cn.lihu.jh.module.ecg.dal.dataobject.appointment;
import lombok.*;
+
+import java.time.*;
import java.util.*;
-import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
@@ -92,7 +93,7 @@
/**
* 棰勭害鏃ユ湡
*/
- private LocalDateTime bookDate;
+ private LocalDate bookDate;
/**
* 棰勭害鏃堕棿娈�
*/
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/queueDO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/queueDO.java
index 6d376db..3ec3ca0 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/queueDO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/queueDO.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.*;
import cn.lihu.jh.framework.mybatis.core.dataobject.BaseDO;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -41,7 +42,7 @@
/**
* 棰勭害鏃ユ湡
*/
- private LocalDateTime bookDate;
+ private LocalDate bookDate;
/**
* 棰勭害鏃堕棿娈�
*/
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 ca3c9b7..8467e63 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
@@ -108,12 +108,12 @@
@Param("seqNum")Integer seqNum, @Param("curStatus")Byte curStatus, @Param("newStatus")Byte newStatus);
@Update("update lihu.queue set status = #{newStatus} " +
- " where pat_id = #{patId} amd status = #{curStatus} and room_id = #{roomId} and bed_no = #{bedNo}")
+ " where pat_id = #{patId} and status = #{curStatus} and room_id = #{roomId} and bed_no = #{bedNo}")
Integer passedPatientReturn(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("patId")String patId,
@Param("curStatus")Byte curStatus, @Param("newStatus")Byte newStatus);
- @Update("update lihu.queue set jumped = #{jumped} " +
- " where pat_id = #{patId} amd status = #{curStatus}")
+ @Update("update lihu.queue set jump_flag = #{jumped} " +
+ " where pat_id = #{patId} and status = #{curStatus}")
Integer queueJump(@Param("patId")String patId, @Param("curStatus")Byte curStatus, @Param("jumped")Byte jumped );
}
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 7edae08..ea7c88d 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
@@ -89,7 +89,7 @@
PatientStatisticVO getPatientStatistic(Long roomId, String bedNo);
- Integer passedPatientReturn(Long roomId, String bedNo, String patId);
+ Integer recallPatient(Long roomId, String bedNo, String patId);
- Integer queueJump( String patId, Byte jumped );
+ Integer patientJump(String patId, Byte jumped );
}
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 48d615c..f7bd7f9 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
@@ -227,9 +227,7 @@
if (0 == openingFlag.get())
return;
- singleThreadExecutor.execute( () -> {
- hurryup();
- });
+ startHurryUp();
}
private void nextPatient(Long roomId, String bedNo) {
@@ -248,9 +246,7 @@
priorityQueue.remove(bo);
priorityQueue.offer(bo);
- singleThreadExecutor.execute( () -> {
- hurryup();
- });
+ startHurryUp();
}
public void finishNextPatient(Long roomId, String bedNo) {
@@ -301,16 +297,25 @@
}
@Override
- public Integer passedPatientReturn(Long roomId, String bedNo, String patId) {
+ public Integer recallPatient(Long roomId, String bedNo, String patId) {
Integer updateNum = queueMapper.passedPatientReturn(roomId, bedNo, patId,
QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.PASSED_RETURN.getStatus());
+ startHurryUp();
return updateNum;
}
@Override
- public Integer queueJump(String patId, Byte jumped) {
+ public Integer patientJump(String patId, Byte jumped) {
Integer updateNum = queueMapper.queueJump(patId, QueueStatusEnum.WAITING.getStatus(), jumped);
- return null;
+ startHurryUp();
+ return updateNum;
+ }
+
+ private void startHurryUp() {
+ singleThreadExecutor.execute( () -> {
+ hurryup();
+ });
}
}
+
diff --git a/sql/mysql/jh.sql b/sql/mysql/jh.sql
index cae995a..68fdcee 100644
--- a/sql/mysql/jh.sql
+++ b/sql/mysql/jh.sql
@@ -22,7 +22,7 @@
`pat_ward_desc` varchar(45) DEFAULT '' COMMENT '鎮ｈ�呮墍鍦ㄧ梾鍖哄悕绉�',
`pat_bed_no` varchar(45) DEFAULT '' COMMENT '搴婂彿',
`book_id` varchar(45) DEFAULT '' COMMENT '棰勭害缂栧彿',
- `book_date` datetime NOT NULL COMMENT '棰勭害鏃ユ湡',
+ `book_date` date NOT NULL COMMENT '棰勭害鏃ユ湡',
`book_timeslot` int NOT NULL COMMENT '棰勭害鏃堕棿娈�',
`book_time` datetime NOT NULL COMMENT '棰勭害鍙戠敓鏃堕棿',
`book_check_type` tinyint(1) DEFAULT NULL COMMENT '棰勭害妫�鏌ョ被鍨�',
@@ -47,7 +47,7 @@
`pat_id` varchar(30) NOT NULL COMMENT '鎮ｈ�呯紪鍙�',
`pat_name` varchar(10) NOT NULL COMMENT '鎮ｈ�呭鍚�',
`pat_gender` tinyint DEFAULT NULL COMMENT '鎮ｈ�呮�у埆',
- `book_date` dateTime NOT NULL COMMENT '棰勭害鏃ユ湡',
+ `book_date` date NOT NULL COMMENT '棰勭害鏃ユ湡',
`book_timeslot` int NOT NULL COMMENT '棰勭害鏃堕棿娈�',
`book_check_type` tinyint DEFAULT NULL COMMENT '棰勭害妫�鏌ョ被鍨�',
`seq_num` int DEFAULT NULL COMMENT '鎺掗槦搴忓彿',
--
Gitblit v1.9.3