diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java
index eb3e59ec..1835f7c4 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java
@@ -16,7 +16,7 @@ public enum PatrolMaintenanceCategory {
     YZT_SZ_YJSZ_SUM("引进水闸", "4"),
     YZT_SZ_DCZ_SUM("挡潮闸", "5"),
     YZT_SZ_CZ_SUM("船闸", "6"),
-    YZT_("多类型混合闸", "7"),
+    YZT_SZ_DLXHHZ("多类型混合闸", "7"),
     YZT_SZ_QT_SUM("其他", "9"),
 
     YZT_DF_HJD_SUM("河江堤", "1"),
diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java
index 640d1411..689a041c 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java
@@ -8,8 +8,10 @@ import com.kms.system.domain.SysXzqh;
 import com.kms.system.service.SysXzqhService;
 import com.kms.yg.cz.service.AttStBaseService;
 import com.kms.yg.cz.service.AttStMpService;
+import com.kms.yg.df.domain.BsSgcDfSafeJbxx;
 import com.kms.yg.df.service.BsSgcDfSafeJbxxService;
 import com.kms.yg.res.service.AttResBaseService;
+import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
 import com.kms.yg.sz.domain.BsSgcSzSzrw;
 import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
 import com.kms.yg.sz.service.BsSgcSzSzrwService;
@@ -372,82 +374,110 @@ public enum StaticIndexEnum {
 
     YZT_SZ_FXHZ_SUM("分泄洪闸", sp -> {
         Map<String, String> map = new HashMap<>();
-        AttStMpService service = SpringUtils.getBean(AttStMpService.class);
-        map.put("sum", String.valueOf(service.count()));
+        BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class);
+        int count = service.count(new LambdaQueryWrapper<BsSgcSzSafeJbxx>()
+                .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_FXHZ_SUM.getValue()));
+        map.put("sum", String.valueOf(count));
         return map;
     }, "个", "0", "1"),
 
     YZT_SZ_JZZ_SUM("节制闸", sp -> {
         Map<String, String> map = new HashMap<>();
-        AttStMpService service = SpringUtils.getBean(AttStMpService.class);
-        map.put("sum", String.valueOf(service.count()));
+        BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class);
+        int count = service.count(new LambdaQueryWrapper<BsSgcSzSafeJbxx>()
+                .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_JZZ_SUM.getValue()));
+        map.put("sum", String.valueOf(count));
         return map;
     }, "个", "0", "2"),
 
     YZT_SZ_PTSZ_SUM("排退水闸", sp -> {
         Map<String, String> map = new HashMap<>();
-        AttStMpService service = SpringUtils.getBean(AttStMpService.class);
-        map.put("sum", String.valueOf(service.count()));
+        BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class);
+        int count = service.count(new LambdaQueryWrapper<BsSgcSzSafeJbxx>()
+                .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_PTSZ_SUM.getValue()));
+        map.put("sum", String.valueOf(count));
         return map;
     }, "个", "0", "3"),
 
     YZT_SZ_YJSZ_SUM("引进水闸", sp -> {
         Map<String, String> map = new HashMap<>();
-        AttStMpService service = SpringUtils.getBean(AttStMpService.class);
-        map.put("sum", String.valueOf(service.count()));
+        BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class);
+        int count = service.count(new LambdaQueryWrapper<BsSgcSzSafeJbxx>()
+                .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_YJSZ_SUM.getValue()));
+        map.put("sum", String.valueOf(count));
         return map;
     }, "个", "0", "4"),
 
     YZT_SZ_DCZ_SUM("挡潮闸", sp -> {
         Map<String, String> map = new HashMap<>();
-        AttStMpService service = SpringUtils.getBean(AttStMpService.class);
-        map.put("sum", String.valueOf(service.count()));
+        BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class);
+        int count = service.count(new LambdaQueryWrapper<BsSgcSzSafeJbxx>()
+                .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_DCZ_SUM.getValue()));
+        map.put("sum", String.valueOf(count));
         return map;
     }, "个", "0", "5"),
 
     YZT_SZ_CZ_SUM("船闸", sp -> {
         Map<String, String> map = new HashMap<>();
-        AttStMpService service = SpringUtils.getBean(AttStMpService.class);
-        map.put("sum", String.valueOf(service.count()));
+        BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class);
+        int count = service.count(new LambdaQueryWrapper<BsSgcSzSafeJbxx>()
+                .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_CZ_SUM.getValue()));
+        map.put("sum", String.valueOf(count));
         return map;
     }, "个", "0", "6"),
 
     YZT_SZ_DLXHHZ_SUM("多类型混合闸", sp -> {
         Map<String, String> map = new HashMap<>();
-        AttStMpService service = SpringUtils.getBean(AttStMpService.class);
-        map.put("sum", String.valueOf(service.count()));
+        BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class);
+        int count = service.count(new LambdaQueryWrapper<BsSgcSzSafeJbxx>()
+                .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_DLXHHZ.getValue()));
+        map.put("sum", String.valueOf(count));
         return map;
     }, "个", "0", "7"),
 
     YZT_SZ_QT_SUM("其他", sp -> {
         Map<String, String> map = new HashMap<>();
-        AttStMpService service = SpringUtils.getBean(AttStMpService.class);
-        map.put("sum", String.valueOf(service.count()));
+        BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class);
+        int count = service.count(new LambdaQueryWrapper<BsSgcSzSafeJbxx>()
+                .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_QT_SUM.getValue()));
+        map.put("sum", String.valueOf(count));
         return map;
     }, "个", "0", "9"),
 
 
     YZT_DF_HJD_SUM("河江堤", sp -> {
-        Map<String,String> map =new HashMap<>();
-        map.put("sum","15");
+        Map<String, String> map = new HashMap<>();
+        BsSgcDfSafeJbxxService service = SpringUtils.getBean(BsSgcDfSafeJbxxService.class);
+        int count = service.count(new LambdaQueryWrapper<BsSgcDfSafeJbxx>()
+                .eq(BsSgcDfSafeJbxx::getDikeType, PatrolMaintenanceCategory.YZT_DF_HJD_SUM.getValue()));
+        map.put("sum", String.valueOf(count));
         return map;
     }, "个", "0", "1"),
 
     YZT_HD_SUM("湖堤", sp -> {
-        Map<String,String> map =new HashMap<>();
-        map.put("sum","47");
+        Map<String, String> map = new HashMap<>();
+        BsSgcDfSafeJbxxService service = SpringUtils.getBean(BsSgcDfSafeJbxxService.class);
+        int count = service.count(new LambdaQueryWrapper<BsSgcDfSafeJbxx>()
+                .eq(BsSgcDfSafeJbxx::getDikeType, PatrolMaintenanceCategory.YZT_HD_SUM.getValue()));
+        map.put("sum", String.valueOf(count));
         return map;
     }, "个", "0", "2"),
 
     YZT_HAID_SUM("海堤", sp -> {
-        Map<String,String> map =new HashMap<>();
-        map.put("sum","156");
+        Map<String, String> map = new HashMap<>();
+        BsSgcDfSafeJbxxService service = SpringUtils.getBean(BsSgcDfSafeJbxxService.class);
+        int count = service.count(new LambdaQueryWrapper<BsSgcDfSafeJbxx>()
+                .eq(BsSgcDfSafeJbxx::getDikeType, PatrolMaintenanceCategory.YZT_HAID_SUM.getValue()));
+        map.put("sum", String.valueOf(count));
         return map;
     }, "个", "0", "3"),
 
     YZT_WYD_SUM("围圩堤", sp -> {
-        Map<String,String> map =new HashMap<>();
-        map.put("sum","975");
+        Map<String, String> map = new HashMap<>();
+        BsSgcDfSafeJbxxService service = SpringUtils.getBean(BsSgcDfSafeJbxxService.class);
+        int count = service.count(new LambdaQueryWrapper<BsSgcDfSafeJbxx>()
+                .eq(BsSgcDfSafeJbxx::getDikeType, PatrolMaintenanceCategory.YZT_WYD_SUM.getValue()));
+        map.put("sum", String.valueOf(count));
         return map;
     }, "个", "0", "4"),