diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/FishStatisticsServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/FishStatisticsServiceImpl.java
index 2b43bbe..8e975ed 100644
--- a/backend/src/main/java/com/yfd/platform/data/service/impl/FishStatisticsServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/data/service/impl/FishStatisticsServiceImpl.java
@@ -34,14 +34,18 @@ public class FishStatisticsServiceImpl implements IFishStatisticsService {
 //        List<String> basinNames = parseFilterList(basinNamesStr);
 //        List<String> stationNames = parseFilterList(stationNamesStr);
 
-        int take = dataSourceRequest.getTake();
-        int skip = dataSourceRequest.getSkip();
-        if (take <= 0) {
-            take = 20;
+        int currentPage = dataSourceRequest.getSkip();
+        int pageSize = dataSourceRequest.getTake();
+
+        if (currentPage <= 0) {
+            currentPage = 1;
+        }
+        if (pageSize <= 0) {
+            pageSize = 20;
         }
 
-        int startRow = skip;
-        int endRow = skip + take;
+        int startRow = (currentPage - 1) * pageSize;
+        int endRow = startRow + pageSize;
 
         List<FishStatisticsVO> records = fishStatisticsMapper.queryStatistics(
                 basinNamesStr, stationNamesStr, startRow, endRow);
@@ -51,8 +55,8 @@ public class FishStatisticsServiceImpl implements IFishStatisticsService {
         Page<FishStatisticsVO> page = new Page<>();
         page.setRecords(records);
         page.setTotal(total);
-        page.setSize(take);
-        page.setCurrent(skip / take + 1L);
+        page.setSize(pageSize);
+        page.setCurrent(currentPage);
 
         return page;
     }
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index 59a6a5c..d8e6c7e 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: devtw
 
 jasypt:
   encryptor:
diff --git a/backend/src/main/resources/mapper/data/FishStatisticsMapper.xml b/backend/src/main/resources/mapper/data/FishStatisticsMapper.xml
index 1680c7b..a08d7de 100644
--- a/backend/src/main/resources/mapper/data/FishStatisticsMapper.xml
+++ b/backend/src/main/resources/mapper/data/FishStatisticsMapper.xml
@@ -178,7 +178,7 @@
         SELECT * FROM (
         SELECT
         t.*,
-        ROW_NUMBER() OVER (ORDER BY t.REPORT_MONTH, t.USER_ID) AS rn
+        ROW_NUMBER() OVER (ORDER BY t.MIN_BASIN_CODE,t.MIN_STATION_CODE,t.REPORT_MONTH,t.MIN_STRDT) AS rn
         FROM (
         <include refid="statisticsQuery"/>
         ) t  ORDER BY t.MIN_BASIN_CODE,t.MIN_STATION_CODE,t.REPORT_MONTH,t.MIN_STRDT