diff --git a/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java
index c586277..3cae586 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java
@@ -70,6 +70,7 @@ public interface AssessTeamRatingMapper extends BaseMapper<AssessTeamRating> {
                 <if test="obj.status != null">
                     and t.rectify_status = #{obj.status}
                 </if>
+                order by t.rectify_status asc,t.rectify_last_date desc
             </script>
              """)
     Page<AssessRectifyVo> listPage(Page<AssessRectifyVo> page,@Param("obj") AssessTaskPageSo page1);
diff --git a/src/main/java/com/gunshi/project/xyt/service/ForecastService.java b/src/main/java/com/gunshi/project/xyt/service/ForecastService.java
index a7e4967..d8fb54c 100644
--- a/src/main/java/com/gunshi/project/xyt/service/ForecastService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/ForecastService.java
@@ -81,8 +81,8 @@ public class ForecastService {
         harry : for(ForeRainVo vo : rainLevelVos){
             BigDecimal lgtd = new BigDecimal(vo.getLgtd());
             BigDecimal lttd = new BigDecimal(vo.getLttd());
-            for(int i = 0;i < nh;i++){
-                for(int j=0;j< nw;j++){
+            for(int i = 0;i < nw;i++){
+                for(int j=0;j< nh;j++){
                     BigDecimal xMin = x11.add(dh.multiply(BigDecimal.valueOf(i)));
                     BigDecimal xMax = x11.add(dh.multiply(BigDecimal.valueOf(i+1)));
                     BigDecimal yMin = y11.add(dw.multiply(BigDecimal.valueOf(j)));
@@ -195,11 +195,11 @@ public class ForecastService {
             List<ForeRainTimeVo> resultList = getData(vo,total,detail);
             vo.setTimeRainVos(resultList);
             vo.setH1(resultList.get(0).getDrp());
-            List<ForeRainTimeVo> list3=resultList.subList(0, Math.min(3, list.size()));
+            List<ForeRainTimeVo> list3=resultList.subList(0, Math.min(3, resultList.size()));
             vo.setH3(list3.stream().map(ForeRainTimeVo::getDrp).reduce(BigDecimal.ZERO, BigDecimal::add));
-            List<ForeRainTimeVo> list6=resultList.subList(0, Math.min(6, list.size()));
+            List<ForeRainTimeVo> list6=resultList.subList(0, Math.min(6, resultList.size()));
             vo.setH6(list6.stream().map(ForeRainTimeVo::getDrp).reduce(BigDecimal.ZERO, BigDecimal::add));
-            List<ForeRainTimeVo> list12=resultList.subList(0, Math.min(12, list.size()));
+            List<ForeRainTimeVo> list12=resultList.subList(0, Math.min(12, resultList.size()));
             vo.setH12(list12.stream().map(ForeRainTimeVo::getDrp).reduce(BigDecimal.ZERO, BigDecimal::add));
         }
         return list.stream().sorted(Comparator.comparing(ForeRainVo::getH24).reversed()).collect(Collectors.toList());
@@ -219,8 +219,8 @@ public class ForecastService {
         BigDecimal lttd = new BigDecimal(vo.getLttd());
         int rownum = 0;
         int colnum = 0;
-        for(int i = 0;i < nh;i++){
-            for(int j=0;j< nw;j++){
+        for(int i = 0;i < nw;i++){
+            for(int j=0;j< nh;j++){
                 BigDecimal xMin = x11.add(dh.multiply(BigDecimal.valueOf(i)));
                 BigDecimal xMax = x11.add(dh.multiply(BigDecimal.valueOf(i+1)));
                 BigDecimal yMin = y11.add(dw.multiply(BigDecimal.valueOf(j)));
diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java
index c095801..2640070 100644
--- a/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java
@@ -1,6 +1,7 @@
 package com.gunshi.project.xyt.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -249,6 +250,9 @@ public class OsmoticShiftRService extends ServiceImpl<OsmoticShiftRMapper, Osmot
 
     public List<OsmoticShiftListVo> listValue() {
         List<OsmoticShiftListVo> list = baseMapper.listValue();
+        if(CollectionUtils.isEmpty(list)){
+            return list;
+        }
         OsmoticQuerySo so = new OsmoticQuerySo();
         List<String> stationCodes = list.stream().map(OsmoticShiftListVo::getStationCode).collect(Collectors.toList());
         String maxTm = list.stream().filter(o->o.getTm() != null).max(Comparator.comparing(OsmoticShiftListVo::getTm)).get().getTm();