From 289ecba11e7ebbb9a3d7aa884481978f760a97a4 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 18 十二月 2024 14:15:16 +0800
Subject: [PATCH] 设备备注 & 查询条件
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devmanage/DeviceDO.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devmanage/DeviceDO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devmanage/DeviceDO.java
index ebe11b9..65dc924 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devmanage/DeviceDO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devmanage/DeviceDO.java
@@ -1,5 +1,7 @@
package cn.lihu.jh.module.ecg.dal.dataobject.devmanage;
+import cn.lihu.jh.module.ecg.dal.dataobject.patient.PatDetails;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.*;
import java.time.LocalDate;
@@ -14,7 +16,7 @@
*
* @author majianbo
*/
-@TableName("device")
+@TableName(value="device", autoResultMap = true)
@KeySequence("device_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
@Data
@EqualsAndHashCode(callSuper = true)
@@ -34,6 +36,18 @@
*/
private String devId;
/**
+ * 璁惧缂栧彿
+ */
+ private String devCodeIntrinsic;
+ /**
+ * 璁惧缂栧彿
+ */
+ private String devCodeHosp;
+ /**
+ * 璁惧缂栧彿
+ */
+ private String devCodeDept;
+ /**
* 鍒嗙被鍚�
*/
private String category;
@@ -51,11 +65,21 @@
private LocalDate purchaseDate;
/**
- * 閬楀け
+ * 鐘舵�佹棩鏈�
*/
- private Integer lost;
+ @TableField(updateStrategy = FieldStrategy.ALWAYS)
+ private LocalDate stateDate;
+
/**
- * 閬楀け鏃ユ湡
+ * 0 - 绌洪棽 10 - 浣跨敤涓� 20 - 宸查仐澶�
*/
- private LocalDate loseDate;
+ private Integer state;
+
+ @TableField(updateStrategy = FieldStrategy.ALWAYS)
+ private Long rentId;
+
+ @TableField(typeHandler = JacksonTypeHandler.class, updateStrategy = FieldStrategy.ALWAYS)
+ private PatDetails patDetails;
+
+ private String comment;
}
--
Gitblit v1.9.3