From 04480e19c8b47c2cb469811d47679c923b82710d Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 29 十一月 2024 15:21:27 +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 | 8 ++++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentConfirmReqVO.java | 8 ++++----
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java | 4 +---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentPageReqVO.java | 7 ++++---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/vo/AppointmentSaveReqVO.java | 3 +++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/appointment/AppointmentDO.java | 4 ----
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java | 2 +-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java | 3 ++-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java | 17 ++---------------
9 files changed, 25 insertions(+), 31 deletions(-)
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 a11f0cb..9952184 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
@@ -1,5 +1,6 @@
package cn.lihu.jh.module.ecg.controller.admin.appointment.vo;
+import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -13,6 +14,9 @@
public class AppointmentConfirmReqVO {
private Long id;
+
+ @Schema(description = "棰勭害鐢宠鍙�", example = "2024435")
+ private String applyNo;
@Schema(description = "灏辫瘖娴佹按鍙�", example = "2024546")
//@NotEmpty(message = "灏辫瘖娴佹按鍙�")
@@ -29,10 +33,6 @@
@Schema(description = "鎮ｈ�呮�у埆", requiredMode = Schema.RequiredMode.REQUIRED)
//@NotNull(message = "鎮ｈ�呮�у埆涓嶈兘涓虹┖")
private Byte patGender;
-
- @Schema(description = "棰勭害缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "27849")
- //@NotEmpty(message = "棰勭害缂栧彿涓嶈兘涓虹┖")
- private String bookId;
@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 34f77a5..4df0c4b 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,5 +1,6 @@
package cn.lihu.jh.module.ecg.controller.admin.appointment.vo;
+import com.alibaba.excel.annotation.ExcelProperty;
import lombok.*;
import java.time.LocalDate;
@@ -16,6 +17,9 @@
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class AppointmentPageReqVO extends PageParam {
+
+ @Schema(description = "棰勭害鐢宠鍙�", example = "2024435")
+ private String applyNo;
@Schema(description = "灏辫瘖娴佹按鍙�", example = "2024546")
private String episodeId;
@@ -58,9 +62,6 @@
@Schema(description = "搴婂彿")
private String patBedNo;
-
- @Schema(description = "棰勭害缂栧彿", example = "27849")
- private String bookId;
@Schema(description = "棰勭害鏃ユ湡")
private LocalDate bookDate;
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 907b5db..01cd947 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
@@ -18,10 +18,18 @@
private Long id;
+ @Schema(description = "棰勭害鐢宠鍙�", example = "2024435")
+ @ExcelProperty("棰勭害鐢宠鍙�")
+ private String applyNo;
+
@Schema(description = "灏辫瘖娴佹按鍙�", example = "2024546")
@ExcelProperty("灏辫瘖娴佹按鍙�")
private String episodeId;
+ @Schema(description = "鎮ｈ�呮潵婧�", example = "2024546")
+ @ExcelProperty("鎮ｈ�呮潵婧�")
+ private Integer patSrc;
+
@Schema(description = "鎮ｈ�呯紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "29034")
@ExcelProperty("鎮ｈ�呯紪鍙�")
private String patId;
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 d1de685..f98f9d9 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
@@ -15,6 +15,9 @@
private Long id;
+ @Schema(description = "棰勭害鐢宠鍙�", example = "2024435")
+ private String applyNo;
+
@Schema(description = "灏辫瘖娴佹按鍙�", example = "2024546")
//@NotEmpty(message = "灏辫瘖娴佹按鍙�")
private String episodeId;
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 86ef28d..1dcdebb 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
@@ -102,10 +102,6 @@
*/
private String patBedNo;
/**
- * 棰勭害缂栧彿
- */
- private String bookId;
- /**
* 棰勭害鏃ユ湡
*/
private LocalDate bookDate;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
index 5ff8284..901896a 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/appointment/AppointmentMapper.java
@@ -23,6 +23,8 @@
default PageResult<AppointmentDO> selectPage(AppointmentPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<AppointmentDO>()
+ .eqIfPresent(AppointmentDO::getApplyNo, reqVO.getApplyNo())
+ .eqIfPresent(AppointmentDO::getEpisodeId, reqVO.getEpisodeId())
.eqIfPresent(AppointmentDO::getPatId, reqVO.getPatId())
.likeIfPresent(AppointmentDO::getPatName, reqVO.getPatName())
.eqIfPresent(AppointmentDO::getPatGender, reqVO.getPatGender())
@@ -36,7 +38,6 @@
.eqIfPresent(AppointmentDO::getPatWardCode, reqVO.getPatWardCode())
.eqIfPresent(AppointmentDO::getPatWardDesc, reqVO.getPatWardDesc())
.eqIfPresent(AppointmentDO::getPatBedNo, reqVO.getPatBedNo())
- .eqIfPresent(AppointmentDO::getBookId, reqVO.getBookId())
.eqIfPresent(AppointmentDO::getBookDate, reqVO.getBookDate())
.eqIfPresent(AppointmentDO::getBookTimeslot, reqVO.getBookTimeslot())
.betweenIfPresent(AppointmentDO::getBookTime, reqVO.getBookTime())
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java
index 58b4dc6..de911b4 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/checktype/CheckTypeMapper.java
@@ -51,7 +51,7 @@
@Select("SELECT * FROM lihu.check_type;")
@Results({
- @Result(property = "displayBarcode", column = "display_barcode", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+ @Result(property = "displayBarcode", column = "display_barcode", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class),
@Result(property = "affinityCheckTypes", column = "affinity_check_types", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
})
List<CheckTypeDO> simpleCheckTypeList();
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 ffea211..bd19244 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
@@ -218,6 +218,7 @@
" (select min(seq_num) as min_seq_num from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus}) a )")
Integer updateBedQueueStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
+ // 寮冪敤鍘熷洜锛氶渶瑕佸厛鑾峰彇锛屽垽鏂�昏緫澶勭悊鍚庯紝鍐嶆洿鏂�
// 鏌愪釜璇婂鑼冨洿鍐� [宸查鐢╙ [宸插彫鍥�-瀹夎] 浜哄憳 鎶㈠崰, 浼氭洿鏂� [宸ヤ綅鍙穄
// 娌℃湁闄愬畾妫�鏌ョ被鍨嬶紝涓嶈浣跨敤鏃堕棿妲�
@Update("<script> " +
@@ -234,9 +235,6 @@
"</script>"
)
Integer preemptToBeInstalledPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatusList")List<Integer> curStatusList, @Param("newStatus")Integer newStatus);
-
- @Update("update lihu.queue set status = #{newStatus} where pat_id = #{patId} and status = #{curStatus}")
- Integer updatePatientQueueStatus(@Param("patId")String patId, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
// 鏁翠釜绯荤粺鑼冨洿鍐� [鎺掗槦涓璢浜哄憳 [琚伐浣嶅尰鐢焆鎶㈠崰
@Update("update lihu.queue set status = #{newStatus}, room_id = #{roomId}, room_name = #{roomName}, \n" +
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
index 263feaa..ce87113 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/appointment/AppointmentServiceImpl.java
@@ -199,10 +199,9 @@
appointmentDO.setPatWardDesc(appointmentExternal.getPatLocWardDesc());
appointmentDO.setPatMobile(appointmentExternal.getPhone());
appointmentDO.setPatBedNo(appointmentExternal.getEnBedno());
- appointmentDO.setBookId(appointmentExternal.getReqIdeApplyno());
appointmentDO.setBookCheckType(getCorrespondingCheckType(appointmentExternal.getPlanDefItemList().getPlanDefItem().getPlanDefItemcode()));
appointmentDO.setBookTime(DateUtils.ofUTC(appointmentExternal.getReqAuthoredOn())); // 寮�鍗曟椂闂�
- appointmentDO.setBookSrc( getBookSource(appointmentExternal.getAdmTypeCode()) );
+ appointmentDO.setBookSrc( 0 );
// 鍏夊紑鍗曠殑鎯呭喌锛屾病鏈夐绾︽椂闂�
if (null != appointmentExternal.getReqExtBooktime() ) {
@@ -245,6 +244,7 @@
try {
QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO();
+ queueSaveReqVO.setApplyNo( appointment.getApplyNo() );
queueSaveReqVO.setEpisodeId( appointment.getEpisodeId() );
queueSaveReqVO.setAppointId(appointment.getId());
queueSaveReqVO.setPatId(appointment.getPatId());
@@ -264,19 +264,6 @@
}
return newSeqNo;
- }
-
- private Integer getBookSource(String admTypeCode) {
- if (admTypeCode.equals("AMB")) // 闂ㄨ瘖
- return 1;
- else if (admTypeCode.equals("EMER")) // 鎬ヨ瘖
- return 2;
- else if (admTypeCode.equals("PHY")) // 浣撴
- return 3;
- else if (admTypeCode.equals("IMP")) // 浣忛櫌
- return 4;
-
- return 1;
}
private Integer getCorrespondingCheckType(String strPlanDefItemcode) {
--
Gitblit v1.9.3