From dedacd79c93f8ef95e0cb986f5e7fbd27ddbd907 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 03 七月 2025 09:12:49 +0800
Subject: [PATCH] 2025-07-03
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java | 184 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 152 insertions(+), 32 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 337f0aa..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
@@ -54,19 +54,15 @@
/**
* 瀹㈡埛瀵硅薄
*/
- @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;
/**
* 浣撴绫诲瀷
*/
- @Excel(name = "浣撴绫诲瀷",readConverterExp="2=涓汉,1=鍥㈤槦")
+ @Excel(name = "浣撴绫诲瀷", readConverterExp = "2=涓汉,1=鍥㈤槦")
@ApiModelProperty(value = "浣撴绫诲瀷")
private String tjType;
@@ -80,7 +76,7 @@
/**
* 娴佹按鍙凤紙鏃堕棿鎴崇敓鎴愶級
*/
- @Excel(name = "娴佹按鍙�",defaultValue = "鏃�")
+// @Excel(name = "娴佹按鍙�", defaultValue = "鏃�")
@ApiModelProperty(value = "娴佹按鍙�")
@JsonSerialize(using = ToStringSerializer.class)
private String tjSerialNumber;
@@ -88,28 +84,29 @@
/**
* 鎵�閫夊椁愶紙缁戝畾濂楅琛級
*/
- @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)
+ @TableField(fill = FieldFill.INSERT_UPDATE, updateStrategy = FieldStrategy.IGNORED)
private Date finishTime;
/**
* 鍑烘姤鍛婃椂闂�
*/
@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,21 +115,27 @@
* 鍗曚綅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;
+
+
/**
* 閮ㄩ棬鍚�
*/
- @Excel(name = "閮ㄩ棬鍚�",defaultValue = "鏃�")
- @ApiModelProperty(value = "閮ㄩ棬鍚�")
+ @Excel(name = "閮ㄩ棬", defaultValue = "鏃�")
+ @ApiModelProperty(value = "閮ㄩ棬")
private String firmDeptName;
/**
* 鍦ㄥ崟浣嶅伐鍙�
*/
- @Excel(name = "鍦ㄥ崟浣嶅伐鍙�",defaultValue = "鏃�")
+ @Excel(name = "宸ュ彿", defaultValue = "鏃�")
@ApiModelProperty(value = "鍦ㄥ崟浣嶅伐鍙�")
@JsonSerialize(using = ToStringSerializer.class)
private String firmWorkId;
@@ -143,23 +146,24 @@
/**
* 鎬绘鍖荤敓鍚嶅瓧
*/
- @Excel(name = "鎬绘鍖荤敓",defaultValue = "鏃�")
+ @Excel(name = "鎬绘鍖荤敓", defaultValue = "鏃�")
@ApiModelProperty(value = "鎬绘鍖荤敓")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String checkDoctor;
/**
* 鎬绘鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鎬绘鏃堕棿",defaultValue = "鏃�", width = 30, dateFormat = "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,19 +179,19 @@
/**
* 鏄惁鍙戦�侀偖浠�
*/
- @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;
- @Excel(name = "鎬绘瀹℃牳鐘舵��",readConverterExp="1=宸插鏍�,0=鏈鏍�")
+ @Excel(name = "鎬绘瀹℃牳鐘舵��", readConverterExp = "1=宸插鏍�,0=鏈鏍�")
@ApiModelProperty(value = "鎬绘瀹℃牳鐘舵��")
private Integer checkStatus;
@@ -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,11 +216,10 @@
* 鎶ュ憡鏈�鍚庝笅杞芥椂闂�
*/
@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;
-
/**
@@ -224,6 +227,7 @@
*/
@TableField(exist = false)
@ApiModelProperty(value = "鎵�鍦ㄥ崟浣嶅悕绉�")
+// @Excel(name = "鍗曚綅")
private String dictCompName;
/**
@@ -231,6 +235,7 @@
*/
@TableField(exist = false)
@ApiModelProperty(value = "鎵�閫夊椁愪俊鎭悕绉�")
+// @Excel(name = "")
private String tjPackageName;
/**
@@ -238,6 +243,7 @@
*/
@TableField(exist = false)
@ApiModelProperty(value = "浣撴璁板綍涓殑瀹㈡埛鍚嶅瓧")
+ @Excel(name = "濮撳悕")
private String tjCustomerName;
/**
@@ -245,6 +251,7 @@
*/
@TableField(exist = false)
@ApiModelProperty(value = "浣撴璁板綍涓殑瀹㈡埛鎬у埆")
+ @Excel(name = "鎬у埆", readConverterExp = "0=鐢�,1=濂�")
private Long tjCustomerSex;
/**
@@ -252,6 +259,7 @@
*/
@TableField(exist = false)
@ApiModelProperty(value = "浣撴璁板綍涓殑瀹㈡埛骞撮緞")
+ @Excel(name = "骞撮緞")
private Integer tjCustomerAge;
/**
@@ -259,6 +267,7 @@
*/
@TableField(exist = false)
@ApiModelProperty(value = "浣撴璁板綍涓殑瀹㈡埛鐢佃瘽")
+ @Excel(name = "鐢佃瘽")
private String tjCustomerPhone;
/**
@@ -266,6 +275,7 @@
*/
@TableField(exist = false)
@ApiModelProperty(value = "浣撴璁板綍涓殑瀹㈡埛韬唤璇佸彿鐮�")
+ @Excel(name = "璇佷欢鍙�")
private String tjCusIdCard;
@@ -352,7 +362,7 @@
@ApiModelProperty("宸叉墦鍗版湭鎵撳嵃")
@TableField(exist = false)
- private Integer type=0;
+ private Integer type = 0;
@ApiModelProperty("涓汉妯℃澘id")
@TableField(exist = false)
@@ -366,25 +376,25 @@
@ApiModelProperty("寰俊鏀粯璁㈠崟涓婚敭id")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String mallOrderId;
-
-
/**
* 浣撴鐘舵��
*/
- @Excel(name = "浣撴鐘舵��",defaultValue = "鏃�")
+// @Excel(name = "浣撴鐘舵��", defaultValue = "鏃�")
@ApiModelProperty(value = "浣撴鐘舵��")
private Integer status;
-
/**
* 鍒濆
*/
@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")
@@ -394,6 +404,116 @@
private String firmDeptId;
+ /**
+ * 鏍告敹鐘舵��
+ */
+ @ApiModelProperty(value = "鏍告敹鐘舵��")
+ private Integer heshouStatus;
+ /**
+ * 鏍告敹浜�
+ */
+ @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;
+
+ /**
+ * 鏈夋棤浼氳瘖
+ */
+ @ApiModelProperty(value = "鏈夋棤浼氳瘖")
+ private Integer isHz;
+
+ /**
+ * 鎶ュ憡棰嗗彇鏂瑰紡
+ */
+ @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;
+
+ /**
+ * 鎺ュ宸ラ緞骞�
+ */
+ 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