diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireController.java
index fd72778..841a000 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireController.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.controller;
 
+import com.lyms.platform.common.result.CommonResult;
 import com.lyms.platform.common.utils.ResultUtils;
 import com.lyms.platform.operate.web.facade.QuestionnaireFacade;
 import com.lyms.platform.permission.model.QuestionnaireEntity;
@@ -41,8 +42,11 @@ public class QuestionnaireController {
         questionnaireQuery.setLimit(limit);
         questionnaireQuery.setPage(page);
         List<QuestionnaireEntity> list= questionnaireFacade.getList(questionnaireQuery);
-        ResultUtils.buildSuccessResultAndWrite(response,list);
-       // return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(questionnaireQuery.getPageInfo()).setData(list);
+        CommonResult commonResult=new CommonResult();
+        commonResult.setList(list);
+        commonResult.setPageInfo(questionnaireQuery.getPageInfo());
+        ResultUtils.buildSuccessResultAndWrite(response,commonResult);
+        ResultUtils.buildSuccessResultAndWrite(response,commonResult);
     }
 
     /**
@@ -53,12 +57,7 @@ public class QuestionnaireController {
     @RequestMapping(method = RequestMethod.GET, value = "/questionnaire/getInfo")
     public void getInfo(HttpServletResponse response,@RequestParam(required = true) Integer id){
         List<QuestionnaireOptionEntity> list=questionnaireFacade.getListById(id);
- /*       BaseResponse baseResponse= new BaseResponse();
-        baseResponse.setErrormsg("成功");
-        baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
-        baseResponse.setObject(list);*/
         ResultUtils.buildSuccessResultAndWrite(response,list);
-       // return baseResponse;
     }
 
     @RequestMapping(method = RequestMethod.POST, value = "/questionnaire/update")
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireRecordController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireRecordController.java
index 5411998..4b3b8c9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireRecordController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireRecordController.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.controller;
 
+import com.lyms.platform.common.result.CommonResult;
 import com.lyms.platform.common.utils.ResultUtils;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.operate.web.facade.QuestionnaireUserFacade;
@@ -42,6 +43,7 @@ public class QuestionnaireRecordController {
             questionnaireQuery.setSort("id");
             questionnaireQuery.setLimit(limit);
             questionnaireQuery.setPage(page);
+
         }
         if (questionnaireId!=null){
             questionnaireQuery.setQuestionnaireId(questionnaireId);
@@ -53,8 +55,14 @@ public class QuestionnaireRecordController {
             questionnaireQuery.setpId(patientId);
         }
         List<QuestionnaireRecordEntity> list= questionnaireUserFacade.getList(questionnaireQuery);
-        ResultUtils.buildSuccessResultAndWrite(response,list);
-       // return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(questionnaireQuery.getPageInfo()).setData(list);
+        if (id!=null){
+            ResultUtils.buildSuccessResultAndWrite(response,list);
+        }else {
+            CommonResult commonResult=new CommonResult();
+            commonResult.setList(list);
+            commonResult.setPageInfo(questionnaireQuery.getPageInfo());
+            ResultUtils.buildSuccessResultAndWrite(response,commonResult);
+        }
     }
 
     /**
@@ -63,22 +71,13 @@ public class QuestionnaireRecordController {
      * @return
      */
     @RequestMapping(method = RequestMethod.GET, value = "/questionnaireRecord/getInfo")
-    //@ResponseBody
     public void getInfo(HttpServletResponse response,@RequestParam(required = true) Integer id){
         List<QuestionnaireRecordDetailsEntity> list=questionnaireUserFacade.getListById(id);
-  /*      BaseResponse baseResponse= new BaseResponse();
-        baseResponse.setErrormsg("成功");
-        baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
-        baseResponse.setObject(list);*/
         ResultUtils.buildSuccessResultAndWrite(response,list);
     }
 
     @RequestMapping(method = RequestMethod.POST, value = "/questionnaireRecord/add")
-   // @ResponseBody
     public void add(HttpServletResponse response,@RequestBody QuestionnaireRecordDTO questionnaireRecordDTO){
-   /*     BaseResponse baseResponse= new BaseResponse();
-        baseResponse.setErrormsg("成功");
-        baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);*/
         Integer id= questionnaireUserFacade.addDetails(questionnaireRecordDTO);
         ResultUtils.buildSuccessResultAndWrite(response,id);
     }