diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/ScreenPartyCenterHouseDistributionFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/ScreenPartyCenterHouseDistributionFormDTO.java
new file mode 100644
index 0000000000..0417a5540e
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/ScreenPartyCenterHouseDistributionFormDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.form.lingshan;
+
+import com.epmet.commons.tools.validator.group.QueryGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description 灵山大屏，根据网格id，查询党员中心户房屋坐标
+ * @Author yzm
+ * @Date 2023/5/18 10:14
+ */
+@Data
+public class ScreenPartyCenterHouseDistributionFormDTO {
+    /**
+     * 网格必填
+     */
+    @NotBlank(message = "gridId不能为空",groups = QueryGroup.class)
+    private String gridId;
+    private String neighborHoodId;
+    private String buildingId;
+}
+
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/HouseDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/HouseDetailResultDTO.java
new file mode 100644
index 0000000000..cb48b95e46
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/HouseDetailResultDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.dto.result.lingshan;
+
+import com.epmet.dto.IcHouseDTO;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2023/5/18 14:05
+ */
+@Data
+public class HouseDetailResultDTO extends IcHouseDTO {
+    /**
+     * 如果是党员中心户，关联的联户数
+     */
+    private Integer totalLianHu;
+}
+
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java
new file mode 100644
index 0000000000..7e179fe4a0
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java
@@ -0,0 +1,43 @@
+package com.epmet.dto.result.lingshan;
+
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2023/5/18 10:56
+ */
+@Data
+public class ScreenPartyCenterHouseDistributionResDTO {
+    /**
+     * 小区id
+     */
+    private String neighborHoodId;
+    private String neighborHoodName;
+    /**
+     * 所属楼栋id
+     */
+    private String buildingId;
+    private String buildingName;
+    /**
+     * 所属单元id
+     */
+    private String buildingUnitId;
+    private String unitName;
+
+    /**
+     * 房屋名字后台插入时生成
+     */
+    private String houseName;
+    /**
+     * 房屋坐标
+     */
+    private String longitude;
+    private String latitude;
+
+    /**
+     * 灵山项目：是否党员中心户：1是；0不是
+     */
+    private String partyCenterHouseFlag;
+}
+
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java
new file mode 100644
index 0000000000..fe3123a482
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java
@@ -0,0 +1,66 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.IcBuildingDTO;
+import com.epmet.dto.IcHouseDTO;
+import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO;
+import com.epmet.dto.result.lingshan.HouseDetailResultDTO;
+import com.epmet.service.IcBuildingService;
+import com.epmet.service.IcHouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Description 灵山大屏-查询gov-org库的接口， 可以放在这....
+ * @Author yzm
+ * @Date 2023/5/18 10:05
+ */
+@RestController
+@RequestMapping("houseScreen")
+public class LingShanScreenGovOrgController {
+    @Autowired
+    private IcHouseService icHouseService;
+    @Autowired
+    private IcBuildingService icBuildingService;
+
+
+    /**
+     * 灵山大屏：查询楼栋坐标
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("building-distribution")
+    public Result<List<IcBuildingDTO>> buildingDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) {
+        return new Result<List<IcBuildingDTO>>().ok(icBuildingService.buildingDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId()));
+    }
+
+
+    /**
+     * 灵山大屏：查询房屋坐标点位
+     * 支持根据网格\小区\楼栋id查询
+     */
+    @PostMapping("house-distribution")
+    public Result<List<IcHouseDTO>> houseDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) {
+        return new Result<List<IcHouseDTO>>().ok(icHouseService.houseDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId(), formDTO.getBuildingId()));
+    }
+
+    /**
+     * 灵山大屏：点击房屋，显示房屋详情
+     * @param houseId
+     * @return
+     */
+    @PostMapping("houseDetail/{houseId}")
+    public Result<HouseDetailResultDTO> queryHouseDetail(@PathVariable("houseId")String houseId){
+        return new Result<HouseDetailResultDTO>().ok(icHouseService.queryHouseDetail(houseId));
+    }
+
+
+
+}
+
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
index 081663290b..c246104556 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
@@ -277,5 +277,16 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
      * @return
      */
     List<HouseTreeDTO> selectHouseTree(@Param("unitId") String unitId);
+
+    /**
+     * 查询楼栋列表：后续可以追加条件
+     * @param customerId 必填！
+     * @param gridId
+     * @param neighborHoodId
+     * @return
+     */
+    List<IcBuildingEntity> selectListByMap(@Param("customerId") String customerId,
+                                           @Param("gridId") String gridId,
+                                           @Param("neighborHoodId") String neighborHoodId);
 }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
index edce357e89..0a7f46984b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
@@ -243,4 +243,17 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
     List<HouseCountPictureListResultDTO> getHouseStatusCount(@Param("orgId") String orgId,@Param("orgType") String orgType, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
 
     List<HousePictureListResultDTO> getHousePictureList(@Param("orgId") String orgId,@Param("orgType") String orgType, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd,@Param("purpose") String purpose,@Param("rentFlag") Integer rentFlag);
+
+    /**
+     * 查询房屋列表：后续可以追加条件
+     * @param customerId 必填！
+     * @param gridId
+     * @param neighborHoodId
+     * @param buildingId
+     * @return
+     */
+    List<IcHouseEntity> selectListByMap(@Param("customerId") String customerId,
+                                        @Param("gridId") String gridId,
+                                        @Param("neighborHoodId") String neighborHoodId,
+                                        @Param("buildingId") String buildingId);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java
index bac9041896..27663c2d94 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java
@@ -139,4 +139,14 @@ public interface IcBuildingService extends BaseService<IcBuildingEntity> {
      * @param updateList
      */
     void updateBuildingLeader(List<IcBuildingDTO> updateList);
+
+    /**
+     * 灵山大屏：查询楼栋坐标
+     *
+     * @param customerId
+     * @param gridId
+     * @param neighborHoodId
+     * @return
+     */
+    List<IcBuildingDTO> buildingDistribution(String customerId, String gridId, String neighborHoodId);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
index dcf092893a..c03cb3d238 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
@@ -16,6 +16,11 @@ import com.epmet.dto.result.lingshan.HouseTreeDTO;
 import com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO;
 import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuDetailDTO;
 import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO;
+import com.epmet.dto.result.HouseAgencyInfoResultDTO;
+import com.epmet.dto.result.HouseInfoDTO;
+import com.epmet.dto.result.HouseListResultDTO;
+import com.epmet.dto.result.HousesNameResultDTO;
+import com.epmet.dto.result.lingshan.*;
 import com.epmet.entity.IcHouseEntity;
 
 import java.util.List;
@@ -186,4 +191,22 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      * @param partyCenterHouseFlag
      */
     void updatePartyCenterHouse(String houseId, String partyCenterHouseFlag);
+
+    /**
+     * 灵山大屏：查询房屋坐标点位
+     *
+     * @param gridId
+     * @param neighborHoodId
+     * @param buildingId
+     * @return
+     */
+    List<IcHouseDTO> houseDistribution(String customerId, String gridId, String neighborHoodId, String buildingId);
+
+
+    /**
+     * 灵山大屏：点击房屋，显示房屋详情
+     * @param houseId
+     * @return
+     */
+    HouseDetailResultDTO queryHouseDetail(String houseId);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
index fa8737e051..899b2698dc 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
@@ -193,4 +193,17 @@ public class IcBuildingServiceImpl extends BaseServiceImpl<IcBuildingDao, IcBuil
             baseDao.update(null, updateWrapper);
         });
     }
+    /**
+     * 灵山大屏：查询楼栋坐标
+     *
+     * @param customerId
+     * @param gridId
+     * @param neighborHoodId
+     * @return
+     */
+    @Override
+    public List<IcBuildingDTO> buildingDistribution(String customerId, String gridId, String neighborHoodId) {
+        List<IcBuildingEntity> list=baseDao.selectListByMap(customerId,gridId,neighborHoodId);
+        return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class);
+    }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index 801c5d72a3..42584eceaf 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -33,10 +33,7 @@ import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO;
 import com.epmet.dto.region.LogOperationResultDTO;
 import com.epmet.dto.result.*;
-import com.epmet.dto.result.lingshan.HouseTreeDTO;
-import com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO;
-import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuDetailDTO;
-import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO;
+import com.epmet.dto.result.lingshan.*;
 import com.epmet.entity.*;
 import com.epmet.entity.*;
 import com.epmet.enums.HousePurposeEnums;
@@ -729,5 +726,36 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         baseDao.update(null, update);
     }
 
+    /**
+     * 灵山大屏：查询房屋坐标点位
+     *
+     * @param gridId
+     * @param neighborHoodId
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public List<IcHouseDTO> houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) {
+        List<IcHouseEntity> list=baseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId);
+        return ConvertUtils.sourceToTarget(list,IcHouseDTO.class);
+    }
+
+    /**
+     * 灵山大屏：点击房屋，显示房屋详情
+     * @param houseId
+     * @return
+     */
+    @Override
+    public HouseDetailResultDTO queryHouseDetail(String houseId) {
+        IcHouseDTO data = get(houseId);
+        HouseDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(data, HouseDetailResultDTO.class);
+        if (null != resultDTO) {
+            LambdaQueryWrapper<LingshanPartyCenterHouseLianhuEntity> countQuery = new LambdaQueryWrapper<>();
+            countQuery.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId, houseId);
+            resultDTO.setTotalLianHu(partyCenterHouseLianhuDao.selectCount(countQuery));
+        }
+        return resultDTO;
+    }
+
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index 9aa8a13be8..038c71de8d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -616,4 +616,22 @@
           and ih.BUILDING_UNIT_ID=#{unitId}
         order by ih.DOOR_NAME asc
     </select>
+
+    <!--  楼栋列表  -->
+    <select id="selectListByMap" parameterType="map" resultType="com.epmet.entity.IcBuildingEntity">
+        SELECT
+            ib.*
+        FROM
+            ic_building ib
+        LEFT JOIN ic_neighbor_hood h ON ( ib.NEIGHBOR_HOOD_ID = h.ID )
+        WHERE
+            ib.DEL_FLAG = '0'
+          AND ib.CUSTOMER_ID = #{customerId}
+        <if test="gridId != null and gridId != ''">
+            AND h.GRID_ID = #{gridId}
+        </if>
+        <if test="neighborHoodId != null and neighborHoodId != ''">
+            AND ib.NEIGHBOR_HOOD_ID = #{neighborHoodId}
+        </if>
+    </select>
 </mapper>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index d070e8b7c0..1c168e5dd8 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -988,4 +988,26 @@
         </if>
         order by ca.CREATED_TIME asc,cg.CREATED_TIME asc,h.CREATED_TIME asc
     </select>
+
+    <!--    房屋列表 -->
+    <select id="selectListByMap" parameterType="map" resultType="com.epmet.entity.IcHouseEntity">
+        SELECT
+            ih.*
+        FROM
+            ic_house ih
+        LEFT JOIN ic_neighbor_hood h
+            ON ( ih.NEIGHBOR_HOOD_ID = h.ID )
+        WHERE
+            ih.DEL_FLAG = '0'
+          AND ih.CUSTOMER_ID = #{customerId}
+        <if test="gridId != null and gridId != ''">
+            AND h.GRID_ID = #{gridId}
+        </if>
+        <if test="neighborHoodId != null and neighborHoodId != ''">
+            AND ih.NEIGHBOR_HOOD_ID = {neighborHoodId}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            AND ih.BUILDING_ID = #{buildingId}
+        </if>
+    </select>
 </mapper>
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java
index 80f8b2f938..e34285d2fd 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java
@@ -3,7 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Map;
 
 /**
  * @author yan Lu
@@ -25,11 +24,30 @@ public class EventAnalysisResultDTO implements Serializable {
     /**
      * 网格化平台数量
      */
-
     private Integer wangGeHua;
+
+    /**
+     * 归档数量
+     */
+    private Integer guiDang;
+    /**
+     * 红灯占比
+     */
+    private Double daiChuLiRate;
+
+    /**
+     * 黄灯占比
+     */
+    private Double chuLiZhongRate;
+
+    /**
+     * 蓝灯占比
+     */
+    private Double yiJieAnRate;
+
     /**
-     * 分类统计数量
+     * 归档占比
      */
-    private Map<String, Integer> categoryCount;
 
+    private Double guiDangRate;
 }
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java
index a931447009..efd13ccbf6 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author yan Lu
@@ -24,26 +25,62 @@ public class EventRateResultDTO implements Serializable {
      * 红灯数量
      */
     private Integer hongDeng;
-    /**
-     * 红灯占比
-     */
-    private Double hongDengRate;
+
     /**
      * 黄灯数量
      */
     private Integer huangDeng;
-    /**
-     * 黄灯占比
-     */
-    private Double huangDengRate;
+
     /**
      * 蓝灯数量
      */
     private Integer lanDeng;
+
     /**
-     * 蓝灯占比
+     * 归档数量
+     */
+    private Integer guiDang;
+
+    /**
+     * 未响应占比
+     */
+    private Double hongDengRate;
+
+    /**
+     * 处理中占比
+     */
+    private Double huangDengRate;
+
+    /**
+     * 已完成占比
      */
     private Double lanDengRate;
 
+    /**
+     * 归档占比
+     */
+    private Double guiDangRate;
+    /**
+     * 分类统计数量
+     */
+    private List<EventRateResultDTO.Category> category;
+
+    @Data
+    public static class Category {
+        /**
+         * 分类编码
+         */
+        private String code;
+
+        /**
+         * 分类名称
+         */
+        private String name;
+
+        /**
+         * 分类数量
+         */
+        private Integer value;
+    }
 
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
index 60e5b7b12c..dd31462f70 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
@@ -560,7 +560,7 @@ public class IcEventController {
     }
 
     /**
-    * @description 获取事件数量和占比率
+    * @description 获取事件数量和分类数量
     * @param  * @param null
     * @return Result
     * @throws
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index 73648097d0..3e67c8d848 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@@ -1925,21 +1925,45 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
 
     @Override
     public EventRateResultDTO getEventRate(String orgId, String orgType) {
-        return baseDao.getEventRate(getOrgPath(orgId, orgType));
+        EventRateResultDTO erDto = baseDao.getEventRate(getOrgPath(orgId, orgType));//事件总量和灯数量,占比
+        List<Map<String, Integer>> dataMap = baseDao.getAnalysis(getOrgPath(orgId, orgType));//按分类获取数量
+        Map<String, Integer> temp = new HashMap<>();
+        if (null != dataMap && dataMap.size() > 0) {
+            for (Map<String, Integer> map : dataMap) {
+                temp.put(String.valueOf(map.get("code")), Integer.valueOf(String.valueOf(map.get("total"))));
+            }
+        }
+        Result<Map<String, String>> categoryMap = govIssueOpenFeignClient.getCategoryMap(EpmetRequestHolder.getLoginUserCustomerId());
+        if (null != categoryMap && categoryMap.getData().size() > 0) {
+            Map<String, String> map = categoryMap.getData();
+            List<EventRateResultDTO.Category> categoryList = new ArrayList<>();
+            map.keySet().forEach(key -> {
+                EventRateResultDTO.Category category = new EventRateResultDTO.Category();
+                if (null != temp.get(key)) {
+                    category.setCode(key);
+                    category.setName(map.get(key));
+                    category.setValue(Integer.valueOf(temp.get(key)));
+                } else {
+                    category.setCode(key);
+                    category.setName(map.get(key));
+                    category.setValue(0);
+                }
+                categoryList.add(category);
+            });
+            erDto.setCategory(categoryList);
+        }
+        return erDto;
     }
 
     @Override
     public EventAnalysisResultDTO getEventAnalysis(String orgId, String orgType) {
-        EventAnalysisResultDTO dto = baseDao.getEventAnalysis(getOrgPath(orgId,orgType));
-        Result<Map<String, String>> categoryMap = govIssueOpenFeignClient.getCategoryMap(EpmetRequestHolder.getLoginUserCustomerId());
-        if (null != categoryMap && categoryMap.getData().size() > 0) {
-            List<Map<String,Integer>> dataMap = baseDao.getAnalysis(getOrgPath(orgId,orgType));
-            if (null != dataMap && dataMap.size() > 0) {
-                Map<String, Integer> merged = new HashMap<>();
-                dataMap.forEach(merged::putAll);
-                dto.setCategoryCount(merged);
-            }
-        }
+        String orgPath = getOrgPath(orgId, orgType);
+        EventRateResultDTO erDto = baseDao.getEventRate(orgPath);//事件总量和灯数量,占比
+        EventAnalysisResultDTO dto = baseDao.getEventAnalysis(orgPath);
+        dto.setDaiChuLiRate(erDto.getHongDengRate() == null ? 0 : erDto.getHongDengRate());
+        dto.setChuLiZhongRate(erDto.getHuangDengRate() == null ? 0 : erDto.getHuangDengRate());
+        dto.setYiJieAnRate(erDto.getLanDengRate() == null ? 0 : erDto.getLanDengRate());
+        dto.setGuiDangRate(erDto.getGuiDangRate() == null ? 0 : erDto.getGuiDangRate());
         return dto;
     }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index 36e6d7c8e9..8881d0e65a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
@@ -446,9 +446,11 @@
             eb.hong AS hongDeng,
             ec.huang AS huangDeng,
             ed.lan as lanDeng,
+            ee.dang as guiDang,
             ROUND( eb.hong / ea.countAll, 2 ) AS hongDengRate,
             ROUND( ec.huang / ea.countAll, 2 ) AS huangDengRate,
-            ROUND( ed.lan / ea.countAll, 2 ) as lanDengRate
+            ROUND( ed.lan / ea.countAll, 2 ) as lanDengRate,
+            ROUND( ee.dang / ea.countAll, 2) as guiDangRate
         FROM
             ( SELECT
                     SUM( CASE WHEN a.OPERATION_TYPE IS NULL OR a.OPERATION_TYPE = 0 THEN 1 ELSE 0 END ) AS countAll
@@ -477,7 +479,13 @@
                 <if test="null != orgIdPath and orgIdPath != ''">
                     and d.GRID_PIDS like concat(#{orgIdPath},'%')
                 </if>
-            ) ed
+            ) ed,
+            ( SELECT SUM( CASE WHEN d.DIFFICULT_POINT = 1 and d.OPERATION_TYPE = 0 THEN 1 ELSE 0 END) as dang
+                FROM ic_event d WHERE d.DEL_FLAG = 0
+                <if test="null != orgIdPath and orgIdPath != ''">
+                    and d.GRID_PIDS like concat(#{orgIdPath},'%')
+                </if>
+            ) ee
     </select>
 
     <select id="getEventAnalysis" resultType="com.epmet.dto.result.EventAnalysisResultDTO">
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
index 87393c2a17..540b0207d9 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
@@ -90,4 +90,35 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable {
      * 工作单位
      */
     private String gzdw;
+
+
+    /**
+     * 因灵山项目添加此列：
+     * 民族：
+     */
+    private String mz;
+
+    /**
+     * 因灵山项目添加此列：
+     * 与户主关系：存储字典纸
+     */
+    private String yhzgx;
+
+    /**
+     * 因灵山项目添加此列：
+     * 与户主关系：名称
+     */
+    private String yhzgxName;
+
+    /**
+     * 因灵山项目添加此列：
+     * 重点人群:信访人员、社区矫正、精障患者、戒毒人员、安置帮教
+     */
+    private List<String> specialCrowdName;
+
+    /**
+     * 因灵山项目添加此列：
+     * 重点人群:特困人员、留守儿童、空巢老人、高龄老人、独居老人、低保、大病、残疾人
+     */
+    private List<String> helpCrowdName;
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/LingShanHelpCrowdTypeEnum.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/LingShanHelpCrowdTypeEnum.java
new file mode 100644
index 0000000000..2afb9ba901
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/LingShanHelpCrowdTypeEnum.java
@@ -0,0 +1,49 @@
+package com.epmet.enums;
+
+public enum LingShanHelpCrowdTypeEnum {
+    // 人员类别。【canji残疾人，dabing大病，dibao低保，gaoling高龄老人，kongchao空巢老人，duju独居老人，liushou留守儿童， tekun特困人员】
+
+    CANJI("canji", "残疾", 1),
+    DABING("dabing", "大病", 2),
+    DIBAO("dibao", "低保", 3),
+    GAOLING("gaoling", "高龄老人", 4),
+    KONGCHAO("kongchao", "空巢老人", 5),
+    DUJU("duju", "独居老人", 6),
+    LIUSHOU("liushou", "留守儿童", 7),
+    TEKUN("tekun", "特困人员", 8);
+
+    /**
+     * 类型。anzhibangjiao,
+     */
+    public final String type;
+    public final String name;
+
+    private Integer headerRowNumber;
+
+    LingShanHelpCrowdTypeEnum(String type, String name, Integer headerRowNumber) {
+        this.type = type;
+        this.name = name;
+        this.headerRowNumber = headerRowNumber;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getHeaderRowNumber() {
+        return headerRowNumber;
+    }
+
+    public static LingShanHelpCrowdTypeEnum getByType(String type) {
+        for (LingShanHelpCrowdTypeEnum e : LingShanHelpCrowdTypeEnum.values()) {
+            if (e.getType().equals(type)) {
+                return e;
+            }
+        }
+        return null;
+    }
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSpecialDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSpecialDao.java
index 81ac6f0eba..208b075208 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSpecialDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSpecialDao.java
@@ -11,7 +11,7 @@ import java.util.List;
 @Mapper
 public interface IcSpecialDao extends BaseDao<IcSpecialEntity> {
 
-    public IcSpecialEntity selectByResiId(@Param("resiId") String resiId);
+    IcSpecialEntity selectByResiId(@Param("resiId") String resiId);
 
     List<LingShanSpecialCrowdListResultDTO> listSpecialCrowd(@Param("orgIdPath") String orgIdPath,
                                                              @Param("orgId") String orgId,
@@ -20,4 +20,11 @@ public interface IcSpecialDao extends BaseDao<IcSpecialEntity> {
                                                              @Param("name") String name,
                                                              @Param("mobile") String mobile,
                                                              @Param("idCard") String idCard);
+
+    /**
+     * 查询：lingshan_help_crowd_resi_merge
+     * @param resiUserId
+     * @return 返回重点帮扶人员类别
+     */
+    List<String> selectHelpCrowdType(String resiUserId);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index cd526c40e7..bcb36c5efb 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -35,6 +35,7 @@ import com.epmet.commons.tools.dto.form.DictListFormDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.dto.result.DictListResultDTO;
 import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.enums.*;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -67,6 +68,8 @@ import com.epmet.dto.result.resi.ResiPortrayalDetailDTO;
 import com.epmet.dto.result.resi.ResiPortrayalResult;
 import com.epmet.dto.result.resi.ResiPortrayalResultDTO;
 import com.epmet.entity.*;
+import com.epmet.enums.LingShanHelpCrowdTypeEnum;
+import com.epmet.enums.LingShanSpecialCrowdTypeEnums;
 import com.epmet.enums.RenHuConditionEnum;
 import com.epmet.excel.EpidemicPreventionExportExcel;
 import com.epmet.excel.support.ExportResiUserItemDTO;
@@ -185,6 +188,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     @Autowired
     private IcVaccineRelationDao icVaccineRelationDao;
+    @Autowired
+    private IcSpecialDao icSpecialDao;
 
     /**
      * 组织字段，目前用于居民信息动态查询接口。将此条件从conditions中移除，单独生成固定的sql片段
@@ -1712,6 +1717,40 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         r.setIcUserName(resiEntity.getName());
         r.setRhzk(resiEntity.getRhzk());
         r.setGzdw(resiEntity.getGzdw());
+        // 因灵山项目添加一下几列 start
+        r.setMz(resiEntity.getMz());
+        r.setYhzgx(resiEntity.getYhzgx());
+        r.setYhzgxName(StrConstant.EPMETY_STR);
+        Result<List<OptionResultDTO>> yhzgxRes=epmetAdminOpenFeignClient.getRelationshipOption();
+        if(yhzgxRes.success()&&CollectionUtils.isNotEmpty(yhzgxRes.getData())){
+            Map<String, String> yhzgxMap = yhzgxRes.getData().stream().collect(Collectors.toMap(OptionResultDTO::getValue, OptionResultDTO::getLabel));
+            if(MapUtils.isNotEmpty(yhzgxMap)&&yhzgxMap.containsKey(r.getYhzgx())){
+                r.setYhzgxName(yhzgxMap.get(r.getYhzgx()));
+            }
+        }
+        // 重点人群:信访人员、社区矫正、精障患者、戒毒人员、安置帮教
+        List<String> specialCrowdName = new ArrayList<>();
+        IcSpecialEntity icSpecialEntity = icSpecialDao.selectByResiId(resiUserId);
+        if (null != icSpecialEntity) {
+            for (LingShanSpecialCrowdTypeEnums e : LingShanSpecialCrowdTypeEnums.values()) {
+                if (icSpecialEntity.getSpecialRqlb().contains(e.getType())) {
+                    specialCrowdName.add(e.getName());
+                }
+            }
+        }
+        r.setSpecialCrowdName(specialCrowdName);
+        //重点帮扶人员类别
+        List<String> helpCrowdName = new ArrayList<>();
+        List<String> crowdTypeList = icSpecialDao.selectHelpCrowdType(resiUserId);
+        if (CollectionUtils.isNotEmpty(crowdTypeList)) {
+            for (LingShanHelpCrowdTypeEnum e : LingShanHelpCrowdTypeEnum.values()) {
+                if (crowdTypeList.contains(e.getType())) {
+                    helpCrowdName.add(e.getName());
+                }
+            }
+        }
+        r.setHelpCrowdName(helpCrowdName);
+        // end lingshan
 
         // 填充网格、小区名称
         String errorMsg = "【居民信息简介】查询网格、小区信息失败";
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml
index 5d66f2482f..9535299885 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml
@@ -43,4 +43,14 @@
         order by s.UPDATED_TIME desc
     </select>
 
+    <select id="selectHelpCrowdType" parameterType="java.lang.String" resultType="java.lang.String">
+        SELECT
+            DISTINCT m.CROWD_TYPE
+        FROM
+            lingshan_help_crowd_resi_merge m
+        WHERE
+            m.DEL_FLAG = '0'
+          AND m.RESI_ID = #{resiUserId}
+        order by m.CREATED_TIME asc
+    </select>
 </mapper>
\ No newline at end of file