diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java
index 66ae1903..a08701a3 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java
@@ -72,7 +72,7 @@ public class QuestionInfoController extends BaseController {
     @Log(title = "问卷基本信息", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@RequestBody QuestionVO questionInfo) {
-        if (Objects.isNull(questionInfo) || StringUtils.isBlank(questionInfo.getQuestionnaireName())) {
+        if (Objects.isNull(questionInfo) || StringUtils.isBlank(questionInfo.getQuestionnaireName()) || StringUtils.isBlank(questionInfo.getQuestionType())) {
             return AjaxResult.error("请添加问卷信息！");
         }
         return questionInfoService.insertQuestionInfo(questionInfo);
@@ -85,6 +85,9 @@ public class QuestionInfoController extends BaseController {
     @Log(title = "问卷基本信息", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public AjaxResult edit(@RequestBody QuestionVO question) {
+        if (Objects.isNull(question) || StringUtils.isBlank(question.getQuestionnaireName()) || StringUtils.isBlank(question.getQuestionType())) {
+            return AjaxResult.error("请添加问卷信息！");
+        }
         return questionInfoService.updateQuestionInfo(question);
     }
 
@@ -94,8 +97,8 @@ public class QuestionInfoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:question:remove')")
     @Log(title = "问卷基本信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long id) {
-        return toAjax(questionInfoService.deleteQuestionInfoById(id));
+    public AjaxResult remove(@PathVariable Long ids) {
+        return toAjax(questionInfoService.deleteQuestionInfoById(ids));
     }
 
     /**
@@ -110,7 +113,7 @@ public class QuestionInfoController extends BaseController {
      * 科室问卷数量
      */
     @GetMapping("/departmentQuestionCount")
-    public AjaxResult departmentQuestionCount(String departmentName, String questionnaireStatus,String questionType) {
-        return questionInfoService.departmentQuestionCount(departmentName, questionnaireStatus,questionType);
+    public AjaxResult departmentQuestionCount(String departmentName, String questionnaireStatus, String questionType) {
+        return questionInfoService.departmentQuestionCount(departmentName, questionnaireStatus, questionType);
     }
 }
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java
index 90a55a41..b70fb70c 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java
@@ -194,6 +194,9 @@ public class QuestionInfoServiceImpl implements IQuestionInfoService {
             log.info("修改问卷题目表失败," + questionSubjects);
             throw new SecurityException("修改问卷失败!请联系管理员！");
         }
+        if (CollectionUtils.isEmpty(questionSubjectOptions)) {
+            return AjaxResult.success();
+        }
         List<QuestionSubjectOption> saveQuestionSubjectOptions = new ArrayList<>();
         for (QuestionSubjectOptionVO questionSubjectOption : questionSubjectOptions) {
             QuestionSubjectOption saveQuestionSubjectOption = new QuestionSubjectOption();