From 562a960261b75d70abd65aa10528f09aeece94e8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 24 九月 2024 09:49:23 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/PatArchive.java | 212 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 196 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 1271664..ffbfaa9 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchive.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchive.java
@@ -27,8 +27,62 @@
/**
* 鑷ID
*/
- @ApiModelProperty(name = "鑷ID")
- private Long patid;
+ @ApiModelProperty("鑷ID")
+ private Long id;
+
+ /**
+ * 鐖禝D
+ */
+ @ApiModelProperty("鐖禝D")
+ private Long pid;
+
+ /**
+ * GUID
+ */
+ @ApiModelProperty("GUID")
+ private String guid;
+
+ /**
+ * 濮撳悕
+ */
+ @ApiModelProperty("鎮ｈ�呯紪鍙�")
+ @Excel(name = " 鎮ｈ�呯紪鍙� ")
+ private String patientno;
+
+ /**
+ * 鏈嶅姟鏍囪瘑锛�0锛岄渶瑕侊紝1锛屼笉闇�瑕�
+ */
+ @ApiModelProperty("鏈嶅姟鏍囪瘑锛�0锛岄渶瑕侊紝1锛屼笉闇�瑕�")
+ @Excel(name = " 鏈嶅姟鏍囪瘑锛�0锛岄渶瑕侊紝1锛屼笉闇�瑕� ")
+ private String notrequiredFlag;
+
+ /**
+ * 涓嶈鏈嶅姟鐨勫師鍥�
+ */
+ @ApiModelProperty("涓嶈鏈嶅姟鐨勫師鍥�")
+ @Excel(name = " 涓嶈鏈嶅姟鐨勫師鍥� ")
+ private String notrequiredreason;
+
+ /**
+ * 鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級
+ */
+ @ApiModelProperty("鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級")
+ @Excel(name = " 鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級 ")
+ private Integer sourcefrom;
+
+ /**
+ * his绯荤粺鐨勬偅鑰卛d
+ */
+ @ApiModelProperty("his绯荤粺鐨勬偅鑰卛d")
+ @Excel(name = "his绯荤粺鐨勬偅鑰卛d")
+ private Integer patidHis;
+
+ /**
+ * his绯荤粺鐨勬偅鑰卛d
+ */
+ @ApiModelProperty("his绯荤粺鐨勬偅鑰卛d")
+ @Excel(name = "his绯荤粺鐨勬偅鑰卛d")
+ private String sdFlag;
/**
* 濮撳悕
@@ -45,11 +99,46 @@
private Long sex;
/**
+ * 璇佷欢绫诲瀷
+ */
+ @ApiModelProperty("璇佷欢绫诲瀷")
+ @Excel(name = " 璇佷欢绫诲瀷 ")
+ private String idcardtype;
+
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("绫嶈疮")
+ @Excel(name = " 绫嶈疮 ")
+ private String nativePlace;
+
+ /**
+ * 浣忛櫌鍙�
+ */
+ @ApiModelProperty(value = "浣忛櫌鍙�")
+ private String inhospno;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("灞呬綇鍦�")
+ @Excel(name = " 灞呬綇鍦� ")
+ private String placeOfResidence;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("鍑虹敓鍦�")
+ @Excel(name = " 鍑虹敓鍦� ")
+ private String birthplace;
+
+ /**
* 璇佷欢鍙风爜
*/
@ApiModelProperty("璇佷欢鍙风爜")
@Excel(name = " 璇佷欢鍙风爜 ")
- private String iccardno;
+ private String idcardno;
/**
* 鐢熸棩
@@ -60,29 +149,39 @@
private Date birthdate;
/**
+ * 鍏ラ櫌鏃堕棿
+ */
+ @ApiModelProperty("鍏ラ櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鐢熸棩 ", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date inhosptime;
+
+ /**
* 骞撮緞
*/
@ApiModelProperty("骞撮緞")
@Excel(name = " 骞撮緞 ")
private Long age;
-
/**
- * 鏉ユ簮
+ * 骞撮緞
*/
- @ApiModelProperty("鏉ユ簮")
- private Long source;
+ @ApiModelProperty("骞撮緞鍗曚綅")
+ @Excel(name = " 骞撮緞鍗曚綅 ")
+ private String ageUnit;
/**
* 寤烘。鏃堕棿
*/
@ApiModelProperty("寤烘。鏃堕棿")
@Excel(name = " 寤烘。鏃堕棿 ")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date archivetime;
/**
* 寤烘。浜�
*/
@ApiModelProperty("寤烘。浜�")
+ @Excel(name = " 寤烘。浜� ")
private String archiveby;
/**
@@ -92,6 +191,7 @@
@Excel(name = " 鎵嬫満鍙风爜 ")
private String telcode;
+
/**
* 浜插睘鍙风爜
*/
@@ -100,22 +200,24 @@
private String relativetelcode;
/**
- * 璇佷欢绫诲瀷
+ * 姘戞棌
*/
- @ApiModelProperty("璇佷欢绫诲瀷")
- @Excel(name = " 璇佷欢绫诲瀷 ")
- private String iccardtype;
+ @ApiModelProperty("姘戞棌")
+ @Excel(name = " 姘戞棌 ")
+ private String nation;
/**
* 鏈烘瀯ID
*/
@ApiModelProperty("鏈烘瀯ID")
+ @Excel(name = " 鏈烘瀯ID ")
private String orgid;
/**
* 寰俊openid
*/
@ApiModelProperty("寰俊openid")
+ @Excel(name = " 寰俊openid ")
private String openid;
/**
@@ -143,12 +245,90 @@
@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;
+
+ /**
+ * 鏍囩
+ */
+ @ApiModelProperty("鎮ｈ�呯被鍨�")
+ @Excel(name = " 鎮ｈ�呯被鍨� ", cellType = Excel.ColumnType.STRING)
+ private String pattype;
+
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("閽夐拤鍙�")
+ @Excel(name = " 閽夐拤鍙� ")
+ private String dduserid;
+
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("绉戝")
+ @Excel(name = " 绉戝 ")
+ private String dept;
+
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("绉戝")
+ @Excel(name = " 绉戝 ")
+ private String deptcode;
+ /**
+ * 鍖荤敓濮撳悕
+ */
+ @ApiModelProperty("鍖荤敓濮撳悕")
+ @Excel(name = " 鍖荤敓濮撳悕 ")
+ private String drname;
+
+ /**
+ * 鍖荤敓缂栫爜
+ */
+ @ApiModelProperty("鍖荤敓缂栫爜")
+ @Excel(name = " 鍖荤敓缂栫爜 ")
+ private String drcode;
+
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("绉戝")
+ @Excel(name = " 绉戝 ")
+ private String bedNo;
+
+ /**
+ * 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳
+ */
+ @ApiModelProperty("浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳")
+ @Excel(name = " 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳 ")
+ private String viptype;
+
+ @ApiModelProperty("鍑洪櫌鐥呭尯鍚嶇О")
+ private String leavehospitaldistrictname;
+
+ @ApiModelProperty("鍑洪櫌鐥呭尯缂栧彿")
+ private String leavehospitaldistrictcode;
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("patid", getPatid()).append("name", getName()).append("sex", getSex()).append("iccardno", getIccardno()).append("birthdate", getBirthdate()).append("age", getAge()).append("source", getSource()).append("archivetime", getArchivetime()).append("archiveby", getArchiveby()).append("telcode", getTelcode()).append("relativetelcode", getRelativetelcode()).append("iccardtype", getIccardtype()).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 outWayId;
+
+ /**
+ * 鍑洪櫌鏂瑰紡鍚嶇О
+ */
+ @ApiModelProperty("鍑洪櫌鏂瑰紡鍚嶇О")
+ @Excel(name = " 鍑洪櫌鏂瑰紡鍚嶇О ")
+ private String outWayName;
+
}
--
Gitblit v1.9.3