diff --git a/platform-biz-service/src/main/resources/mainOrm/master/QuestionnaireRecordMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/QuestionnaireRecordMapper.xml
index 87c0c7d..94b7f14 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/QuestionnaireRecordMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/QuestionnaireRecordMapper.xml
@@ -48,7 +48,7 @@
          VALUES (#{phone},#{username},#{name},#{pId},#{questionnaireId},#{point},#{created})
     </insert>
 
-    <select id="queryQuestionnaireCount" resultType="int"
+    <select id="queryQuestionnaireRecordCount" resultType="int"
             parameterType="com.lyms.platform.permission.model.QuestionnaireRecordQuery">
         SELECT count(id) from questionnaire_record
         where
@@ -59,6 +59,9 @@
         <if test="username!=null">
             and username=#{username,jdbcType=VARCHAR}
         </if>
+        <if test="pId!=null">
+            and pId=#{pId,jdbcType=VARCHAR}
+        </if>
     </select>
 
 </mapper>
\ No newline at end of file
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 e8296dd..5411998 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
@@ -28,8 +28,8 @@ public class QuestionnaireRecordController {
      */
 
     @RequestMapping(method = RequestMethod.GET, value = "/questionnaireRecord/getList")
-    public void getList(HttpServletResponse response, @RequestParam(required =  true) Integer page,
-                                @RequestParam(required =  true) Integer limit,
+    public void getList(HttpServletResponse response, @RequestParam(required =  false) Integer page,
+                                @RequestParam(required =  false) Integer limit,
                                 @RequestParam(required =  false) Integer questionnaireId,
                                 @RequestParam(required =  false) String username,
                                 @RequestParam(required =  false) String patientId,
@@ -37,6 +37,11 @@ public class QuestionnaireRecordController {
         QuestionnaireRecordQuery questionnaireQuery=new QuestionnaireRecordQuery();
         if (id!=null){
             questionnaireQuery.setId(id);
+        }else {
+            questionnaireQuery.setNeed("true");
+            questionnaireQuery.setSort("id");
+            questionnaireQuery.setLimit(limit);
+            questionnaireQuery.setPage(page);
         }
         if (questionnaireId!=null){
             questionnaireQuery.setQuestionnaireId(questionnaireId);
@@ -47,10 +52,6 @@ public class QuestionnaireRecordController {
         if (StringUtils.isNotEmpty(patientId)){
             questionnaireQuery.setpId(patientId);
         }
-        questionnaireQuery.setNeed("true");
-        questionnaireQuery.setSort("id");
-        questionnaireQuery.setLimit(limit);
-        questionnaireQuery.setPage(page);
         List<QuestionnaireRecordEntity> list= questionnaireUserFacade.getList(questionnaireQuery);
         ResultUtils.buildSuccessResultAndWrite(response,list);
        // return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(questionnaireQuery.getPageInfo()).setData(list);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/QuestionnaireUserFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/QuestionnaireUserFacade.java
index 58fe066..b4a18cc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/QuestionnaireUserFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/QuestionnaireUserFacade.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.facade;
 
+import com.lyms.platform.operate.web.vo.DetailsRecordDTO;
 import com.lyms.platform.operate.web.vo.QuestionnaireRecordDTO;
 import com.lyms.platform.permission.model.QuestionnaireOptionEntity;
 import com.lyms.platform.permission.model.QuestionnaireRecordDetailsEntity;
@@ -46,9 +47,9 @@ public class QuestionnaireUserFacade {
             questionnaireRecordEntity.setUsername(questionnaireRecordDTO.getUsername());
             questionnaireRecordEntity.setQuestionnaireId(questionnaireRecordDTO.getQuestionnaireId());
             questionnaireRecordService.add(questionnaireRecordEntity);
-            for (QuestionnaireRecordDTO.DetailsRecordDTO detailsRecordDTO :questionnaireRecordDTO.getList()){
+            for (DetailsRecordDTO detailsRecordDTO :questionnaireRecordDTO.getList()){
                 QuestionnaireRecordDetailsEntity questionnaireRecordDetailsEntity=new QuestionnaireRecordDetailsEntity();
-                questionnaireRecordDetailsEntity.setQuestionnaireRecordId(detailsRecordDTO.getQuestionnaireOptionId());
+                questionnaireRecordDetailsEntity.setQuestionnaireRecordId(questionnaireRecordEntity.getId());
                 QuestionnaireOptionEntity questionnaireOptionEntity= questionnaireFacade.getOptionInfo(detailsRecordDTO.getQuestionnaireOptionId());
                 questionnaireRecordDetailsEntity.setAnswer(questionnaireOptionEntity.getAnswer());
                 questionnaireRecordDetailsEntity.setChoice(detailsRecordDTO.getChoice());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/vo/DetailsRecordDTO.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/vo/DetailsRecordDTO.java
new file mode 100644
index 0000000..eefb572
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/vo/DetailsRecordDTO.java
@@ -0,0 +1,22 @@
+package com.lyms.platform.operate.web.vo;
+
+public class DetailsRecordDTO {
+    private Integer questionnaireOptionId;//选项ID
+    private String choice;//选项
+
+    public Integer getQuestionnaireOptionId() {
+        return questionnaireOptionId;
+    }
+
+    public void setQuestionnaireOptionId(Integer questionnaireOptionId) {
+        this.questionnaireOptionId = questionnaireOptionId;
+    }
+
+    public String getChoice() {
+        return choice;
+    }
+
+    public void setChoice(String choice) {
+        this.choice = choice;
+    }
+}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/vo/QuestionnaireRecordDTO.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/vo/QuestionnaireRecordDTO.java
index d89bf30..6e297db 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/vo/QuestionnaireRecordDTO.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/vo/QuestionnaireRecordDTO.java
@@ -11,26 +11,6 @@ public class QuestionnaireRecordDTO {
     private String name;//调查问卷名称
     List<DetailsRecordDTO> list;//选项集合
 
-   public class DetailsRecordDTO{
-        private Integer questionnaireOptionId;//选项ID
-        private String choice;//选项
-
-       public Integer getQuestionnaireOptionId() {
-           return questionnaireOptionId;
-       }
-
-       public void setQuestionnaireOptionId(Integer questionnaireOptionId) {
-           this.questionnaireOptionId = questionnaireOptionId;
-       }
-
-       public String getChoice() {
-            return choice;
-        }
-
-        public void setChoice(String choice) {
-            this.choice = choice;
-        }
-    }
 
     public String getPhone() {
         return phone;