From cdd1ef49773e49dd91d19f9d02c82fb70e9f658c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 七月 2025 18:07:54 +0800
Subject: [PATCH] zjh20250718

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java |   93 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 90 insertions(+), 3 deletions(-)

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
index 2aace84..d7281d0 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
@@ -281,6 +281,12 @@
     @TableField(exist = false)
     private String packId;
 
+    @TableField(exist = false)
+    private String dwDeptName;
+
+    @TableField(exist = false)
+    private String groupingName;
+
     //鍗曢」ids
     @TableField(exist = false)
     private List<Long> proIdList;
@@ -311,9 +317,6 @@
      */
     private String groupingId;
 
-    @ApiModelProperty(value = "鍒嗙粍鍚�")
-    @TableField(exist = false)
-    private String groupingName;
 
     @ApiModelProperty(value = "搴旀敹浠锋牸")
     @TableField(exist = false)
@@ -357,6 +360,90 @@
     @ApiModelProperty("鏈夋晥澶╂暟")
     private Integer yxts;
 
+    /**
+     * 鎺ュ宸ラ緞骞�
+     */
+    @ExcelImport("鎺ュ宸ラ緞骞�")
+    @ApiModelProperty("鎺ュ宸ラ緞骞�")
+    private String zhiyeJhgln;
+
+    /**
+     * 鎺ュ宸ラ緞鏈�
+     */
+    @ExcelImport("鎺ュ宸ラ緞鏈�")
+    @ApiModelProperty("鎺ュ宸ラ緞鏈�")
+    private String zhiyeJhgly;
+
+    /**
+     * 寮�濮嬫帴瀹虫棩鏈�
+     */
+    @ExcelImport("寮�濮嬫帴瀹虫棩鏈�")
+    @ApiModelProperty("寮�濮嬫帴瀹虫棩鏈�")
+    private String zhiyeKsjhrq;
+
+    /**
+     * 宸ュ彿
+     */
+    @ExcelImport("宸ュ彿")
+    @ApiModelProperty("宸ュ彿")
+    private String zhiyeGh;
+
+    /**
+     * 杞﹂棿
+     */
+    @ApiModelProperty("杞﹂棿")
+    private String zhiyeCj;
+
+    /**
+     * 鑱屼笟缁撹
+     */
+    @ApiModelProperty("鑱屼笟缁撹")
+    private String zhiyeJl;
+
+    /**
+     * 鑱屼笟缁撴灉
+     */
+    @ApiModelProperty("鑱屼笟缁撴灉")
+    private String zhiyeJg;
+
+    @ExcelImport("宸ョ")
+    @ApiModelProperty("宸ョ")
+    private String zhiyeGz;
+
+    @ExcelImport("鎬诲伐榫勫勾")
+    @ApiModelProperty("鎬诲伐榫勫勾")
+    private String zhiyeZgln;
+
+    @ExcelImport("鎬诲伐榫勬湀")
+    @ApiModelProperty("鎬诲伐榫勬湀")
+    private String zhiyeZgly;
+
+    @ExcelImport("鎺ュ鍥犵礌")
+    @ApiModelProperty("鎺ュ鍥犵礌")
+    private String zhiyeJhys;
+
+    @ExcelImport("鍏ヨ亴鏃堕棿")
+    @ApiModelProperty("鍏ヨ亴鏃堕棿")
+    private String zhiyeRzsj;
+
+    @ExcelImport("鎵�澶勫崟浣�")
+    @ApiModelProperty("鎵�澶勫崟浣�")
+    private String zhiyeScdw;
+
+    @ExcelImport("鑱屼笟鍙插紑濮嬫棩鏈�")
+    @ApiModelProperty("鑱屼笟鍙插紑濮嬫棩鏈�")
+    private String zhiyeZysksrq;
+
+    @ExcelImport("鑱屼笟鍙茬粨鏉熸棩鏈�")
+    @ApiModelProperty("鑱屼笟鍙茬粨鏉熸棩鏈�")
+    private String zhiyeZysjsrq;
+
+    @ExcelImport("鑱屼笟鍙叉墍鍦ㄥ崟浣�")
+    @ApiModelProperty("鑱屼笟鍙叉墍鍦ㄥ崟浣�")
+    private String zhiyeZysszdw;
+
+
+
 
 
     @Override

--
Gitblit v1.8.0