防疫人员信息-导入-修改-详情

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordDetailDTO.java

@@ -301,4 +301,8 @@ public class EpidemicRecordDetailDTO implements Serializable {
 	 * 详情复现
 	 */
 	private String[] deptIdList;
+
+//	@Excel(name = "房屋地址")
+	private String houseAddress;
+
 }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicReportUserInfoDTO.java

@@ -294,4 +294,10 @@ public class EpidemicReportUserInfoDTO implements Serializable {
     private String deptId;
 
 
+//    @Excel(name = "房屋地址")
+    private String houseAddress;
+
+
+
+
 }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/entity/EpidemicUserInfoEntity.java

@@ -303,6 +303,9 @@ public class EpidemicUserInfoEntity extends BasePingyinEntity {
 	 */
 	private Integer familyMemberOutMonth;
 
+	/**
+	 * 房屋性质
+	 */
 	private String houseProperty;
 
 	/**
@@ -330,4 +333,38 @@ public class EpidemicUserInfoEntity extends BasePingyinEntity {
 	 * 所有部门
 	 */
 	private String allDeptNames;
+
+	/**
+	 * 房屋地址
+	 */
+	private String houseAddress;
+
+	/**
+	 * 小区
+	 */
+	private String plot;
+	/**
+	 * 楼号
+	 */
+	private String buildingNo;
+	/**
+	 * 单元
+	 */
+	private String unit;
+	/**
+	 * 房间号
+	 */
+	private String roomNo;
+	/**
+	 * 家庭保障情况
+	 */
+	private String familySecurity;
+	/**
+	 * 居住情况
+	 */
+	private String livingSituation;
+	/**
+	 * 现居住地详细地址
+	 */
+	private String outLiveAddressDetail;
 }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java

@@ -172,21 +172,6 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             result.setDestinationAddressCodes(new String[]{});
         }
 
-        if (result.getIdCard().equals("37012419650516501X")) {
-            result.setPlot("锦水丽景");
-            result.setBuildingNo("9");
-            result.setUnit("3");
-            result.setRoomNo("301");
-            result.setLivingSituation("独居");
-        } else if (result.getIdCard().equals("370124200312190023")){
-            result.setPlot("众城市场");
-            result.setUnit("南街");
-            result.setRoomNo("东首");
-            result.setLivingSituation("自住");
-            result.setLiveAddressDetail("五岭路众城市场南街东首");
-            result.setCar("无");
-        }
-
         return result;
     }
 
@@ -1138,6 +1123,29 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
                 check.setMotorVehicleNum(epidemicUserInfoEntity.getMotorVehicleNum());
                 check.setDogStatus(epidemicUserInfoEntity.getDogStatus());
 
+                check.setGender(epidemicUserInfoEntity.getGender());
+                check.setHouseAddress(epidemicUserInfoEntity.getHouseAddress());
+                check.setPlot(epidemicUserInfoEntity.getPlot());
+                check.setBuildingNo(epidemicUserInfoEntity.getBuildingNo());
+                check.setUnit(epidemicUserInfoEntity.getUnit());
+                check.setRoomNo(epidemicUserInfoEntity.getRoomNo());
+                check.setHouseProperty(epidemicUserInfoEntity.getHouseProperty());
+                check.setRelation(epidemicUserInfoEntity.getRelation());
+                check.setHushaiStatus(epidemicUserInfoEntity.getHushaiStatus());
+                check.setFamilySecurity(epidemicUserInfoEntity.getFamilySecurity());
+                check.setLivingSituation(epidemicUserInfoEntity.getLivingSituation());
+                check.setFormerName(epidemicUserInfoEntity.getFormerName());
+                check.setBirthday(epidemicUserInfoEntity.getBirthday());
+                check.setBloodType(epidemicUserInfoEntity.getBloodType());
+                check.setHeight(epidemicUserInfoEntity.getHeight());
+                check.setNationality(epidemicUserInfoEntity.getNationality());
+                check.setFaith(epidemicUserInfoEntity.getFaith());
+                check.setGraduateSchool(epidemicUserInfoEntity.getGraduateSchool());
+                check.setProfessional(epidemicUserInfoEntity.getProfessional());
+                check.setCarNo(epidemicUserInfoEntity.getCarNo());
+                check.setNativePlace(epidemicUserInfoEntity.getNativePlace());
+                check.setOutLiveAddressDetail(epidemicUserInfoEntity.getOutLiveAddressDetail());
+
                 check.setDeptId(epidemicUserInfoEntity.getDeptId());
                 check.setDeptName(epidemicUserInfoEntity.getDeptName());
                 check.setParentDeptIds(epidemicUserInfoEntity.getParentDeptIds());

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/excel/BaseResidentInformationUpdateExcel.java

@@ -18,9 +18,6 @@ public class BaseResidentInformationUpdateExcel implements Serializable {
     @Excel(name = "姓名")
     private String userName;
 
-    @Excel(name = "性别", replace = {"女_0", "男_1"})
-    private String gender;
-
     @Excel(name = "民族")
     private String nation;
 
@@ -48,7 +45,6 @@ public class BaseResidentInformationUpdateExcel implements Serializable {
     @Excel(name = "身份证号码")
     private String selfIdentityNo;
 
-    private String birthday;
 
     @Excel(name = "文化程度")
     private String standardOfCulture;
@@ -112,6 +108,71 @@ public class BaseResidentInformationUpdateExcel implements Serializable {
     @Excel(name = "年龄")
     private Integer age;
 
+    @Excel(name = "性别", replace = {"女_0", "男_1"})
+    private String gender;
+
+    @Excel(name = "房屋地址")
+    private String houseAddress;
+
+    @Excel(name = "小区")
+    private String plot;
+
+    @Excel(name = "楼号")
+    private String buildingNo;
+
+    @Excel(name = "单元")
+    private String unit;
+
+    @Excel(name = "房间号")
+    private String roomNo;
+
+    @Excel(name = "房屋性质")
+    private String houseProperty;
+
+    @Excel(name = "与户主关系")
+    private String relation;
+
+    @Excel(name = "人户状况")
+    private String hushaiStatus;
+
+    @Excel(name = "家庭保障情况")
+    private String familySecurity;
+
+    @Excel(name = "居住情况")
+    private String livingSituation;
+
+    @Excel(name = "曾用名")
+    private String formerName;
+
+    @Excel(name = "出生年月")
+    private String birthday;
+
+    @Excel(name = "血型")
+    private String bloodType;
+
+    @Excel(name = "身高")
+    private String height;
+
+    @Excel(name = "国籍")
+    private String nationality;
+
+    @Excel(name = "宗教信仰")
+    private String faith;
+
+    @Excel(name = "毕业院校")
+    private String graduateSchool;
+
+    @Excel(name = "专业")
+    private String professional;
+
+    @Excel(name = "车牌号")
+    private String carNo;
+
+    @Excel(name = "籍贯")
+    private String nativePlace;
+
+    @Excel(name = "现居住地详细地址")
+    private String outLiveAddressDetail;
 
 
 }