From 7d5f9cae5e237c25649ac4b481ace6355447a06c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 02 八月 2024 17:51:31 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/PatArchive.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchive.java b/smartor/src/main/java/com/smartor/domain/PatArchive.java
index 6c92148..31860dc 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchive.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchive.java
@@ -28,7 +28,7 @@
* 鑷ID
*/
@ApiModelProperty("鑷ID")
- private Long patid;
+ private Long id;
/**
* 濮撳悕
@@ -92,6 +92,14 @@
private Date birthdate;
/**
+ * 鍏ラ櫌鏃堕棿
+ */
+ @ApiModelProperty("鍏ラ櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鐢熸棩 ", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date inhosptime;
+
+ /**
* 骞撮緞
*/
@ApiModelProperty("骞撮緞")
@@ -103,13 +111,14 @@
*/
@ApiModelProperty("鏉ユ簮")
@Excel(name = " 鏉ユ簮 ")
- private Long source;
+ private Long sourcefrom;
/**
* 寤烘。鏃堕棿
*/
@ApiModelProperty("寤烘。鏃堕棿")
@Excel(name = " 寤烘。鏃堕棿 ")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date archivetime;
/**
@@ -180,8 +189,15 @@
@Excel(name = " 鏍囩 ", cellType = Excel.ColumnType.STRING)
private String tag;
+ /**
+ * 鏍囩
+ */
+ @ApiModelProperty("鏍囩id")
+ @Excel(name = " 鏍囩id ", cellType = Excel.ColumnType.STRING)
+ private Long tagid;
+
@ApiModelProperty("鏍囩闆嗗悎")
- private List<String> tagList;
+ private List<PatArchivetag> tagList;
/**
* 鏍囩
@@ -197,8 +213,26 @@
@Excel(name = " 閽夐拤鍙� ")
private String dduserid;
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("patid", getPatid()).append("name", getName()).append("sex", getSex()).append("idcardno", getIdcardno()).append("birthdate", getBirthdate()).append("age", getAge()).append("source", getSource()).append("archivetime", getArchivetime()).append("archiveby", getArchiveby()).append("telcode", getTelcode()).append("relativetelcode", getRelativetelcode()).append("idcardtype", getIdcardtype()).append("orgid", getOrgid()).append("openid", getOpenid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).toString();
- }
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("绉戝")
+ @Excel(name = " 绉戝 ")
+ private String dept;
+
+
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("绉戝")
+ @Excel(name = " 绉戝 ")
+ private String bedNo;
+
+ /**
+ * 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳
+ */
+ @ApiModelProperty("浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳")
+ @Excel(name = " 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳 ")
+ private String viptype;
+
}
--
Gitblit v1.9.3