diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java
index 0a17e20..0f63f54 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java
@@ -87,7 +87,7 @@ public class WxCounselorController extends BaseController {
      * 预约处理列表
      */
     @GetMapping("/reservation/pageList")
-    public TableDataInfo<ReservationCounselorOrderVo> reservationPageList(PageQuery pageQuery) {
+    public TableDataInfo<ReservationOrderListVo> reservationPageList(PageQuery pageQuery) {
         return reservationService.queryReservationPageList(pageQuery);
     }
 
@@ -142,7 +142,7 @@ public class WxCounselorController extends BaseController {
      * @return
      */
     @GetMapping("/reservation/order")
-    public R<List<ReservationCounselorOrderVo>> getReservationOrder(String time) {
+    public R<List<ReservationOrderListVo>> getReservationOrder(String time) {
         Long userId = LoginHelper.getUserId();
         return R.ok(reservationService.selectOrderList(time, userId));
     }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java
index 96bb717..1ab916c 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java
@@ -46,8 +46,8 @@ public class WxMyController extends BaseController {
      * 查询我的测评任务
      */
     @GetMapping("/evaluation/task/pageList")
-    public TableDataInfo<SysEvaluationRecordVo> list(PageQuery pageQuery) {
-        return myService.queryEvaluationRecordPageList(pageQuery);
+    public TableDataInfo<SysEvaluationRecordVo> taskList(PageQuery pageQuery) {
+        return myService.queryPersonalEvaluationRecordPageList(pageQuery);
     }
 
     /**
@@ -65,4 +65,12 @@ public class WxMyController extends BaseController {
     public TableDataInfo<ReservationOrderVo> list(ReservationOrderBo bo, PageQuery pageQuery) {
         return myService.queryReservationPageList(bo, pageQuery);
     }
+
+    /**
+     * 查询团队测评
+     */
+    @GetMapping("/evaluation/publish/pageList")
+    public TableDataInfo<SysEvaluationRecordVo> publishList(PageQuery pageQuery) {
+        return myService.queryPublishEvaluationRecordPageList(pageQuery);
+    }
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxReservationController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxReservationController.java
deleted file mode 100644
index 9000356..0000000
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxReservationController.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.dromara.scale.controller.wx;
-
-import lombok.RequiredArgsConstructor;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.scale.service.IReservationService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>预约<p>
- *
- * @author cjw
- * @version V1.0.0
- * @date 2024/9/23 14:23
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/wx/reservation/")
-public class WxReservationController extends BaseController {
-
-    private IReservationService reservationService;
-
-    /**
-     * 查询咨询师预约列表
-     */
-//    @GetMapping("/user/reservation/pageList")
-//    public TableDataInfo<ReservationVo> userReservationOrderList(PageQuery pageQuery) {
-//        Long userId = LoginHelper.getUserId();
-//        return reservationService.queryPageList(bo, pageQuery);
-//    }
-}
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationCounselorOrderVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderListVo.java
similarity index 81%
rename from ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationCounselorOrderVo.java
rename to ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderListVo.java
index c223371..0259860 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationCounselorOrderVo.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderListVo.java
@@ -6,14 +6,14 @@ import java.io.Serial;
 import java.io.Serializable;
 
 /**
- * <p>预约订单<p>
+ * <p>预约和订单的列表展示类<p>
  *
  * @author cjw
  * @version V1.0.0
  * @date 2024/8/20 10:23
  */
 @Data
-public class ReservationCounselorOrderVo implements Serializable {
+public class ReservationOrderListVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java
index 2f2acf0..f8fc4b1 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java
@@ -6,7 +6,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.scale.domain.ReservationDay;
 import org.dromara.scale.domain.vo.ReservationDateVo;
 import org.dromara.scale.domain.vo.ReservationDayVo;
-import org.dromara.scale.domain.vo.ReservationCounselorOrderVo;
+import org.dromara.scale.domain.vo.ReservationOrderListVo;
 
 import java.util.List;
 
@@ -23,5 +23,5 @@ public interface ReservationDayMapper extends BaseMapperPlus<ReservationDay, Res
 
     List<ReservationDateVo> selectNotUseDateList(@Param("time") String time, @Param("userId") Long userId);
 
-    List<ReservationCounselorOrderVo> selectOrderList(@Param("time") String time, @Param("userId") Long userId);
+    List<ReservationOrderListVo> selectOrderList(@Param("time") String time, @Param("userId") Long userId);
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationTimeMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationTimeMapper.java
index debb60f..df30c80 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationTimeMapper.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationTimeMapper.java
@@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.scale.domain.ReservationTime;
-import org.dromara.scale.domain.vo.ReservationCounselorOrderVo;
+import org.dromara.scale.domain.vo.ReservationOrderListVo;
 import org.dromara.scale.domain.vo.ReservationTimeVo;
 
 /**
@@ -17,6 +17,6 @@ import org.dromara.scale.domain.vo.ReservationTimeVo;
 @Mapper
 public interface ReservationTimeMapper extends BaseMapperPlus<ReservationTime, ReservationTimeVo> {
 
-    Page<ReservationCounselorOrderVo> selectPageList(@Param("page") Page<ReservationTime> page, @Param("counselorId") Long counselorId);
+    Page<ReservationOrderListVo> selectPageList(@Param("page") Page<ReservationTime> page, @Param("counselorId") Long counselorId);
 
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java
index 139ac4b..0591589 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IMyService.java
@@ -15,7 +15,8 @@ public interface IMyService {
 
     List<StatisticNumVo> getMyNum();
 
-    TableDataInfo<SysEvaluationRecordVo> queryEvaluationRecordPageList(PageQuery pageQuery);
+    TableDataInfo<SysEvaluationRecordVo> queryPersonalEvaluationRecordPageList(PageQuery pageQuery);
+    TableDataInfo<SysEvaluationRecordVo> queryPublishEvaluationRecordPageList(PageQuery pageQuery);
 
     TableDataInfo<SysScaleVo> queryScalePageList(SysScaleBo bo, PageQuery pageQuery);
 
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java
index f962103..31252e7 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java
@@ -5,7 +5,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.scale.domain.bo.ReservationDayBo;
 import org.dromara.scale.domain.bo.SysInterveneRecordBo;
 import org.dromara.scale.domain.vo.ReservationDateVo;
-import org.dromara.scale.domain.vo.ReservationCounselorOrderVo;
+import org.dromara.scale.domain.vo.ReservationOrderListVo;
 import org.dromara.scale.domain.vo.ReservationDayVo;
 
 import java.util.List;
@@ -19,7 +19,7 @@ public interface IReservationService {
      * @param pageQuery 分页参数
      * @return 心理咨询师分页列表
      */
-    TableDataInfo<ReservationCounselorOrderVo> queryReservationPageList(PageQuery pageQuery);
+    TableDataInfo<ReservationOrderListVo> queryReservationPageList(PageQuery pageQuery);
 
     /**
      * 新增预约
@@ -35,7 +35,7 @@ public interface IReservationService {
 
     List<ReservationDayVo> selectTimeListBy7Day(Long counselorId);
 
-    List<ReservationCounselorOrderVo> selectOrderList(String time, Long counselorId);
+    List<ReservationOrderListVo> selectOrderList(String time, Long counselorId);
 
     /**
      * 新增干预记录
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java
index 278a230..21b3d4a 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java
@@ -70,19 +70,15 @@ public class MyServiceImpl implements IMyService {
     }
 
     @Override
-    public TableDataInfo<SysEvaluationRecordVo> queryEvaluationRecordPageList(PageQuery pageQuery) {
+    public TableDataInfo<SysEvaluationRecordVo> queryPersonalEvaluationRecordPageList(PageQuery pageQuery) {
         Long userId = LoginHelper.getUserId();
-        LambdaQueryWrapper<SysEvaluationRecord> lqw = Wrappers.lambdaQuery();
-        lqw.eq(SysEvaluationRecord::getUserId, userId);
-        lqw.orderByDesc(SysEvaluationRecord::getCreateTime);
-        Page<SysEvaluationRecordVo> result = evaluationRecordMapper.selectRecordVoPage(pageQuery.build(), lqw);
-        List<SysEvaluationRecordVo> records = result.getRecords();
-        for (SysEvaluationRecordVo record : records) {
-            SysScale scale = scaleMapper.selectById(record.getScaleId());
-            String s = ossService.selectUrlByIds(String.valueOf(scale.getAppCover()));
-            record.setAppCoverUrl(s);
-        }
-        return TableDataInfo.build(result);
+        return queryEvaluationRecordPageList(userId, 0, pageQuery);
+    }
+
+    @Override
+    public TableDataInfo<SysEvaluationRecordVo> queryPublishEvaluationRecordPageList(PageQuery pageQuery) {
+        Long userId = LoginHelper.getUserId();
+        return queryEvaluationRecordPageList(userId, 1, pageQuery);
     }
 
     @Override
@@ -101,4 +97,20 @@ public class MyServiceImpl implements IMyService {
             new LambdaQueryWrapper<ReservationOrder>().eq(ReservationOrder::getCreateBy, userId));
         return TableDataInfo.build(page);
     }
+
+    private TableDataInfo<SysEvaluationRecordVo> queryEvaluationRecordPageList(Long userId, int flag, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysEvaluationRecord> lqw = Wrappers.lambdaQuery();
+        lqw.eq(SysEvaluationRecord::getUserId, userId);
+        //根据flag查询个人或发布
+        lqw.eq(SysEvaluationRecord::getPublishFlag, flag);
+        lqw.orderByDesc(SysEvaluationRecord::getCreateTime);
+        Page<SysEvaluationRecordVo> result = evaluationRecordMapper.selectRecordVoPage(pageQuery.build(), lqw);
+        List<SysEvaluationRecordVo> records = result.getRecords();
+        for (SysEvaluationRecordVo record : records) {
+            SysScale scale = scaleMapper.selectById(record.getScaleId());
+            String s = ossService.selectUrlByIds(String.valueOf(scale.getAppCover()));
+            record.setAppCoverUrl(s);
+        }
+        return TableDataInfo.build(result);
+    }
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java
index 7676de6..a832dfe 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java
@@ -15,7 +15,7 @@ import org.dromara.scale.domain.ReservationOrder;
 import org.dromara.scale.domain.ReservationTime;
 import org.dromara.scale.domain.bo.ReservationDayBo;
 import org.dromara.scale.domain.bo.SysInterveneRecordBo;
-import org.dromara.scale.domain.vo.ReservationCounselorOrderVo;
+import org.dromara.scale.domain.vo.ReservationOrderListVo;
 import org.dromara.scale.domain.vo.ReservationDateVo;
 import org.dromara.scale.domain.vo.ReservationDayVo;
 import org.dromara.scale.mapper.ReservationDayMapper;
@@ -44,13 +44,14 @@ public class ReservationServiceImpl implements IReservationService {
 
     /**
      * 预约处理列表 -只捞取未完成的数据
+     *
      * @param pageQuery 分页参数
      * @return
      */
     @Override
-    public TableDataInfo<ReservationCounselorOrderVo> queryReservationPageList(PageQuery pageQuery) {
+    public TableDataInfo<ReservationOrderListVo> queryReservationPageList(PageQuery pageQuery) {
         Long userId = LoginHelper.getUserId();
-        Page<ReservationCounselorOrderVo> result = timeMapper.selectPageList(pageQuery.build(), userId);
+        Page<ReservationOrderListVo> result = timeMapper.selectPageList(pageQuery.build(), userId);
         return TableDataInfo.build(result);
     }
 
@@ -119,7 +120,7 @@ public class ReservationServiceImpl implements IReservationService {
     }
 
     @Override
-    public List<ReservationCounselorOrderVo> selectOrderList(String time, Long counselorId) {
+    public List<ReservationOrderListVo> selectOrderList(String time, Long counselorId) {
         return dayMapper.selectOrderList(time, counselorId);
     }
 
@@ -127,8 +128,12 @@ public class ReservationServiceImpl implements IReservationService {
     public Boolean insertIntervene(SysInterveneRecordBo bo) {
         Long orderId = bo.getBatchNo();
         ReservationOrder reservationOrder = reservationOrderMapper.selectById(orderId);
-        if (reservationOrder == null || reservationOrder.getOrderStatus() !=1) {
-           throw new ServiceException("订单状态异常，请确认后再提交");
+        if (reservationOrder == null || reservationOrder.getOrderStatus() != 1) {
+            throw new ServiceException("订单状态异常，请确认后再提交");
+        }
+        Long timeId = bo.getInterveneId();
+        if (timeId == null) {
+            throw new ServiceException("必要参数为空，请确认后再提交");
         }
         ReservationOrder orderUpdate = new ReservationOrder();
         orderUpdate.setDiagnose(bo.getDiagnose());
@@ -137,7 +142,7 @@ public class ReservationServiceImpl implements IReservationService {
         orderUpdate.setId(orderId);
         boolean orderFlag = reservationOrderMapper.updateById(orderUpdate) > 0;
         ReservationTime timeUpdate = new ReservationTime();
-        timeUpdate.setId(bo.getInterveneId());
+        timeUpdate.setId(timeId);
         timeUpdate.setStatus(2);
         boolean timeFlag = timeMapper.updateById(timeUpdate) > 0;
         return orderFlag && timeFlag;
diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml
index 4c5edd7..3f82b8b 100644
--- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml
+++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml
@@ -27,7 +27,7 @@
           and DATE_FORMAT(rd.day_time, '%Y-%m') = #{time}
     </select>
 
-    <select id="selectOrderList" resultType="org.dromara.scale.domain.vo.ReservationCounselorOrderVo">
+    <select id="selectOrderList" resultType="org.dromara.scale.domain.vo.ReservationOrderListVo">
         select u.nick_name                         as name,
                rt.id                               as timeId,
                ro.id                               as orderId,
diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationTimeMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationTimeMapper.xml
index c290d40..65152e4 100644
--- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationTimeMapper.xml
+++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationTimeMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.scale.mapper.ReservationTimeMapper">
 
-    <select id="selectPageList" resultType="org.dromara.scale.domain.vo.ReservationCounselorOrderVo">
+    <select id="selectPageList" resultType="org.dromara.scale.domain.vo.ReservationOrderListVo">
         select u.nick_name                          as name,
                rt.id                                as timeId,
                ro.id                                as orderId,