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 b2ecdbaa8c..15b1c23755 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
@@ -630,6 +630,23 @@ public class IcEventController {
         return new Result<EventAnalysisResultDTO>().ok(icEventService.getEventAnalysis(orgId, orgType, eventType));
     }
 
+
+
+    /**
+     * @param
+     * @return Result<EventAnalysisResultDTO>
+     * @throws
+     * @description 按事件分类统计
+     * @author yan Lu
+     * @date 2023/5/18 17:53
+     */
+    @GetMapping("yifengScreen/getEventAnalysis")
+    public Result<EventAnalysisResultDTO> getEventAnalysisYF(@RequestParam("orgId") String orgId,
+                                                           @RequestParam("orgType") String orgType,
+                                                           @RequestParam("eventType") String eventType) {
+        return new Result<EventAnalysisResultDTO>().ok(icEventService.getEventAnalysis(orgId, orgType, eventType));
+    }
+
     /**
      * @param
      * @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 5dd175b4f4..1f171d10f9 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
@@ -2003,53 +2003,53 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 total = eventType.equals("0") ? dto.getJiSuJiBan() : eventType.equals("1") ?
                         dto.getZhiTongLianBan() : dto.getWangGeHua();
             }
-            if (dto.getJiSuJiBan() < 1986) {
-                dto.setJiSuJiBan(1986);
-                dto.setZhiTongLianBan(1362);
-                dto.setWangGeHua(9120);
-            }
-            if (StringUtils.isEmpty(eventType)) {
-                dto.setYiJieAn(297);
-                dto.setYiJieAnRate(0.024);
-                dto.setGuiDang(12042);
-                dto.setGuiDangRate(0.972);
-                dto.setDaiChuLi(13);
-                dto.setDaiChuLiRate(0.001);
-                dto.setChuLiZhong(37);
-                dto.setChuLiZhongRate(0.003);
-            }
-            if (!StringUtils.isEmpty(eventType) && eventType.equals("0")) {
-                dto.setYiJieAn(99);
-                dto.setYiJieAnRate(0.23);
-                dto.setGuiDang(313);
-                dto.setGuiDangRate(0.77);
-                dto.setDaiChuLi(0);
-                dto.setDaiChuLiRate(0.0);
-                dto.setChuLiZhong(0);
-                dto.setChuLiZhongRate(0.0);
-            }
-            if (!StringUtils.isEmpty(eventType) && eventType.equals("1")) {
-                dto.setYiJieAn(20);
-                dto.setYiJieAnRate(0.28);
-                dto.setGuiDang(52);
-                dto.setGuiDangRate(0.72);
-                dto.setDaiChuLi(0);
-                dto.setDaiChuLiRate(0.0);
-                dto.setChuLiZhong(0);
-                dto.setChuLiZhongRate(0.0);
-            }
-            if (!StringUtils.isEmpty(eventType) && eventType.equals("2")) {
-                dto.setYiJieAn(1082);
-                dto.setYiJieAnRate(0.82);
-                dto.setGuiDang(120);
-                dto.setGuiDangRate(0.09);
-                dto.setDaiChuLi(39);
-                dto.setDaiChuLiRate(0.03);
-                dto.setChuLiZhong(79);
-                dto.setChuLiZhongRate(0.06);
-            }
-            return dto;
-//            return biuldData(dto, orgPath, eventType, total);
+//            if (dto.getJiSuJiBan() < 1986) {
+//                dto.setJiSuJiBan(1986);
+//                dto.setZhiTongLianBan(1362);
+//                dto.setWangGeHua(9120);
+//            }
+//            if (StringUtils.isEmpty(eventType)) {
+//                dto.setYiJieAn(297);
+//                dto.setYiJieAnRate(0.024);
+//                dto.setGuiDang(12042);
+//                dto.setGuiDangRate(0.972);
+//                dto.setDaiChuLi(13);
+//                dto.setDaiChuLiRate(0.001);
+//                dto.setChuLiZhong(37);
+//                dto.setChuLiZhongRate(0.003);
+//            }
+//            if (!StringUtils.isEmpty(eventType) && eventType.equals("0")) {
+//                dto.setYiJieAn(99);
+//                dto.setYiJieAnRate(0.23);
+//                dto.setGuiDang(313);
+//                dto.setGuiDangRate(0.77);
+//                dto.setDaiChuLi(0);
+//                dto.setDaiChuLiRate(0.0);
+//                dto.setChuLiZhong(0);
+//                dto.setChuLiZhongRate(0.0);
+//            }
+//            if (!StringUtils.isEmpty(eventType) && eventType.equals("1")) {
+//                dto.setYiJieAn(20);
+//                dto.setYiJieAnRate(0.28);
+//                dto.setGuiDang(52);
+//                dto.setGuiDangRate(0.72);
+//                dto.setDaiChuLi(0);
+//                dto.setDaiChuLiRate(0.0);
+//                dto.setChuLiZhong(0);
+//                dto.setChuLiZhongRate(0.0);
+//            }
+//            if (!StringUtils.isEmpty(eventType) && eventType.equals("2")) {
+//                dto.setYiJieAn(1082);
+//                dto.setYiJieAnRate(0.82);
+//                dto.setGuiDang(120);
+//                dto.setGuiDangRate(0.09);
+//                dto.setDaiChuLi(39);
+//                dto.setDaiChuLiRate(0.03);
+//                dto.setChuLiZhong(79);
+//                dto.setChuLiZhongRate(0.06);
+//            }
+//            return dto;
+            return biuldData(dto, orgPath, eventType, total);
         } catch (Exception e) {
             e.getMessage();
             return null;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanHelpCrowdController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanHelpCrowdController.java
index 4693f3d9c9..cd576f9a3d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanHelpCrowdController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanHelpCrowdController.java
@@ -46,9 +46,9 @@ public class LingShanHelpCrowdController {
     private LingShanHelpCrowdService helpCrowdService;
 
     /**
-     * @Description: 导入重点帮扶人群
      * @param file:
      * @param crowdType:
+     * @Description: 导入重点帮扶人群
      * @Return com.epmet.commons.tools.utils.Result
      * @Author: wangxianzhang
      * @Date: 2023/5/25 2:13 PM
@@ -75,9 +75,9 @@ public class LingShanHelpCrowdController {
     }
 
     /**
-     * @Description: 保存临时文件
      * @param file:
      * @param suffix:
+     * @Description: 保存临时文件
      * @Return java.nio.file.Path
      * @Author: wangxianzhang
      * @Date: 2023/5/25 2:14 PM
@@ -101,8 +101,8 @@ public class LingShanHelpCrowdController {
     }
 
     /**
-     * @Description: 下载导入模板
      * @param helpType:
+     * @Description: 下载导入模板
      * @Return void
      * @Author: wangxianzhang
      * @Date: 2023/5/25 2:17 PM
@@ -112,7 +112,7 @@ public class LingShanHelpCrowdController {
 
         LingShanHelpCrowdTypeEnum typeEnum;
 
-        if ((typeEnum = LingShanHelpCrowdTypeEnum.getByType(helpType)) == null ) {
+        if ((typeEnum = LingShanHelpCrowdTypeEnum.getByType(helpType)) == null) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "【重点帮扶人群】下载模板：指定的类型不正确：" + helpType);
         }
 
@@ -128,7 +128,6 @@ public class LingShanHelpCrowdController {
     }
 
     /**
-     * @Description: 列表查询重点帮扶人群
      * @param pageNo:
      * @param pageSize:
      * @param mobile:
@@ -136,12 +135,13 @@ public class LingShanHelpCrowdController {
      * @param helpType:
      * @param orgType:
      * @param orgId:
-     * @Return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData<com.epmet.dto.result.lingshan.LingShanHelpCrowdListRstDTO>>
+     * @Description: 列表查询重点帮扶人群
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData   <   com.epmet.dto.result.lingshan.LingShanHelpCrowdListRstDTO>>
      * @Author: wangxianzhang
      * @Date: 2023/5/25 3:31 PM
      */
     @GetMapping("listHelpCrowd")
-    @MaskResponse(fieldNames = { "name", "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_CHINESE_NAME, MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
+    @MaskResponse(fieldNames = {"name", "mobile", "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME, MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
     public Result<PageData<LingShanHelpCrowdListRstDTO>> listHelpCrowd(@RequestParam("pageNo") Integer pageNo,
                                                                        @RequestParam("pageSize") Integer pageSize,
                                                                        @RequestParam(value = "mobile", required = false) String mobile,
@@ -151,13 +151,13 @@ public class LingShanHelpCrowdController {
                                                                        @RequestParam(value = "orgType", required = false) String orgType,
                                                                        @RequestParam(value = "orgId", required = false) String orgId) {
 
-        PageData<LingShanHelpCrowdListRstDTO> pd = helpCrowdService.listHelpCrowd(pageNo, pageSize, idCard,mobile, name, helpType, orgType, orgId);
+        PageData<LingShanHelpCrowdListRstDTO> pd = helpCrowdService.listHelpCrowd(pageNo, pageSize, idCard, mobile, name, helpType, orgType, orgId);
         return new Result<PageData<LingShanHelpCrowdListRstDTO>>().ok(pd);
     }
 
     /**
-     * @Description: 保存 (新增或者修改)
      * @param form:
+     * @Description: 保存 (新增或者修改)
      * @Return com.epmet.commons.tools.utils.Result
      * @Author: wangxianzhang
      * @Date: 2023/5/25 5:25 PM
@@ -171,8 +171,8 @@ public class LingShanHelpCrowdController {
     }
 
     /**
-     * @Description: 根据居民id删除居民的帮扶人员信息
      * @param input:
+     * @Description: 根据居民id删除居民的帮扶人员信息
      * @Return com.epmet.commons.tools.utils.Result
      * @Author: wangxianzhang
      * @Date: 2023/5/26 9:05 AM
@@ -190,8 +190,8 @@ public class LingShanHelpCrowdController {
     }
 
     /**
-     * @Description: 详情
      * @param resiId:
+     * @Description: 详情
      * @Return com.epmet.commons.tools.utils.Result
      * @Author: wangxianzhang
      * @Date: 2023/5/26 9:36 AM
@@ -203,9 +203,9 @@ public class LingShanHelpCrowdController {
     }
 
     /**
-     * @Description: 大屏 ：根据分类统计(用于右边的展示条，也用于中间的选择菜单)
      * @param orgId:
      * @param orgType:
+     * @Description: 大屏 ：根据分类统计(用于右边的展示条，也用于中间的选择菜单)
      * @Return com.epmet.commons.tools.utils.Result
      * @Author: wangxianzhang
      * @Date: 2023/5/29 2:04 PM
@@ -216,12 +216,28 @@ public class LingShanHelpCrowdController {
         return new Result<List<LingShanHelpCrowdStatusByCateRstDTO>>().ok(l);
     }
 
+
+    /**
+     * @param orgId:
+     * @param orgType:
+     * @Description: 大屏 ：根据分类统计(用于右边的展示条，也用于中间的选择菜单)
+     * @Return com.epmet.commons.tools.utils.Result
+     * @Author: wangxianzhang
+     * @Date: 2023/5/29 2:04 PM
+     */
+    @GetMapping("screen/yifengScreen/statsByCategory")
+    public Result<List<LingShanHelpCrowdStatusByCateRstDTO>> statsByCategoryYF(@RequestParam("orgId") String orgId, @RequestParam("orgType") String orgType) {
+        List<LingShanHelpCrowdStatusByCateRstDTO> l = helpCrowdService.statsByCategory(orgId, orgType);
+        return new Result<List<LingShanHelpCrowdStatusByCateRstDTO>>().ok(l);
+    }
+
+
     /**
-     * @Description: 大屏地图：查询当前组织下级，指定帮扶类型的数据，打点
      * @param orgId:
- * @param orgType:
- * @param helpType:
-     * @Return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.lingshan.LingShanHelpCrowdScreenQtyOfSubOrgRstDTO>>
+     * @param orgType:
+     * @param helpType:
+     * @Description: 大屏地图：查询当前组织下级，指定帮扶类型的数据，打点
+     * @Return com.epmet.commons.tools.utils.Result<java.util.List   <   com.epmet.dto.result.lingshan.LingShanHelpCrowdScreenQtyOfSubOrgRstDTO>>
      * @Author: wangxianzhang
      * @Date: 2023/5/29 2:42 PM
      */