From af107cf08b73e7fef0b3d447867474de6db78701 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 4 Nov 2021 10:44:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=BA=AB=E4=BB=BD=E8=AF=81?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EpidemicUserInfoServiceImpl.java  | 14 +++++++++-----
 .../epdc/vaccine/feign/VimAdminFeignClient.java    |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
index 4d8f6da..01ec349 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
@@ -717,6 +717,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
                 saveResidentList(BaseResidentInformationUpdateExcels, parentAndAllDeptDTO, populationIdNoAndIdMap);
             }
         } catch (Exception e1) {
+            e1.printStackTrace();
             throw new RenException("导入失败：请检查导入模板或导入数据");
         }
         return new Result();
@@ -797,11 +798,12 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
                 String result = IdentityNoUtils.IdentityNoVerification(selfIdentityNo);
                 if (result != null) {
                     errorInfo += "本人身份证号码有误;";
-                } else {
-                    BaseResidentInformationUpdateExcel.setGender(IdentityNoUtils.getSex(selfIdentityNo));
-                    BaseResidentInformationUpdateExcel.setAge(IdentityNoUtils.getAge(selfIdentityNo));
-                    BaseResidentInformationUpdateExcel.setBirthday(IdentityNoUtils.getBirthday(selfIdentityNo));
                 }
+//                else {
+//                    BaseResidentInformationUpdateExcel.setGender(IdentityNoUtils.getSex(selfIdentityNo));
+//                    BaseResidentInformationUpdateExcel.setAge(IdentityNoUtils.getAge(selfIdentityNo));
+//                    BaseResidentInformationUpdateExcel.setBirthday(IdentityNoUtils.getBirthday(selfIdentityNo));
+//                }
                 BaseResidentInformationUpdateExcel.setSelfIdentityNo(selfIdentityNo);
             }
             if (StringUtils.isBlank(residentsName)) {
@@ -1055,7 +1057,9 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
 //            populationInformationEntity.setResidentsIdentityNo(baseResidentInformationExcel.getResidentsFamilyIdentityNo());
 //            EpidemicUserInfoEntity epidemicUserInfoEntity = convertInformationToUserInfo(populationInformationEntity);
             epidemicUserInfoEntity.setIdCard(baseResidentInformationExcel.getSelfIdentityNo());
-            epidemicUserInfoEntity.setMotorVehicleNum(Integer.valueOf(baseResidentInformationExcel.getMotorVehicleNum()));
+            if(StringUtils.isNotBlank(baseResidentInformationExcel.getMotorVehicleNum())){
+                epidemicUserInfoEntity.setMotorVehicleNum(Integer.valueOf(baseResidentInformationExcel.getMotorVehicleNum()));
+            }
             if(null != parentAndAllDeptDTO){
                 epidemicUserInfoEntity.setDeptId(parentAndAllDeptDTO.getGridId());
                 epidemicUserInfoEntity.setDeptName(parentAndAllDeptDTO.getGrid());
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/VimAdminFeignClient.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/VimAdminFeignClient.java
index e3e8311..c31176c 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/VimAdminFeignClient.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/VimAdminFeignClient.java
@@ -19,7 +19,9 @@ import java.util.List;
  * @email yujintao@elink-cn.com
  * @date 2019/9/5 14:44
  */
-@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = VimAdminFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = VimAdminFeignClientFallback.class
+//        ,url = "http://127.0.0.1:9092"
+)
 public interface VimAdminFeignClient {
 
     /**