From 43727df73e52cc00a1f1aee3c20a1aec8db1b92f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 27 二月 2025 08:45:25 +0800
Subject: [PATCH] 修改查询
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 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..5845912 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
@@ -122,6 +122,11 @@
@JsonSerialize(using = ToStringSerializer.class)
private String firmId;
+ @ApiModelProperty(value = "鍗曚綅鍚嶇О")
+ private String firmName;
+
+
+
/**
* 閮ㄩ棬鍚�
*/
@@ -145,6 +150,7 @@
*/
@Excel(name = "鎬绘鍖荤敓", defaultValue = "鏃�")
@ApiModelProperty(value = "鎬绘鍖荤敓")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String checkDoctor;
/**
@@ -153,7 +159,7 @@
@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;
/**
@@ -380,7 +386,9 @@
@ApiModelProperty(value = "鍒濆鏃堕棿")
@TableField(fill = FieldFill.UPDATE)
private Date confirmTime;
+
@ApiModelProperty(value = "鍒濆椹冲洖鐞嗙敱")
+ // 0鍚屾剰1鎷掔粷
private String confirmStatus;
@ApiModelProperty(value = "鍒嗙粍id")
@@ -400,11 +408,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 +429,34 @@
@ApiModelProperty(value = "鎶ュ憡棰嗗彇鏂瑰紡")
private String getType;
+ /**
+ * 鎶ュ憡棰嗗彇鍦板潃
+ */
+ @TableField(exist = false)
+ private TjReportGetAddress addAddress;
+
+ /**
+ * 浣撴绫诲埆
+ */
+ @ApiModelProperty("浣撴绫诲埆")
+ private String tjCategory;
+
+ @ApiModelProperty("灏辫瘖缂栧彿")
+ private String cardId;
+
+ @ApiModelProperty("棰勭害鍙�")
+ private String reservationId;
+
+ @ApiModelProperty(value = "鎶樻墸")
+ private String discount;
+
+
+ @TableField(exist = false)
+ private Integer dycs;
+
+
+ @TableField(exist = false)
+ private String zt;
@Override
public String toString() {
--
Gitblit v1.8.0