From fce96ef468291fb9a0e6a4d34ab371315e9485d4 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 03 十月 2026 00:59:44 +0800
Subject: [PATCH] ai优化
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devrent/DevRentDO.java | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 102 insertions(+), 8 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 eeca1de..2e28d35 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,10 +1,11 @@
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;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import cn.lihu.jh.framework.mybatis.core.dataobject.BaseDO;
@@ -14,7 +15,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,9 +31,13 @@
@TableId
private Long id;
/**
- * 璁惧缂栧彿
+ * 鐢宠缂栧彿
*/
- private String devId;
+ private String applyNo;
+ /**
+ * 灏辫瘖娴佹按鍙�
+ */
+ private String episodeId;
/**
* 鎮ｈ�呯紪鍙�
*/
@@ -42,6 +47,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 +68,10 @@
* 鎷嗘満鏃堕棿
*/
private LocalDateTime returnTime;
+ /**
+ * 鏁版嵁褰曞叆鏃堕棿
+ */
+ private LocalDateTime entryTime;
/**
* 骞叉壈鏁�
*/
@@ -66,5 +89,76 @@
*/
private String remark;
- private Integer cancelled;
-}
\ No newline at end of file
+ /**
+ * @see DevRentStateEnum
+ */
+ private Integer state;
+
+ private Integer paid;
+
+ // ==================== 闇�姹�1锛氭偅鑰呬俊鎭� 18 椤规墍闇�鐨勫钩閾哄瓧娈� ====================
+ // 浠ヤ笅鍧囨潵鑷绾﹀崟 appointment锛坉ev_rent 琛ㄦ棤瀵瑰簲鍒楋級锛岀敱 DevRentServiceImpl
+ // 鏌ヨ鍚庢寜 applyNo 鍥炴煡鍥炲～銆�
+ //
+ // 銆愰噸瑕併�戝繀椤绘爣璁� @TableField(exist = false)锛�
+ // DevRentDO 浼氱敤浜� updateById / insert锛岃嫢涓嶅姞璇ユ敞瑙ｏ紝MyBatis-Plus 浼氭妸杩欎簺
+ // 涓嶅瓨鍦ㄧ殑鍒楁嫾杩� SQL锛屽鑷� "Unknown column" 鎶ラ敊銆�
+ //
+ // 涔嬫墍浠ュ钩閾鸿�屼笉璁╁墠绔 patDetails JSON锛�
+ // patDetails 鏄‘璁ら绾︽椂鍐欏叆鐨勫揩鐓э紝鍙兘婊炲悗浜� appointment 鐨勬渶鏂板�硷紱
+ // 涓斿墠绔 patDetails?.xxx 鏃� TS 绫诲瀷鎻愮ず锛屽鏄撳啓閿欍��
+
+ @TableField(exist = false)
+ private Byte patGender;
+
+ @TableField(exist = false)
+ private LocalDate patBirthday;
+
+ @TableField(exist = false)
+ private Date registerDate;
+
+ @TableField(exist = false)
+ private String doctor;
+
+ @TableField(exist = false)
+ private Date doctorTime;
+
+ @TableField(exist = false)
+ private Integer patSrc;
+
+ @TableField(exist = false)
+ private String patMobile;
+
+ @TableField(exist = false)
+ private String patPhone;
+
+ @TableField(exist = false)
+ private String patWardDesc;
+
+ @TableField(exist = false)
+ private String patBedNo;
+
+ @TableField(exist = false)
+ private String medicalCard;
+
+ @TableField(exist = false)
+ private String outpatientNo;
+
+ @TableField(exist = false)
+ private String patIdentityId;
+
+ /**
+ * 鍖诲槺鍙凤紙HIS 鎶ユ枃 observationRequest.id.item[root=2.16.156.10011.1.28].extension锛夈��
+ * 涓庛�岀敵璇峰崟鍙� applyNo銆嶄笉鍚岋細鍓嶈�呮槸鍖诲槺鏍囪瘑锛屽悗鑰呮槸鐢宠鍗曟爣璇嗐�傝鑺傜偣鍦ㄨ鑼冧腑闈炲繀椤婚」锛屽簱涓彲涓虹┖銆�
+ */
+ private String doctorAdviceNo;
+
+ /** 澶氳�愯嵂锛�0 鏃� / 1 澶氳�� / 2 澶氶噸鑰愯嵂 */
+ @TableField(exist = false)
+ private String tolerance;
+
+ /**
+ * 鏄惁搴婅竟锛�0鍚� 1鏄級鈥斺�� 闇�姹�2锛屾潵婧� HIS zdy.ISCB
+ */
+ private String isBedside;
+}
--
Gitblit v1.9.3