diff --git a/src/main/java/com/example/caseData/controller/CaseExchangeController.java b/src/main/java/com/example/caseData/controller/CaseExchangeController.java
index 175a7f3..2398291 100644
--- a/src/main/java/com/example/caseData/controller/CaseExchangeController.java
+++ b/src/main/java/com/example/caseData/controller/CaseExchangeController.java
@@ -272,88 +272,29 @@ public class CaseExchangeController {
      * 临床病例库-病例交流-列表
      */
     @PostMapping("/exchange/list")
-    public Response<Map<String, Object>> getCaseExchangeSearchList(
+    public Response<List<CaseExchangeDto>> getCaseExchangeSearchList(
             @Validated()
             @RequestBody getCaseExchangeSearchList request
     ) {
         request.validateForLimit();
 
 
-        LambdaQueryWrapper<CaseExchangeModel> selectedQueryWrapper = new LambdaQueryWrapper<>();
-        selectedQueryWrapper.eq(CaseExchangeModel::getExchangeStatus, 1)  // 上线状态
-                .eq(CaseExchangeModel::getIsSelected, 1)
-                .orderByDesc(CaseExchangeModel::getCreatedAt) // 按发布时间倒序
-                .last("LIMIT 3"); // 只取2条记录
-        List<CaseExchangeModel> selectedExchanges = caseExchangeDao.selectList(selectedQueryWrapper);
+//        LambdaQueryWrapper<CaseExchangeModel> selectedQueryWrapper = new LambdaQueryWrapper<>();
+//        selectedQueryWrapper.eq(CaseExchangeModel::getExchangeStatus, 1)  // 上线状态
+//                .eq(CaseExchangeModel::getIsSelected, 1)
+//                .orderByDesc(CaseExchangeModel::getCreatedAt) // 按发布时间倒序
+//                .last("LIMIT 3"); // 只取2条记录
+//        List<CaseExchangeModel> selectedExchanges = caseExchangeDao.selectList(selectedQueryWrapper);
 
-
-        Map<String, Object> resultMap = new HashMap<>();
-
-
-        // 获取文章数据
-        IPage<CaseExchangeDto> resultPage = caseExchangeDao.getCaseExchangeSearchList(
+        // 获取数据
+        List<CaseExchangeDto> caseExchanges = caseExchangeDao.getCaseExchangeSearchList(
                 request.getLimit(),
                 request.getKeyword(),
                 request.getIsSelected(),
                 request.handleOrder()
         );
 
-//        for (CaseExchangeDto dto : resultPage.getRecords()) {
-//            // 查找用户所属医院
-//            if (userId != null){
-//                if (!userId.equals(dto.getUserId())){
-//                    user = userDao.selectById(dto.getUserId());
-//                    if (user == null) {
-//                        return Response.error();
-//                    }
-//
-//                    // 获取当前用户所属医院
-//                    basicHospital = basicHospitalDao.selectById(user.getHospitalId());
-//                    if (basicHospital == null) {
-//                        return Response.error();
-//                    }
-//                }
-//            }else{
-//                user = userDao.selectById(dto.getUserId());
-//                if (user == null) {
-//                    return Response.error();
-//                }
-//
-//                // 获取当前用户所属医院
-//                basicHospital = basicHospitalDao.selectById(user.getHospitalId());
-//                if (basicHospital == null) {
-//                    return Response.error();
-//                }
-//            }
-//
-//            dto.setAvatar(Replace.addOssDomain(user.getAvatar()));
-//            dto.setUserName(user.getUserName());
-//            dto.setHospitalName(basicHospital.getHospitalName());
-//
-//            // 获取用户收藏状态
-//            if (userId != null) {
-//                // 检测用户是否已收藏过
-//                UserCollectExchangeModel userCollectExchangeModel = caseExchangeService.getUserCollectExchangeStatus(dto.getExchangeId(),userId);
-//                if (userCollectExchangeModel != null) {
-//                    dto.setCollect(true);
-//                }
-//            }
-//
-//            // 查找标签
-//            LambdaQueryWrapper<CaseExchangeLabelModel> labelQueryWrapper = new LambdaQueryWrapper<>();
-//            labelQueryWrapper.eq(CaseExchangeLabelModel::getExchangeId, dto.getExchangeId());
-//            List<CaseExchangeLabelModel> caseExchangeLabels = caseExchangeLabelDao.selectList(labelQueryWrapper);
-//            if (caseExchangeLabels != null && !caseExchangeLabels.isEmpty()) {
-//                List<CaseExchangeLabelDto> caseExchangeLabelDto = CaseExchangeLabelDto.GetListDto(caseExchangeLabels);
-//                dto.setLabel(caseExchangeLabelDto);
-//            }
-//        }
-
-        resultMap.put("page", resultPage.getCurrent());
-        resultMap.put("pageSize", resultPage.getSize());
-        resultMap.put("total", resultPage.getTotal());
-        resultMap.put("data", resultPage.getRecords());
-        return Response.success(resultMap);
+        return Response.success(caseExchanges);
     }
 
     /**
diff --git a/src/main/java/com/example/caseData/dao/CaseExchangeDao.java b/src/main/java/com/example/caseData/dao/CaseExchangeDao.java
index 32dfc1a..ee8b704 100644
--- a/src/main/java/com/example/caseData/dao/CaseExchangeDao.java
+++ b/src/main/java/com/example/caseData/dao/CaseExchangeDao.java
@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
+import java.util.List;
 import java.util.Map;
 
 @Mapper
@@ -35,7 +36,7 @@ public interface CaseExchangeDao extends BaseMapper<CaseExchangeModel> {
      * @param keyword 搜索关键词-标题/医生名称/标签名称
      * @param order 排序
      */
-    IPage<CaseExchangeDto> getCaseExchangeSearchList(
+    List<CaseExchangeDto> getCaseExchangeSearchList(
             @Param("limit") Integer limit,
             @Param("keyword") String keyword,
             @Param("isSelected") Integer isSelected,
diff --git a/src/main/resources/mapper/CaseExchangeMapper.xml b/src/main/resources/mapper/CaseExchangeMapper.xml
index 3836e73..6a3f30c 100644
--- a/src/main/resources/mapper/CaseExchangeMapper.xml
+++ b/src/main/resources/mapper/CaseExchangeMapper.xml
@@ -50,7 +50,7 @@
             LEFT JOIN user c ON c.user_id = a.user_id
             WHERE a.exchange_status = 1
             <if test="isSelected != null and isSelected != ''">
-                AND c.is_selected = #{isSelected}
+                AND a.is_selected = #{isSelected}
             </if>
             <if test="keyword != null and keyword != ''">
                 AND (