From 8d913e5594f45ca2a4ce656ea9feb99ffe715913 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 29 十一月 2024 18:44:58 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/PatArchiveVO.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java b/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
index acc4209..a6be5e7 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
@@ -19,7 +19,7 @@
* @author smartor
* @date 2023-03-04
*/
-@ApiModel(value = "PatArchiveVO" , description = "鎮ｈ�呮。妗堝璞�")
+@ApiModel(value = "PatArchiveVO", description = "鎮ｈ�呮。妗堝璞�")
@Data
public class PatArchiveVO extends BaseEntity {
@@ -87,7 +87,7 @@
*/
@ApiModelProperty("鐢熸棩")
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " 鐢熸棩 " , width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = " 鐢熸棩 ", width = 30, dateFormat = "yyyy-MM-dd")
private Date birthdate;
/**
@@ -95,7 +95,7 @@
*/
@ApiModelProperty("鍏ラ櫌鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " 鐢熸棩 " , width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = " 鐢熸棩 ", width = 30, dateFormat = "yyyy-MM-dd")
private Date inhosptime;
/**
@@ -185,14 +185,14 @@
* 鏍囩
*/
@ApiModelProperty("鏍囩")
- @Excel(name = " 鏍囩 " , cellType = Excel.ColumnType.STRING)
+ @Excel(name = " 鏍囩 ", cellType = Excel.ColumnType.STRING)
private String tag;
/**
* 鏍囩
*/
@ApiModelProperty("鏍囩id")
- @Excel(name = " 鏍囩id " , cellType = Excel.ColumnType.STRING)
+ @Excel(name = " 鏍囩id ", cellType = Excel.ColumnType.STRING)
private Long tagid;
@ApiModelProperty("鏍囩闆嗗悎")
@@ -202,7 +202,7 @@
* 鏍囩
*/
@ApiModelProperty("鎮ｈ�呯被鍨�")
- @Excel(name = " 鎮ｈ�呯被鍨� " , cellType = Excel.ColumnType.STRING)
+ @Excel(name = " 鎮ｈ�呯被鍨� ", cellType = Excel.ColumnType.STRING)
private String pattype;
/**
@@ -258,7 +258,6 @@
@ApiModelProperty("鍑洪櫌鐥呭尯缂栧彿")
private String leavehospitaldistrictcode;
-
/**
* 鍑洪櫌鏂瑰紡搴忓彿
*/
@@ -272,6 +271,36 @@
@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