From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java |   61 +++++++++++++++++++++++++++---
 1 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
index 6c61a2f..247df6f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
@@ -120,7 +120,7 @@
     private String firmId;
 
     @ApiModelProperty(value = "鍗曚綅鍚嶇О")
-    @Excel(name = "鍗曚綅鍚�")
+    @Excel(name = "鍗曚綅")
     private String firmName;
 
 
@@ -128,8 +128,8 @@
     /**
      * 閮ㄩ棬鍚�
      */
-    @Excel(name = "閮ㄩ棬鍚�", defaultValue = "鏃�")
-    @ApiModelProperty(value = "閮ㄩ棬鍚�")
+    @Excel(name = "閮ㄩ棬", defaultValue = "鏃�")
+    @ApiModelProperty(value = "閮ㄩ棬")
     private String firmDeptName;
 
     /**
@@ -207,7 +207,7 @@
      * 鎶ュ憡鏈�鍚庢墦鍗版椂闂�
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = " 鎵撳嵃鎶ュ憡鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏃�")
+    @Excel(name = " 鎵撳嵃鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏃�")
     @ApiModelProperty(value = "鎶ュ憡鏈�鍚庢墦鍗版椂闂�")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date printLastTime;
@@ -275,7 +275,7 @@
      */
     @TableField(exist = false)
     @ApiModelProperty(value = "浣撴璁板綍涓殑瀹㈡埛韬唤璇佸彿鐮�")
-    @Excel(name = "韬唤璇佸彿鐮�")
+    @Excel(name = "璇佷欢鍙�")
     private String tjCusIdCard;
 
 
@@ -379,7 +379,7 @@
     /**
      * 浣撴鐘舵��
      */
-    @Excel(name = "浣撴鐘舵��", defaultValue = "鏃�")
+//    @Excel(name = "浣撴鐘舵��", defaultValue = "鏃�")
     @ApiModelProperty(value = "浣撴鐘舵��")
     private Integer status;
     /**
@@ -445,7 +445,7 @@
      * 浣撴绫诲埆
      */
     @ApiModelProperty("浣撴绫诲埆")
-    @Excel(name = "浣撴绫诲埆")
+//    @Excel(name = "浣撴绫诲埆")
     private String tjCategory;
 
     @ApiModelProperty("灏辫瘖缂栧彿")
@@ -467,6 +467,53 @@
     @Excel(name = "浣撴鐘舵��")
     private String zt;
 
+    /**
+     * 鎺ュ宸ラ緞骞�
+     */
+    private String zhiyeJhgln;
+
+    /**
+     * 鎺ュ宸ラ緞鏈�
+     */
+    private String zhiyeJhgly;
+
+    /**
+     * 寮�濮嬫帴瀹虫棩鏈�
+     */
+    private String zhiyeKsjhrq;
+
+    /**
+     * 宸ュ彿
+     */
+    private String zhiyeGh;
+
+
+    /**
+     * 杞﹂棿
+     */
+    private String zhiyeCj;
+
+    /**
+     * 鑱屼笟缁撹
+     */
+    private String zhiyeJl;
+
+    /**
+     * 鑱屼笟缁撴灉
+     */
+    private String zhiyeJg;
+
+
+    private String zhiyeGz;
+    private String zhiyeZgln;
+    private String zhiyeZgly;
+    private String zhiyeJhys;
+    private String zhiyeRzsj;
+    private String zhiyeScdw;
+    private String zhiyeZysksrq;
+    private String zhiyeZysjsrq;
+    private String zhiyeZysszdw;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

--
Gitblit v1.8.0