diff --git a/src/views/dictionary/template/components/CriterionFormItem.vue b/src/views/dictionary/template/components/CriterionFormItem.vue
index 16b7dfd4..b7398f76 100644
--- a/src/views/dictionary/template/components/CriterionFormItem.vue
+++ b/src/views/dictionary/template/components/CriterionFormItem.vue
@@ -143,6 +143,12 @@
           v-if="question.Type==='number'"
           v-model="questionForm[question.Id]"
         />
+        <!-- 自动分类 -->
+        <el-input
+          v-if="question.Type==='calss'"
+          v-model="questionForm[question.Id]"
+          disabled
+        />
         <!-- 上传图像 -->
         <el-upload
           v-if="question.Type==='upload'"
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 0c3579c6..b5bff7c3 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -22,6 +22,7 @@
         >
           <el-option
             v-for="item of $d.Criterion_Question_Type"
+            v-show="item.value !== 'class'"
             :key="item.value"
             :value="item.value"
             :label="item.label"
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index cc9237e5..dc091fa1 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -16,6 +16,7 @@
         >
           <el-option
             v-for="item of $d.Criterion_Question_Type"
+            v-show="item.value !== 'class'"
             :key="item.value"
             :value="item.value"
             :label="item.label"
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
index 3b11279e..b4a8bf53 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
@@ -23,7 +23,7 @@
           {{ $t("trials:readingUnit:qsList:title:add") }}
         </el-button>
       </div>
-      <el-table :data="questionForm[question.Id]">
+      <el-table :data="question.TableQuestions.Answers">
         <el-table-column
           v-for="item of question.TableQuestions.Questions"
           :key="item.Id"
@@ -235,7 +235,7 @@
         <el-upload
           v-if="question.Type === 'upload'"
           :action="accept"
-          :limit="question.ImageCount"
+          :limit="question.ImageCount > 0 ? parseInt(question.ImageCount) : 100"
           :on-preview="handlePictureCardPreview"
           :before-upload="handleBeforeUpload"
           :http-request="uploadScreenshot"
@@ -290,7 +290,7 @@
       v-if="
         question.Childrens &&
         question.Childrens.length > 0 &&
-        (question.Type !== 'table' && question.Type !== 'basicTable')
+        (question.Type !== 'table' && question.Type !== 'basicTable') && Object.keys(questionForm).length > 0
       "
     >
       <QuestionFormItem
@@ -369,9 +369,7 @@ export default {
   props: {
     questionForm: {
       type: Object,
-      default() {
-        return {};
-      },
+      required: true,
     },
     isSystemCriterion: {
       type: Boolean,
@@ -379,9 +377,7 @@ export default {
     },
     question: {
       type: Object,
-      default() {
-        return {};
-      },
+      required: true,
     },
     criterionId: {
       type: String,
@@ -666,6 +662,9 @@ export default {
         row.QuestionName + this.$t("trials:readingUnit:qsList:title:tableQs"); // '表格问题'
       this.QuestionsList = row.TableQuestions.Questions;
       this.AnswersList = row.TableQuestions.Answers;
+      row.TableQuestions.Questions.map(i=>{
+        this.$set(this.QuestionsForm, i.Id, null)
+      })
       this.QuestionsForm = {};
     },
     getOrganInfoList() {
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue
index f39bb20b..0805c904 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue
@@ -131,7 +131,7 @@
       <el-upload
         v-if="question.Type==='upload'"
         :action="accept"
-        :limit="question.ImageCount"
+        :limit="question.ImageCount > 0 ? parseInt(question.ImageCount) : 100"
         :on-preview="handlePictureCardPreview"
         :before-upload="handleBeforeUpload"
         :http-request="uploadScreenshot"
@@ -273,11 +273,11 @@ export default {
         })
       }
     }
-    if (this.question.Type === 'number') {
-      this.$set(this.questionForm, this.question.Id, 0)
-    } else {
-      this.$set(this.questionForm, this.question.Id, '')
-    }
+    // if (this.question.Type === 'number') {
+    //   this.$set(this.questionForm, this.question.Id, 0)
+    // } else {
+    //   this.$set(this.questionForm, this.question.Id, null)
+    // }
     if (this.question.TableQuestionType === 1 && this.question.LesionType !== null) {
       this.getOrganInfoList()
     }