From e8c5fd71396e1e30d2b99e66b67e6e815ac677fd Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 23 五月 2025 17:03:03 +0800
Subject: [PATCH] zjh20250523

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java |   94 ++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 88 insertions(+), 6 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 23f9998..8284ed0 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
@@ -81,8 +81,8 @@
      * 鍑虹敓鏃ユ湡
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @ExcelExport(value = "鍑虹敓鏃ユ湡",sort =6)
-    @ExcelImport("鍑虹敓鏃ユ湡")
+//    @ExcelExport(value = "鍑虹敓鏃ユ湡",sort =6)
+//    @ExcelImport("鍑虹敓鏃ユ湡")
     @Excel(name = "鍑虹敓鏃ユ湡",sort = 6,dateFormat = "yyyy/MM/dd")
     @ApiModelProperty("鍑虹敓鏃ユ湡")
     private Date birthday;
@@ -223,10 +223,10 @@
     private String department;
 
 
-    @ExcelExport(value = "鎵�鍦ㄥ湴",sort =-5)
-    @ExcelImport("鎵�鍦ㄥ湴")
-    @Excel(name = "鎵�鍦ㄥ湴",sort = 5,cellType = Excel.ColumnType.STRING,color = IndexedColors.RED)
-    @ApiModelProperty("鎵�鍦ㄥ湴")
+    @ExcelExport(value = "浣撴鎵�鍦ㄥ湴",sort =-5)
+    @ExcelImport("浣撴鎵�鍦ㄥ湴")
+    @Excel(name = "浣撴鎵�鍦ㄥ湴",sort = 5,cellType = Excel.ColumnType.STRING,color = IndexedColors.RED)
+    @ApiModelProperty("浣撴鎵�鍦ㄥ湴")
     private String szd;
 
 
@@ -353,6 +353,88 @@
     @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