From 0fa1f4767affcd1879709ebea630016356836c75 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 18 九月 2026 15:07:20 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/ecg
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/QueueDO.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
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 527bf28..3d13aa9 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
@@ -1,12 +1,15 @@
package cn.lihu.jh.module.ecg.dal.dataobject.queue;
+import cn.lihu.jh.module.ecg.dal.dataobject.patient.PatDetails;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.*;
import com.baomidou.mybatisplus.annotation.*;
import cn.lihu.jh.framework.mybatis.core.dataobject.BaseDO;
import java.time.LocalDate;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 鎺掗槦 DO
@@ -29,6 +32,18 @@
@TableId
private Integer id;
/**
+ * 棰勭害鐢宠鍙�
+ */
+ private String applyNo;
+ /**
+ * 灏辫瘖娴佹按鍙�
+ */
+ private String episodeId;
+ /**
+ * 鍐呴儴棰勭害缂栧彿
+ */
+ private Long appointId;
+ /**
* 鎮ｈ�呯紪鍙�
*/
private String patId;
@@ -43,7 +58,8 @@
/**
* 鎮ｈ�呰鎯�
*/
- private String patDetails;
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private PatDetails patDetails;
/**
* 棰勭害鏃ユ湡
*/
@@ -85,6 +101,10 @@
*/
private Byte jumpFlag;
/**
+ * 鏄惁浜插拰椤�, 鐢ㄤ簬鎺у埗 浜插拰椤圭殑涓嶅彨鍙�
+ */
+ private Integer affinityItem;
+ /**
* 璇婂缂栧彿
*/
private Long roomId;
@@ -96,10 +116,24 @@
* 璇婄枟搴婄紪鍙�
*/
private String bedNo;
+
+ @TableField(exist = false)
+ private String tolerance;
+
/**
- * 浜插拰椤�
+ * 浠ヤ笅瀛楁鏉ヨ嚜棰勭害鍗曪紙appointment锛夛紝queue 琛ㄤ腑涓嶅瓨鍦紝
+ * 鐢� QueueServiceImpl#fillAppointmentInfo 鍦ㄦ煡璇㈠悗鎸� applyNo 鍥炴煡濉厖銆�
*/
- @TableField(typeHandler = JacksonTypeHandler.class)
- private List<Integer> affinityItems;
+ @TableField(exist = false)
+ private LocalDate patBirthday;
+
+ @TableField(exist = false)
+ private Date registerDate;
+
+ @TableField(exist = false)
+ private String doctor;
+
+ @TableField(exist = false)
+ private Date doctorTime;
}
--
Gitblit v1.9.3