diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/psychology/dao/PsychologyAnswerDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/psychology/dao/PsychologyAnswerDao.java
index 282510d..9c5a07a 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/psychology/dao/PsychologyAnswerDao.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/psychology/dao/PsychologyAnswerDao.java
@@ -18,11 +18,12 @@
 package com.elink.esua.epdc.modules.smile.psychology.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyAnswerFormDTO;
 import com.elink.esua.epdc.modules.smile.psychology.entity.PsychologyAnswerEntity;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyAnswerFormDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 心理问题答复表
@@ -42,4 +43,14 @@ public interface PsychologyAnswerDao extends BaseDao<PsychologyAnswerEntity> {
      * @date 2020/6/15 10:16
      */
     List<String> selectListAnsweredQuestionId(PsychologyAnswerFormDTO dto);
+
+    /**
+     * 回复列表
+     *
+     * @return java.util.List<com.elink.esua.epdc.modules.smile.psychology.entity.PsychologyAnswerEntity>
+     * @params [params]
+     * @author zhangyuan
+     * @since 2020/5/21 14:54
+     */
+    List<PsychologyAnswerEntity> selectListOfPsychologyAnswer(Map<String, Object> params);
 }
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/psychology/service/impl/PsychologyAnswerServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/psychology/service/impl/PsychologyAnswerServiceImpl.java
index ad54bfa..86006d5 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/psychology/service/impl/PsychologyAnswerServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/psychology/service/impl/PsychologyAnswerServiceImpl.java
@@ -24,8 +24,6 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.smile.dto.psychology.PsychologyAnswerDTO;
-import com.elink.esua.epdc.smile.dto.psychology.form.PsychologySubmitAnswerFormDTO;
 import com.elink.esua.epdc.modules.smile.psychology.dao.PsychologistDao;
 import com.elink.esua.epdc.modules.smile.psychology.dao.PsychologyAnswerDao;
 import com.elink.esua.epdc.modules.smile.psychology.dao.PsychologyQuestionDao;
@@ -33,6 +31,8 @@ import com.elink.esua.epdc.modules.smile.psychology.entity.PsychologistEntity;
 import com.elink.esua.epdc.modules.smile.psychology.entity.PsychologyAnswerEntity;
 import com.elink.esua.epdc.modules.smile.psychology.redis.PsychologyAnswerRedis;
 import com.elink.esua.epdc.modules.smile.psychology.service.PsychologyAnswerService;
+import com.elink.esua.epdc.smile.dto.psychology.PsychologyAnswerDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologySubmitAnswerFormDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -63,11 +63,10 @@ public class PsychologyAnswerServiceImpl extends BaseServiceImpl<PsychologyAnswe
 
     @Override
     public PageData<PsychologyAnswerDTO> page(Map<String, Object> params) {
-        IPage<PsychologyAnswerEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, PsychologyAnswerDTO.class);
+        IPage<PsychologyAnswerEntity> page = getPage(params);
+        List<PsychologyAnswerEntity> entityList = baseDao.selectListOfPsychologyAnswer(params);
+        List<PsychologyAnswerDTO> list = ConvertUtils.sourceToTarget(entityList, PsychologyAnswerDTO.class);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
diff --git a/epdc-cloud-property/src/main/resources/mapper/smile/psychology/PsychologyAnswerDao.xml b/epdc-cloud-property/src/main/resources/mapper/smile/psychology/PsychologyAnswerDao.xml
index 8a91cd7..1897e1c 100644
--- a/epdc-cloud-property/src/main/resources/mapper/smile/psychology/PsychologyAnswerDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/smile/psychology/PsychologyAnswerDao.xml
@@ -3,6 +3,11 @@
 
 <mapper namespace="com.elink.esua.epdc.modules.smile.psychology.dao.PsychologyAnswerDao">
 
+    <sql id="Base_Column_List">
+        ID,	QUESTION_ID,	PSYCHOLOGIST_ID,	PSYCHOLOGIST_NAME,
+	ANSWER_CONTENT,	DEL_FLAG,	REVISION,	CREATED_BY,	CREATED_TIME,	UPDATED_BY,	UPDATED_TIME
+    </sql>
+
     <select id="selectListAnsweredQuestionId" resultType="java.lang.String">
         SELECT
             DISTINCT(QUESTION_ID) AS QUESTION_ID
@@ -15,4 +20,15 @@
         ORDER BY CREATED_TIME DESC
             LIMIT #{pageIndex},  #{pageSize};
     </select>
+
+    <select id="selectListOfPsychologyAnswer" resultType="com.elink.esua.epdc.modules.smile.psychology.entity.PsychologyAnswerEntity">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        epdc_psychology_answer pa
+        WHERE
+        pa.DEL_FLAG = '0'
+        AND pa.QUESTION_ID = #{id}
+        ORDER BY pa.CREATED_TIME DESC
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/resources/mapper/smile/psychology/PsychologyQuestionDao.xml b/epdc-cloud-property/src/main/resources/mapper/smile/psychology/PsychologyQuestionDao.xml
index d4b454e..ce8262c 100644
--- a/epdc-cloud-property/src/main/resources/mapper/smile/psychology/PsychologyQuestionDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/smile/psychology/PsychologyQuestionDao.xml
@@ -143,6 +143,15 @@
         <if test="userName != null and userName != ''">
             AND pq.USER_NAME like CONCAT( '%', #{userName}, '%' )
         </if>
+        <if test="questionContent != null and questionContent != ''">
+            AND pq.QUESTION_CONTENT like CONCAT( '%', #{questionContent}, '%' )
+        </if>
+        <if test="startDate != null and startDate != ''">
+            AND pq.CREATED_TIME &gt;= #{startDate}
+        </if>
+        <if test="endDate != null and endDate != ''">
+            AND pq.CREATED_TIME &lt;= #{endDate}
+        </if>
         ORDER BY pq.CREATED_TIME DESC
     </select>
 </mapper>
\ No newline at end of file