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/queue/QueueDO.java | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 104 insertions(+), 9 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 2156668..b9a2c92 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,17 +1,22 @@
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
*
* @author 鑺嬮亾婧愮爜
*/
-@TableName("queue")
+@TableName( value="queue", autoResultMap = true )
@KeySequence("queue_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
@Data
@EqualsAndHashCode(callSuper = true)
@@ -27,6 +32,18 @@
@TableId
private Integer id;
/**
+ * 棰勭害鐢宠鍙�
+ */
+ private String applyNo;
+ /**
+ * 灏辫瘖娴佹按鍙�
+ */
+ private String episodeId;
+ /**
+ * 鍐呴儴棰勭害缂栧彿
+ */
+ private Long appointId;
+ /**
* 鎮ｈ�呯紪鍙�
*/
private String patId;
@@ -39,6 +56,11 @@
*/
private Byte patGender;
/**
+ * 鎮ｈ�呰鎯�
+ */
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private PatDetails patDetails;
+ /**
* 棰勭害鏃ユ湡
*/
private LocalDate bookDate;
@@ -49,15 +71,23 @@
/**
* 棰勭害妫�鏌ョ被鍨�
*/
- private Byte bookCheckType;
+ private Integer bookCheckType;
+ /**
+ * 棰勭害搴忓彿
+ */
+ private Integer bookSeqNum;
+ /**
+ * 鏄惁VIP
+ */
+ private Integer isVip;
/**
* 鎺掗槦搴忓彿
*/
private Integer seqNum;
/**
- * 10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡
+ * 5:杩囧彿 10:鎺掗槦涓� 15:宸插彫鍥� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚
*/
- private Byte status;
+ private Integer status;
/**
* 杩囧彿鏍囪
*/
@@ -67,13 +97,13 @@
*/
private Byte expired;
/**
- * 璇煶鍙彿鏍囪
- */
- private Integer called;
- /**
* 鎻掗槦鏍囪
*/
private Byte jumpFlag;
+ /**
+ * 鏄惁浜插拰椤�, 鐢ㄤ簬鎺у埗 浜插拰椤圭殑涓嶅彨鍙�
+ */
+ private Integer affinityItem;
/**
* 璇婂缂栧彿
*/
@@ -87,4 +117,69 @@
*/
private String bedNo;
-}
\ No newline at end of file
+ @TableField(exist = false)
+ private String tolerance;
+
+ /**
+ * 鏄惁搴婅竟锛�0鍚� 1鏄級鈥斺�� 闇�姹�2銆�
+ * <p>
+ * queue 琛ㄥ凡鏈夎鍒楋紙瑙� _prep/22_add_seq_rule_and_bedside.sql锛夛紝
+ * 棰勭害纭鏃剁敱 appointment.is_bedside 甯﹀叆锛涘宸插瓨鍦ㄧ殑闃熷垪琛岋紝
+ * 涔熷彲鐢� {@code fillAppointmentInfo} 鍥炴煡琛ュ～銆�
+ */
+ private String isBedside;
+
+ /**
+ * 浠ヤ笅瀛楁鏉ヨ嚜棰勭害鍗曪紙appointment锛夛紝queue 琛ㄤ腑涓嶅瓨鍦紝
+ * 鐢� QueueServiceImpl#fillAppointmentInfo 鍦ㄦ煡璇㈠悗鎸� applyNo 鍥炴煡濉厖銆�
+ */
+ @TableField(exist = false)
+ private LocalDate patBirthday;
+
+ @TableField(exist = false)
+ private Date registerDate;
+
+ @TableField(exist = false)
+ private String doctor;
+
+ @TableField(exist = false)
+ private Date doctorTime;
+
+ // ==================== 闇�姹�1锛氭偅鑰呬俊鎭� 18 椤规墍闇�鐨勫钩閾哄瓧娈� ====================
+ // 浠ヤ笅鍧囨潵鑷� appointment锛宷ueue 琛ㄦ棤瀵瑰簲鍒楋紝鐢� fillAppointmentInfo 鍥炲～銆�
+ // 涔嬫墍浠�"骞抽摵"鑰屼笉鏄鍓嶇璇� patDetails JSON锛�
+ // 1) patDetails 鏄‘璁ら绾︽椂鍐欏叆鐨勫揩鐓э紝鍙兘婊炲悗浜� appointment 鐨勬渶鏂板�硷紱
+ // 2) 鍓嶇妯℃澘璇� `row.patDetails?.xxx` 鏃犳硶浜彈 TS 绫诲瀷鎻愮ず锛屾槗鍐欓敊銆�
+
+ @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;
+
+ /** 灏辫瘖鍗″彿锛坢edical_card锛涘簱涓涓虹┖锛屽墠绔嚜琛屽洖閫�鍒� outpatient_no锛� */
+ @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;
+}
+
--
Gitblit v1.9.3