From 9526971c403417c1c007804f24884c443b9e6cd7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 04 九月 2024 00:34:40 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/PatArchive.java | 96 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 80 insertions(+), 16 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..c981a65 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchive.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchive.java
@@ -28,7 +28,47 @@
* 鑷ID
*/
@ApiModelProperty("鑷ID")
- private Long patid;
+ private Long id;
+
+ /**
+ * 鐖禝D
+ */
+ @ApiModelProperty("鐖禝D")
+ private Long pid;
+
+ /**
+ * GUID
+ */
+ @ApiModelProperty("GUID")
+ private Long guid;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("鎮ｈ�呯紪鍙�")
+ @Excel(name = " 鎮ｈ�呯紪鍙� ")
+ private String patientno;
+
+ /**
+ * 鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級
+ */
+ @ApiModelProperty("鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級")
+ @Excel(name = " 鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級 ")
+ private int sourcefrom;
+
+ /**
+ * his绯荤粺鐨勬偅鑰卛d
+ */
+ @ApiModelProperty("his绯荤粺鐨勬偅鑰卛d")
+ @Excel(name = "his绯荤粺鐨勬偅鑰卛d")
+ private int patidHis;
+
+ /**
+ * his绯荤粺鐨勬偅鑰卛d
+ */
+ @ApiModelProperty("his绯荤粺鐨勬偅鑰卛d")
+ @Excel(name = "his绯荤粺鐨勬偅鑰卛d")
+ private String sdFlag;
/**
* 濮撳悕
@@ -59,7 +99,6 @@
@Excel(name = " 绫嶈疮 ")
private String nativePlace;
-
/**
* 璇佷欢鍙风爜
*/
@@ -67,14 +106,12 @@
@Excel(name = " 灞呬綇鍦� ")
private String placeOfResidence;
-
/**
* 璇佷欢鍙风爜
*/
@ApiModelProperty("鍑虹敓鍦�")
@Excel(name = " 鍑虹敓鍦� ")
private String birthplace;
-
/**
* 璇佷欢鍙风爜
@@ -92,6 +129,14 @@
private Date birthdate;
/**
+ * 鍏ラ櫌鏃堕棿
+ */
+ @ApiModelProperty("鍏ラ櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鐢熸棩 ", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date inhosptime;
+
+ /**
* 骞撮緞
*/
@ApiModelProperty("骞撮緞")
@@ -99,17 +144,11 @@
private Long age;
/**
- * 鏉ユ簮
- */
- @ApiModelProperty("鏉ユ簮")
- @Excel(name = " 鏉ユ簮 ")
- private Long source;
-
- /**
* 寤烘。鏃堕棿
*/
@ApiModelProperty("寤烘。鏃堕棿")
@Excel(name = " 寤烘。鏃堕棿 ")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date archivetime;
/**
@@ -180,8 +219,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 +243,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