Merge remote-tracking branch 'origin/dev_optimize' into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -1295,14 +1295,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }else if (formDTO.getAttentionType().equals(NumConstant.ONE)){
             list = baseDao.vaccineList(formDTO);
         }
-        List<String> idCards = list.stream().map(m -> m.getIdCard()).distinct().collect(Collectors.toList());
+        Set<String> homeIds = list.stream().filter(m -> StringUtils.isNotBlank(m.getIdCard())).map(m -> m.getHomeId()).distinct().collect(Collectors.toSet());
-        if (CollectionUtils.isNotEmpty(idCards)){
+        if (CollectionUtils.isNotEmpty(homeIds)){
-            Result<List<HousesNameResultDTO>> housesNameByIdCards = govOrgOpenFeignClient.getHousesNameByIdCards(idCards);
+            Result<List<HouseInfoDTO>> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(homeIds, formDTO.getCustomerId());
-            if (!housesNameByIdCards.success()){
+            if (!houseInfoRes.success()){
                 throw new EpmetException("查询居民所属房屋失败...");
             }
-            if (CollectionUtils.isNotEmpty(housesNameByIdCards.getData())){
+            if (CollectionUtils.isNotEmpty(houseInfoRes.getData())){
-                list.forEach(l -> housesNameByIdCards.getData().stream().filter( h -> h.getIdCard().equals(l.getIdCard())).forEach(h -> l.setHouseName(h.getHouseName())));
+                list.forEach(l -> houseInfoRes.getData().stream().filter( h -> h.getHomeId().equals(l.getHomeId())).forEach(h -> l.setHouseName(h.getAllName())));
             }
         }
         PageInfo<EpidemicPreventionResultDTO> pageInfo = new PageInfo<>(list);