diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
index a345ecdc..47046c92 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
@@ -2690,10 +2690,10 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
         StringBuilder sql = new StringBuilder();
         sql.append("SELECT ")
                 .append("t.STCD AS stcd, ")
-                .append("t.STNM AS ennm, ")
+                .append("t.ENNM AS ennm, ")
                 .append("t.LOGO AS logo, ")
-                .append("t.STNM AS stnm, ")
-                .append("t.STNM AS titleName, ")
+                .append("t.ENNM AS stnm, ")
+                .append("t.ENNM AS titleName, ")
                 .append("t.RVCD AS rvcd, ")
                 .append("t.ADDVCD AS addvcd, ")
                 .append("t.LGTD AS lgtd, ")
@@ -2745,7 +2745,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 .append("   WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' ")
                 .append(") siteSort ON siteSort.RVCD = t.HBRVCD AND siteSort.STCD = t.STCD ")
                 .append("LEFT JOIN ( ")
-                .append("   SELECT STCD, COUNT(ID) AS configCount ")
+                .append("   SELECT STCD, COUNT(STCD) AS configCount ")
                 .append("   FROM SD_EQ_B_H ")
                 .append("   WHERE NVL(IS_DELETED, 0) = 0 ")
                 .append("   GROUP BY STCD ")
@@ -2878,7 +2878,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
         }
         return switch (field) {
             case "stcd" -> "t.STCD";
-            case "stnm", "ennm", "titleName" -> "t.STNM";
+            case "stnm", "ennm", "titleName" -> "t.ENNM";
             case "rvcd" -> "t.RVCD";
             case "addvcd" -> "t.ADDVCD";
             case "lgtd" -> "t.LGTD";
@@ -2901,9 +2901,9 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
             case "rvcdStepSort" -> "rvcdStepSort";
             case "rstcdStepSort" -> "rstcdStepSort";
             case "baseStepSort" -> "baseStepSort";
-            case "ifEngSpecial" -> "ifEngSpecial";
-            case "anchoPointState" -> "anchoPointState";
-            case "endInstalledType" -> "endInstalledType";
+            case "ifEngSpecial" -> "(CASE WHEN elec.configCount > 0 THEN 'true' WHEN elec.configCount IS NULL THEN 'false' ELSE 'false' END)";
+            case "anchoPointState" -> "(CASE WHEN t.PRSC IN ('1','2') AND t.BLDSTT_CODE = 2 THEN 'large_eng_built' WHEN t.PRSC IN ('1','2') AND t.BLDSTT_CODE = 1 THEN 'large_eng_ubuilt' WHEN t.PRSC IN ('1','2') AND (t.BLDSTT_CODE = 0 OR t.BLDSTT_CODE IS NULL) THEN 'large_eng_nbuilt' WHEN t.PRSC IN ('3') AND t.BLDSTT_CODE = 2 THEN 'mid_eng_built' WHEN t.PRSC IN ('3') AND t.BLDSTT_CODE = 1 THEN 'mid_eng_ubuilt' WHEN t.PRSC IN ('3') AND (t.BLDSTT_CODE = 0 OR t.BLDSTT_CODE IS NULL) THEN 'mid_eng_nbuilt' END)";
+            case "endInstalledType" -> "(CASE WHEN t.PRSC IN ('1','2') THEN 1 WHEN t.PRSC IN ('3') THEN 2 END)";
             default -> null;
         };
     }
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wq/service/impl/EnvWqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wq/service/impl/EnvWqDataServiceImpl.java
index cbc2bb8b..6ea50150 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/wq/service/impl/EnvWqDataServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wq/service/impl/EnvWqDataServiceImpl.java
@@ -4575,12 +4575,12 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
                 .append("t.FHSTCD AS fhstcd, ")
                 .append("t.ORDER_INDEX AS orderIndex, ")
                 .append("eng.ENNM AS ennm, ")
-                .append("hb.BASE_NAME AS baseName, ")
+                .append("hb.BASENAME AS baseName, ")
                 .append("hb.BASEID AS baseId, ")
                 .append("eng.HBRVCD AS hbrvcd, ")
-                .append("NVL(hbrv.NAME, '') AS hbrvcdName, ")
-                .append("NVL(rvcd.NAME, '') AS rvcdName, ")
-                .append("NVL(addvcd.NAME, '') AS addvcdName, ")
+                .append("NVL(hbrv.HBRVNM, '') AS hbrvcdName, ")
+                .append("NVL(rvcd.RVNM, '') AS rvcdName, ")
+                .append("NVL(addvcd.ADDVNM, '') AS addvcdName, ")
                 .append("NVL(along.ORDER_INDEX, 999999) AS rvcdStepSort, ")
                 .append("NVL(rstSort.SORT, 999999) AS rstcdStepSort, ")
                 .append("NVL(siteSort.SORT, 999999) AS siteStepSort, ")
@@ -4590,9 +4590,9 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
                 .append("FROM SD_WQ_B_H t ")
                 .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = t.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ")
                 .append("LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = eng.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 ")
-                .append("LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.CODE = eng.HBRVCD AND NVL(hbrv.IS_DELETED, 0) = 0 ")
-                .append("LEFT JOIN SD_RVCD_DIC rvcd ON rvcd.CODE = eng.RVCD AND NVL(rvcd.IS_DELETED, 0) = 0 ")
-                .append("LEFT JOIN SD_ADDVCD_DIC addvcd ON addvcd.CODE = eng.ADDVCD AND NVL(addvcd.IS_DELETED, 0) = 0 ")
+                .append("LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.HBRVCD = eng.HBRVCD AND NVL(hbrv.IS_DELETED, 0) = 0 ")
+                .append("LEFT JOIN SD_RVCD_DIC rvcd ON rvcd.RVCD = eng.RVCD AND NVL(rvcd.IS_DELETED, 0) = 0 ")
+                .append("LEFT JOIN SD_ADDVCD_DIC addvcd ON addvcd.ADDVCD = eng.ADDVCD  ")
                 .append("LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ")
                 .append("LEFT JOIN ( ")
                 .append("   SELECT det.SORT, cfg.RVCD, det.STCD ")
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java
index 87a25b85..b28551d8 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java
@@ -2872,7 +2872,7 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService {
                 .append("sttp.STTP_NAME AS sttpName, ")
                 .append("t.DTIN AS dtin, ")
                 .append("NULL AS stdSstate ")
-                .append("FROM SD_DFLTKW_B_H t ")
+                .append("FROM SD_DW_B_H t ")
                 .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = t.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ")
                 .append("LEFT JOIN SD_STTP_B sttp ON sttp.STTP_CODE = t.STTP AND NVL(sttp.IS_DELETED, 0) = 0 ")
                 .append("WHERE NVL(t.IS_DELETED, 0) = 0 ")