From 4a3b70cab4dfbaa86448c018e0d0f5db363c88fc Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Wed, 15 Jul 2026 11:15:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=B2=BF=E7=A8=8B?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qgc_base/domain/vo/EngPointVo.java        |  4 ++
 .../service/impl/SdEngInfoBHServiceImpl.java  | 41 +++++------
 .../eq/service/impl/EngEqDataServiceImpl.java | 70 +++++++++----------
 .../zq/service/impl/EngRiverServiceImpl.java  | 10 +--
 .../fb/service/impl/FbStationServiceImpl.java | 10 +--
 .../fh/service/impl/FhHabitatServiceImpl.java | 16 ++---
 .../service/impl/FprMonitorServiceImpl.java   | 10 +--
 .../vd/service/impl/VdMonitorServiceImpl.java |  4 +-
 .../service/impl/WarnDataServiceImpl.java     | 22 +++---
 .../wq/service/impl/EnvWqDataServiceImpl.java | 40 +++++------
 .../service/impl/SdWtMonitorServiceImpl.java  | 16 ++---
 .../wte/service/impl/WeFishServiceImpl.java   |  6 +-
 .../zq/service/impl/ZqMonitorServiceImpl.java | 34 ++++-----
 13 files changed, 144 insertions(+), 139 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngPointVo.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngPointVo.java
index ad4444c9..6f5a5843 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngPointVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngPointVo.java
@@ -59,6 +59,10 @@ public class EngPointVo {
     @Schema(description = "所属行政区名称")
     private String addvcdName;
 
+    @Schema(description = "基地名称")
+    private String baseName;
+
+
     @Schema(description = "站点类型")
     private String sttp;
 
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 5f599d11..e6b62797 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
@@ -1324,19 +1324,19 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 "LEFT JOIN SD_HYCD_DIC topHy ON topHy.HYCD = eng.TOP_HYCD AND NVL(topHy.IS_DELETED, 0) = 0 AND NVL(topHy.ENABLED, 1) = 1 " +
                 "LEFT JOIN SD_PWR_B_H pwr ON pwr.STCD = eng.STCD AND NVL(pwr.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN SD_RSVRFCCH_B_H rbh ON rbh.STCD = eng.STCD AND NVL(rbh.IS_DELETED, 0) = 0 " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN MS_ALONG_B along ON along.BASEID = eng.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "   SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "   SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "   FROM MS_ALONGDET_B det " +
                 "   INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "   WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = eng.STCD " +
+                ") rstSort ON  rstSort.BASEID = eng.BASE_ID  AND rstSort.STCD = eng.STCD " +
                 "LEFT JOIN ( " +
-                "   SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "   SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "   FROM MS_ALONGDET_B det " +
                 "   INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "   WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = eng.STCD " +
+                ") siteSort ON siteSort.BASEID = eng.BASE_ID AND siteSort.STCD = eng.STCD " +
                 "WHERE NVL(eng.IS_DELETED, 0) = 0";
     }
 
@@ -2149,19 +2149,19 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 "LEFT JOIN SD_ENGINFO_B_H s ON e.STCD = s.STCD AND NVL(s.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN SD_STTP_B sttp ON sttp.STTP_CODE = 'ENG' AND NVL(sttp.IS_DELETED, 0) = 0 AND NVL(sttp.ENABLE, 1) = 1 " +
                 "LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = s.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = s.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN MS_ALONG_B along ON along.BASEID = e.BASEID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "   SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "   SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "   FROM MS_ALONGDET_B det " +
                 "   INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "   WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") rstSort ON rstSort.RVCD = s.HBRVCD AND rstSort.STCD = s.STCD " +
+                ") rstSort ON rstSort.BASEID = e.BASEID AND rstSort.STCD = s.STCD " +
                 "LEFT JOIN ( " +
-                "   SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "   SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "   FROM MS_ALONGDET_B det " +
                 "   INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "   WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") siteSort ON siteSort.RVCD = s.HBRVCD AND siteSort.STCD = s.STCD " +
+                ") siteSort ON siteSort.BASEID = e.BASEID AND siteSort.STCD = s.STCD " +
                 "WHERE NVL(e.IS_DELETED, 0) = 0";
     }
 
@@ -2859,6 +2859,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 .append("t.ENNM AS stnm, ")
                 .append("t.ENNM AS titleName, ")
                 .append("t.RVCD AS rvcd, ")
+                .append("t.BASE_NAME AS baseName, ")
                 .append("t.ADDVCD AS addvcd, ")
                 .append("t.LGTD AS lgtd, ")
                 .append("t.LTTD AS lttd, ")
@@ -2896,19 +2897,19 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 .append("FROM SD_ENGINFO_B_H t ")
                 .append("LEFT JOIN SD_PWR_B_H p ON t.STCD = p.STCD AND NVL(p.IS_DELETED, 0) = 0  ")
                 .append("LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = t.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 ")
-                .append("LEFT JOIN MS_ALONG_B along ON along.RVCD = t.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ")
+                .append("LEFT JOIN MS_ALONG_B along ON along.BASEID = t.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ")
                 .append("LEFT JOIN ( ")
-                .append("   SELECT det.SORT, cfg.RVCD, det.STCD ")
+                .append("   SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD ")
                 .append("   FROM MS_ALONGDET_B det ")
                 .append("   INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID ")
                 .append("   WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' ")
-                .append(") rstSort ON rstSort.RVCD = t.HBRVCD AND rstSort.STCD = t.STCD ")
+                .append(") rstSort ON rstSort.BASEID = t.BASE_ID AND rstSort.STCD = t.STCD ")
                 .append("LEFT JOIN ( ")
-                .append("   SELECT det.SORT, cfg.RVCD, det.STCD ")
+                .append("   SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD ")
                 .append("   FROM MS_ALONGDET_B det ")
                 .append("   INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID ")
                 .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(") siteSort ON siteSort.BASEID = t.BASE_ID AND siteSort.STCD = t.STCD ")
                 .append("LEFT JOIN ( ")
                 .append("   SELECT STCD, COUNT(STCD) AS configCount ")
                 .append("   FROM SD_EQ_B_H ")
@@ -3052,19 +3053,19 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 "NVL(siteSort.SORT, 999999) AS siteStepSort " +
                 "FROM SD_ENGINFO_B_H eng " +
                 "LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = eng.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN MS_ALONG_B along ON along.BASEID = eng.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = eng.STCD " +
+                ") rstSort ON rstSort.BASEID = eng.BASE_ID AND rstSort.STCD = eng.STCD " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = eng.STCD " +
+                ") siteSort ON siteSort.BASEID = eng.BASE_ID AND siteSort.STCD = eng.STCD " +
                 "WHERE NVL(eng.IS_DELETED, 0) = 0 " +
                 "AND NVL(eng.USFL, 0) = 1 " +
                 "AND eng.LGTD IS NOT NULL " +
diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java
index 9e967791..646f80d9 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java
@@ -1863,19 +1863,19 @@ public class EngEqDataServiceImpl implements EngEqDataService {
                 "LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.HBRVCD = eng.HBRVCD AND hbrv.BASEID = eng.BASE_ID " +
                 " AND NVL(hbrv.IS_DELETED, 0) = 0 AND NVL(hbrv.ENABLED, 1) = 1 " +
                 "LEFT JOIN SD_ADDVCD_DIC addv ON addv.ADDVCD = eng.ADDVCD " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN MS_ALONG_B along ON along.BASEID = eng.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = eng.STCD " +
+                ") rstSort ON rstSort.BASEID = eng.BASE_ID AND rstSort.STCD = eng.STCD " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = eng.STCD " +
+                ") siteSort ON siteSort.BASEID = eng.BASE_ID AND siteSort.STCD = eng.STCD " +
                 "LEFT JOIN (" + buildDayMetricSourceSql(filter, paramMap, indexHolder, 0) + ") met ON met.STCD = eng.STCD " +
                 "LEFT JOIN (" + buildDayRunSourceSql(filter, paramMap, indexHolder, 0) + ") runAgg ON runAgg.STCD = eng.STCD " +
                 "LEFT JOIN (" + buildStaticRuleSql("EQMN") + ") qecNoRule ON qecNoRule.STCD = eng.STCD " +
@@ -2215,19 +2215,19 @@ public class EngEqDataServiceImpl implements EngEqDataService {
                 "LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.HBRVCD = eng.HBRVCD AND hbrv.BASEID = eng.BASE_ID " +
                 " AND NVL(hbrv.IS_DELETED, 0) = 0 AND NVL(hbrv.ENABLED, 1) = 1 " +
                 "LEFT JOIN SD_ADDVCD_DIC addv ON addv.ADDVCD = eng.ADDVCD " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN MS_ALONG_B along ON along.BASEID = eng.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = eng.STCD " +
+                ") rstSort ON rstSort.BASEID = eng.BASE_ID AND rstSort.STCD = eng.STCD " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = eng.STCD " +
+                ") siteSort ON siteSort.BASEID = eng.BASE_ID AND siteSort.STCD = eng.STCD " +
                 "LEFT JOIN (" + buildHourMetricSourceSql(filter, paramMap, indexHolder, 0) + ") met ON met.STCD = eng.STCD " +
                 "LEFT JOIN (" + buildHourRunSourceSql(filter, paramMap, indexHolder, 0) + ") runAgg ON runAgg.STCD = eng.STCD " +
                 "LEFT JOIN (" + buildStaticRuleSql("EQMN") + ") qecNoRule ON qecNoRule.STCD = eng.STCD " +
@@ -2894,19 +2894,19 @@ public class EngEqDataServiceImpl implements EngEqDataService {
                 "LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.HBRVCD = eng.HBRVCD AND hbrv.BASEID = eng.BASE_ID " +
                 " AND NVL(hbrv.IS_DELETED, 0) = 0 AND NVL(hbrv.ENABLED, 1) = 1 " +
                 "LEFT JOIN SD_ADDVCD_DIC addv ON addv.ADDVCD = eng.ADDVCD " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN MS_ALONG_B along ON along.BASEID = eng.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = eng.STCD " +
+                ") rstSort ON rstSort.BASEID = eng.BASE_ID AND rstSort.STCD = eng.STCD " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = eng.STCD " +
+                ") siteSort ON siteSort.BASEID = eng.BASE_ID AND siteSort.STCD = eng.STCD " +
                 "LEFT JOIN (" + buildIntervalMetricSourceSql(filter, paramMap, indexHolder, 0) + ") met ON met.STCD = eng.STCD " +
                 "LEFT JOIN (" + beforeMetricSql + ") beforeMet ON beforeMet.STCD = eng.STCD " +
                 "LEFT JOIN (" + buildIntervalNoRuleSql() + ") qecNoRule ON qecNoRule.STCD = eng.STCD " +
@@ -3869,20 +3869,20 @@ public class EngEqDataServiceImpl implements EngEqDataService {
                 "  AND NVL(hbrv.IS_DELETED, 0) = 0 AND NVL(hbrv.ENABLED, 1) = 1 " +
                 "LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD " +
                 "LEFT JOIN SD_ADDVCD_DIC addv ON addv.ADDVCD = eng.ADDVCD " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN MS_ALONG_B along ON along.BASEID = eng.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") rstSort ON rstSort.RVCD = eng.HBRVCD " +
+                ") rstSort ON rstSort.BASEID = eng.BASE_ID " +
                 " AND rstSort.STCD = eng.STCD "+
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = eng.STCD " +
+                ") siteSort ON siteSort.BASEID = eng.BASE_ID AND siteSort.STCD = eng.STCD " +
                 "INNER JOIN SD_QEC_R sqr ON sqr.STCD = eng.STCD " +
                 "LEFT JOIN SD_HYDROPW_R shr ON shr.STCD = sqr.STCD AND shr.TM = sqr.TM AND NVL(shr.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN SD_QEC_R bsqr ON bsqr.STCD = sqr.STCD AND ADD_MONTHS(bsqr.TM, 12) = sqr.TM AND NVL(bsqr.IS_DELETED, 0) = 0 ";
@@ -3934,19 +3934,19 @@ public class EngEqDataServiceImpl implements EngEqDataService {
                 "  AND NVL(hbrv.IS_DELETED, 0) = 0 AND NVL(hbrv.ENABLED, 1) = 1 " +
                 "LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD " +
                 "LEFT JOIN SD_ADDVCD_DIC addv ON addv.ADDVCD = eng.ADDVCD " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN MS_ALONG_B along ON along.BASEID = eng.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = eng.STCD " +
+                ") rstSort ON rstSort.BASEID = eng.BASE_ID AND rstSort.STCD = eng.STCD " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = eng.STCD " +
+                ") siteSort ON siteSort.BASEID = eng.BASE_ID AND siteSort.STCD = eng.STCD " +
                 "LEFT JOIN (" + buildDayRunDaySql() + ") runDay ON runDay.STCD = day.STCD AND runDay.DT = day.DT " +
                 "LEFT JOIN SD_QECDAY_S beforeDay ON beforeDay.STCD = day.STCD " +
                 " AND ADD_MONTHS(beforeDay.DT, 12) = day.DT AND NVL(beforeDay.IS_DELETED, 0) = 0 " +
@@ -4000,19 +4000,19 @@ public class EngEqDataServiceImpl implements EngEqDataService {
                 "  AND NVL(hbrv.IS_DELETED, 0) = 0 AND NVL(hbrv.ENABLED, 1) = 1 " +
                 "LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD " +
                 "LEFT JOIN SD_ADDVCD_DIC addv ON addv.ADDVCD = eng.ADDVCD " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN MS_ALONG_B along ON along.BASEID = eng.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = eng.STCD " +
+                ") rstSort ON rstSort.BASEID = eng.BASE_ID AND rstSort.STCD = eng.STCD " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = eng.STCD " +
+                ") siteSort ON siteSort.BASEID = eng.BASE_ID AND siteSort.STCD = eng.STCD " +
                 "LEFT JOIN SD_HYDROPWDRTP_S runDrtp ON drtp.STCD = runDrtp.STCD " +
                 " AND drtp.DRTP = runDrtp.DRTP " +
                 " AND NVL(drtp.DR, -1) = NVL(runDrtp.DR, -1) " +
@@ -5947,19 +5947,19 @@ public class EngEqDataServiceImpl implements EngEqDataService {
                 .append("FROM SD_EQ_B_H a ")
                 .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = a.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 MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ")
+                .append("LEFT JOIN MS_ALONG_B along ON along.BASEID = a.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ")
                 .append("LEFT JOIN ( ")
-                .append("   SELECT det.SORT, cfg.RVCD, det.STCD ")
+                .append("   SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD ")
                 .append("   FROM MS_ALONGDET_B det ")
                 .append("   INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID ")
                 .append("   WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' ")
-                .append(") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = a.RSTCD ")
+                .append(") rstSort ON rstSort.BASEID = a.BASE_ID AND rstSort.STCD = a.RSTCD ")
                 .append("LEFT JOIN ( ")
-                .append("   SELECT det.SORT, cfg.RVCD, det.STCD ")
+                .append("   SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD ")
                 .append("   FROM MS_ALONGDET_B det ")
                 .append("   INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID ")
                 .append("   WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' ")
-                .append(") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = a.STCD ")
+                .append(") siteSort ON siteSort.BASEID = a.BASE_ID AND siteSort.STCD = a.STCD ")
                 .append("WHERE NVL(a.IS_DELETED, 0) = 0 ")
 //                .append("AND NVL(a.USFL, 1) = 1 ")
                 .append("AND a.LGTD IS NOT NULL ")
diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/zq/service/impl/EngRiverServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_eng/zq/service/impl/EngRiverServiceImpl.java
index 87d73bd9..3ee25669 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_eng/zq/service/impl/EngRiverServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_eng/zq/service/impl/EngRiverServiceImpl.java
@@ -190,19 +190,19 @@ public class EngRiverServiceImpl implements EngRiverService {
                 "LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.HBRVCD = eng.HBRVCD AND hbrv.BASEID = eng.BASE_ID " +
                 "  AND NVL(hbrv.IS_DELETED, 0) = 0 AND NVL(hbrv.ENABLED, 1) = 1 " +
                 "LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN MS_ALONG_B along ON along.BASEID = eng.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = rb.RSTCD " +
+                ") rstSort ON rstSort.BASEID = eng.BASE_ID AND rstSort.STCD = rb.RSTCD " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = rb.STCD " +
+                ") siteSort ON siteSort.BASEID = eng.BASE_ID AND siteSort.STCD = rb.STCD " +
                 "LEFT JOIN SD_VDINFO_B vdb ON vdb.CSTCD = rr.STCD AND NVL(vdb.USFL, 1) = 1 " +
                 "LEFT JOIN SD_VDINFO_R vdr ON vdr.STCD = vdb.STCD AND vdr.TM = rr.TM AND NVL(vdr.IS_DELETED, 0) = 0 " +
                 "WHERE NVL(rr.IS_DELETED, 0) = 0 " +
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fb/service/impl/FbStationServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fb/service/impl/FbStationServiceImpl.java
index dda0ae22..d2ed6e61 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/fb/service/impl/FbStationServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fb/service/impl/FbStationServiceImpl.java
@@ -4638,19 +4638,19 @@ public class FbStationServiceImpl implements FbStationService {
                 .append("FROM SD_FBRD_B_H a ")
                 .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = a.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ")
                 .append("LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = a.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 ")
-                .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 MS_ALONG_B along ON along.RVCD = a.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ")
                 .append("LEFT JOIN ( ")
-                .append("   SELECT det.SORT, cfg.RVCD, det.STCD ")
+                .append("   SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD ")
                 .append("   FROM MS_ALONGDET_B det ")
                 .append("   INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID ")
                 .append("   WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' ")
-                .append(") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = a.RSTCD ")
+                .append(") rstSort ON rstSort.BASEID = a.BASE_ID AND rstSort.STCD = a.RSTCD ")
                 .append("LEFT JOIN ( ")
-                .append("   SELECT det.SORT, cfg.RVCD, det.STCD ")
+                .append("   SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD ")
                 .append("   FROM MS_ALONGDET_B det ")
                 .append("   INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID ")
                 .append("   WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' ")
-                .append(") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = a.STCD ")
+                .append(") siteSort ON siteSort.BASEID = a.BASE_ID AND siteSort.STCD = a.STCD ")
                 .append("LEFT JOIN ( ")
                 .append("   SELECT t.RSTCD AS stcd, COUNT(1) AS lcjStatus ")
                 .append("   FROM SD_ENGFR_R t ")
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fh/service/impl/FhHabitatServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fh/service/impl/FhHabitatServiceImpl.java
index a9d57798..061610af 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/fh/service/impl/FhHabitatServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fh/service/impl/FhHabitatServiceImpl.java
@@ -458,15 +458,15 @@ public class FhHabitatServiceImpl implements FhHabitatService {
                 "FROM SD_FHBT_B_H fh " +
                 "LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = fh.RSTCD  " +
                 "LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = NVL(fh.BASE_ID, eng.BASE_ID) " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = NVL(fh.HBRVCD, eng.HBRVCD) AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN MS_ALONG_B along ON along.BASEID = fh.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "    SELECT det.SORT, a.RVCD, det.STCD " +
+                "    SELECT det.SORT,a.BASEID, a.RVCD, det.STCD " +
                 "    FROM MS_ALONGDET_B det " +
                 "    INNER JOIN MS_ALONG_B a ON a.ID = det.ALONG_ID " +
                 "    WHERE NVL(det.IS_DELETED, 0) = 0 " +
                 "      AND NVL(a.IS_DELETED, 0) = 0 " +
                 "      AND a.CODE = 'common' " +
-                ") rstAlong ON rstAlong.RVCD = NVL(fh.HBRVCD, eng.HBRVCD) AND rstAlong.STCD = fh.RSTCD " +
+                ") rstAlong ON rstAlong.BASEID = fh.BASE_ID AND rstAlong.STCD = fh.RSTCD " +
                 "LEFT JOIN ( " +
                 "    SELECT DISTINCT FHSTCD " +
                 "    FROM ( " +
@@ -594,17 +594,17 @@ public class FhHabitatServiceImpl implements FhHabitatService {
                 "      FROM SD_FHBT_B_H fh " +
                 "      LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = fh.RSTCD " +
                 "      LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = NVL(fh.BASE_ID, eng.BASE_ID) " +
-                "      LEFT JOIN MS_ALONG_B along ON along.RVCD = NVL(fh.HBRVCD, eng.HBRVCD) " +
+                "      LEFT JOIN MS_ALONG_B along ON along.BASEID =fh.BASE_ID " +
                 "                                AND along.CODE = 'common' " +
                 "                                AND NVL(along.IS_DELETED, 0) = 0 " +
                 "      LEFT JOIN ( " +
-                "          SELECT det.SORT, a.RVCD, det.STCD " +
+                "          SELECT det.SORT,a.BASEID, a.RVCD, det.STCD " +
                 "            FROM MS_ALONGDET_B det " +
                 "            INNER JOIN MS_ALONG_B a ON a.ID = det.ALONG_ID " +
                 "           WHERE NVL(det.IS_DELETED, 0) = 0 " +
                 "             AND NVL(a.IS_DELETED, 0) = 0 " +
                 "             AND a.CODE = 'common' " +
-                "      ) rstAlong ON rstAlong.RVCD = NVL(fh.HBRVCD, eng.HBRVCD) AND rstAlong.STCD = fh.RSTCD " +
+                "      ) rstAlong ON rstAlong.BASEID = fh.BASE_ID AND rstAlong.STCD = fh.RSTCD " +
                 "     WHERE NVL(fh.IS_DELETED, 0) = 0 " +
 //                "       AND NVL(fh.BASE_ID, 'other') <> 'other' " +
 //                "       AND NOT EXISTS ( " +
@@ -618,13 +618,13 @@ public class FhHabitatServiceImpl implements FhHabitatService {
                 "                         AND along.CODE = 'common' " +
                 "                         AND NVL(along.IS_DELETED, 0) = 0 " +
                 " LEFT JOIN ( " +
-                "     SELECT det.SORT, a.RVCD, det.STCD " +
+                "     SELECT det.SORT,a.BASEID, a.RVCD, det.STCD " +
                 "       FROM MS_ALONGDET_B det " +
                 "       INNER JOIN MS_ALONG_B a ON a.ID = det.ALONG_ID " +
                 "      WHERE NVL(det.IS_DELETED, 0) = 0 " +
                 "        AND NVL(a.IS_DELETED, 0) = 0 " +
                 "        AND a.CODE = 'common' " +
-                " ) rstAlong ON rstAlong.RVCD = eng.HBRVCD AND rstAlong.STCD = childBase.RSTCD ";
+                " ) rstAlong ON rstAlong.BASEID = eng.BASE_ID AND rstAlong.STCD = childBase.RSTCD ";
         return "SELECT childBase.STCD, " +
                 "       childBase.STNM, " +
                 "       childBase.FHSTCD, " +
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java
index 864df8d9..d6cde63c 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java
@@ -446,25 +446,25 @@ public class FprMonitorServiceImpl implements FprMonitorService {
                 "LEFT JOIN SD_STTP_B sttp ON sttp.STTP_CODE = src.STTP " +
                 "  AND NVL(sttp.IS_DELETED, 0) = 0 " +
                 "  AND NVL(sttp.ENABLE, 1) = 1 " +
-                "LEFT JOIN MS_ALONG_B alongBase ON alongBase.RVCD = src.HBRVCD " +
+                "LEFT JOIN MS_ALONG_B alongBase ON alongBase.BASEID = src.BASE_ID " +
                 "  AND alongBase.CODE = 'common' " +
                 "  AND NVL(alongBase.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "  SELECT det.STCD, det.SORT, along.RVCD " +
+                "  SELECT det.STCD, det.SORT,along.BASEID, along.RVCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B along ON det.ALONG_ID = along.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 " +
                 "    AND NVL(along.IS_DELETED, 0) = 0 " +
                 "    AND along.CODE = 'common' " +
-                ") engSort ON engSort.RVCD = src.HBRVCD AND engSort.STCD = src.RSTCD " +
+                ") engSort ON engSort.BASEID = src.BASE_ID AND engSort.STCD = src.RSTCD " +
                 "LEFT JOIN ( " +
-                "  SELECT det.STCD, det.SORT, along.RVCD " +
+                "  SELECT det.STCD, det.SORT,along.BASEID, along.RVCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B along ON det.ALONG_ID = along.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 " +
                 "    AND NVL(along.IS_DELETED, 0) = 0 " +
                 "    AND along.CODE = 'common' " +
-                ") siteSort ON siteSort.RVCD = src.HBRVCD AND siteSort.STCD = src.STCD " +
+                ") siteSort ON siteSort.BASEID = src.BASE_ID AND siteSort.STCD = src.STCD " +
                 "WHERE NVL(src.IS_DELETED, 0) = 0 ";
     }
 
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/vd/service/impl/VdMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/vd/service/impl/VdMonitorServiceImpl.java
index e8b5c32c..e9955d81 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/vd/service/impl/VdMonitorServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/vd/service/impl/VdMonitorServiceImpl.java
@@ -834,10 +834,10 @@ public class VdMonitorServiceImpl implements VdMonitorService {
                 "  AND NVL(hbrv.IS_DELETED, 0) = 0 AND NVL(hbrv.ENABLED, 1) = 1 " +
                 "LEFT JOIN SD_STTP_B vdSttp ON vdSttp.STTP_CODE = src.STTP " +
                 "  AND NVL(vdSttp.IS_DELETED, 0) = 0 AND NVL(vdSttp.ENABLE, 1) = 1 " +
-                "LEFT JOIN (SELECT det.SORT, cfg.RVCD, det.STCD FROM MS_ALONGDET_B det " +
+                "LEFT JOIN (SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD FROM MS_ALONGDET_B det " +
                 "INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common') siteSort " +
-                "ON siteSort.RVCD = NVL(eng.HBRVCD, src.HBRVCD) AND siteSort.STCD = src.STCD " +
+                "ON siteSort.BASEID = src.BASE_ID AND siteSort.STCD = src.STCD " +
                 "WHERE src.STTP LIKE 'VD%' " +
                 "AND src.AI_EXT_CODE IS NOT NULL " +
                 "AND src.LGTD IS NOT NULL " +
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/warn/service/impl/WarnDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/warn/service/impl/WarnDataServiceImpl.java
index 678074c0..e95e6602 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/warn/service/impl/WarnDataServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/warn/service/impl/WarnDataServiceImpl.java
@@ -469,9 +469,9 @@ public class WarnDataServiceImpl implements WarnDataService {
         sql.append("INNER JOIN SD_AIMONITOR_B_H b ON a.STCD = b.STCD AND NVL(b.IS_DELETED, 0) = 0 AND b.STTP LIKE 'AI_%' ");
         sql.append("LEFT JOIN SD_ENGINFO_B_H eng ON b.RSTCD = eng.STCD AND NVL(eng.IS_DELETED, 0) = 0 ");
         sql.append("LEFT JOIN SD_HYDROBASE hb ON b.BASE_ID = hb.BASEID AND NVL(hb.IS_DELETED, 0) = 0 ");
-        sql.append("LEFT JOIN MS_ALONG_B along ON b.HBRVCD = along.RVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ");
-        sql.append("LEFT JOIN (SELECT det.SORT, cfg.RVCD, det.STCD FROM MS_ALONGDET_B det INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common') rstSort ON rstSort.RVCD = b.HBRVCD AND rstSort.STCD = b.RSTCD ");
-        sql.append("LEFT JOIN (SELECT det.SORT, cfg.RVCD, det.STCD FROM MS_ALONGDET_B det INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common') siteSort ON siteSort.RVCD = b.HBRVCD AND siteSort.STCD = b.STCD ");
+        sql.append("LEFT JOIN MS_ALONG_B along ON b.BASEID = along.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ");
+        sql.append("LEFT JOIN (SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD FROM MS_ALONGDET_B det INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common') rstSort ON rstSort.BASEID = b.BASE_ID AND rstSort.STCD = b.RSTCD ");
+        sql.append("LEFT JOIN (SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD FROM MS_ALONGDET_B det INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common') siteSort ON siteSort.BASEID = b.BASE_ID AND siteSort.STCD = b.STCD ");
         sql.append("WHERE NVL(a.IS_DELETED, 0) = 0 ");
         sql.append("AND a.FID NOT LIKE '%ORA-%' AND a.FID NOT LIKE '%Out%' ");
 
@@ -540,9 +540,9 @@ public class WarnDataServiceImpl implements WarnDataService {
         sql.append("INNER JOIN SD_AIMONITOR_B_H b ON a.STCD = b.STCD AND NVL(b.IS_DELETED, 0) = 0 AND b.STTP LIKE 'AI_%' ");
         sql.append("LEFT JOIN SD_ENGINFO_B_H eng ON b.RSTCD = eng.STCD AND NVL(eng.IS_DELETED, 0) = 0 ");
         sql.append("LEFT JOIN SD_HYDROBASE hb ON b.BASE_ID = hb.BASEID AND NVL(hb.IS_DELETED, 0) = 0 ");
-        sql.append("LEFT JOIN MS_ALONG_B along ON b.HBRVCD = along.RVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ");
-        sql.append("LEFT JOIN (SELECT det.SORT, cfg.RVCD, det.STCD FROM MS_ALONGDET_B det INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common') rstSort ON rstSort.RVCD = b.HBRVCD AND rstSort.STCD = b.RSTCD ");
-        sql.append("LEFT JOIN (SELECT det.SORT, cfg.RVCD, det.STCD FROM MS_ALONGDET_B det INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common') siteSort ON siteSort.RVCD = b.HBRVCD AND siteSort.STCD = b.STCD ");
+        sql.append("LEFT JOIN MS_ALONG_B along ON b.BASE_ID = along.BASEID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ");
+        sql.append("LEFT JOIN (SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD FROM MS_ALONGDET_B det INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common') rstSort ON rstSort.BASEID = b.BASE_ID AND rstSort.STCD = b.RSTCD ");
+        sql.append("LEFT JOIN (SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD FROM MS_ALONGDET_B det INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common') siteSort ON siteSort.BASEID = b.BASE_ID AND siteSort.STCD = b.STCD ");
         sql.append("WHERE a.IS_DELETED = 0 ");
 //        sql.append("AND (a.TASK_STATUS IS NULL OR a.TASK_STATUS = 'Approved') ");
         sql.append("AND a.FID NOT LIKE '%ORA-%' AND a.FID NOT LIKE '%Out%' ");
@@ -1154,19 +1154,19 @@ public class WarnDataServiceImpl implements WarnDataService {
                 "NVL(siteSort.SORT, 999999) AS siteStepSort " +
                 "FROM SD_ENGINFO_B_H eng " +
                 "LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = eng.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN MS_ALONG_B along ON along.BASEID = eng.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = eng.STCD " +
+                ") rstSort ON rstSort.BASEID = eng.BASE_ID AND rstSort.STCD = eng.STCD " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = eng.STCD " +
+                ") siteSort ON siteSort.BASEID = eng.BASE_ID AND siteSort.STCD = eng.STCD " +
                 "WHERE NVL(eng.IS_DELETED, 0) = 0 " +
                 "AND NVL(eng.USFL, 0) = 1 " +
                 "AND eng.LGTD IS NOT 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 1fe1ebfe..7c606e32 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
@@ -1342,17 +1342,17 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
                 "LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD " +
                 "LEFT JOIN SD_ADDVCD_DIC addv ON addv.ADDVCD = eng.ADDVCD " +
                 "LEFT JOIN SD_FHBT_B_H fh ON fh.STCD = wq.FHSTCD AND NVL(fh.IS_DELETED, 0) = 0 " +
-                "LEFT JOIN MS_ALONG_B rvAlong ON rvAlong.RVCD = eng.HBRVCD AND rvAlong.CODE = 'common' AND NVL(rvAlong.IS_DELETED, 0) = 0 " +
-                "LEFT JOIN (SELECT det.SORT, along.RVCD, det.STCD " +
+                "LEFT JOIN MS_ALONG_B rvAlong ON rvAlong.BASEID = wq.BASE_ID AND rvAlong.CODE = 'common' AND NVL(rvAlong.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN (SELECT det.SORT,along.BASEID, along.RVCD, det.STCD " +
                 "           FROM MS_ALONGDET_B det " +
                 "           INNER JOIN MS_ALONG_B along ON det.ALONG_ID = along.ID " +
                 "           WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(along.IS_DELETED, 0) = 0 AND along.CODE = 'common') rstAlong " +
-                "       ON rstAlong.RVCD = eng.HBRVCD AND rstAlong.STCD = wq.RSTCD " +
-                "LEFT JOIN (SELECT det.SORT, along.RVCD, det.STCD " +
+                "       ON rstAlong.BASEID = wq.BASE_ID AND rstAlong.STCD = wq.RSTCD " +
+                "LEFT JOIN (SELECT det.SORT,along.BASEID, along.RVCD, det.STCD " +
                 "           FROM MS_ALONGDET_B det " +
                 "           INNER JOIN MS_ALONG_B along ON det.ALONG_ID = along.ID " +
                 "           WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(along.IS_DELETED, 0) = 0 AND along.CODE = 'common') siteAlong " +
-                "       ON siteAlong.RVCD = eng.HBRVCD AND siteAlong.STCD = wq.STCD " +
+                "       ON siteAlong.BASEID = wq.BASE_ID AND siteAlong.STCD = wq.STCD " +
                 "WHERE wq.STTP IN ('WQ', 'WQFB') AND NVL(wq.IS_DELETED, 0) = 0";
     }
 
@@ -1824,17 +1824,17 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
                 "LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = wq.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD " +
                 "LEFT JOIN SD_ADDVCD_DIC addv ON addv.ADDVCD = eng.ADDVCD " +
-                "LEFT JOIN MS_ALONG_B rvAlong ON rvAlong.RVCD = eng.HBRVCD AND rvAlong.CODE = 'common' AND NVL(rvAlong.IS_DELETED, 0) = 0 " +
-                "LEFT JOIN (SELECT det.SORT, along.RVCD, det.STCD " +
+                "LEFT JOIN MS_ALONG_B rvAlong ON rvAlong.BASEID = wq.BASE_ID AND rvAlong.CODE = 'common' AND NVL(rvAlong.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN (SELECT det.SORT,cfg.BASEID, along.RVCD, det.STCD " +
                 "           FROM MS_ALONGDET_B det " +
                 "           INNER JOIN MS_ALONG_B along ON det.ALONG_ID = along.ID " +
                 "           WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(along.IS_DELETED, 0) = 0 AND along.CODE = 'common') rstAlong " +
-                "       ON rstAlong.RVCD = eng.HBRVCD AND rstAlong.STCD = wq.RSTCD " +
-                "LEFT JOIN (SELECT det.SORT, along.RVCD, det.STCD " +
+                "       ON rstAlong.BASEID = wq.BASE_ID AND rstAlong.STCD = wq.RSTCD " +
+                "LEFT JOIN (SELECT det.SORT,cfg.BASEID, along.RVCD, det.STCD " +
                 "           FROM MS_ALONGDET_B det " +
                 "           INNER JOIN MS_ALONG_B along ON det.ALONG_ID = along.ID " +
                 "           WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(along.IS_DELETED, 0) = 0 AND along.CODE = 'common') siteAlong " +
-                "       ON siteAlong.RVCD = eng.HBRVCD AND siteAlong.STCD = wq.STCD " +
+                "       ON siteAlong.BASEID = wq.BASE_ID AND siteAlong.STCD = wq.STCD " +
                 "WHERE wq.STTP = 'WQ' AND NVL(wq.IS_DELETED, 0) = 0";
     }
 
@@ -2264,17 +2264,17 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
                 "LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.HBRVCD = eng.HBRVCD AND hbrv.BASEID = wq.BASE_ID AND NVL(hbrv.IS_DELETED, 0) = 0 AND NVL(hbrv.ENABLED, 1) = 1 " +
                 "LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD " +
                 "LEFT JOIN SD_ADDVCD_DIC addv ON addv.ADDVCD = eng.ADDVCD " +
-                "LEFT JOIN MS_ALONG_B rvAlong ON rvAlong.RVCD = eng.HBRVCD AND rvAlong.CODE = 'common' AND NVL(rvAlong.IS_DELETED, 0) = 0 " +
-                "LEFT JOIN (SELECT det.SORT, along.RVCD, det.STCD " +
+                "LEFT JOIN MS_ALONG_B rvAlong ON rvAlong.BASEID = wq.BASE_ID AND rvAlong.CODE = 'common' AND NVL(rvAlong.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN (SELECT det.SORT,along.BASEID, along.RVCD, det.STCD " +
                 "           FROM MS_ALONGDET_B det " +
                 "           INNER JOIN MS_ALONG_B along ON det.ALONG_ID = along.ID " +
                 "           WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(along.IS_DELETED, 0) = 0 AND along.CODE = 'common') rstAlong " +
-                "       ON rstAlong.RVCD = eng.HBRVCD AND rstAlong.STCD = wq.RSTCD " +
-                "LEFT JOIN (SELECT det.SORT, along.RVCD, det.STCD " +
+                "       ON rstAlong.RVCD = wq.BASE_ID AND rstAlong.STCD = wq.RSTCD " +
+                "LEFT JOIN (SELECT det.SORT,along.BASEID, along.RVCD, det.STCD " +
                 "           FROM MS_ALONGDET_B det " +
                 "           INNER JOIN MS_ALONG_B along ON det.ALONG_ID = along.ID " +
                 "           WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(along.IS_DELETED, 0) = 0 AND along.CODE = 'common') siteAlong " +
-                "       ON siteAlong.RVCD = eng.HBRVCD AND siteAlong.STCD = wq.STCD " +
+                "       ON siteAlong.BASEID = wq.BASE_ID AND siteAlong.STCD = wq.STCD " +
                 "WHERE wq.STTP = 'WQ' AND NVL(wq.IS_DELETED, 0) = 0";
     }
 
@@ -4617,19 +4617,19 @@ public class EnvWqDataServiceImpl implements EnvWqDataService {
                 .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 MS_ALONG_B along ON along.BASEID = t.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ")
                 .append("LEFT JOIN ( ")
-                .append("   SELECT det.SORT, cfg.RVCD, det.STCD ")
+                .append("   SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD ")
                 .append("   FROM MS_ALONGDET_B det ")
                 .append("   INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID ")
                 .append("   WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' ")
-                .append(") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = t.RSTCD ")
+                .append(") rstSort ON rstSort.BASEID = t.BASE_ID AND rstSort.STCD = t.RSTCD ")
                 .append("LEFT JOIN ( ")
-                .append("   SELECT det.SORT, cfg.RVCD, det.STCD ")
+                .append("   SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD ")
                 .append("   FROM MS_ALONGDET_B det ")
                 .append("   INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID ")
                 .append("   WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' ")
-                .append(") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = t.STCD ")
+                .append(") siteSort ON siteSort.BASEID = t.BASE_ID AND siteSort.STCD = t.STCD ")
                 .append("WHERE NVL(t.IS_DELETED, 0) = 0 ")
                 .append("AND NVL(t.USFL, 1) = 1 ");
 
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 c9a01bc6..812c3674 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
@@ -1306,21 +1306,21 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService {
                 .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = wt.RSTCD  ")
                 .append("LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = eng.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 ")
                 .append("LEFT JOIN (")
-                .append("    SELECT det.STCD, det.SORT, along.RVCD ")
+                .append("    SELECT det.STCD, det.SORT,along.BASEID, along.RVCD ")
                 .append("    FROM MS_ALONGDET_B det ")
                 .append("    INNER JOIN MS_ALONG_B along ON along.ID = det.ALONG_ID ")
                 .append("    WHERE NVL(det.IS_DELETED, 0) = 0 ")
                 .append("      AND NVL(along.IS_DELETED, 0) = 0 ")
                 .append("      AND along.CODE = 'common'")
-                .append(") rstSort ON rstSort.STCD = wt.RSTCD AND rstSort.RVCD = eng.HBRVCD ")
+                .append(") rstSort ON rstSort.STCD = wt.RSTCD AND rstSort.BASEID = wt.BASE_ID ")
                 .append("LEFT JOIN (")
-                .append("    SELECT det.STCD, det.SORT, along.RVCD ")
+                .append("    SELECT det.STCD, det.SORT,along.BASEID, along.RVCD ")
                 .append("    FROM MS_ALONGDET_B det ")
                 .append("    INNER JOIN MS_ALONG_B along ON along.ID = det.ALONG_ID ")
                 .append("    WHERE NVL(det.IS_DELETED, 0) = 0 ")
                 .append("      AND NVL(along.IS_DELETED, 0) = 0 ")
                 .append("      AND along.CODE = 'common'")
-                .append(") siteSort ON siteSort.STCD = wt.STCD AND siteSort.RVCD = eng.HBRVCD ")
+                .append(") siteSort ON siteSort.STCD = wt.STCD AND siteSort.BASEID = wt.BASE_ID ")
                 .append("WHERE NVL(wt.IS_DELETED, 0) = 0 ")
                 .append("  AND wt.STTP = 'WTVT' ")
                 .append("  AND NVL(wt.USFL, 0) = 1 ")
@@ -1381,21 +1381,21 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService {
                 .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = wt.RSTCD  ")
                 .append("LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = eng.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 ")
                 .append("LEFT JOIN (")
-                .append("    SELECT det.STCD, det.SORT, along.RVCD ")
+                .append("    SELECT det.STCD, det.SORT,along.BASEID, along.RVCD ")
                 .append("    FROM MS_ALONGDET_B det ")
                 .append("    INNER JOIN MS_ALONG_B along ON along.ID = det.ALONG_ID ")
                 .append("    WHERE NVL(det.IS_DELETED, 0) = 0 ")
                 .append("      AND NVL(along.IS_DELETED, 0) = 0 ")
                 .append("      AND along.CODE = 'common'")
-                .append(") rstSort ON rstSort.STCD = wt.RSTCD AND rstSort.RVCD = eng.HBRVCD ")
+                .append(") rstSort ON rstSort.STCD = wt.RSTCD AND rstSort.BASEID = wt.BASE_ID ")
                 .append("LEFT JOIN (")
-                .append("    SELECT det.STCD, det.SORT, along.RVCD ")
+                .append("    SELECT det.STCD, det.SORT,along.BASEID, along.RVCD ")
                 .append("    FROM MS_ALONGDET_B det ")
                 .append("    INNER JOIN MS_ALONG_B along ON along.ID = det.ALONG_ID ")
                 .append("    WHERE NVL(det.IS_DELETED, 0) = 0 ")
                 .append("      AND NVL(along.IS_DELETED, 0) = 0 ")
                 .append("      AND along.CODE = 'common'")
-                .append(") siteSort ON siteSort.STCD = wt.STCD AND siteSort.RVCD = eng.HBRVCD ")
+                .append(") siteSort ON siteSort.STCD = wt.STCD AND siteSort.BASEID = wt.BASE_ID ")
                 .append("WHERE NVL(wt.IS_DELETED, 0) = 0 ")
                 .append("  AND wt.STTP = 'WTVT' ")
                 .append("  AND NVL(wt.USFL, 0) = 1 ")
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java
index 26bc2a95..9a89714f 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java
@@ -1113,16 +1113,16 @@ public class WeFishServiceImpl implements WeFishService {
                 .append("    WHERE NVL(IS_DELETED, 0) = 0 AND STATUS = 1 ")
                 .append("    GROUP BY STCD ")
                 .append(") latest ON latest.STCD = section.STCD ")
-                .append("LEFT JOIN MS_ALONG_B along ON along.RVCD = section.HBRVCD ")
+                .append("LEFT JOIN MS_ALONG_B along ON along.BASEID = section.BASE_ID ")
                 .append("    AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 ")
                 .append("LEFT JOIN ( ")
-                .append("    SELECT det.SORT, cfg.RVCD, det.STCD ")
+                .append("    SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD ")
                 .append("    FROM MS_ALONGDET_B det ")
                 .append("    INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID ")
                 .append("    WHERE NVL(det.IS_DELETED, 0) = 0 ")
                 .append("      AND NVL(cfg.IS_DELETED, 0) = 0 ")
                 .append("      AND cfg.CODE = 'common' ")
-                .append(") siteSort ON siteSort.RVCD = section.HBRVCD AND siteSort.STCD = section.STCD ")
+                .append(") siteSort ON siteSort.BASEID = section.BASE_ID AND siteSort.STCD = section.STCD ")
                 .append("WHERE NVL(section.USFL, 1) = 1 ");
 
         String filterSql = buildWePointFilterCondition(dataSourceRequest.getFilter(), paramMap, new int[]{0});
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/impl/ZqMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/impl/ZqMonitorServiceImpl.java
index 85743199..972a77e1 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/impl/ZqMonitorServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/zq/service/impl/ZqMonitorServiceImpl.java
@@ -714,19 +714,19 @@ public class ZqMonitorServiceImpl implements ZqMonitorService {
                 "LEFT JOIN SD_HBRV_DIC hbrv ON hbrv.HBRVCD = eng.HBRVCD AND hbrv.BASEID = eng.BASE_ID " +
                 "  AND NVL(hbrv.IS_DELETED, 0) = 0 AND NVL(hbrv.ENABLED, 1) = 1 " +
                 "LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN MS_ALONG_B along ON along.BASEID = rb.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = rb.RSTCD " +
+                ") rstSort ON rstSort.BASEID = rb.BASE_ID AND rstSort.STCD = rb.RSTCD " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = rb.STCD " +
+                ") siteSort ON siteSort.BASEID = rb.BASE_ID AND siteSort.STCD = rb.STCD " +
                 "LEFT JOIN SD_VDINFO_B vdb ON vdb.CSTCD = rr.STCD AND NVL(vdb.USFL, 1) = 1 " +
                 "LEFT JOIN SD_VDINFO_R vdr ON vdr.STCD = vdb.STCD AND vdr.TM = rr.TM AND NVL(vdr.IS_DELETED, 0) = 0 " +
                 "WHERE NVL(rr.IS_DELETED, 0) = 0 " +
@@ -761,19 +761,19 @@ public class ZqMonitorServiceImpl implements ZqMonitorService {
                 "INNER JOIN SD_RIVER_B_H rb ON rb.STCD = day.STCD AND rb.STTP = 'ZQ' AND NVL(rb.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = rb.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = eng.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN MS_ALONG_B along ON along.BASEID = rb.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = rb.RSTCD " +
+                ") rstSort ON rstSort.BASEID = rb.BASE_ID AND rstSort.STCD = rb.RSTCD " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = rb.STCD " +
+                ") siteSort ON siteSort.BASEID = rb.BASE_ID AND siteSort.STCD = rb.STCD " +
                 "WHERE NVL(day.IS_DELETED, 0) = 0 ";
     }
 
@@ -808,19 +808,19 @@ public class ZqMonitorServiceImpl implements ZqMonitorService {
                 "INNER JOIN SD_RIVER_B_H rb ON rb.STCD = drtp.STCD AND rb.STTP = 'ZQ' AND NVL(rb.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = rb.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = eng.BASE_ID AND NVL(hb.IS_DELETED, 0) = 0 " +
-                "LEFT JOIN MS_ALONG_B along ON along.RVCD = eng.HBRVCD AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
+                "LEFT JOIN MS_ALONG_B along ON along.BASEID = rb.BASE_ID AND along.CODE = 'common' AND NVL(along.IS_DELETED, 0) = 0 " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") rstSort ON rstSort.RVCD = eng.HBRVCD AND rstSort.STCD = rb.RSTCD " +
+                ") rstSort ON rstSort.BASEID = rb.BASE_ID AND rstSort.STCD = rb.RSTCD " +
                 "LEFT JOIN ( " +
-                "  SELECT det.SORT, cfg.RVCD, det.STCD " +
+                "  SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD " +
                 "  FROM MS_ALONGDET_B det " +
                 "  INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID " +
                 "  WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' " +
-                ") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = rb.STCD " +
+                ") siteSort ON siteSort.BASEID = rb.BASE_ID AND siteSort.STCD = rb.STCD " +
                 "WHERE NVL(drtp.IS_DELETED, 0) = 0 ";
     }
 
@@ -2419,11 +2419,11 @@ public class ZqMonitorServiceImpl implements ZqMonitorService {
                 "LEFT JOIN SD_RVCD_DIC rv ON rv.RVCD = eng.RVCD\n" +
                 "LEFT JOIN SD_RIVER_B_H fh ON fh.STCD = rb.FHSTCD AND NVL(fh.IS_DELETED, 0) = 0\n" +
                 "LEFT JOIN (\n" +
-                "    SELECT det.SORT, cfg.RVCD, det.STCD\n" +
+                "    SELECT det.SORT,cfg.BASEID, cfg.RVCD, det.STCD\n" +
                 "    FROM MS_ALONGDET_B det\n" +
                 "    INNER JOIN MS_ALONG_B cfg ON det.ALONG_ID = cfg.ID\n" +
                 "    WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common'\n" +
-                ") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = rb.STCD\n" +
+                ") siteSort ON siteSort.BASEID = rb.BASE_ID AND siteSort.STCD = rb.STCD\n" +
                 "WHERE NVL(rb.IS_DELETED, 0) = 0 AND rb.STTP = 'ZQ' AND rb.LGTD IS NOT NULL AND rb.LTTD IS NOT NULL ");
 
         Map<String, Object> paramMap = new HashMap<>();