From d1708b4b2bc6596f9c62354274f1af97be45401c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 28 十一月 2024 14:40:46 +0800
Subject: [PATCH] 按工位的多个检查项目 抢占 排队中 患者
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devrent/DevRentDO.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devrent/DevRentDO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devrent/DevRentDO.java
index 8533c86..f0aa71f 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devrent/DevRentDO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devrent/DevRentDO.java
@@ -1,5 +1,8 @@
package cn.lihu.jh.module.ecg.dal.dataobject.devrent;
+import cn.lihu.jh.module.ecg.dal.dataobject.patient.PatDetails;
+import cn.lihu.jh.module.ecg.enums.DevRentStateEnum;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
@@ -14,7 +17,7 @@
*
* @author 鑺嬮亾婧愮爜
*/
-@TableName("dev_rent")
+@TableName(value="dev_rent", autoResultMap = true)
@KeySequence("dev_rent_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
@Data
@EqualsAndHashCode(callSuper = true)
@@ -30,10 +33,6 @@
@TableId
private Long id;
/**
- * 璁惧缂栧彿
- */
- private String devId;
- /**
* 鎮ｈ�呯紪鍙�
*/
private String patId;
@@ -42,6 +41,20 @@
*/
private String patName;
/**
+ * 鎮ｈ�呰鎯�
+ */
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private PatDetails patDetails;
+ /**
+ * 妫�鏌ョ被鍨�
+ */
+ private Integer checkType;
+ /**
+ * 璁惧缂栧彿
+ */
+ @TableField(updateStrategy = FieldStrategy.ALWAYS)
+ private String devId;
+ /**
* 瑁呮満鏃堕棿
*/
private LocalDateTime rentTime;
@@ -49,6 +62,10 @@
* 鎷嗘満鏃堕棿
*/
private LocalDateTime returnTime;
+ /**
+ * 鏁版嵁褰曞叆鏃堕棿
+ */
+ private LocalDateTime entryTime;
/**
* 骞叉壈鏁�
*/
@@ -67,12 +84,9 @@
private String remark;
/**
- * 鏀惧純瀹夎
+ * @see DevRentStateEnum
*/
- private Integer cancelled;
+ private Integer state;
- /**
- * 閬楀け
- */
- private Integer lost;
-}
\ No newline at end of file
+ private Integer paid;
+}
--
Gitblit v1.9.3