From 1630243ed75a92c60d0638e7d14477e4aadcf2b7 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 四月 2025 17:41:44 +0800
Subject: [PATCH] zjh20250418

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java |   85 +++++++++++++++++++++++++++++++++---------
 1 files changed, 66 insertions(+), 19 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 0b9696a..6c61a2f 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
@@ -54,13 +54,9 @@
     /**
      * 瀹㈡埛瀵硅薄
      */
-    @Excels({
-            @Excel(name = "瀹㈡埛鍚嶇О", targetAttr = "cusName", type = Excel.Type.EXPORT, defaultValue = "鏃�"),
-            @Excel(name = "瀹㈡埛鎬у埆", targetAttr = "cusSex", type = Excel.Type.EXPORT, readConverterExp = "0=鐢�,1=濂�", defaultValue = "鏃�"),
-            @Excel(name = "瀹㈡埛鐢佃瘽", targetAttr = "cusPhone", type = Excel.Type.EXPORT, defaultValue = "鏃�"),
-    })
     @TableField(exist = false)
     @ApiModelProperty(value = "瀹㈡埛瀵硅薄")
+//    @Excel(name = "瀹㈡埛鍚嶇О", targetAttr = "cusName", type = Excel.Type.EXPORT, defaultValue = "鏃�")
     private TjCustomer customer;
 
     /**
@@ -80,7 +76,7 @@
     /**
      * 娴佹按鍙凤紙鏃堕棿鎴崇敓鎴愶級
      */
-    @Excel(name = "娴佹按鍙�", defaultValue = "鏃�")
+//    @Excel(name = "娴佹按鍙�", defaultValue = "鏃�")
     @ApiModelProperty(value = "娴佹按鍙�")
     @JsonSerialize(using = ToStringSerializer.class)
     private String tjSerialNumber;
@@ -88,19 +84,20 @@
     /**
      * 鎵�閫夊椁愶紙缁戝畾濂楅琛級
      */
-    @Excel(name = "鎵�閫夊椁�", defaultValue = "鏃�")
+//    @Excel(name = "鎵�閫夊椁�", defaultValue = "鏃�")
     @ApiModelProperty(value = "鎵�閫夊椁�")
     @JsonSerialize(using = ToStringSerializer.class)
     private String pacId;
 
     @TableField(exist = false)
+    @Excel(name = "濂楅鍚�")
     private String pacName;
 
     /**
      * 浣撴瀹屾垚鏃堕棿
      */
     @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, updateStrategy = FieldStrategy.IGNORED)
     private Date finishTime;
@@ -109,7 +106,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 reportTime;
@@ -118,9 +115,15 @@
      * 鍗曚綅ID锛堝閿級
      */
     @ApiModelProperty(value = "鍗曚綅ID")
-    @Excel(name = "鍗曚綅ID", defaultValue = "鏃�")
+//    @Excel(name = "鍗曚綅ID", defaultValue = "鏃�")
     @JsonSerialize(using = ToStringSerializer.class)
     private String firmId;
+
+    @ApiModelProperty(value = "鍗曚綅鍚嶇О")
+    @Excel(name = "鍗曚綅鍚�")
+    private String firmName;
+
+
 
     /**
      * 閮ㄩ棬鍚�
@@ -132,7 +135,7 @@
     /**
      * 鍦ㄥ崟浣嶅伐鍙�
      */
-    @Excel(name = "鍦ㄥ崟浣嶅伐鍙�", defaultValue = "鏃�")
+    @Excel(name = "宸ュ彿", defaultValue = "鏃�")
     @ApiModelProperty(value = "鍦ㄥ崟浣嶅伐鍙�")
     @JsonSerialize(using = ToStringSerializer.class)
     private String firmWorkId;
@@ -145,6 +148,7 @@
      */
     @Excel(name = "鎬绘鍖荤敓", defaultValue = "鏃�")
     @ApiModelProperty(value = "鎬绘鍖荤敓")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private String checkDoctor;
 
     /**
@@ -153,13 +157,13 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "鎬绘鏃堕棿", defaultValue = "鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "鎬绘鏃堕棿")
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date checkTime;
 
     /**
      * 鎬讳綋寤鸿
      */
-    @Excel(name = "鎬讳綋寤鸿", defaultValue = "鏃�")
+//    @Excel(name = "鎬讳綋寤鸿", defaultValue = "鏃�")
     @ApiModelProperty(value = "鎬讳綋寤鸿")
     private String checkAdvice;
 
@@ -167,7 +171,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 releaseTime;
@@ -175,14 +179,14 @@
     /**
      * 鏄惁鍙戦�侀偖浠�
      */
-    @Excel(name = "鏄惁鍙戦�侀偖浠�", readConverterExp = "1=宸插彂閫�,0=鏈彂閫�")
+//    @Excel(name = "鏄惁鍙戦�侀偖浠�", readConverterExp = "1=宸插彂閫�,0=鏈彂閫�")
     @ApiModelProperty(value = "鏄惁鍙戦�侀偖浠�")
     private String sendEmail;
 
     /**
      * 鏄惁鍙戦�佺煭淇�
      */
-    @Excel(name = "鏄惁鍙戦�佺煭淇�", readConverterExp = "1=宸插彂閫�,0=鏈彂閫�")
+//    @Excel(name = "鏄惁鍙戦�佺煭淇�", readConverterExp = "1=宸插彂閫�,0=鏈彂閫�")
     @ApiModelProperty(value = "鏄惁鍙戦�佺煭淇�")
     private String sendMessage;
 
@@ -195,7 +199,7 @@
     /**
      * 鏄惁澶嶆
      */
-    @Excel(name = "鏄惁澶嶆", readConverterExp = "1=鍚�,0=鏄�")
+//    @Excel(name = "鏄惁澶嶆", readConverterExp = "1=鍚�,0=鏄�")
     @ApiModelProperty(value = "鏄惁澶嶆")
     private Integer isReturn;
 
@@ -203,7 +207,7 @@
      * 鎶ュ憡鏈�鍚庢墦鍗版椂闂�
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = " pc鏈�鍚庢墦鍗版姤鍛婃椂闂�", 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;
@@ -212,7 +216,7 @@
      * 鎶ュ憡鏈�鍚庝笅杞芥椂闂�
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "web鏈�鍚庝笅杞芥姤鍛婃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏃�")
+//    @Excel(name = "web鏈�鍚庝笅杞芥姤鍛婃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", defaultValue = "鏃�")
     @ApiModelProperty(value = "鎶ュ憡鏈�鍚庝笅杞芥椂闂�")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date downloadLastTime;
@@ -223,6 +227,7 @@
      */
     @TableField(exist = false)
     @ApiModelProperty(value = "鎵�鍦ㄥ崟浣嶅悕绉�")
+//    @Excel(name = "鍗曚綅")
     private String dictCompName;
 
     /**
@@ -230,6 +235,7 @@
      */
     @TableField(exist = false)
     @ApiModelProperty(value = "鎵�閫夊椁愪俊鎭悕绉�")
+//    @Excel(name = "")
     private String tjPackageName;
 
     /**
@@ -237,6 +243,7 @@
      */
     @TableField(exist = false)
     @ApiModelProperty(value = "浣撴璁板綍涓殑瀹㈡埛鍚嶅瓧")
+    @Excel(name = "濮撳悕")
     private String tjCustomerName;
 
     /**
@@ -244,6 +251,7 @@
      */
     @TableField(exist = false)
     @ApiModelProperty(value = "浣撴璁板綍涓殑瀹㈡埛鎬у埆")
+    @Excel(name = "鎬у埆",  readConverterExp = "0=鐢�,1=濂�")
     private Long tjCustomerSex;
 
     /**
@@ -251,6 +259,7 @@
      */
     @TableField(exist = false)
     @ApiModelProperty(value = "浣撴璁板綍涓殑瀹㈡埛骞撮緞")
+    @Excel(name = "骞撮緞")
     private Integer tjCustomerAge;
 
     /**
@@ -258,6 +267,7 @@
      */
     @TableField(exist = false)
     @ApiModelProperty(value = "浣撴璁板綍涓殑瀹㈡埛鐢佃瘽")
+    @Excel(name = "鐢佃瘽")
     private String tjCustomerPhone;
 
     /**
@@ -265,6 +275,7 @@
      */
     @TableField(exist = false)
     @ApiModelProperty(value = "浣撴璁板綍涓殑瀹㈡埛韬唤璇佸彿鐮�")
+    @Excel(name = "韬唤璇佸彿鐮�")
     private String tjCusIdCard;
 
 
@@ -376,11 +387,14 @@
      */
     @ApiModelProperty(value = "鍒濆鍖荤敓")
     private String confirmDoctor;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "鍒濆鏃堕棿")
     @TableField(fill = FieldFill.UPDATE)
     private Date confirmTime;
+
     @ApiModelProperty(value = "鍒濆椹冲洖鐞嗙敱")
+    // 0鍚屾剰1鎷掔粷
     private String confirmStatus;
 
     @ApiModelProperty(value = "鍒嗙粍id")
@@ -400,11 +414,13 @@
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "鏍告敹鏃堕棿")
+    @TableField(fill = FieldFill.UPDATE)
     private Date heshouTime;
     /**
      * 鏍告敹浜�
      */
     @ApiModelProperty(value = "鏍告敹浜�")
+    @TableField(fill = FieldFill.UPDATE)
     private String heshouDoctor;
 
     /**
@@ -419,6 +435,37 @@
     @ApiModelProperty(value = "鎶ュ憡棰嗗彇鏂瑰紡")
     private String getType;
 
+    /**
+     * 鎶ュ憡棰嗗彇鍦板潃
+     */
+    @TableField(exist = false)
+    private TjReportGetAddress addAddress;
+
+    /**
+     * 浣撴绫诲埆
+     */
+    @ApiModelProperty("浣撴绫诲埆")
+    @Excel(name = "浣撴绫诲埆")
+    private String tjCategory;
+
+    @ApiModelProperty("灏辫瘖缂栧彿")
+    @Excel(name = "灏辫瘖缂栧彿")
+    private String cardId;
+
+    @ApiModelProperty("棰勭害鍙�")
+    private String reservationId;
+
+    @ApiModelProperty(value = "鎶樻墸")
+    private String discount;
+
+
+    @TableField(exist = false)
+    private Integer dycs;
+
+
+    @TableField(exist = false)
+    @Excel(name = "浣撴鐘舵��")
+    private String zt;
 
     @Override
     public String toString() {

--
Gitblit v1.8.0