From aa016f922247159480e49e851824c73a8d53f051 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 29 Aug 2022 14:26:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=86=A0=E7=97=85=E6=AF=92=E7=96=AB?=
 =?UTF-8?q?=E8=8B=97=E6=8E=A5=E7=A7=8D=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6--bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/HouseServiceImpl.java  |  4 ++-
 .../impl/IcVaccinePrarmeterServiceImpl.java   | 29 +++++++++++++------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index e8de32ecce..933a07daeb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -264,8 +264,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         houseChangeRecordCollect(formDTO.getId(), formDTO.getCustomerId(), icHouseDTO);
 
         icHouseDao.updateById(entity);
+        IcHouseDTO houseDTO = icHouseService.get(formDTO.getId());
+
         //删除房屋缓存
-        icHouseRedis.delHouseInfo(formDTO.getId(), entity.getCustomerId());
+        icHouseRedis.delHouseInfo(formDTO.getId(), houseDTO.getCustomerId());
     }
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
index 60c17c8a0e..89dc8a65de 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java
@@ -523,21 +523,18 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
      */
     @SneakyThrows
     private void synchronizationVaccineInfo(IcVaccinePrarmeterEntity icVaccinePrarmeterEntity,String icResiUserId){
+        if(!"1".equals(icVaccinePrarmeterEntity.getIsVaccination())){
+            return;
+        }
         // 同步接种记录
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         // 处理第一次接种时间格式
         String firstTime = icVaccinePrarmeterEntity.getFirstVacTime();
+        if(StringUtils.isBlank(firstTime)){
+            return;
+        }
         Date firstDate = sdf.parse(firstTime);
         icVaccinePrarmeterEntity.setFirstVacTime(sdf.format(firstDate));
-        // 处理第二次接种时间格式
-        String secondTime = icVaccinePrarmeterEntity.getSecondVacTime();
-        Date secondDate = sdf.parse(secondTime);
-        icVaccinePrarmeterEntity.setSecondVacTime(sdf.format(secondDate));
-        // 处理第三次接种时间格式
-        String thirdTime = icVaccinePrarmeterEntity.getThirdVacTime();
-        Date thirdDate = sdf.parse(thirdTime);
-        icVaccinePrarmeterEntity.setThirdVacTime(sdf.format(thirdDate));
-
         // 查询第一次接种信息
         List<IcVaccineEntity> icVaccineEntityFirstList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(firstDate));
         if(icVaccineEntityFirstList.size() > 0){
@@ -553,6 +550,13 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
 
         }
 
+        // 处理第二次接种时间格式
+        String secondTime = icVaccinePrarmeterEntity.getSecondVacTime();
+        if(StringUtils.isBlank(secondTime)){
+            return;
+        }
+        Date secondDate = sdf.parse(secondTime);
+        icVaccinePrarmeterEntity.setSecondVacTime(sdf.format(secondDate));
         // 查询第二次接种信息
         List<IcVaccineEntity> icVaccineEntitySecondList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(secondDate));
         if(icVaccineEntitySecondList.size() > 0){
@@ -568,6 +572,13 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrar
 
         }
 
+        // 处理第三次接种时间格式
+        String thirdTime = icVaccinePrarmeterEntity.getThirdVacTime();
+        if(StringUtils.isBlank(thirdTime)){
+            return;
+        }
+        Date thirdDate = sdf.parse(thirdTime);
+        icVaccinePrarmeterEntity.setThirdVacTime(sdf.format(thirdDate));
         // 查询第三次接种信息
         List<IcVaccineEntity> icVaccineEntityThirdList = icVaccineDao.getVaccineListByIdCard(icVaccinePrarmeterEntity.getIdCard(),sdf.format(thirdDate));
         if(icVaccineEntityThirdList.size() > 0){