From da6cce0d9f01b98d20b9ed89b438cd32006a8dd8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 22 十一月 2024 17:17:10 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/PatArchiveVO.java | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 165 insertions(+), 12 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java b/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
index 2bc1dc0..a6be5e7 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
@@ -9,6 +9,7 @@
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -21,13 +22,12 @@
@ApiModel(value = "PatArchiveVO", description = "鎮ｈ�呮。妗堝璞�")
@Data
public class PatArchiveVO extends BaseEntity {
- private static final long serialVersionUID = 1L;
/**
* 鑷ID
*/
- @ApiModelProperty(value = "鑷ID")
- private Long patid;
+ @ApiModelProperty("鑷ID")
+ private Long id;
/**
* 濮撳悕
@@ -42,6 +42,38 @@
@ApiModelProperty("鎬у埆")
@Excel(name = " 鎬у埆 ")
private Long sex;
+
+ /**
+ * 璇佷欢绫诲瀷
+ */
+ @ApiModelProperty("璇佷欢绫诲瀷")
+ @Excel(name = " 璇佷欢绫诲瀷 ")
+ private String idcardtype;
+
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("绫嶈疮")
+ @Excel(name = " 绫嶈疮 ")
+ private String nativePlace;
+
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("灞呬綇鍦�")
+ @Excel(name = " 灞呬綇鍦� ")
+ private String placeOfResidence;
+
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("鍑虹敓鍦�")
+ @Excel(name = " 鍑虹敓鍦� ")
+ private String birthplace;
+
/**
* 璇佷欢鍙风爜
@@ -59,6 +91,14 @@
private Date birthdate;
/**
+ * 鍏ラ櫌鏃堕棿
+ */
+ @ApiModelProperty("鍏ラ櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鐢熸棩 ", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date inhosptime;
+
+ /**
* 骞撮緞
*/
@ApiModelProperty("骞撮緞")
@@ -70,18 +110,21 @@
*/
@ApiModelProperty("鏉ユ簮")
@Excel(name = " 鏉ユ簮 ")
- private Long source;
+ private Long sourcefrom;
/**
* 寤烘。鏃堕棿
*/
@ApiModelProperty("寤烘。鏃堕棿")
+ @Excel(name = " 寤烘。鏃堕棿 ")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date archivetime;
/**
* 寤烘。浜�
*/
@ApiModelProperty("寤烘。浜�")
+ @Excel(name = " 寤烘。浜� ")
private String archiveby;
/**
@@ -91,17 +134,20 @@
@Excel(name = " 鎵嬫満鍙风爜 ")
private String telcode;
+
/**
* 浜插睘鍙风爜
*/
@ApiModelProperty("浜插睘鍙风爜")
+ @Excel(name = " 浜插睘鍙风爜 ")
private String relativetelcode;
/**
- * 璇佷欢绫诲瀷
+ * 姘戞棌
*/
- @ApiModelProperty("璇佷欢绫诲瀷")
- private String idcardtype;
+ @ApiModelProperty("姘戞棌")
+ @Excel(name = " 姘戞棌 ")
+ private String nation;
/**
* 鏈烘瀯ID
@@ -114,6 +160,7 @@
* 寰俊openid
*/
@ApiModelProperty("寰俊openid")
+ @Excel(name = " 寰俊openid ")
private String openid;
/**
@@ -138,16 +185,122 @@
* 鏍囩
*/
@ApiModelProperty("鏍囩")
+ @Excel(name = " 鏍囩 ", cellType = Excel.ColumnType.STRING)
private String tag;
+ /**
+ * 鏍囩
+ */
+ @ApiModelProperty("鏍囩id")
+ @Excel(name = " 鏍囩id ", cellType = Excel.ColumnType.STRING)
+ private Long tagid;
+
@ApiModelProperty("鏍囩闆嗗悎")
- List<PatArchivetag> tagList;
+ private List<PatArchivetag> tagList;
+
+ /**
+ * 鏍囩
+ */
+ @ApiModelProperty("鎮ｈ�呯被鍨�")
+ @Excel(name = " 鎮ｈ�呯被鍨� ", cellType = Excel.ColumnType.STRING)
+ private String pattype;
+
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("閽夐拤鍙�")
+ @Excel(name = " 閽夐拤鍙� ")
+ private String dduserid;
+
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("绉戝")
+ @Excel(name = " 绉戝 ")
+ private String dept;
+
+
+ /**
+ * 鏈嶅姟鏍囪瘑锛�0锛岄渶瑕侊紝1锛屼笉闇�瑕�
+ */
+ @ApiModelProperty("鏈嶅姟鏍囪瘑锛�0锛岄渶瑕侊紝1锛屼笉闇�瑕�")
+ @Excel(name = " 鏈嶅姟鏍囪瘑锛�0锛岄渶瑕侊紝1锛屼笉闇�瑕� ")
+ private String notrequiredFlag;
+
+ /**
+ * 涓嶈鏈嶅姟鐨勫師鍥�
+ */
+ @ApiModelProperty("涓嶈鏈嶅姟鐨勫師鍥�")
+ @Excel(name = " 涓嶈鏈嶅姟鐨勫師鍥� ")
+ private String notrequiredreason;
+
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("绉戝")
+ @Excel(name = " 绉戝 ")
+ private String bedNo;
+
+ /**
+ * 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳
+ */
+ @ApiModelProperty("浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳")
+ @Excel(name = " 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳 ")
+ private String viptype;
@ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
private Integer isoperation;
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("patid", getPatid()).append("name", getName()).append("sex", getSex()).append("iccardno", getIdcardno()).append("birthdate", getBirthdate()).append("age", getAge()).append("source", getSource()).append("archivetime", getArchivetime()).append("archiveby", getArchiveby()).append("telcode", getTelcode()).append("relativetelcode", getRelativetelcode()).append("iccardtype", 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("鍑洪櫌鐥呭尯鍚嶇О")
+ private String leavehospitaldistrictname;
+
+ @ApiModelProperty("鍑洪櫌鐥呭尯缂栧彿")
+ private String leavehospitaldistrictcode;
+
+ /**
+ * 鍑洪櫌鏂瑰紡搴忓彿
+ */
+ @ApiModelProperty("鍑洪櫌鏂瑰紡搴忓彿")
+ @Excel(name = " 鍑洪櫌鏂瑰紡搴忓彿 ")
+ private String outWayId;
+
+ /**
+ * 鍑洪櫌鏂瑰紡鍚嶇О
+ */
+ @ApiModelProperty("鍑洪櫌鏂瑰紡鍚嶇О")
+ @Excel(name = " 鍑洪櫌鏂瑰紡鍚嶇О ")
+ private String outWayName;
+ @ApiModelProperty("鐓ф姢鍦烘墍锛�1瀹跺涵 2鍏昏�佹満鏋�")
+ @Excel(name = " 鐓ф姢鍦烘墍锛�1瀹跺涵 2鍏昏�佹満鏋� ")
+ private String careFacilities;
+
+ @ApiModelProperty("鐓ф姢鍦烘墍锛�1瀹跺涵 2鍏昏�佹満鏋�")
+ @Excel(name = " 鐓ф姢鍦烘墍锛�1瀹跺涵 2鍏昏�佹満鏋� ")
+ private String casePath;
+
+ @ApiModelProperty("鍙楁暀鑲茬▼搴�")
+ @Excel(name = "鍙楁暀鑲茬▼搴�")
+ private String degreeOfEducation;
+
+ @ApiModelProperty("濠氬Щ鐘跺喌")
+ @Excel(name = "濠氬Щ鐘跺喌")
+ private String maritalStatus;
+
+ @ApiModelProperty("瀹跺涵浜哄潎鏀跺叆")
+ @Excel(name = "瀹跺涵浜哄潎鏀跺叆")
+ private String income;
+
+ @ApiModelProperty("鍖讳繚绫诲瀷")
+ @Excel(name = "鍖讳繚绫诲瀷")
+ private String medicareType;
+
+ @ApiModelProperty("涓昏鐓ф姢浜�")
+ @Excel(name = "涓昏鐓ф姢浜�")
+ private String carePerson;
+
+ @ApiModelProperty("涓昏鐓ф姢浜哄勾榫�")
+ @Excel(name = "涓昏鐓ф姢浜哄勾榫�")
+ private String casePersonAge;
+
}
--
Gitblit v1.9.3