diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java
index ac2f579e..f0fa2ff4 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java
@@ -477,7 +477,8 @@ public class RescueInfoServiceImpl extends ServiceImpl<RescueInfoMapper, RescueI
             rescueInfo.setRescueStatus("2");
             rescueInfo.setRescueTime(new Date());
             baseMapper.insert(rescueInfo);
-            detailService.save(new RescueInfoDetail(rescueInfo.getId(), "0", "救援发起", "救援发起"));
+//            detailService.save(new RescueInfoDetail(rescueInfo.getId(), "0", "救援发起", "救援发起"));
+            detailService.save(new RescueInfoDetail(rescueInfo.getId(), "0", "救援发起", null));
 
             // TODO 暂时注掉 后面在看要不要完善
 //            // 自动通知对应路段司机
diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml
index 62a51618..2254e061 100644
--- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml
+++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml
@@ -90,7 +90,7 @@
                 <choose>
                     <when test="map.rescueStatus == '1'.toString()">
                         <!-- 救援中 -->
-                        and (ri.rescue_status = '1' or ri.rescue_status = '2' or ri.rescue_status = '3')
+                        and (ri.rescue_status = '1' or ri.rescue_status = '2' or ri.rescue_status = '3' or ri.rescue_status = '4')
                     </when>
                     <when test="map.rescueStatus == '2'.toString()">
                         <!--待支付 -->
@@ -446,8 +446,8 @@
         IFNULL(sum(roi.pay_money), 0) as yiskNum,
         IFNULL(sum(CASE WHEN roi.order_status = '1' THEN roi.set_money ELSE 0 END), 0) as dskNum
         FROM rescue_info ri
-        left join rescue_order_info roi on roi.rescue_info_id = ri.id
-        where 1 = 1
+        left join rescue_order_info roi on roi.rescue_info_id = ri.id AND roi.deleted = 0
+        where 1 = 1 AND ri.deleted = 0
         <if test="map.deptList != null and map.deptList.size()>0">
             and ri.dept_id in
             <foreach collection="map.deptList" separator="," item="item" open="(" close=")">
@@ -473,8 +473,8 @@
         IFNULL(sum(roi.pay_money), 0) as yiskNum,
         IFNULL(sum(CASE WHEN roi.order_status = '1' THEN roi.set_money ELSE 0 END), 0) as dskNum
         FROM rescue_info ri
-        left join rescue_order_info roi on roi.rescue_info_id = ri.id
-        where 1 = 1
+        left join rescue_order_info roi on roi.rescue_info_id = ri.id AND roi.deleted = 0
+        where 1 = 1 AND ri.deleted = 0
           AND ri.second_dispatch_id = #{map.userId}
         <if test="map.deptList != null and map.deptList.size()>0">
             and ri.dept_id in