From c40be027ef8068b9a77bb24c94291dee25f563d8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:28:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
index 90aa740..239de37 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
@@ -67,20 +67,44 @@
@ExcelProperty(value = "经济状况", index = 15)
private String economicCondition;
- @ExcelProperty(value = "监护人", index = 16)
- private String guarDian;
+ @ExcelProperty(value = "人员类型", index = 16)
+ private String personType;
- @ExcelProperty(value = "监护人联系电话", index = 17)
- private String guarDianPhone;
+ @ExcelProperty(value = "家庭情况", index = 17)
+ private String familySituation;
- @ExcelProperty(value = "与患者关系", index = 18)
- private Integer patientRelation;
+ @ExcelProperty(value = "监护人姓名", index = 18)
+ private String custodyPerson;
- @ExcelProperty(value = "目前诊断", index = 19)
- private String diagnose;
+ @ExcelProperty(value = "与监护人关系", index = 19)
+ private Integer custodyRelation;
- @ExcelProperty(value = "其他", index = 20)
- private String other;
+ @ExcelProperty(value = "监护人公民身份号码", index = 20)
+ private String custodyCardNo;
+
+ @ExcelProperty(value = "监护人联系方式", index = 21)
+ private String custodyPersonPhone;
+
+ @ExcelProperty(value = "监护人居住详址", index = 22)
+ private String custodyAddress;
+
+ @ExcelProperty(value = "帮扶人姓名", index = 23)
+ private String helpPerson;
+
+ @ExcelProperty(value = "帮扶人联系方式", index = 24)
+ private String helpPersonPhone;
+
+ @ExcelProperty(value = "帮扶手段", index = 25)
+ private String helpMethod;
+
+ @ExcelProperty(value = "帮扶情况", index = 26)
+ private String helpSituation;
+
+ @ExcelProperty(value = "是否违法犯罪（1.是 0.否）", index = 27)
+ private Integer isCrime;
+
+ @ExcelProperty(value = "违法犯罪情况", index = 28)
+ private String crimeSutiation;
/**
--
Gitblit v1.7.1