From d866e43afbe901bfc640776e02f767b9045acbc2 Mon Sep 17 00:00:00 2001 From: 赵文轩 <1652863494@qq.com> Date: 星期三, 12 六月 2024 09:04:56 +0800 Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis --- ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java index b941fd3..d05b873 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java @@ -48,6 +48,14 @@ @ExcelImport(value = "濮撳悕", required = true) private String cusName; + + @ApiModelProperty("灏辫瘖缂栧彿") + private String cardId; + + + @ApiModelProperty("鎮h�卙is ID锛屾偅鑰呭敮涓�鍙�") + private String pationId; + /** * 瀹㈡埛鎬у埆 */ @@ -212,7 +220,7 @@ * 浣撴鏃堕棿 */ @TableField(exist = false) - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date tjTime; /** @@ -298,6 +306,24 @@ @TableField(exist = false) private Integer isHz; + @TableField(exist = false) + private Long isPositive; + + @TableField(exist = false) + private String tjCategory; + + @ApiModelProperty("搴ф満") + private String dwPhone; + + @ApiModelProperty("鏂囧寲绋嬪害") + private String wenHua; + + @ApiModelProperty(value = "鑱屼笟鍘嗗彶") + @TableField(exist = false) + private List<TjAskWorkLog> workLogs; + + @TableField(exist = false) + private String isBlack; @Override public String toString() { @@ -323,6 +349,7 @@ .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("deleted", getDeleted()) + .append("dwPhone", getDwPhone()) .toString(); } } -- Gitblit v1.8.0