z综合治理人群，公共服务，这些居民，显示姓名(身份证号)

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java

@@ -112,4 +112,7 @@ public interface StrConstant {
     String NO = "否";
 
     String ELLIPSIS="......";
+
+    String BRACKET_LEFT="(";
+    String BRACKET_RIGNT=")";
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiInfoResultDTO.java

@@ -10,4 +10,5 @@ public class IcResiInfoResultDTO {
     private String id;
     private String name;
     private String buildId;
+    private String idNum;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@@ -14,36 +14,31 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
 import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.dataaggre.constant.OrgConstant;
-import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult;
-import com.epmet.dataaggre.constant.OrgConstant;
 import com.epmet.dataaggre.constant.TableConstant;
+import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult;
 import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult;
 import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO;
 import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO;
 import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
-import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
-import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTOV2;
-import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO;
-import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
 import com.epmet.dataaggre.entity.govorg.*;
 import com.epmet.dataaggre.entity.govproject.IcEventEntity;
 import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
 import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity;
+import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity;
 import com.epmet.dataaggre.enums.MenusEnums;
 import com.epmet.dataaggre.redis.GovCustomerMenuRedis;
-import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity;
 import com.epmet.dataaggre.service.CoverageService;
 import com.epmet.dataaggre.service.epmetuser.IcResiService;
 import com.epmet.dataaggre.service.govorg.GovOrgCoverageService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.epmet.dataaggre.service.govproject.GovProjectService;
 import com.epmet.dataaggre.service.heart.HeartService;
+import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService;
 import com.epmet.dto.GovMenuDTO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -507,7 +502,8 @@ public class CoverageServiceImpl implements CoverageService {
                 String[] coordinates = getUserCoordinates(re.getId(), re.getBuildId(), rootAgency);
 
                 return new CoverageAnalisisDataListResultDTO(
-                        re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? re.getName() : null,
+                        re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType,
+                        re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdCard()).concat(StrConstant.BRACKET_RIGNT),
                         coordinates[1], coordinates[0]);
 
             }).collect(Collectors.toList());
@@ -521,7 +517,8 @@ public class CoverageServiceImpl implements CoverageService {
 
                 return new CoverageAnalisisDataListResultDTO(
                         re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType,
-                        isPage ? re.getName() : null, coordinates[1], coordinates[0]);
+                        re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdNum()).concat(StrConstant.BRACKET_RIGNT),
+                        coordinates[1], coordinates[0]);
 
             }).collect(Collectors.toList());
         } else if (CoveragePlaceTypeEnum.EVENT.getCode().equals(placeType)) {

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -38,7 +38,7 @@
 
     <!--根据特殊人群类别查询居民列表-->
     <select id="listSpecialResisBySpecialType" resultType="com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO">
-        select resi.id, resi.BUILD_ID, resi.NAME
+        select resi.id, resi.BUILD_ID, resi.NAME,resi.ID_CARD as idNum
         from ic_resi_user resi
                  inner join ic_special s on (resi.ID = s.IC_RESI_USER)
         where resi.CUSTOMER_ID = #{customerId}