diff --git a/src/App.vue b/src/App.vue
index 1f450fe..2e3a7d7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,8 +3,9 @@
  * @email: 18603454788@163.com
  * @Date: 2021-02-22 09:20:03
  * @LastEditors: wally
- * @LastEditTime: 2021-04-02 09:49:21
+ * @LastEditTime: 2021-04-14 19:12:11
 -->
+
 <template>
   <a-config-provider :locale="zh_CN">
     <div class="d-flex flex-row flex-nowrap" id="app">
diff --git a/src/components/BiologicalSampleSearch/SampleTable.vue b/src/components/BiologicalSampleSearch/SampleTable.vue
index c0775cf..c647e46 100644
--- a/src/components/BiologicalSampleSearch/SampleTable.vue
+++ b/src/components/BiologicalSampleSearch/SampleTable.vue
@@ -13,10 +13,9 @@
         class="white pa-3"
       >
         <template slot="sampleType" slot-scope="text, record">
-          <span v-if="record.sampleType === 0">抗血凝10ml</span>
-          <span v-else-if="record.sampleType === 1">促凝血5ml</span>
-          <span v-else-if="record.sampleType === 2">晨尿10ml</span>
-          <span v-else-if="record.sampleType === 3">24小时尿10ml</span>
+          <span v-if="record.sampleType === 0">血标本上清液</span>
+          <span v-else-if="record.sampleType === 1">血标本细胞</span>
+          <span v-else-if="record.sampleType === 2">尿标本</span>
         </template>
         <template slot="collectTime" slot-scope="text, record">
           <span>{{ record.collectTime }}天</span>
@@ -38,7 +37,7 @@ const columns = [
     key: 'name',
   },
   {
-    title: '住院号',
+    title: '患者编号',
     align: 'center',
     dataIndex: 'hospitalization',
     key: 'hospitalization',
diff --git a/src/components/BiologicalSampleSearch/Search.vue b/src/components/BiologicalSampleSearch/Search.vue
index 9e47b8e..33fe3cb 100644
--- a/src/components/BiologicalSampleSearch/Search.vue
+++ b/src/components/BiologicalSampleSearch/Search.vue
@@ -1,3 +1,10 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-02-22 09:20:03
+ * @LastEditors: wally
+ * @LastEditTime: 2021-04-14 18:30:24
+-->
 <template>
   <!-- search -->
   <div>
@@ -14,7 +21,7 @@
           </a-select>
         </a-form-item>
         <a-form-item>
-          <a-input placeholder="患者住院号" style="width: 14em" v-decorator="['inpatientNumber']" />
+          <a-input placeholder="患者编号" style="width: 14em" v-decorator="['inpatientNumber']" />
         </a-form-item>
         <a-form-item>
           <a-select placeholder="请选择采集时间" style="min-width: 150px" v-decorator="['acquisitionTime']" allow-clear>
@@ -39,19 +46,15 @@ export default {
       types: [
         {
           id: 0,
-          title: '抗血凝10ml',
+          title: '血标本上清液',
         },
         {
           id: 1,
-          title: '促凝血5ml',
+          title: '血标本细胞',
         },
         {
           id: 2,
-          title: '晨尿10ml',
-        },
-        {
-          id: 3,
-          title: '24小时尿10ml',
+          title: '尿标本',
         },
       ],
       acquisitionTime: [
diff --git a/src/components/CaseTable/CaseTable.vue b/src/components/CaseTable/CaseTable.vue
index d782f27..3dbc32e 100644
--- a/src/components/CaseTable/CaseTable.vue
+++ b/src/components/CaseTable/CaseTable.vue
@@ -42,7 +42,7 @@ import { mapMutations, mapState } from 'vuex';
 import { upPatientMes } from 'config/api';
 const columns = [
   {
-    title: '住院号',
+    title: '患者编号',
     align: 'center',
     dataIndex: 'hospitalization',
     key: 'hospitalization',
diff --git a/src/components/PatientInfo/PatientAdd.vue b/src/components/PatientInfo/PatientAdd.vue
index 16f7388..3fe0b14 100644
--- a/src/components/PatientInfo/PatientAdd.vue
+++ b/src/components/PatientInfo/PatientAdd.vue
@@ -1,43 +1,35 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-02-22 09:20:03
+ * @LastEditors: wally
+ * @LastEditTime: 2021-04-14 18:33:40
+-->
 <template>
   <div class="d-flex flex-wrap pb-3">
     <!-- 添加 -->
     <a-modal :closable="false" footer title="新增病患" v-model="visible" width="700px">
       <a-form :form="form" @submit="handleSubmit" ref="form">
         <!-- 住院号 -->
-        <a-form-item
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="住院号"
-        >
+        <!-- <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="患者编号">
           <a-input
-            placeholder="住院号"
+            placeholder="患者编号"
             v-decorator="[
-                      'hospitalization',
-                      {
-                        rules: [
-                          { required: true, message: '住院号不能为空' },
-                          { whitespace: true, message: '住院号不能为空' },
-                          { max: 140, massage: '住院号最多140个字符' },
-                        ],
-                      },
-                    ]"
+              'hospitalization',
+              {
+                rules: [
+                  { required: true, message: '患者编号不能为空' },
+                  { whitespace: true, message: '患者编号不能为空' },
+                  { max: 140, massage: '患者编号最多140个字符' },
+                ],
+              },
+            ]"
           />
-        </a-form-item>
+        </a-form-item> -->
         <!-- 对照组 -->
-        <a-form-item
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="对照组"
-        >
-          <a-select
-            placeholder="对照组"
-            v-decorator="['inpatientId',{rules: [{ required: true, message: '对照组不能为空' }]}]"
-          >
-            <a-select-option
-              :key="index"
-              :value="group.id"
-              v-for="(group, index) in controlGroups"
-            >{{ group.name }}</a-select-option>
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="对照组">
+          <a-select placeholder="对照组" v-decorator="['inpatientId', { rules: [{ required: true, message: '对照组不能为空' }] }]">
+            <a-select-option :key="index" :value="group.id" v-for="(group, index) in controlGroups">{{ group.name }}</a-select-option>
           </a-select>
         </a-form-item>
 
diff --git a/src/components/PatientInfo/PatientTable.vue b/src/components/PatientInfo/PatientTable.vue
index 43f0f1e..a4f1960 100644
--- a/src/components/PatientInfo/PatientTable.vue
+++ b/src/components/PatientInfo/PatientTable.vue
@@ -39,7 +39,7 @@
     </div>
     <a-empty v-else />
     <a-modal title="会议记录预览" width="600px" v-model="visible" @ok="handleOk" @cancel="handleCancel">
-      是否要录入住院号为：
+      是否要录入患者编号为：
       <span style="color: green">{{ hospitalization }}</span>
       的患者的相关数据
     </a-modal>
@@ -58,7 +58,7 @@ const columns = [
     scopedSlots: { customRender: 'id' },
   },
   {
-    title: '住院号',
+    title: '编号',
     align: 'center',
     dataIndex: 'hospitalization',
     key: 'hospitalization',
diff --git a/src/components/PatientInfo/Search.vue b/src/components/PatientInfo/Search.vue
index 3e40e73..e43329e 100644
--- a/src/components/PatientInfo/Search.vue
+++ b/src/components/PatientInfo/Search.vue
@@ -4,7 +4,7 @@
     <div class="d-flex flex-row flex-nowrap">
       <a-form :form="form" @submit="handleSubmit" class="d-flex flex-nowrap align-center" layout="inline">
         <a-form-item>
-          <a-input placeholder="住院号" style="width: 14em" v-decorator="['inpatientNumber']" />
+          <a-input placeholder="患者编号" style="width: 14em" v-decorator="['inpatientNumber']" />
         </a-form-item>
         <a-form-item>
           <a-select placeholder="请选择对照组" style="min-width: 450px" v-decorator="['groupValue']" allow-clear>
diff --git a/src/plugins/ant-design-vue.js b/src/plugins/ant-design-vue.js
index cc63dea..0d2921a 100644
--- a/src/plugins/ant-design-vue.js
+++ b/src/plugins/ant-design-vue.js
@@ -3,7 +3,7 @@
  * @email: 18603454788@163.com
  * @Date: 2021-01-29 11:16:27
  * @LastEditors: wally
- * @LastEditTime: 2021-01-29 17:39:07
+ * @LastEditTime: 2021-04-13 10:12:29
  */
 import Vue from 'vue';
 import {
@@ -41,6 +41,7 @@ import {
   List,
   Collapse,
   Cascader,
+  TimePicker,
 } from 'ant-design-vue';
 import { ConfigProvider } from 'ant-design-vue';
 Vue.component(ConfigProvider.name, ConfigProvider);
@@ -76,6 +77,7 @@ Vue.use(List);
 Vue.use(Collapse);
 Vue.use(Cascader);
 Vue.use(InputNumber);
+Vue.use(TimePicker);
 
 Vue.prototype.$message = message;
 Vue.prototype.$notification = notification;
diff --git a/src/views/BiologicalSamples/BiologicalSamples.vue b/src/views/BiologicalSamples/BiologicalSamples.vue
index b1bc719..c0b530c 100644
--- a/src/views/BiologicalSamples/BiologicalSamples.vue
+++ b/src/views/BiologicalSamples/BiologicalSamples.vue
@@ -3,30 +3,31 @@
     <div class="metting">
       <a-card :bordered="false" title="生物样本">
         <a-form :form="form" @submit="handleSubmit">
-          <!-- 住院号 -->
-          <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="住院号">
+          <!-- 患者编号 -->
+          <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="患者编号">
             <a-input
-              placeholder="住院号"
+              placeholder="患者编号"
               v-decorator="[
                 'inpatientNumber',
                 {
                   rules: [
-                    { required: true, message: '住院号不能为空' },
-                    { whitespace: true, message: '住院号不能为空' },
-                    { max: 140, massage: '住院号最多140个字符' },
+                    { required: true, message: '患者编号不能为空' },
+                    { whitespace: true, message: '患者编号不能为空' },
+                    { max: 140, massage: '患者编号最多140个字符' },
                   ],
+                  initialValue: hospitalization,
                 },
               ]"
             />
           </a-form-item>
           <!-- 样本类型 -->
-          <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="样本类型">
+          <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="样本类型" required>
             <a-select placeholder="请选择样本类型" style="min-width: 150px" v-decorator="['sampleType']" allow-clear>
               <a-select-option :key="item.id" :value="item.id" v-for="item in types">{{ item.title }}</a-select-option>
             </a-select>
           </a-form-item>
           <!-- 样本类型 -->
-          <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="采集时间">
+          <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="采集时间" required>
             <a-select placeholder="请选择采集时间" style="min-width: 150px" v-decorator="['acquisitionTime']" allow-clear>
               <a-select-option :key="t.id" :value="t.id" v-for="t in acquisitionTime">{{ t.title }}</a-select-option>
             </a-select>
@@ -56,22 +57,19 @@ export default {
       tailItemLayout,
       form: this.$form.createForm(this, { name: 'page-add' }),
       inpatientNumber: '', // 主持人
+      hospitalization: '',
       types: [
         {
           id: 0,
-          title: '抗血凝10ml',
+          title: '血标本上清液',
         },
         {
           id: 1,
-          title: '促凝血5ml',
+          title: '血标本细胞',
         },
         {
           id: 2,
-          title: '晨尿10ml',
-        },
-        {
-          id: 3,
-          title: '24小时尿10ml',
+          title: '尿标本',
         },
       ],
       acquisitionTime: [
@@ -90,13 +88,24 @@ export default {
       ],
     };
   },
-
+  created() {
+    this.hospitalization = localStorage.getItem('hospitalization');
+  },
   methods: {
     // 提交表单
     handleSubmit(e) {
       e.preventDefault();
       this.form.validateFieldsAndScroll(async (err, values) => {
         if (!err) {
+          console.log(values);
+          if (!values.sampleType && values.sampleType !== 0) {
+            this.$message.error('请填写完整信息');
+            return;
+          }
+          if (!values.acquisitionTime && values.acquisitionTime !== 0) {
+            this.$message.error('请填写完整信息');
+            return;
+          }
           try {
             const param = {
               sampleType: values.sampleType,
diff --git a/src/views/CaseAnalysis/CaseAnalysis.vue b/src/views/CaseAnalysis/CaseAnalysis.vue
index 469fc2f..5926b3a 100644
--- a/src/views/CaseAnalysis/CaseAnalysis.vue
+++ b/src/views/CaseAnalysis/CaseAnalysis.vue
@@ -11,28 +11,15 @@
               style="min-width: 150px"
               v-decorator="['hospital']"
             >
-              <a-select-option
-                :key="item.id"
-                :value="item.id"
-                v-for="item in hospitals"
-              >{{ item.name }}</a-select-option>
+              <a-select-option :key="item.id" :value="item.id" v-for="item in hospitals">{{ item.name }}</a-select-option>
             </a-select>
           </a-form-item>
           <a-form-item>
-            <a-input placeholder="患者住院号" style="width: 14em" v-model="setObj.hospitalization" />
+            <a-input placeholder="患者患者编号" style="width: 14em" v-model="setObj.hospitalization" />
           </a-form-item>
           <a-form-item>
-            <a-select
-              @change="chooseHos($event, 3)"
-              allow-clear
-              placeholder="请选择录入状态"
-              style="min-width: 150px"
-            >
-              <a-select-option
-                :key="item.id"
-                :value="item.id"
-                v-for="item in statusList"
-              >{{ item.name }}</a-select-option>
+            <a-select @change="chooseHos($event, 3)" allow-clear placeholder="请选择录入状态" style="min-width: 150px">
+              <a-select-option :key="item.id" :value="item.id" v-for="item in statusList">{{ item.name }}</a-select-option>
             </a-select>
           </a-form-item>
         </a-form>
@@ -57,22 +44,13 @@
               class="d-flex align-center mb-3"
             >
               <a-input @change="onChange($event, a.type, a.id, a.recordId)" v-if="a.type === 1" />
-              <a-textarea
-                @change="onChange($event, a.type, a.id, a.recordId)"
-                style="height: 100px"
-                v-else-if="a.type === 2"
-              />
+              <a-textarea @change="onChange($event, a.type, a.id, a.recordId)" style="height: 100px" v-else-if="a.type === 2" />
               <a-radio-group
                 @change="onChange($event, a.type, a.id, a.recordId)"
                 class="d-flex flex-row flex-wrap"
                 v-else-if="a.type === 3"
               >
-                <a-radio
-                  :key="c"
-                  :style="radioStyle"
-                  :value="b.showValue"
-                  v-for="(b, c) in a.optionVos"
-                >{{ b.showValue }}</a-radio>
+                <a-radio :key="c" :style="radioStyle" :value="b.showValue" v-for="(b, c) in a.optionVos">{{ b.showValue }}</a-radio>
               </a-radio-group>
               <a-checkbox-group
                 @change="onChange($event, a.type, a.id, a.recordId)"
@@ -85,22 +63,10 @@
                   </a-col>
                 </a-row>
               </a-checkbox-group>
-              <a-select
-                @change="onChange($event, a.type, a.id, a.recordId)"
-                style="width: 120px"
-                v-else-if="a.type === 5"
-              >
-                <a-select-option
-                  :key="c"
-                  :value="b.showValue"
-                  v-for="(b, c) in a.optionVos"
-                >{{ b.showValue }}</a-select-option>
+              <a-select @change="onChange($event, a.type, a.id, a.recordId)" style="width: 120px" v-else-if="a.type === 5">
+                <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in a.optionVos">{{ b.showValue }}</a-select-option>
               </a-select>
-              <a-range-picker
-                @change="onChange($event, a.type, a.id, a.recordId)"
-                show-time
-                v-else-if="a.type === 6"
-              />
+              <a-range-picker @change="onChange($event, a.type, a.id, a.recordId)" show-time v-else-if="a.type === 6" />
               <a-upload
                 :action="action"
                 :default-file-list="fileList"
@@ -125,16 +91,8 @@
                 class="d-flex flex-row flex-wrap"
                 v-else-if="a.type === 8"
               >
-                <a-radio-group
-                  @change="onChange($event, a.type, a.id, a.recordId)"
-                  class="d-flex flex-row flex-wrap"
-                >
-                  <a-radio
-                    :key="g"
-                    :style="radioStyle"
-                    :value="f.showValue"
-                    v-for="(f, g) in a.optionVos"
-                  >{{ f.showValue }}</a-radio>
+                <a-radio-group @change="onChange($event, a.type, a.id, a.recordId)" class="d-flex flex-row flex-wrap">
+                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in a.optionVos">{{ f.showValue }}</a-radio>
                 </a-radio-group>
                 <div :key="k" v-for="(j, k) in a.optionVos">
                   <div
@@ -149,11 +107,7 @@
                       :wrapper-col="formItemLayout.wrapperCol"
                       class="d-flex align-center mt-2 mb-0"
                     >
-                      <a-input
-                        @change="inputChange(a.id, $event, j.showValue)"
-                        placeholder="请输入其他"
-                        style="width: 200px"
-                      ></a-input>
+                      <a-input @change="inputChange(a.id, $event, j.showValue)" placeholder="请输入其他" style="width: 200px"></a-input>
                     </a-form-item>
                   </div>
                 </div>
@@ -173,21 +127,17 @@
                 <div :key="k" v-for="(j, k) in a.optionVos">
                   <div
                     v-if="
-                          contentList.find(item => {
-                            return item.testQuestionsId === a.id && item.contents === `${j.showValue}`;
-                          }) && j.afterOperation === 1
-                        "
+                      contentList.find(item => {
+                        return item.testQuestionsId === a.id && item.contents === `${j.showValue}`;
+                      }) && j.afterOperation === 1
+                    "
                   >
                     <a-form-item
                       :label-col="formItemLayout.labelCol"
                       :wrapper-col="formItemLayout.wrapperCol"
                       class="d-flex align-center mt-2 mb-0"
                     >
-                      <a-input
-                        @change="inputChange(a.id, $event, j.showValue)"
-                        placeholder="请输入其他"
-                        style="width: 200px"
-                      ></a-input>
+                      <a-input @change="inputChange(a.id, $event, j.showValue)" placeholder="请输入其他" style="width: 200px"></a-input>
                     </a-form-item>
                   </div>
                 </div>
@@ -196,11 +146,7 @@
               </a-checkbox-group>
               <div v-else-if="a.type === 10">
                 <a-select @change="onChange($event, a.type, a.id, a.recordId)" style="width: 120px">
-                  <a-select-option
-                    :key="c"
-                    :value="b.showValue"
-                    v-for="(b, c) in a.optionVos"
-                  >{{ b.showValue }}</a-select-option>
+                  <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in a.optionVos">{{ b.showValue }}</a-select-option>
                 </a-select>
                 <div :key="c" v-for="(b, c) in a.optionVos">
                   <div
@@ -215,19 +161,13 @@
                       :wrapper-col="formItemLayout.wrapperCol"
                       class="d-flex align-center mb-3"
                     >
-                      <a-input
-                        @change="inputChange(a.id, $event, b.showValue)"
-                        style="width: 200px"
-                      ></a-input>
+                      <a-input @change="inputChange(a.id, $event, b.showValue)" style="width: 200px"></a-input>
                     </a-form-item>
                   </div>
                 </div>
               </div>
               <div v-else-if="a.type === 11">
-                <a-checkbox-group
-                  @change="onChange($event, a.type, a.id, a.recordId)"
-                  class="d-flex flex-row flex-wrap"
-                >
+                <a-checkbox-group @change="onChange($event, a.type, a.id, a.recordId)" class="d-flex flex-row flex-wrap">
                   <a-row>
                     <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in a.optionVos">
                       <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
@@ -241,29 +181,18 @@
                             }) && b.afterOperation > 0
                           "
                         >
-                          <a-input
-                            @change="inputChange(a.id, $event, b.showValue)"
-                            style="width: 200px"
-                          ></a-input>
+                          <a-input @change="inputChange(a.id, $event, b.showValue)" style="width: 200px"></a-input>
                         </div>
                       </div>
-                    </a-col>
-                  </a-row>说明：
+                    </a-col> </a-row
+                  >说明：
                   <a-input @change="explainChange(a.id, $event)" style="width: 200px" />
                 </a-checkbox-group>
               </div>
               <!-- 当类型为12时，为单选+关联 -->
               <div v-else-if="a.type === 12">
-                <a-radio-group
-                  @change="onChange($event, a.type, a.id, a.recordId)"
-                  class="d-flex flex-row flex-wrap"
-                >
-                  <a-radio
-                    :key="g"
-                    :style="radioStyle"
-                    :value="f.showValue"
-                    v-for="(f, g) in a.optionVos"
-                  >{{ f.showValue }}</a-radio>
+                <a-radio-group @change="onChange($event, a.type, a.id, a.recordId)" class="d-flex flex-row flex-wrap">
+                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in a.optionVos">{{ f.showValue }}</a-radio>
                 </a-radio-group>
                 <div :key="k" v-for="(j, k) in a.optionVos">
                   <div
@@ -285,10 +214,7 @@
                           style="width: 200px"
                           v-if="j.afterOperation === 1"
                         ></a-input>
-                        <a-textarea
-                          @change="inputChange(a.id, $event, j.showValue)"
-                          v-else-if="j.afterOperation === 2"
-                        ></a-textarea>
+                        <a-textarea @change="inputChange(a.id, $event, j.showValue)" v-else-if="j.afterOperation === 2"></a-textarea>
                         <div v-else-if="j.afterOperation === 3">
                           <div :key="ohter.id" v-for="ohter in j.questionVos">
                             <a-form-item
@@ -297,10 +223,7 @@
                               :wrapper-col="formItemLayout.wrapperCol"
                               class="d-flex align-center mb-3"
                             >
-                              <a-input
-                                @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                v-if="ohter.type === 1"
-                              />
+                              <a-input @change="onChange($event, ohter.type, ohter.id, ohter.recordId)" v-if="ohter.type === 1" />
                               <a-textarea
                                 @change="onChange($event, ohter.type, ohter.id)"
                                 style="height: 100px"
@@ -311,12 +234,9 @@
                                 class="d-flex flex-row flex-wrap"
                                 v-else-if="ohter.type === 3"
                               >
-                                <a-radio
-                                  :key="c"
-                                  :style="radioStyle"
-                                  :value="b.showValue"
-                                  v-for="(b, c) in ohter.optionVos"
-                                >{{ b.showValue }}</a-radio>
+                                <a-radio :key="c" :style="radioStyle" :value="b.showValue" v-for="(b, c) in ohter.optionVos">{{
+                                  b.showValue
+                                }}</a-radio>
                               </a-radio-group>
                               <a-checkbox-group
                                 @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
@@ -324,11 +244,7 @@
                                 v-else-if="ohter.type === 4"
                               >
                                 <a-row>
-                                  <a-col
-                                    :key="indexNum"
-                                    :span="24"
-                                    v-for="(ques, indexNum) in ohter.optionVos"
-                                  >
+                                  <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in ohter.optionVos">
                                     <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
                                   </a-col>
                                 </a-row>
@@ -338,11 +254,9 @@
                                 style="width: 120px"
                                 v-else-if="ohter.type === 5"
                               >
-                                <a-select-option
-                                  :key="c"
-                                  :value="b.showValue"
-                                  v-for="(b, c) in ohter.optionVos"
-                                >{{ b.showValue }}</a-select-option>
+                                <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in ohter.optionVos">{{
+                                  b.showValue
+                                }}</a-select-option>
                               </a-select>
                               <a-range-picker
                                 @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
@@ -373,16 +287,10 @@
                                 class="d-flex flex-row flex-wrap"
                                 v-else-if="ohter.type === 8"
                               >
-                                <a-radio-group
-                                  @change="onChange($event, ohter.type, ohter.id)"
-                                  class="d-flex flex-row flex-wrap"
-                                >
-                                  <a-radio
-                                    :key="g"
-                                    :style="radioStyle"
-                                    :value="f.showValue"
-                                    v-for="(f, g) in ohter.optionVos"
-                                  >{{ f.showValue }}</a-radio>
+                                <a-radio-group @change="onChange($event, ohter.type, ohter.id)" class="d-flex flex-row flex-wrap">
+                                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in ohter.optionVos">{{
+                                    f.showValue
+                                  }}</a-radio>
                                 </a-radio-group>
                                 <div :key="n" v-for="(m, n) in ohter.optionVos">
                                   <div
@@ -397,10 +305,7 @@
                                       :wrapper-col="formItemLayout.wrapperCol"
                                       class="d-flex align-center mb-3"
                                     >
-                                      <a-input
-                                        @change="inputChange(ohter.id, $event, m.showValue)"
-                                        style="width: 200px"
-                                      ></a-input>
+                                      <a-input @change="inputChange(ohter.id, $event, m.showValue)" style="width: 200px"></a-input>
                                     </a-form-item>
                                   </div>
                                 </div>
@@ -411,11 +316,7 @@
                                 v-else-if="ohter.type === 9"
                               >
                                 <a-row>
-                                  <a-col
-                                    :key="indexNum"
-                                    :span="24"
-                                    v-for="(ques, indexNum) in ohter.optionVos"
-                                  >
+                                  <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in ohter.optionVos">
                                     <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
                                   </a-col>
                                   <a-col :span="100">
@@ -432,10 +333,7 @@
                                           :wrapper-col="formItemLayout.wrapperCol"
                                           class="d-flex align-center mb-3"
                                         >
-                                          <a-input
-                                            @change="inputChange(ohter.id, $event, m.showValue)"
-                                            style="width: 200px"
-                                          ></a-input>
+                                          <a-input @change="inputChange(ohter.id, $event, m.showValue)" style="width: 200px"></a-input>
                                         </a-form-item>
                                       </div>
                                     </div>
@@ -443,15 +341,10 @@
                                 </a-row>
                               </a-checkbox-group>
                               <div v-else-if="ohter.type === 10">
-                                <a-select
-                                  @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                  style="width: 120px"
-                                >
-                                  <a-select-option
-                                    :key="c"
-                                    :value="b.showValue"
-                                    v-for="(b, c) in ohter.optionVos"
-                                  >{{ b.showValue }}</a-select-option>
+                                <a-select @change="onChange($event, ohter.type, ohter.id, ohter.recordId)" style="width: 120px">
+                                  <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in ohter.optionVos">{{
+                                    b.showValue
+                                  }}</a-select-option>
                                 </a-select>
                                 <div :key="c" v-for="(b, c) in ohter.optionVos">
                                   <div
@@ -466,10 +359,7 @@
                                       :wrapper-col="formItemLayout.wrapperCol"
                                       class="d-flex align-center mb-3"
                                     >
-                                      <a-input
-                                        @change="inputChange(ohter.id, $event, b.showValue)"
-                                        style="width: 200px"
-                                      ></a-input>
+                                      <a-input @change="inputChange(ohter.id, $event, b.showValue)" style="width: 200px"></a-input>
                                     </a-form-item>
                                   </div>
                                 </div>
@@ -480,11 +370,7 @@
                                   class="d-flex flex-row flex-wrap"
                                 >
                                   <a-row>
-                                    <a-col
-                                      :key="indexNum"
-                                      :span="24"
-                                      v-for="(ques, indexNum) in ohter.optionVos"
-                                    >
+                                    <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in ohter.optionVos">
                                       <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
                                     </a-col>
                                     <a-col :span="100">
@@ -499,18 +385,12 @@
                                             }) && b.afterOperation > 0
                                           "
                                         >
-                                          <a-input
-                                            @change="inputChange(ohter.id, $event, b.showValue)"
-                                            style="width: 200px"
-                                          ></a-input>
+                                          <a-input @change="inputChange(ohter.id, $event, b.showValue)" style="width: 200px"></a-input>
                                         </div>
                                       </div>
-                                    </a-col>
-                                  </a-row>说明：
-                                  <a-input
-                                    @change="explainChange(ohter.id, $event)"
-                                    style="width: 200px"
-                                  />
+                                    </a-col> </a-row
+                                  >说明：
+                                  <a-input @change="explainChange(ohter.id, $event)" style="width: 200px" />
                                 </a-checkbox-group>
                               </div>
                               <!-- 当类型为12时，为单选+关联 -->
@@ -519,12 +399,9 @@
                                   @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
                                   class="d-flex flex-row flex-wrap"
                                 >
-                                  <a-radio
-                                    :key="g"
-                                    :style="radioStyle"
-                                    :value="f.showValue"
-                                    v-for="(f, g) in ohter.optionVos"
-                                  >{{ f.showValue }}</a-radio>
+                                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in ohter.optionVos">{{
+                                    f.showValue
+                                  }}</a-radio>
                                 </a-radio-group>
                                 <div :key="n" v-for="(m, n) in ohter.optionVos">
                                   <div
@@ -557,9 +434,7 @@
                                 </div>
                               </div>
                               <div v-else-if="ohter.type === 13">
-                                <a-input-number
-                                  @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                />
+                                <a-input-number @change="onChange($event, ohter.type, ohter.id, ohter.recordId)" />
                                 <span style="margin-left: 10px">{{ other.units }}</span>
                               </div>
                               <div v-else-if="ohter.type === 14">图片识别</div>
@@ -580,11 +455,7 @@
           </div>
           <!-- 一级标题下的各种二级标题（subReportCodes） -->
           <div :key="w.name" v-for="w in item.subReportCodes">
-            <a-form-item
-              :label-col="formItemLayout.labelCol"
-              :wrapper-col="formItemLayout.wrapperCol"
-              class="d-flex align-center mb-0"
-            >
+            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" class="d-flex align-center mb-0">
               <!-- 二级大标题 -->
               <h3 class="font-bold">{{ w.name }}：</h3>
             </a-form-item>
@@ -597,22 +468,13 @@
                 class="d-flex align-center mb-3"
               >
                 <a-input @change="onChange($event, e.type, e.id, e.recordId)" v-if="e.type === 1" />
-                <a-textarea
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  style="height: 100px"
-                  v-else-if="e.type === 2"
-                />
+                <a-textarea @change="onChange($event, e.type, e.id, e.recordId)" style="height: 100px" v-else-if="e.type === 2" />
                 <a-radio-group
                   @change="onChange($event, e.type, e.id, e.recordId)"
                   class="d-flex flex-row flex-wrap"
                   v-else-if="e.type === 3"
                 >
-                  <a-radio
-                    :key="c"
-                    :style="radioStyle"
-                    :value="b.showValue"
-                    v-for="(b, c) in e.optionVos"
-                  >{{ b.showValue }}</a-radio>
+                  <a-radio :key="c" :style="radioStyle" :value="b.showValue" v-for="(b, c) in e.optionVos">{{ b.showValue }}</a-radio>
                 </a-radio-group>
                 <a-checkbox-group
                   @change="onChange($event, e.type, e.id, e.recordId)"
@@ -625,22 +487,10 @@
                     </a-col>
                   </a-row>
                 </a-checkbox-group>
-                <a-select
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  style="width: 120px"
-                  v-else-if="e.type === 5"
-                >
-                  <a-select-option
-                    :key="c"
-                    :value="b.showValue"
-                    v-for="(b, c) in e.optionVos"
-                  >{{ b.showValue }}</a-select-option>
+                <a-select @change="onChange($event, e.type, e.id, e.recordId)" style="width: 120px" v-else-if="e.type === 5">
+                  <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in e.optionVos">{{ b.showValue }}</a-select-option>
                 </a-select>
-                <a-range-picker
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  show-time
-                  v-else-if="e.type === 6"
-                />
+                <a-range-picker @change="onChange($event, e.type, e.id, e.recordId)" show-time v-else-if="e.type === 6" />
                 <a-upload
                   :action="action"
                   :default-file-list="fileList"
@@ -665,16 +515,8 @@
                   class="d-flex flex-row flex-wrap"
                   v-else-if="e.type === 8"
                 >
-                  <a-radio-group
-                    @change="onChange($event, e.type, e.id)"
-                    class="d-flex flex-row flex-wrap"
-                  >
-                    <a-radio
-                      :key="g"
-                      :style="radioStyle"
-                      :value="f.showValue"
-                      v-for="(f, g) in e.optionVos"
-                    >{{ f.showValue }}</a-radio>
+                  <a-radio-group @change="onChange($event, e.type, e.id)" class="d-flex flex-row flex-wrap">
+                    <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in e.optionVos">{{ f.showValue }}</a-radio>
                   </a-radio-group>
                   <div :key="k" v-for="(j, k) in e.optionVos">
                     <div
@@ -689,10 +531,7 @@
                         :wrapper-col="formItemLayout.wrapperCol"
                         class="d-flex align-center mb-3"
                       >
-                        <a-input
-                          @change="inputChange(e.id, $event, j.showValue)"
-                          style="width: 200px"
-                        ></a-input>
+                        <a-input @change="inputChange(e.id, $event, j.showValue)" style="width: 200px"></a-input>
                       </a-form-item>
                     </div>
                   </div>
@@ -720,10 +559,7 @@
                             :wrapper-col="formItemLayout.wrapperCol"
                             class="d-flex align-center mb-3"
                           >
-                            <a-input
-                              @change="inputChange(e.id, $event, j.showValue)"
-                              style="width: 200px"
-                            ></a-input>
+                            <a-input @change="inputChange(e.id, $event, j.showValue)" style="width: 200px"></a-input>
                           </a-form-item>
                         </div>
                       </div>
@@ -731,15 +567,8 @@
                   </a-row>
                 </a-checkbox-group>
                 <div v-else-if="e.type === 10">
-                  <a-select
-                    @change="onChange($event, e.type, e.id, e.recordId)"
-                    style="width: 120px"
-                  >
-                    <a-select-option
-                      :key="c"
-                      :value="b.showValue"
-                      v-for="(b, c) in e.optionVos"
-                    >{{ b.showValue }}</a-select-option>
+                  <a-select @change="onChange($event, e.type, e.id, e.recordId)" style="width: 120px">
+                    <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in e.optionVos">{{ b.showValue }}</a-select-option>
                   </a-select>
                   <div :key="c" v-for="(b, c) in e.optionVos">
                     <div
@@ -754,19 +583,13 @@
                         :wrapper-col="formItemLayout.wrapperCol"
                         class="d-flex align-center mb-3"
                       >
-                        <a-input
-                          @change="inputChange(e.id, $event, b.showValue)"
-                          style="width: 200px"
-                        ></a-input>
+                        <a-input @change="inputChange(e.id, $event, b.showValue)" style="width: 200px"></a-input>
                       </a-form-item>
                     </div>
                   </div>
                 </div>
                 <div v-else-if="e.type === 11">
-                  <a-checkbox-group
-                    @change="onChange($event, e.type, e.id, e.recordId)"
-                    class="d-flex flex-row flex-wrap"
-                  >
+                  <a-checkbox-group @change="onChange($event, e.type, e.id, e.recordId)" class="d-flex flex-row flex-wrap">
                     <a-row>
                       <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in e.optionVos">
                         <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
@@ -780,29 +603,18 @@
                               }) && b.afterOperation > 0
                             "
                           >
-                            <a-input
-                              @change="inputChange(e.id, $event, b.showValue)"
-                              style="width: 200px"
-                            ></a-input>
+                            <a-input @change="inputChange(e.id, $event, b.showValue)" style="width: 200px"></a-input>
                           </div>
                         </div>
-                      </a-col>
-                    </a-row>说明：
+                      </a-col> </a-row
+                    >说明：
                     <a-input @change="explainChange(e.id, $event)" style="width: 200px" />
                   </a-checkbox-group>
                 </div>
                 <!-- 当类型为12时，为单选+关联 -->
                 <div v-else-if="e.type === 12">
-                  <a-radio-group
-                    @change="onChange($event, e.type, e.id, e.recordId)"
-                    class="d-flex flex-row flex-wrap"
-                  >
-                    <a-radio
-                      :key="g"
-                      :style="radioStyle"
-                      :value="f.showValue"
-                      v-for="(f, g) in e.optionVos"
-                    >{{ f.showValue }}</a-radio>
+                  <a-radio-group @change="onChange($event, e.type, e.id, e.recordId)" class="d-flex flex-row flex-wrap">
+                    <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in e.optionVos">{{ f.showValue }}</a-radio>
                   </a-radio-group>
                   <div :key="k" v-for="(j, k) in e.optionVos">
                     <div
@@ -824,16 +636,10 @@
                             style="width: 200px"
                             v-if="j.afterOperation === 1"
                           ></a-input>
-                          <a-textarea
-                            @change="inputChange(e.id, $event, j.showValue)"
-                            v-else-if="j.afterOperation === 2"
-                          ></a-textarea>
+                          <a-textarea @change="inputChange(e.id, $event, j.showValue)" v-else-if="j.afterOperation === 2"></a-textarea>
                           <div v-else-if="j.afterOperation === 3">
                             <a-form-item class="d-flex align-center mb-3">
-                              <a-input
-                                @change="onChange($event, h.type, h.id, h.h.recordId)"
-                                v-if="h.type === 1"
-                              />
+                              <a-input @change="onChange($event, h.type, h.id, h.h.recordId)" v-if="h.type === 1" />
                               <a-textarea
                                 @change="onChange($event, h.type, h.id, h.recordId)"
                                 style="height: 100px"
@@ -844,12 +650,9 @@
                                 class="d-flex flex-row flex-wrap"
                                 v-else-if="h.type === 3"
                               >
-                                <a-radio
-                                  :key="c"
-                                  :style="radioStyle"
-                                  :value="b.showValue"
-                                  v-for="(b, c) in h.optionVos"
-                                >{{ b.showValue }}</a-radio>
+                                <a-radio :key="c" :style="radioStyle" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
+                                  b.showValue
+                                }}</a-radio>
                               </a-radio-group>
                               <a-checkbox-group
                                 @change="onChange($event, h.type, h.id, h.recordId)"
@@ -857,31 +660,17 @@
                                 v-else-if="h.type === 4"
                               >
                                 <a-row>
-                                  <a-col
-                                    :key="indexNum"
-                                    :span="24"
-                                    v-for="(ques, indexNum) in h.optionVos"
-                                  >
+                                  <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
                                     <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
                                   </a-col>
                                 </a-row>
                               </a-checkbox-group>
-                              <a-select
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                style="width: 120px"
-                                v-else-if="h.type === 5"
-                              >
-                                <a-select-option
-                                  :key="c"
-                                  :value="b.showValue"
-                                  v-for="(b, c) in h.optionVos"
-                                >{{ b.showValue }}</a-select-option>
+                              <a-select @change="onChange($event, h.type, h.id, h.recordId)" style="width: 120px" v-else-if="h.type === 5">
+                                <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
+                                  b.showValue
+                                }}</a-select-option>
                               </a-select>
-                              <a-range-picker
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                show-time
-                                v-else-if="h.type === 6"
-                              />
+                              <a-range-picker @change="onChange($event, h.type, h.id, h.recordId)" show-time v-else-if="h.type === 6" />
                               <a-upload
                                 :action="action"
                                 :default-file-list="fileList"
@@ -906,16 +695,10 @@
                                 class="d-flex flex-row flex-wrap"
                                 v-else-if="h.type === 8"
                               >
-                                <a-radio-group
-                                  @change="onChange($event, h.type, h.id, h.recordId)"
-                                  class="d-flex flex-row flex-wrap"
-                                >
-                                  <a-radio
-                                    :key="g"
-                                    :style="radioStyle"
-                                    :value="f.showValue"
-                                    v-for="(f, g) in h.optionVos"
-                                  >{{ f.showValue }}</a-radio>
+                                <a-radio-group @change="onChange($event, h.type, h.id, h.recordId)" class="d-flex flex-row flex-wrap">
+                                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in h.optionVos">{{
+                                    f.showValue
+                                  }}</a-radio>
                                 </a-radio-group>
                                 <div :key="n" v-for="(m, n) in h.optionVos">
                                   <div
@@ -930,10 +713,7 @@
                                       :wrapper-col="formItemLayout.wrapperCol"
                                       class="d-flex align-center mb-3"
                                     >
-                                      <a-input
-                                        @change="inputChange(h.id, $event, m.showValue)"
-                                        style="width: 200px"
-                                      ></a-input>
+                                      <a-input @change="inputChange(h.id, $event, m.showValue)" style="width: 200px"></a-input>
                                     </a-form-item>
                                   </div>
                                 </div>
@@ -944,11 +724,7 @@
                                 v-else-if="h.type === 9"
                               >
                                 <a-row>
-                                  <a-col
-                                    :key="indexNum"
-                                    :span="24"
-                                    v-for="(ques, indexNum) in h.optionVos"
-                                  >
+                                  <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
                                     <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
                                   </a-col>
                                   <a-col :span="100">
@@ -965,10 +741,7 @@
                                           :wrapper-col="formItemLayout.wrapperCol"
                                           class="d-flex align-center mb-3"
                                         >
-                                          <a-input
-                                            @change="inputChange(h.id, $event, m.showValue)"
-                                            style="width: 200px"
-                                          ></a-input>
+                                          <a-input @change="inputChange(h.id, $event, m.showValue)" style="width: 200px"></a-input>
                                         </a-form-item>
                                       </div>
                                     </div>
@@ -976,15 +749,10 @@
                                 </a-row>
                               </a-checkbox-group>
                               <div v-else-if="h.type === 10">
-                                <a-select
-                                  @change="onChange($event, h.type, h.id, h.recordId)"
-                                  style="width: 120px"
-                                >
-                                  <a-select-option
-                                    :key="c"
-                                    :value="b.showValue"
-                                    v-for="(b, c) in h.optionVos"
-                                  >{{ b.showValue }}</a-select-option>
+                                <a-select @change="onChange($event, h.type, h.id, h.recordId)" style="width: 120px">
+                                  <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
+                                    b.showValue
+                                  }}</a-select-option>
                                 </a-select>
                                 <div :key="c" v-for="(b, c) in h.optionVos">
                                   <div
@@ -999,25 +767,15 @@
                                       :wrapper-col="formItemLayout.wrapperCol"
                                       class="d-flex align-center mb-3"
                                     >
-                                      <a-input
-                                        @change="inputChange(h.id, $event, b.showValue)"
-                                        style="width: 200px"
-                                      ></a-input>
+                                      <a-input @change="inputChange(h.id, $event, b.showValue)" style="width: 200px"></a-input>
                                     </a-form-item>
                                   </div>
                                 </div>
                               </div>
                               <div v-else-if="h.type === 11">
-                                <a-checkbox-group
-                                  @change="onChange($event, h.type, h.id, h.recordId)"
-                                  class="d-flex flex-row flex-wrap"
-                                >
+                                <a-checkbox-group @change="onChange($event, h.type, h.id, h.recordId)" class="d-flex flex-row flex-wrap">
                                   <a-row>
-                                    <a-col
-                                      :key="indexNum"
-                                      :span="24"
-                                      v-for="(ques, indexNum) in h.optionVos"
-                                    >
+                                    <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
                                       <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
                                     </a-col>
                                     <a-col :span="100">
@@ -1031,32 +789,20 @@
                                             }) && b.afterOperation > 0
                                           "
                                         >
-                                          <a-input
-                                            @change="inputChange(h.id, $event, b.showValue)"
-                                            style="width: 200px"
-                                          ></a-input>
+                                          <a-input @change="inputChange(h.id, $event, b.showValue)" style="width: 200px"></a-input>
                                         </div>
                                       </div>
-                                    </a-col>
-                                  </a-row>说明：
-                                  <a-input
-                                    @change="explainChange(h.id, $event)"
-                                    style="width: 200px"
-                                  />
+                                    </a-col> </a-row
+                                  >说明：
+                                  <a-input @change="explainChange(h.id, $event)" style="width: 200px" />
                                 </a-checkbox-group>
                               </div>
                               <!-- 当类型为12时，为单选+关联 -->
                               <div v-else-if="h.type === 12">
-                                <a-radio-group
-                                  @change="onChange($event, h.type, h.id, h.recordId)"
-                                  class="d-flex flex-row flex-wrap"
-                                >
-                                  <a-radio
-                                    :key="g"
-                                    :style="radioStyle"
-                                    :value="f.showValue"
-                                    v-for="(f, g) in h.optionVos"
-                                  >{{ f.showValue }}</a-radio>
+                                <a-radio-group @change="onChange($event, h.type, h.id, h.recordId)" class="d-flex flex-row flex-wrap">
+                                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in h.optionVos">{{
+                                    f.showValue
+                                  }}</a-radio>
                                 </a-radio-group>
                                 <div :key="n" v-for="(m, n) in h.optionVos">
                                   <div
@@ -1088,9 +834,7 @@
                                 </div>
                               </div>
                               <div v-else-if="h.type === 13">
-                                <a-input-number
-                                  @change="onChange($event, h.type, h.id, h.recordId)"
-                                />
+                                <a-input-number @change="onChange($event, h.type, h.id, h.recordId)" />
                                 <span style="margin-left: 10px">{{ h.units }}</span>
                               </div>
                               <div v-else-if="h.type === 14">图片识别</div>
@@ -1130,13 +874,7 @@
         placeholder="请选择类型"
         style="width: 200px"
       />
-      <a-select
-        @change="handleChange"
-        mode="multiple"
-        placeholder="请选择对照组"
-        size="default"
-        style="width: 450px; margin-left: 40px"
-      >
+      <a-select @change="handleChange" mode="multiple" placeholder="请选择对照组" size="default" style="width: 450px; margin-left: 40px">
         <a-select-option :key="i.id" v-for="i in controlGroups">{{ i.name }}</a-select-option>
       </a-select>
     </div>
@@ -1179,7 +917,7 @@ export default {
       numList: [1, 2, 3, 4, 5],
       setObj: {
         hospitalId: '', // 选择的医院Id
-        hospitalization: '', // 输入的住院号
+        hospitalization: '', // 输入的患者编号
         inpatientId: '', // 选择的对照组Id
         inputStatus: '', // 选择的录入状态
       },
@@ -1615,7 +1353,7 @@ export default {
             conditionList: this.contentList,
             conditionListDate: this.conditionListDate,
             hospitalId: this.setObj.hospitalId, // 医院id
-            hospitalization: this.setObj.hospitalization, // 住院号
+            hospitalization: this.setObj.hospitalization, // 患者编号
             inpatientId: this.inpatientList, // 对照组id
             inputStatus: this.setObj.inputStatus, // 录入状态
             reportParams: this.caseAnswer, // 认知量表答题情况
diff --git a/src/views/CaseSearch/CaseSearch.vue b/src/views/CaseSearch/CaseSearch.vue
index 34f182c..7c4b0bd 100644
--- a/src/views/CaseSearch/CaseSearch.vue
+++ b/src/views/CaseSearch/CaseSearch.vue
@@ -3,49 +3,21 @@
     <div class="d-flex flex-row flex-wrap">
       <a-form :form="form1" class="d-flex flex-wrap align-center" layout="inline">
         <a-form-item>
-          <a-select
-            @change="chooseHos($event, 1)"
-            allow-clear
-            placeholder="请选择医院"
-            style="min-width: 150px"
-            v-decorator="['hospital']"
-          >
-            <a-select-option
-              :key="item.id"
-              :value="item.id"
-              v-for="item in hospitals"
-            >{{ item.name }}</a-select-option>
+          <a-select @change="chooseHos($event, 1)" allow-clear placeholder="请选择医院" style="min-width: 150px" v-decorator="['hospital']">
+            <a-select-option :key="item.id" :value="item.id" v-for="item in hospitals">{{ item.name }}</a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item>
-          <a-input placeholder="患者住院号" style="width: 14em" v-model="setObj.hospitalization" />
+          <a-input placeholder="患者编号" style="width: 14em" v-model="setObj.hospitalization" />
         </a-form-item>
         <a-form-item>
-          <a-select
-            @change="chooseHos($event, 2)"
-            allow-clear
-            placeholder="请选择对照组"
-            style="min-width: 450px"
-          >
-            <a-select-option
-              :key="item.id"
-              :value="item.id"
-              v-for="item in controlGroups"
-            >{{ item.name }}</a-select-option>
+          <a-select @change="chooseHos($event, 2)" allow-clear placeholder="请选择对照组" style="min-width: 450px">
+            <a-select-option :key="item.id" :value="item.id" v-for="item in controlGroups">{{ item.name }}</a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item>
-          <a-select
-            @change="chooseHos($event, 3)"
-            allow-clear
-            placeholder="请选择录入状态"
-            style="min-width: 150px"
-          >
-            <a-select-option
-              :key="item.id"
-              :value="item.id"
-              v-for="item in statusList"
-            >{{ item.name }}</a-select-option>
+          <a-select @change="chooseHos($event, 3)" allow-clear placeholder="请选择录入状态" style="min-width: 150px">
+            <a-select-option :key="item.id" :value="item.id" v-for="item in statusList">{{ item.name }}</a-select-option>
           </a-select>
         </a-form-item>
       </a-form>
@@ -69,22 +41,13 @@
               class="d-flex align-center mb-3"
             >
               <a-input @change="onChange($event, a.type, a.id, a.recordId)" v-if="a.type === 1" />
-              <a-textarea
-                @change="onChange($event, a.type, a.id, a.recordId)"
-                style="height: 100px"
-                v-else-if="a.type === 2"
-              />
+              <a-textarea @change="onChange($event, a.type, a.id, a.recordId)" style="height: 100px" v-else-if="a.type === 2" />
               <a-radio-group
                 @change="onChange($event, a.type, a.id, a.recordId)"
                 class="d-flex flex-row flex-wrap"
                 v-else-if="a.type === 3"
               >
-                <a-radio
-                  :key="c"
-                  :style="radioStyle"
-                  :value="b.showValue"
-                  v-for="(b, c) in a.optionVos"
-                >{{ b.showValue }}</a-radio>
+                <a-radio :key="c" :style="radioStyle" :value="b.showValue" v-for="(b, c) in a.optionVos">{{ b.showValue }}</a-radio>
               </a-radio-group>
               <a-checkbox-group
                 @change="onChange($event, a.type, a.id, a.recordId)"
@@ -97,22 +60,10 @@
                   </a-col>
                 </a-row>
               </a-checkbox-group>
-              <a-select
-                @change="onChange($event, a.type, a.id, a.recordId)"
-                style="min-width: 120px"
-                v-else-if="a.type === 5"
-              >
-                <a-select-option
-                  :key="c"
-                  :value="b.showValue"
-                  v-for="(b, c) in a.optionVos"
-                >{{ b.showValue }}</a-select-option>
+              <a-select @change="onChange($event, a.type, a.id, a.recordId)" style="min-width: 120px" v-else-if="a.type === 5">
+                <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in a.optionVos">{{ b.showValue }}</a-select-option>
               </a-select>
-              <a-range-picker
-                @change="onChange($event, a.type, a.id, a.recordId)"
-                show-time
-                v-else-if="a.type === 6"
-              />
+              <a-range-picker @change="onChange($event, a.type, a.id, a.recordId)" show-time v-else-if="a.type === 6" />
               <a-upload
                 :action="action"
                 :default-file-list="fileList"
@@ -137,16 +88,8 @@
                 class="d-flex flex-row flex-wrap"
                 v-else-if="a.type === 8"
               >
-                <a-radio-group
-                  @change="onChange($event, a.type, a.id, a.recordId)"
-                  class="d-flex flex-row flex-wrap"
-                >
-                  <a-radio
-                    :key="g"
-                    :style="radioStyle"
-                    :value="f.showValue"
-                    v-for="(f, g) in a.optionVos"
-                  >{{ f.showValue }}</a-radio>
+                <a-radio-group @change="onChange($event, a.type, a.id, a.recordId)" class="d-flex flex-row flex-wrap">
+                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in a.optionVos">{{ f.showValue }}</a-radio>
                 </a-radio-group>
                 <div :key="k" v-for="(j, k) in a.optionVos">
                   <div
@@ -156,16 +99,8 @@
                       }) && j.afterOperation === 1
                     "
                   >
-                    <a-form-item
-                      :label-col="formItemLayout.labelCol"
-                      :wrapper-col="formItemLayout.wrapperCol"
-                      class="mt-2 mb-0"
-                    >
-                      <a-input
-                        @change="inputChange(a.id, $event, j.showValue)"
-                        placeholder="请输入其他"
-                        style="width: 200px"
-                      ></a-input>
+                    <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" class="mt-2 mb-0">
+                      <a-input @change="inputChange(a.id, $event, j.showValue)" placeholder="请输入其他" style="width: 200px"></a-input>
                     </a-form-item>
                   </div>
                 </div>
@@ -185,21 +120,13 @@
                 <div :key="k" v-for="(j, k) in a.optionVos">
                   <div
                     v-if="
-                          contentList.find(item => {
-                            return item.testQuestionsId === a.id && item.contents === `${j.showValue}`;
-                          }) && j.afterOperation === 1
-                        "
+                      contentList.find(item => {
+                        return item.testQuestionsId === a.id && item.contents === `${j.showValue}`;
+                      }) && j.afterOperation === 1
+                    "
                   >
-                    <a-form-item
-                      :label-col="formItemLayout.labelCol"
-                      :wrapper-col="formItemLayout.wrapperCol"
-                      class="mt-2 mb-0"
-                    >
-                      <a-input
-                        @change="inputChange(a.id, $event, j.showValue)"
-                        placeholder="请输入其他"
-                        style="width: 200px"
-                      ></a-input>
+                    <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" class="mt-2 mb-0">
+                      <a-input @change="inputChange(a.id, $event, j.showValue)" placeholder="请输入其他" style="width: 200px"></a-input>
                     </a-form-item>
                   </div>
                 </div>
@@ -207,15 +134,8 @@
                 </a-row>-->
               </a-checkbox-group>
               <div v-else-if="a.type === 10">
-                <a-select
-                  @change="onChange($event, a.type, a.id, a.recordId)"
-                  style="min-width: 120px"
-                >
-                  <a-select-option
-                    :key="c"
-                    :value="b.showValue"
-                    v-for="(b, c) in a.optionVos"
-                  >{{ b.showValue }}</a-select-option>
+                <a-select @change="onChange($event, a.type, a.id, a.recordId)" style="min-width: 120px">
+                  <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in a.optionVos">{{ b.showValue }}</a-select-option>
                 </a-select>
                 <div :key="c" v-for="(b, c) in a.optionVos">
                   <div
@@ -225,23 +145,14 @@
                       }) && b.afterOperation === 1
                     "
                   >
-                    <a-form-item
-                      :label-col="formItemLayout.labelCol"
-                      :wrapper-col="formItemLayout.wrapperCol"
-                    >
-                      <a-input
-                        @change="inputChange(a.id, $event, b.showValue)"
-                        style="width: 200px"
-                      ></a-input>
+                    <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+                      <a-input @change="inputChange(a.id, $event, b.showValue)" style="width: 200px"></a-input>
                     </a-form-item>
                   </div>
                 </div>
               </div>
               <div v-else-if="a.type === 11">
-                <a-checkbox-group
-                  @change="onChange($event, a.type, a.id, a.recordId)"
-                  class="d-flex flex-row flex-wrap"
-                >
+                <a-checkbox-group @change="onChange($event, a.type, a.id, a.recordId)" class="d-flex flex-row flex-wrap">
                   <a-row>
                     <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in a.optionVos">
                       <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
@@ -255,29 +166,18 @@
                             }) && b.afterOperation > 0
                           "
                         >
-                          <a-input
-                            @change="inputChange(a.id, $event, b.showValue)"
-                            style="width: 200px"
-                          ></a-input>
+                          <a-input @change="inputChange(a.id, $event, b.showValue)" style="width: 200px"></a-input>
                         </div>
                       </div>
-                    </a-col>
-                  </a-row>说明：
+                    </a-col> </a-row
+                  >说明：
                   <a-input @change="explainChange(a.id, $event)" style="width: 200px" />
                 </a-checkbox-group>
               </div>
               <!-- 当类型为12时，为单选+关联 -->
               <div v-else-if="a.type === 12">
-                <a-radio-group
-                  @change="onChange($event, a.type, a.id, a.recordId)"
-                  class="d-flex flex-row flex-wrap"
-                >
-                  <a-radio
-                    :key="g"
-                    :style="radioStyle"
-                    :value="f.showValue"
-                    v-for="(f, g) in a.optionVos"
-                  >{{ f.showValue }}</a-radio>
+                <a-radio-group @change="onChange($event, a.type, a.id, a.recordId)" class="d-flex flex-row flex-wrap">
+                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in a.optionVos">{{ f.showValue }}</a-radio>
                 </a-radio-group>
                 <div :key="k" v-for="(j, k) in a.optionVos">
                   <div
@@ -288,20 +188,13 @@
                     "
                   >
                     <div :key="i" v-for="(h, i) in j.questionVos">
-                      <a-form-item
-                        :label="h.question"
-                        :label-col="formItemLayout.labelCol"
-                        :wrapper-col="formItemLayout.wrapperCol"
-                      >
+                      <a-form-item :label="h.question" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
                         <a-input
                           @change="inputChange(a.id, $event, j.showValue)"
                           style="width: 200px"
                           v-if="j.afterOperation === 1"
                         ></a-input>
-                        <a-textarea
-                          @change="inputChange(a.id, $event, j.showValue)"
-                          v-else-if="j.afterOperation === 2"
-                        ></a-textarea>
+                        <a-textarea @change="inputChange(a.id, $event, j.showValue)" v-else-if="j.afterOperation === 2"></a-textarea>
                         <div v-else-if="j.afterOperation === 3">
                           <div :key="ohter.id" v-for="ohter in j.questionVos">
                             <a-form-item
@@ -309,10 +202,7 @@
                               :label-col="formItemLayout.labelCol"
                               :wrapper-col="formItemLayout.wrapperCol"
                             >
-                              <a-input
-                                @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                v-if="ohter.type === 1"
-                              />
+                              <a-input @change="onChange($event, ohter.type, ohter.id, ohter.recordId)" v-if="ohter.type === 1" />
                               <a-textarea
                                 @change="onChange($event, ohter.type, ohter.id)"
                                 style="height: 100px"
@@ -323,12 +213,9 @@
                                 class="d-flex flex-row flex-wrap"
                                 v-else-if="ohter.type === 3"
                               >
-                                <a-radio
-                                  :key="c"
-                                  :style="radioStyle"
-                                  :value="b.showValue"
-                                  v-for="(b, c) in ohter.optionVos"
-                                >{{ b.showValue }}</a-radio>
+                                <a-radio :key="c" :style="radioStyle" :value="b.showValue" v-for="(b, c) in ohter.optionVos">{{
+                                  b.showValue
+                                }}</a-radio>
                               </a-radio-group>
                               <a-checkbox-group
                                 @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
@@ -336,11 +223,7 @@
                                 v-else-if="ohter.type === 4"
                               >
                                 <a-row>
-                                  <a-col
-                                    :key="indexNum"
-                                    :span="24"
-                                    v-for="(ques, indexNum) in ohter.optionVos"
-                                  >
+                                  <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in ohter.optionVos">
                                     <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
                                   </a-col>
                                 </a-row>
@@ -350,11 +233,9 @@
                                 style="min-width: 120px"
                                 v-else-if="ohter.type === 5"
                               >
-                                <a-select-option
-                                  :key="c"
-                                  :value="b.showValue"
-                                  v-for="(b, c) in ohter.optionVos"
-                                >{{ b.showValue }}</a-select-option>
+                                <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in ohter.optionVos">{{
+                                  b.showValue
+                                }}</a-select-option>
                               </a-select>
                               <a-range-picker
                                 @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
@@ -385,16 +266,10 @@
                                 class="d-flex flex-row flex-wrap"
                                 v-else-if="ohter.type === 8"
                               >
-                                <a-radio-group
-                                  @change="onChange($event, ohter.type, ohter.id)"
-                                  class="d-flex flex-row flex-wrap"
-                                >
-                                  <a-radio
-                                    :key="g"
-                                    :style="radioStyle"
-                                    :value="f.showValue"
-                                    v-for="(f, g) in ohter.optionVos"
-                                  >{{ f.showValue }}</a-radio>
+                                <a-radio-group @change="onChange($event, ohter.type, ohter.id)" class="d-flex flex-row flex-wrap">
+                                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in ohter.optionVos">{{
+                                    f.showValue
+                                  }}</a-radio>
                                 </a-radio-group>
                                 <div :key="n" v-for="(m, n) in ohter.optionVos">
                                   <div
@@ -404,14 +279,8 @@
                                       }) && m.afterOperation === 1
                                     "
                                   >
-                                    <a-form-item
-                                      :label-col="formItemLayout.labelCol"
-                                      :wrapper-col="formItemLayout.wrapperCol"
-                                    >
-                                      <a-input
-                                        @change="inputChange(ohter.id, $event, m.showValue)"
-                                        style="width: 200px"
-                                      ></a-input>
+                                    <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+                                      <a-input @change="inputChange(ohter.id, $event, m.showValue)" style="width: 200px"></a-input>
                                     </a-form-item>
                                   </div>
                                 </div>
@@ -422,11 +291,7 @@
                                 v-else-if="ohter.type === 9"
                               >
                                 <a-row>
-                                  <a-col
-                                    :key="indexNum"
-                                    :span="24"
-                                    v-for="(ques, indexNum) in ohter.optionVos"
-                                  >
+                                  <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in ohter.optionVos">
                                     <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
                                   </a-col>
                                   <a-col :span="100">
@@ -438,14 +303,8 @@
                                           }) && m.afterOperation === 1
                                         "
                                       >
-                                        <a-form-item
-                                          :label-col="formItemLayout.labelCol"
-                                          :wrapper-col="formItemLayout.wrapperCol"
-                                        >
-                                          <a-input
-                                            @change="inputChange(ohter.id, $event, m.showValue)"
-                                            style="width: 200px"
-                                          ></a-input>
+                                        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+                                          <a-input @change="inputChange(ohter.id, $event, m.showValue)" style="width: 200px"></a-input>
                                         </a-form-item>
                                       </div>
                                     </div>
@@ -453,15 +312,10 @@
                                 </a-row>
                               </a-checkbox-group>
                               <div v-else-if="ohter.type === 10">
-                                <a-select
-                                  @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                  style="min-width: 120px"
-                                >
-                                  <a-select-option
-                                    :key="c"
-                                    :value="b.showValue"
-                                    v-for="(b, c) in ohter.optionVos"
-                                  >{{ b.showValue }}</a-select-option>
+                                <a-select @change="onChange($event, ohter.type, ohter.id, ohter.recordId)" style="min-width: 120px">
+                                  <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in ohter.optionVos">{{
+                                    b.showValue
+                                  }}</a-select-option>
                                 </a-select>
                                 <div :key="c" v-for="(b, c) in ohter.optionVos">
                                   <div
@@ -471,14 +325,8 @@
                                       }) && b.afterOperation === 1
                                     "
                                   >
-                                    <a-form-item
-                                      :label-col="formItemLayout.labelCol"
-                                      :wrapper-col="formItemLayout.wrapperCol"
-                                    >
-                                      <a-input
-                                        @change="inputChange(ohter.id, $event, b.showValue)"
-                                        style="width: 200px"
-                                      ></a-input>
+                                    <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+                                      <a-input @change="inputChange(ohter.id, $event, b.showValue)" style="width: 200px"></a-input>
                                     </a-form-item>
                                   </div>
                                 </div>
@@ -489,11 +337,7 @@
                                   class="d-flex flex-row flex-wrap"
                                 >
                                   <a-row>
-                                    <a-col
-                                      :key="indexNum"
-                                      :span="24"
-                                      v-for="(ques, indexNum) in ohter.optionVos"
-                                    >
+                                    <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in ohter.optionVos">
                                       <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
                                     </a-col>
                                     <a-col :span="100">
@@ -508,18 +352,12 @@
                                             }) && b.afterOperation > 0
                                           "
                                         >
-                                          <a-input
-                                            @change="inputChange(ohter.id, $event, b.showValue)"
-                                            style="width: 200px"
-                                          ></a-input>
+                                          <a-input @change="inputChange(ohter.id, $event, b.showValue)" style="width: 200px"></a-input>
                                         </div>
                                       </div>
-                                    </a-col>
-                                  </a-row>说明：
-                                  <a-input
-                                    @change="explainChange(ohter.id, $event)"
-                                    style="width: 200px"
-                                  />
+                                    </a-col> </a-row
+                                  >说明：
+                                  <a-input @change="explainChange(ohter.id, $event)" style="width: 200px" />
                                 </a-checkbox-group>
                               </div>
                               <!-- 当类型为12时，为单选+关联 -->
@@ -528,12 +366,9 @@
                                   @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
                                   class="d-flex flex-row flex-wrap"
                                 >
-                                  <a-radio
-                                    :key="g"
-                                    :style="radioStyle"
-                                    :value="f.showValue"
-                                    v-for="(f, g) in ohter.optionVos"
-                                  >{{ f.showValue }}</a-radio>
+                                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in ohter.optionVos">{{
+                                    f.showValue
+                                  }}</a-radio>
                                 </a-radio-group>
                                 <div :key="n" v-for="(m, n) in ohter.optionVos">
                                   <div
@@ -565,9 +400,7 @@
                                 </div>
                               </div>
                               <div v-else-if="ohter.type === 13">
-                                <a-input-number
-                                  @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                />
+                                <a-input-number @change="onChange($event, ohter.type, ohter.id, ohter.recordId)" />
                                 <span style="margin-left: 10px">{{ other.units }}</span>
                               </div>
                               <div v-else-if="ohter.type === 14">图片识别</div>
@@ -588,11 +421,7 @@
           </div>
           <!-- 一级标题下的各种二级标题（subReportCodes） -->
           <div :key="w.name" v-for="w in item.subReportCodes">
-            <a-form-item
-              :label-col="formItemLayout.labelCol"
-              :wrapper-col="formItemLayout.wrapperCol"
-              class="d-flex align-center mb-0"
-            >
+            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" class="d-flex align-center mb-0">
               <!-- 二级大标题 -->
               <h3 class="font-bold">{{ w.name }}：</h3>
             </a-form-item>
@@ -605,22 +434,13 @@
                 class="d-flex align-center mb-3"
               >
                 <a-input @change="onChange($event, e.type, e.id, e.recordId)" v-if="e.type === 1" />
-                <a-textarea
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  style="height: 100px"
-                  v-else-if="e.type === 2"
-                />
+                <a-textarea @change="onChange($event, e.type, e.id, e.recordId)" style="height: 100px" v-else-if="e.type === 2" />
                 <a-radio-group
                   @change="onChange($event, e.type, e.id, e.recordId)"
                   class="d-flex flex-row flex-wrap"
                   v-else-if="e.type === 3"
                 >
-                  <a-radio
-                    :key="c"
-                    :style="radioStyle"
-                    :value="b.showValue"
-                    v-for="(b, c) in e.optionVos"
-                  >{{ b.showValue }}</a-radio>
+                  <a-radio :key="c" :style="radioStyle" :value="b.showValue" v-for="(b, c) in e.optionVos">{{ b.showValue }}</a-radio>
                 </a-radio-group>
                 <a-checkbox-group
                   @change="onChange($event, e.type, e.id, e.recordId)"
@@ -633,22 +453,10 @@
                     </a-col>
                   </a-row>
                 </a-checkbox-group>
-                <a-select
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  style="min-width: 120px"
-                  v-else-if="e.type === 5"
-                >
-                  <a-select-option
-                    :key="c"
-                    :value="b.showValue"
-                    v-for="(b, c) in e.optionVos"
-                  >{{ b.showValue }}</a-select-option>
+                <a-select @change="onChange($event, e.type, e.id, e.recordId)" style="min-width: 120px" v-else-if="e.type === 5">
+                  <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in e.optionVos">{{ b.showValue }}</a-select-option>
                 </a-select>
-                <a-range-picker
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  show-time
-                  v-else-if="e.type === 6"
-                />
+                <a-range-picker @change="onChange($event, e.type, e.id, e.recordId)" show-time v-else-if="e.type === 6" />
                 <a-upload
                   :action="action"
                   :default-file-list="fileList"
@@ -673,16 +481,8 @@
                   class="d-flex flex-row flex-wrap"
                   v-else-if="e.type === 8"
                 >
-                  <a-radio-group
-                    @change="onChange($event, e.type, e.id)"
-                    class="d-flex flex-row flex-wrap"
-                  >
-                    <a-radio
-                      :key="g"
-                      :style="radioStyle"
-                      :value="f.showValue"
-                      v-for="(f, g) in e.optionVos"
-                    >{{ f.showValue }}</a-radio>
+                  <a-radio-group @change="onChange($event, e.type, e.id)" class="d-flex flex-row flex-wrap">
+                    <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in e.optionVos">{{ f.showValue }}</a-radio>
                   </a-radio-group>
                   <div :key="k" v-for="(j, k) in e.optionVos">
                     <div
@@ -697,10 +497,7 @@
                         :wrapper-col="formItemLayout.wrapperCol"
                         class="d-flex align-center mb-3"
                       >
-                        <a-input
-                          @change="inputChange(e.id, $event, j.showValue)"
-                          style="width: 200px"
-                        ></a-input>
+                        <a-input @change="inputChange(e.id, $event, j.showValue)" style="width: 200px"></a-input>
                       </a-form-item>
                     </div>
                   </div>
@@ -728,10 +525,7 @@
                             :wrapper-col="formItemLayout.wrapperCol"
                             class="d-flex align-center mb-3"
                           >
-                            <a-input
-                              @change="inputChange(e.id, $event, j.showValue)"
-                              style="width: 200px"
-                            ></a-input>
+                            <a-input @change="inputChange(e.id, $event, j.showValue)" style="width: 200px"></a-input>
                           </a-form-item>
                         </div>
                       </div>
@@ -739,15 +533,8 @@
                   </a-row>
                 </a-checkbox-group>
                 <div v-else-if="e.type === 10">
-                  <a-select
-                    @change="onChange($event, e.type, e.id, e.recordId)"
-                    style="min-width: 120px"
-                  >
-                    <a-select-option
-                      :key="c"
-                      :value="b.showValue"
-                      v-for="(b, c) in e.optionVos"
-                    >{{ b.showValue }}</a-select-option>
+                  <a-select @change="onChange($event, e.type, e.id, e.recordId)" style="min-width: 120px">
+                    <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in e.optionVos">{{ b.showValue }}</a-select-option>
                   </a-select>
                   <div :key="c" v-for="(b, c) in e.optionVos">
                     <div
@@ -762,19 +549,13 @@
                         :wrapper-col="formItemLayout.wrapperCol"
                         class="d-flex align-center mb-3"
                       >
-                        <a-input
-                          @change="inputChange(e.id, $event, b.showValue)"
-                          style="width: 200px"
-                        ></a-input>
+                        <a-input @change="inputChange(e.id, $event, b.showValue)" style="width: 200px"></a-input>
                       </a-form-item>
                     </div>
                   </div>
                 </div>
                 <div v-else-if="e.type === 11">
-                  <a-checkbox-group
-                    @change="onChange($event, e.type, e.id, e.recordId)"
-                    class="d-flex flex-row flex-wrap"
-                  >
+                  <a-checkbox-group @change="onChange($event, e.type, e.id, e.recordId)" class="d-flex flex-row flex-wrap">
                     <a-row>
                       <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in e.optionVos">
                         <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
@@ -788,29 +569,18 @@
                               }) && b.afterOperation > 0
                             "
                           >
-                            <a-input
-                              @change="inputChange(e.id, $event, b.showValue)"
-                              style="width: 200px"
-                            ></a-input>
+                            <a-input @change="inputChange(e.id, $event, b.showValue)" style="width: 200px"></a-input>
                           </div>
                         </div>
-                      </a-col>
-                    </a-row>说明：
+                      </a-col> </a-row
+                    >说明：
                     <a-input @change="explainChange(e.id, $event)" style="width: 200px" />
                   </a-checkbox-group>
                 </div>
                 <!-- 当类型为12时，为单选+关联 -->
                 <div v-else-if="e.type === 12">
-                  <a-radio-group
-                    @change="onChange($event, e.type, e.id, e.recordId)"
-                    class="d-flex flex-row flex-wrap"
-                  >
-                    <a-radio
-                      :key="g"
-                      :style="radioStyle"
-                      :value="f.showValue"
-                      v-for="(f, g) in e.optionVos"
-                    >{{ f.showValue }}</a-radio>
+                  <a-radio-group @change="onChange($event, e.type, e.id, e.recordId)" class="d-flex flex-row flex-wrap">
+                    <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in e.optionVos">{{ f.showValue }}</a-radio>
                   </a-radio-group>
                   <div :key="k" v-for="(j, k) in e.optionVos">
                     <div
@@ -832,16 +602,10 @@
                             style="width: 200px"
                             v-if="j.afterOperation === 1"
                           ></a-input>
-                          <a-textarea
-                            @change="inputChange(e.id, $event, j.showValue)"
-                            v-else-if="j.afterOperation === 2"
-                          ></a-textarea>
+                          <a-textarea @change="inputChange(e.id, $event, j.showValue)" v-else-if="j.afterOperation === 2"></a-textarea>
                           <div v-else-if="j.afterOperation === 3">
                             <a-form-item class="d-flex align-center mb-3">
-                              <a-input
-                                @change="onChange($event, h.type, h.id, h.h.recordId)"
-                                v-if="h.type === 1"
-                              />
+                              <a-input @change="onChange($event, h.type, h.id, h.h.recordId)" v-if="h.type === 1" />
                               <a-textarea
                                 @change="onChange($event, h.type, h.id, h.recordId)"
                                 style="height: 100px"
@@ -852,12 +616,9 @@
                                 class="d-flex flex-row flex-wrap"
                                 v-else-if="h.type === 3"
                               >
-                                <a-radio
-                                  :key="c"
-                                  :style="radioStyle"
-                                  :value="b.showValue"
-                                  v-for="(b, c) in h.optionVos"
-                                >{{ b.showValue }}</a-radio>
+                                <a-radio :key="c" :style="radioStyle" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
+                                  b.showValue
+                                }}</a-radio>
                               </a-radio-group>
                               <a-checkbox-group
                                 @change="onChange($event, h.type, h.id, h.recordId)"
@@ -865,11 +626,7 @@
                                 v-else-if="h.type === 4"
                               >
                                 <a-row>
-                                  <a-col
-                                    :key="indexNum"
-                                    :span="24"
-                                    v-for="(ques, indexNum) in h.optionVos"
-                                  >
+                                  <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
                                     <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
                                   </a-col>
                                 </a-row>
@@ -879,17 +636,11 @@
                                 style="min-width: 120px"
                                 v-else-if="h.type === 5"
                               >
-                                <a-select-option
-                                  :key="c"
-                                  :value="b.showValue"
-                                  v-for="(b, c) in h.optionVos"
-                                >{{ b.showValue }}</a-select-option>
+                                <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
+                                  b.showValue
+                                }}</a-select-option>
                               </a-select>
-                              <a-range-picker
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                show-time
-                                v-else-if="h.type === 6"
-                              />
+                              <a-range-picker @change="onChange($event, h.type, h.id, h.recordId)" show-time v-else-if="h.type === 6" />
                               <a-upload
                                 :action="action"
                                 :default-file-list="fileList"
@@ -914,16 +665,10 @@
                                 class="d-flex flex-row flex-wrap"
                                 v-else-if="h.type === 8"
                               >
-                                <a-radio-group
-                                  @change="onChange($event, h.type, h.id, h.recordId)"
-                                  class="d-flex flex-row flex-wrap"
-                                >
-                                  <a-radio
-                                    :key="g"
-                                    :style="radioStyle"
-                                    :value="f.showValue"
-                                    v-for="(f, g) in h.optionVos"
-                                  >{{ f.showValue }}</a-radio>
+                                <a-radio-group @change="onChange($event, h.type, h.id, h.recordId)" class="d-flex flex-row flex-wrap">
+                                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in h.optionVos">{{
+                                    f.showValue
+                                  }}</a-radio>
                                 </a-radio-group>
                                 <div :key="n" v-for="(m, n) in h.optionVos">
                                   <div
@@ -938,10 +683,7 @@
                                       :wrapper-col="formItemLayout.wrapperCol"
                                       class="d-flex align-center mb-3"
                                     >
-                                      <a-input
-                                        @change="inputChange(h.id, $event, m.showValue)"
-                                        style="width: 200px"
-                                      ></a-input>
+                                      <a-input @change="inputChange(h.id, $event, m.showValue)" style="width: 200px"></a-input>
                                     </a-form-item>
                                   </div>
                                 </div>
@@ -952,11 +694,7 @@
                                 v-else-if="h.type === 9"
                               >
                                 <a-row>
-                                  <a-col
-                                    :key="indexNum"
-                                    :span="24"
-                                    v-for="(ques, indexNum) in h.optionVos"
-                                  >
+                                  <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
                                     <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
                                   </a-col>
                                   <a-col :span="100">
@@ -973,10 +711,7 @@
                                           :wrapper-col="formItemLayout.wrapperCol"
                                           class="d-flex align-center mb-3"
                                         >
-                                          <a-input
-                                            @change="inputChange(h.id, $event, m.showValue)"
-                                            style="width: 200px"
-                                          ></a-input>
+                                          <a-input @change="inputChange(h.id, $event, m.showValue)" style="width: 200px"></a-input>
                                         </a-form-item>
                                       </div>
                                     </div>
@@ -984,15 +719,10 @@
                                 </a-row>
                               </a-checkbox-group>
                               <div v-else-if="h.type === 10">
-                                <a-select
-                                  @change="onChange($event, h.type, h.id, h.recordId)"
-                                  style="min-width: 120px"
-                                >
-                                  <a-select-option
-                                    :key="c"
-                                    :value="b.showValue"
-                                    v-for="(b, c) in h.optionVos"
-                                  >{{ b.showValue }}</a-select-option>
+                                <a-select @change="onChange($event, h.type, h.id, h.recordId)" style="min-width: 120px">
+                                  <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
+                                    b.showValue
+                                  }}</a-select-option>
                                 </a-select>
                                 <div :key="c" v-for="(b, c) in h.optionVos">
                                   <div
@@ -1007,25 +737,15 @@
                                       :wrapper-col="formItemLayout.wrapperCol"
                                       class="d-flex align-center mb-3"
                                     >
-                                      <a-input
-                                        @change="inputChange(h.id, $event, b.showValue)"
-                                        style="width: 200px"
-                                      ></a-input>
+                                      <a-input @change="inputChange(h.id, $event, b.showValue)" style="width: 200px"></a-input>
                                     </a-form-item>
                                   </div>
                                 </div>
                               </div>
                               <div v-else-if="h.type === 11">
-                                <a-checkbox-group
-                                  @change="onChange($event, h.type, h.id, h.recordId)"
-                                  class="d-flex flex-row flex-wrap"
-                                >
+                                <a-checkbox-group @change="onChange($event, h.type, h.id, h.recordId)" class="d-flex flex-row flex-wrap">
                                   <a-row>
-                                    <a-col
-                                      :key="indexNum"
-                                      :span="24"
-                                      v-for="(ques, indexNum) in h.optionVos"
-                                    >
+                                    <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
                                       <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
                                     </a-col>
                                     <a-col :span="100">
@@ -1039,32 +759,20 @@
                                             }) && b.afterOperation > 0
                                           "
                                         >
-                                          <a-input
-                                            @change="inputChange(h.id, $event, b.showValue)"
-                                            style="width: 200px"
-                                          ></a-input>
+                                          <a-input @change="inputChange(h.id, $event, b.showValue)" style="width: 200px"></a-input>
                                         </div>
                                       </div>
-                                    </a-col>
-                                  </a-row>说明：
-                                  <a-input
-                                    @change="explainChange(h.id, $event)"
-                                    style="width: 200px"
-                                  />
+                                    </a-col> </a-row
+                                  >说明：
+                                  <a-input @change="explainChange(h.id, $event)" style="width: 200px" />
                                 </a-checkbox-group>
                               </div>
                               <!-- 当类型为12时，为单选+关联 -->
                               <div v-else-if="h.type === 12">
-                                <a-radio-group
-                                  @change="onChange($event, h.type, h.id, h.recordId)"
-                                  class="d-flex flex-row flex-wrap"
-                                >
-                                  <a-radio
-                                    :key="g"
-                                    :style="radioStyle"
-                                    :value="f.showValue"
-                                    v-for="(f, g) in h.optionVos"
-                                  >{{ f.showValue }}</a-radio>
+                                <a-radio-group @change="onChange($event, h.type, h.id, h.recordId)" class="d-flex flex-row flex-wrap">
+                                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in h.optionVos">{{
+                                    f.showValue
+                                  }}</a-radio>
                                 </a-radio-group>
                                 <div :key="n" v-for="(m, n) in h.optionVos">
                                   <div
@@ -1097,9 +805,7 @@
                                 </div>
                               </div>
                               <div v-else-if="h.type === 13">
-                                <a-input-number
-                                  @change="onChange($event, h.type, h.id, h.recordId)"
-                                />
+                                <a-input-number @change="onChange($event, h.type, h.id, h.recordId)" />
                                 <span style="margin-left: 10px">{{ h.units }}</span>
                               </div>
                               <div v-else-if="h.type === 14">图片识别</div>
@@ -1127,12 +833,7 @@
         <CaseKTOne :case-list="caseList" />
       </a-collapse-panel>
     </a-collapse>
-    <a-button
-      @click="setData()"
-      class="white--text px-10"
-      style="margin-top: 40px"
-      type="primary"
-    >搜索</a-button>
+    <a-button @click="setData()" class="white--text px-10" style="margin-top: 40px" type="primary">搜索</a-button>
     <case-table :lists="lists" @setData="setData" class="mt-3" />
   </div>
 </template>
diff --git a/src/views/PatientInfo/PatientInfo.vue b/src/views/PatientInfo/PatientInfo.vue
index 35cccf0..283c2d4 100644
--- a/src/views/PatientInfo/PatientInfo.vue
+++ b/src/views/PatientInfo/PatientInfo.vue
@@ -8,42 +8,17 @@
         <!-- 首先遍历整个data大数组 -->
         <!-- <div v-for="(item, index) in list" :key="index"> -->
         <a-collapse-panel :header="item.name" :key="index.toString()" v-for="(item, index) in list">
-          <!-- <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-          一级大标题
-          <h2>病史相关</h2>
-          <h2>{{ item.name }}：</h2>
-          </a-form-item>-->
           <!-- 一级标题下的各种问题（questionVos），判断类型1-12，展示不同需要填写的内容 -->
-          <div :key="a.name" v-for="a in item.questionVos">
+          <div :key="a.name" v-for="a in item.questionVos" style="position: relative">
             <a-form-item :label="a.question" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-input :max-length="500" @change="onChange($event, a.type, a.id, a.recordId)" v-if="a.type === 1" v-model="a.answer" />
               <a-textarea
                 :max-length="500"
                 @change="onChange($event, a.type, a.id, a.recordId)"
-                style="height: 100px; width: 100%"
+                style="height: 150px; width: 100%"
                 v-else-if="a.type === 2"
                 v-model="a.answer"
               />
-              <a-radio-group
-                @change="onChange($event, a.type, a.id, a.recordId)"
-                class="d-flex flex-row flex-wrap"
-                v-else-if="a.type === 3"
-                v-model="a.answer"
-              >
-                <a-radio :key="c" :style="radioStyle" :value="b.showValue" v-for="(b, c) in a.optionVos">{{ b.showValue }}</a-radio>
-              </a-radio-group>
-              <a-checkbox-group
-                :default-value="getList(a.optionVos)"
-                @change="onChange($event, a.type, a.id, a.recordId)"
-                class="d-flex flex-row flex-wrap"
-                v-else-if="a.type === 4"
-              >
-                <a-row>
-                  <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in a.optionVos">
-                    <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
-                  </a-col>
-                </a-row>
-              </a-checkbox-group>
               <a-select
                 @change="onChange($event, a.type, a.id, a.recordId)"
                 style="width: 100%"
@@ -55,8 +30,7 @@
               <a-date-picker
                 :default-value="a.answer ? $moment(a.answer, dateFormat) : ''"
                 @change="onChange($event, a.type, a.id, a.recordId)"
-                placeholder="日期时间选择"
-                show-time
+                placeholder="日期选择"
                 style="width: 100%"
                 v-else-if="a.type === 6"
               />
@@ -79,73 +53,6 @@
                   <a-icon type="upload" />点击上传
                 </a-button>
               </a-upload>
-              <a-radio-group
-                :default-value="getAnswer(a.answer)"
-                @change="onChange($event, a.type, a.id, a.recordId)"
-                class="d-flex flex-row flex-wrap"
-                style="width: 100%"
-                v-else-if="a.type === 8"
-              >
-                <!-- <a-radio-group class="d-flex flex-row flex-wrap" @change="onChange($event, a.type, a.id, a.recordId)"> -->
-                <div>
-                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in a.optionVos">{{ f.showValue }}</a-radio>
-                </div>
-                <div :key="k" v-for="(j, k) in a.optionVos">
-                  <div
-                    v-if="
-                      (contentList.find(item => {
-                        return item.testQuestionsId === a.id && item.contents === `${j.showValue}`;
-                      }) &&
-                        j.afterOperation === 1) ||
-                      (j.afterOperation === 1 &&
-                        !contentList.find(item => {
-                          return item.testQuestionsId === a.id;
-                        }))
-                    "
-                  >
-                    <a-form-item class="d-flex align-center mt-2 mb-0">
-                      <a-input
-                        :max-length="500"
-                        @change="inputChange(a.id, $event, j.showValue)"
-                        placeholder="请输入其他"
-                        style="width: 100%"
-                        v-model="j.otherInformation"
-                      ></a-input>
-                    </a-form-item>
-                  </div>
-                </div>
-                <!-- </a-radio-group> -->
-              </a-radio-group>
-              <a-checkbox-group
-                :default-value="getList(a.optionVos)"
-                @change="onChange($event, a.type, a.id, a.recordId)"
-                class="d-flex flex-row flex-wrap"
-                style="width: 100%"
-                v-else-if="a.type === 9"
-              >
-                <!-- <a-row>
-                <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in a.optionVos">-->
-                <div :key="indexNum" v-for="(ques, indexNum) in a.optionVos">
-                  <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
-                </div>
-                <!-- </a-col>
-                <a-col :span="100">-->
-                <div :key="k" v-for="(j, k) in a.optionVos">
-                  <div v-if="j.afterOperation === 1">
-                    <a-form-item class="d-flex align-center mt-2 mb-0">
-                      <a-input
-                        :max-length="500"
-                        @change="inputChange1(a.id, $event, j.showValue, a.recordId, a.optionVos)"
-                        placeholder="请输入其他"
-                        style="width: 100%"
-                        v-model="j.otherInformation"
-                      ></a-input>
-                    </a-form-item>
-                  </div>
-                </div>
-                <!-- </a-col>
-                </a-row>-->
-              </a-checkbox-group>
               <div v-else-if="a.type === 10">
                 <a-select :default-value="getAnswer(a.answer)" @change="onChange($event, a.type, a.id, a.recordId)" style="width: 100%">
                   <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in a.optionVos">{{ b.showValue }}</a-select-option>
@@ -174,36 +81,263 @@
                   </div>
                 </div>
               </div>
-              <div v-else-if="a.type === 11">
+              <div v-else-if="a.type === 4">
                 <a-checkbox-group
                   :default-value="getList(a.optionVos)"
                   @change="onChange($event, a.type, a.id, a.recordId)"
                   class="d-flex flex-row flex-wrap"
                   style="width: 100%"
                 >
-                  <a-row>
-                    <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in a.optionVos">
-                      <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
-                    </a-col>
-                    <a-col :span="100">
-                      <div :key="c" v-for="(b, c) in a.optionVos">
-                        <div v-if="b.afterOperation > 0">
+                  <a-row class="flex-1 flex-wrap">
+                    <div style="width: 100%" :key="indexNum" :span="24" v-for="(ques, indexNum) in a.optionVos">
+                      <a-col>
+                        <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
+                      </a-col>
+                      <a-col>
+                        <div
+                          v-if="
+                            (contentList.find(item => {
+                              return item.testQuestionsId === a.id && item.contents === `${ques.showValue}`;
+                            }) &&
+                              ques.afterOperation > 0) ||
+                            (ques.afterOperation > 0 && ques.choose === 1)
+                          "
+                        >
+                          <!-- <div v-if="ques.afterOperation > 0"> -->
                           <a-input
                             :max-length="500"
-                            @change="inputChange1(a.id, $event, j.showValue, a.recordId, a.optionVos)"
+                            @change="inputChange1(a.id, $event, ques.showValue, a.recordId, a.optionVos, ques.id)"
                             style="width: 100%"
-                            v-model="b.otherInformation"
+                            v-model="ques.otherInformation"
+                            v-if="ques.afterOperation === 1"
+                          />
+                          <a-textarea
+                            @change="inputChange1(a.id, $event, ques.showValue, a.recordId, a.optionVos, ques.id)"
+                            style="width: 100%; height: 150px"
+                            :max-length="500"
+                            v-else-if="ques.afterOperation === 2"
                           />
+                          <div v-else-if="ques.afterOperation === 3" :key="i" v-for="(h, i) in ques.questionVos" style="position: relative">
+                            <a-form-item
+                              :label="h.question"
+                              :label-col="formItemLayout.labelCol"
+                              :wrapper-col="formItemLayout.wrapperCol"
+                              class="d-flex align-center mb-3"
+                            >
+                              <a-input
+                                :max-length="500"
+                                @change="onChange($event, h.type, h.id, h.h.recordId)"
+                                v-if="h.type === 1"
+                                v-model="h.answer"
+                              />
+                              <a-textarea
+                                @change="onChange($event, h.type, h.id, h.recordId)"
+                                style="height: 150px; width: 100%"
+                                v-else-if="h.type === 2"
+                                v-model="h.answer"
+                              />
+                              <a-select
+                                @change="onChange($event, h.type, h.id, h.recordId)"
+                                style="width: 100%"
+                                v-else-if="h.type === 5"
+                                v-model="h.answer"
+                              >
+                                <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
+                                  b.showValue
+                                }}</a-select-option>
+                              </a-select>
+                              <a-date-picker
+                                :default-value="h.answer ? $moment(h.answer, dateFormat) : ''"
+                                @change="onChange($event, h.type, h.id, h.recordId)"
+                                placeholder="日期选择"
+                                show-time
+                                style="width: 100%"
+                                v-else-if="h.type === 6"
+                              />
+                              <a-upload
+                                :action="action"
+                                :default-file-list="fileList"
+                                :headers="headers"
+                                @change="fileChange($event, h.id)"
+                                list-type="picture"
+                                name="files"
+                                v-else-if="h.type === 7"
+                              >
+                                <a-button
+                                  v-show="
+                                    !contentList.find(item => {
+                                      return item.testQuestionsId === h.id;
+                                    })
+                                  "
+                                >
+                                  <a-icon type="upload" />
+                                  点击上传
+                                </a-button>
+                              </a-upload>
+                              <div v-else-if="h.type === 10">
+                                <a-select
+                                  :default-value="getAnswer(h.answer)"
+                                  @change="onChange($event, h.type, h.id, h.recordId)"
+                                  style="width: 100%"
+                                >
+                                  <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
+                                    b.showValue
+                                  }}</a-select-option>
+                                </a-select>
+                                <div :key="c" v-for="(b, c) in h.optionVos">
+                                  <div
+                                    v-if="
+                                      (contentList.find(item => {
+                                        return item.testQuestionsId === h.id && item.contents === `${b.showValue}`;
+                                      }) &&
+                                        b.afterOperation === 1) ||
+                                      (b.afterOperation === 1 &&
+                                        !contentList.find(item => {
+                                          return item.testQuestionsId === h.id;
+                                        }))
+                                    "
+                                  >
+                                    <a-form-item class="d-flex align-center mb-3">
+                                      <a-input
+                                        :max-length="500"
+                                        @change="inputChange(h.id, $event, b.showValue)"
+                                        style="width: 100%"
+                                        v-model="b.otherInformation"
+                                      ></a-input>
+                                    </a-form-item>
+                                  </div>
+                                </div>
+                              </div>
+                              <!-- 当类型为4时，为多选  +  ===  -->
+                              <div v-else-if="h.type === 4">
+                                <a-checkbox-group
+                                  :default-value="getList(h.optionVos)"
+                                  @change="onChange($event, h.type, h.id, h.recordId)"
+                                  class="d-flex flex-row flex-wrap"
+                                  style="100%"
+                                >
+                                  <a-row class="flex-1 flex-wrap">
+                                    <div style="width: 100%" :key="indexANum" :span="24" v-for="(quesA, indexANum) in h.optionVos">
+                                      <a-col>
+                                        <a-checkbox :value="quesA.submitValue">{{ quesA.showValue }}</a-checkbox>
+                                      </a-col>
+                                      <a-col>
+                                        <div
+                                          v-if="
+                                            (contentList.find(item => {
+                                              return item.testQuestionsId === h.id && item.contents === `${quesA.showValue}`;
+                                            }) &&
+                                              quesA.afterOperation > 0) ||
+                                            (quesA.afterOperation > 0 && quesA.choose === 1)
+                                          "
+                                        >
+                                          <!-- <div v-if="quesA.afterOperation > 0"> -->
+                                          <a-input
+                                            :max-length="500"
+                                            @change="inputChange1(h.id, $event, quesA.showValue, h.recordId, h.optionVos, quesA.id)"
+                                            style="width: 100%"
+                                            v-model="quesA.otherInformation"
+                                            v-if="quesA.afterOperation === 1"
+                                          />
+                                          <a-textarea
+                                            @change="inputChange1(h.id, $event, quesA.showValue, h.recordId, h.optionVos, quesA.id)"
+                                            style="width: 100%; height: 150px"
+                                            :max-length="500"
+                                            v-else-if="quesA.afterOperation === 2"
+                                          />
+                                          <div v-else-if="quesA.afterOperation === 3">当前程序已无法嵌套</div>
+                                        </div>
+                                      </a-col>
+                                    </div>
+                                  </a-row>
+                                </a-checkbox-group>
+                              </div>
+                              <!-- 当类型为3时，为单选  +  ===  -->
+                              <div v-else-if="h.type === 3">
+                                <a-radio-group
+                                  @change="onChange($event, h.type, h.id, h.recordId)"
+                                  class="d-flex flex-row flex-wrap"
+                                  v-model="h.answer"
+                                >
+                                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in h.optionVos">{{
+                                    f.showValue
+                                  }}</a-radio>
+                                </a-radio-group>
+                                <div :key="n" v-for="(m, n) in h.optionVos">
+                                  <div
+                                    v-if="
+                                      contentList.find(item => {
+                                        return item.testQuestionsId === h.id && item.contents === `${m.showValue}`;
+                                      }) && m.afterOperation > 0
+                                    "
+                                  >
+                                    <a-input
+                                      :max-length="500"
+                                      @change="inputChange(h.id, $event, m.showValue)"
+                                      style="width: 200px"
+                                      v-if="m.afterOperation === 1"
+                                    ></a-input>
+                                    <a-textarea
+                                      style="height: 150px; width: 100%"
+                                      @change="inputChange(h.id, $event, m.showValue)"
+                                      v-else-if="m.afterOperation === 2"
+                                    ></a-textarea>
+                                    <div v-else-if="m.afterOperation === 3" :key="q" v-for="(p, q) in m.questionVos">
+                                      <a-form-item
+                                        :label="p.question"
+                                        :label-col="formItemLayout.labelCol"
+                                        :wrapper-col="formItemLayout.wrapperCol"
+                                      >
+                                        <div>当前程序已无法嵌套</div>
+                                      </a-form-item>
+                                    </div>
+                                  </div>
+                                </div>
+                              </div>
+                              <div v-else-if="h.type === 13">
+                                <a-input-number
+                                  :max-length="500"
+                                  @change="onChange($event, h.type, h.id, h.recordId)"
+                                  style="width: 200px"
+                                  v-model="h.answer"
+                                />
+                                <span style="margin-left: 10px">{{ h.units }}</span>
+                              </div>
+                              <div v-else-if="h.type === 15">
+                                <a-time-picker placeholder="时间选择" @change="onChange($event, h.type, h.id, h.recordId)" />
+                              </div>
+                              <div v-else-if="h.type === 16">
+                                <a-date-picker placeholder="日期时间选择" @change="onChange($event, h.type, h.id, h.recordId)" show-time />
+                              </div>
+                              <div v-for="(dom, domIndex) in h.domList" :key="domIndex">
+                                <a-input v-if="h.type === 1" v-model="h.domList[domIndex]"></a-input>
+                                <a-textarea
+                                  style="height: 150px; width: 100%"
+                                  v-else-if="h.type === 2"
+                                  v-model="h.domList[domIndex]"
+                                ></a-textarea>
+                              </div>
+                              <div v-if="h.remark && JSON.parse(h.remark).type === 'desc'">
+                                说明：
+                                <a-input @change="explainChange(h.id, $event)" v-model="h.explains"></a-input>
+                              </div>
+                            </a-form-item>
+                            <a-button
+                              v-if="h.remark && JSON.parse(h.remark).type === 'add'"
+                              class="add-btn"
+                              @click="addDom('AB', a.id, index, k, h.id)"
+                            >
+                              +
+                            </a-button>
+                          </div>
                         </div>
-                      </div>
-                    </a-col>
+                      </a-col>
+                    </div>
                   </a-row>
-                  说明：
-                  <a-textarea @change="explainChange(a.id, $event)" style="width: 100%" />
                 </a-checkbox-group>
               </div>
               <!-- 当类型为12时，为单选+关联 -->
-              <div v-else-if="a.type === 12">
+              <div v-else-if="a.type === 3">
                 <a-radio-group @change="onChange($event, a.type, a.id, a.recordId)" class="d-flex flex-row flex-wrap" v-model="a.answer">
                   <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in a.optionVos">{{ f.showValue }}</a-radio>
                 </a-radio-group>
@@ -217,280 +351,225 @@
                       (j.afterOperation > 0 && j.showValue === a.answer)
                     "
                   >
-                    <div :key="i" v-for="(h, i) in j.questionVos">
+                    <a-input
+                      :max-length="500"
+                      @change="inputChange(a.id, $event, j.showValue)"
+                      style="width: 200px"
+                      v-if="j.afterOperation === 1"
+                    ></a-input>
+                    <a-textarea
+                      style="height: 150px; width: 100%"
+                      v-else-if="j.afterOperation === 2"
+                      @change="inputChange(a.id, $event, j.showValue)"
+                    ></a-textarea>
+                    <div v-else-if="j.afterOperation === 3" :key="i" v-for="(h, i) in j.questionVos" style="position: relative">
                       <a-form-item
                         :label-col="formItemLayout1.labelCol"
                         :wrapper-col="formItemLayout1.wrapperCol"
                         class="d-flex align-center mb-3"
                       >
-                        <a-input
-                          :max-length="500"
-                          @change="inputChange(a.id, $event, j.showValue)"
-                          style="width: 200px"
-                          v-if="j.afterOperation === 1"
-                        ></a-input>
-                        <a-textarea @change="inputChange(a.id, $event, j.showValue)" v-else-if="j.afterOperation === 2"></a-textarea>
-                        <div v-else-if="j.afterOperation === 3">
-                          <a-form-item
-                            :label="h.question"
-                            :label-col="formItemLayout.labelCol"
-                            :wrapper-col="formItemLayout.wrapperCol"
-                            class="d-flex align-center mb-3"
+                        <a-form-item
+                          :label="h.question"
+                          :label-col="formItemLayout.labelCol"
+                          :wrapper-col="formItemLayout.wrapperCol"
+                          class="d-flex align-center mb-3"
+                        >
+                          <a-input
+                            :max-length="500"
+                            @change="onChange($event, h.type, h.id, h.recordId)"
+                            style="width: 100%"
+                            v-if="h.type === 1"
+                            v-model="h.answer"
+                          />
+                          <a-textarea
+                            @change="onChange($event, h.type, h.id)"
+                            style="height: 150px; width: 100%"
+                            v-else-if="h.type === 2"
+                            v-model="h.answer"
+                          />
+                          <a-select
+                            @change="onChange($event, h.type, h.id, h.recordId)"
+                            style="width: 120px"
+                            v-else-if="h.type === 5"
+                            v-model="h.answer"
                           >
-                            <a-input
-                              :max-length="500"
-                              @change="onChange($event, h.type, h.id, h.recordId)"
-                              style="width: 100%"
-                              v-if="h.type === 1"
-                              v-model="h.answer"
-                            />
-                            <a-textarea
-                              @change="onChange($event, h.type, h.id)"
-                              style="height: 100px; width: 100%"
-                              v-else-if="h.type === 2"
-                              v-model="h.answer"
-                            />
-                            <a-radio-group
-                              @change="onChange($event, h.type, h.id, h.recordId)"
-                              class="d-flex flex-row flex-wrap"
-                              v-else-if="h.type === 3"
-                              v-model="h.answer"
-                            >
-                              <a-radio :key="c" :style="radioStyle" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
-                                b.showValue
-                              }}</a-radio>
-                            </a-radio-group>
-                            <a-checkbox-group
-                              :default-value="getList(h.optionVos)"
-                              @change="onChange($event, h.type, h.id, h.recordId)"
-                              class="d-flex flex-row flex-wrap"
-                              v-else-if="h.type === 4"
+                            <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in h.optionVos">{{ b.showValue }}</a-select-option>
+                          </a-select>
+                          <a-date-picker
+                            :default-value="h.answer ? $moment(h.answer, dateFormat) : ''"
+                            @change="onChange($event, h.type, h.id, h.recordId)"
+                            placeholder="日期选择"
+                            show-time
+                            style="width: 100%"
+                            v-else-if="h.type === 6"
+                          />
+                          <a-upload
+                            :action="action"
+                            :default-file-list="fileList"
+                            :headers="headers"
+                            @change="fileChange($event, h.id)"
+                            list-type="picture"
+                            name="files"
+                            v-else-if="h.type === 7"
+                          >
+                            <a-button
+                              v-show="
+                                !contentList.find(item => {
+                                  return item.testQuestionsId === h.id;
+                                })
+                              "
                             >
-                              <a-row>
-                                <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
-                                  <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
-                                </a-col>
-                              </a-row>
-                            </a-checkbox-group>
+                              <a-icon type="upload" />点击上传
+                            </a-button>
+                          </a-upload>
+                          <div v-else-if="h.type === 10">
                             <a-select
+                              :default-value="getAnswer(h.answer)"
                               @change="onChange($event, h.type, h.id, h.recordId)"
-                              style="width: 120px"
-                              v-else-if="h.type === 5"
-                              v-model="h.answer"
+                              style="width: 100%"
                             >
                               <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
                                 b.showValue
                               }}</a-select-option>
                             </a-select>
-                            <a-date-picker
-                              :default-value="h.answer ? $moment(h.answer, dateFormat) : ''"
-                              @change="onChange($event, h.type, h.id, h.recordId)"
-                              placeholder="日期时间选择"
-                              show-time
-                              style="width: 100%"
-                              v-else-if="h.type === 6"
-                            />
-                            <a-upload
-                              :action="action"
-                              :default-file-list="fileList"
-                              :headers="headers"
-                              @change="fileChange($event, h.id)"
-                              list-type="picture"
-                              name="files"
-                              v-else-if="h.type === 7"
-                            >
-                              <a-button
-                                v-show="
-                                  !contentList.find(item => {
-                                    return item.testQuestionsId === h.id;
-                                  })
+                            <div :key="c" v-for="(b, c) in h.optionVos">
+                              <div
+                                v-if="
+                                  (contentList.find(item => {
+                                    return item.testQuestionsId === h.id && item.contents === `${b.showValue}`;
+                                  }) &&
+                                    b.afterOperation === 1) ||
+                                  (b.afterOperation === 1 &&
+                                    !contentList.find(item => {
+                                      return item.testQuestionsId === h.id;
+                                    }))
                                 "
                               >
-                                <a-icon type="upload" />点击上传
-                              </a-button>
-                            </a-upload>
-                            <a-radio-group
-                              :default-value="getAnswer(h.answer)"
-                              @change="onChange($event, h.type, h.id, h.recordId)"
-                              class="d-flex flex-row flex-wrap"
-                              style="width: 100%"
-                              v-else-if="h.type === 8"
-                            >
-                              <!-- <a-radio-group class="d-flex flex-row flex-wrap" @change="onChange($event, h.type, h.id)"> -->
-                              <div>
-                                <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in h.optionVos">{{
-                                  f.showValue
-                                }}</a-radio>
-                              </div>
-                              <!-- </a-radio-group> -->
-                              <div :key="n" v-for="(m, n) in h.optionVos">
-                                <div
-                                  v-if="
-                                    (contentList.find(item => {
-                                      return item.testQuestionsId === h.id && item.contents === `${m.showValue}`;
-                                    }) &&
-                                      m.afterOperation === 1) ||
-                                    (m.afterOperation === 1 &&
-                                      !contentList.find(item => {
-                                        return item.testQuestionsId === h.id;
-                                      }))
-                                  "
-                                >
-                                  <a-form-item class="d-flex align-center mb-3">
-                                    <a-input
-                                      :max-length="500"
-                                      @change="inputChange(h.id, $event, m.showValue)"
-                                      style="width: 100%"
-                                      v-model="m.otherInformation"
-                                    ></a-input>
-                                  </a-form-item>
-                                </div>
-                              </div>
-                            </a-radio-group>
-                            <a-checkbox-group
-                              :default-value="getList(h.optionVos)"
-                              @change="onChange($event, h.type, h.id, h.recordId)"
-                              class="d-flex flex-row flex-wrap"
-                              style="width: 100%"
-                              v-else-if="h.type === 9"
-                            >
-                              <a-row>
-                                <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
-                                  <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
-                                </a-col>
-                                <a-col :span="100">
-                                  <div :key="n" v-for="(m, n) in h.optionVos">
-                                    <div v-if="m.afterOperation === 1">
-                                      <a-form-item class="d-flex align-center mb-3">
-                                        <a-input
-                                          :max-length="500"
-                                          @change="inputChange1(h.id, $event, m.showValue, h.recordId, h.optionVos)"
-                                          style="width: 100%"
-                                          v-model="m.otherInformation"
-                                        ></a-input>
-                                      </a-form-item>
-                                    </div>
-                                  </div>
-                                </a-col>
-                              </a-row>
-                            </a-checkbox-group>
-                            <div v-else-if="h.type === 10">
-                              <a-select
-                                :default-value="getAnswer(h.answer)"
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                style="width: 100%"
-                              >
-                                <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
-                                  b.showValue
-                                }}</a-select-option>
-                              </a-select>
-                              <div :key="c" v-for="(b, c) in h.optionVos">
-                                <div
-                                  v-if="
-                                    (contentList.find(item => {
-                                      return item.testQuestionsId === h.id && item.contents === `${b.showValue}`;
-                                    }) &&
-                                      b.afterOperation === 1) ||
-                                    (b.afterOperation === 1 &&
-                                      !contentList.find(item => {
-                                        return item.testQuestionsId === h.id;
-                                      }))
-                                  "
-                                >
-                                  <a-form-item class="d-flex align-center mb-3">
-                                    <a-input
-                                      :max-length="500"
-                                      @change="inputChange(h.id, $event, b.showValue)"
-                                      style="width: 100%"
-                                      v-model="b.otherInformation"
-                                    ></a-input>
-                                  </a-form-item>
-                                </div>
+                                <a-form-item class="d-flex align-center mb-3">
+                                  <a-input
+                                    :max-length="500"
+                                    @change="inputChange(h.id, $event, b.showValue)"
+                                    style="width: 100%"
+                                    v-model="b.otherInformation"
+                                  ></a-input>
+                                </a-form-item>
                               </div>
                             </div>
-                            <div v-else-if="h.type === 11">
-                              <a-checkbox-group
-                                :default-value="getList(h.optionVos)"
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                class="d-flex flex-row flex-wrap"
-                                style="width: 100%"
-                              >
-                                <a-row>
-                                  <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
+                          </div>
+                          <div v-else-if="h.type === 4">
+                            <a-checkbox-group
+                              :default-value="getList(h.optionVos)"
+                              @change="onChange($event, h.type, h.id, h.recordId)"
+                              class="d-flex flex-row flex-wrap"
+                              style="width: 100%"
+                            >
+                              <a-row class="flex-1 flex-wrap">
+                                <div style="width: 100%" :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
+                                  <a-col>
                                     <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
                                   </a-col>
-                                  <a-col :span="100">
-                                    <div :key="c" v-for="(b, c) in h.optionVos">
-                                      <div v-if="b.afterOperation > 0">
-                                        <a-input
-                                          :max-length="500"
-                                          @change="inputChange1(h.id, $event, b.showValue, h.recordId, h.optionVos)"
-                                          style="width: 100%"
-                                          v-model="b.otherInformation"
-                                        ></a-input>
-                                      </div>
-                                    </div>
-                                  </a-col>
-                                </a-row>
-                                说明：
-                                <a-input :max-length="500" @change="explainChange(h.id, $event)" style="width: 100%" />
-                              </a-checkbox-group>
-                            </div>
-                            <!-- 当类型为12时，为单选+关联 -->
-                            <div v-else-if="h.type === 12">
-                              <a-radio-group
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                class="d-flex flex-row flex-wrap"
-                                v-model="h.answer"
-                              >
-                                <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in h.optionVos">{{
-                                  f.showValue
-                                }}</a-radio>
-                              </a-radio-group>
-                              <div :key="n" v-for="(m, n) in h.optionVos">
-                                <div
-                                  v-if="
-                                    contentList.find(item => {
-                                      return item.testQuestionsId === h.id && item.contents === `${m.showValue}`;
-                                    }) && m.afterOperation > 0
-                                  "
-                                >
-                                  <div :key="q" v-for="(p, q) in m.questionVos">
-                                    <a-form-item
-                                      :label="p.question"
-                                      :label-col="formItemLayout.labelCol"
-                                      :wrapper-col="formItemLayout.wrapperCol"
-                                      class="d-flex align-center mb-3"
+                                  <a-col>
+                                    <div
+                                      v-if="
+                                        (contentList.find(item => {
+                                          return item.testQuestionsId === h.id && item.contents === `${ques.showValue}`;
+                                        }) &&
+                                          ques.afterOperation > 0) ||
+                                        (ques.afterOperation > 0 && ques.choose === 1)
+                                      "
                                     >
+                                      <!-- <div v-if="ques.afterOperation > 0"> -->
                                       <a-input
                                         :max-length="500"
-                                        @change="inputChange(h.id, $event, m.showValue)"
-                                        style="width: 200px"
-                                        v-if="m.afterOperation === 1"
-                                      ></a-input>
+                                        @change="inputChange1(h.id, $event, ques.showValue, h.recordId, h.optionVos, ques.id)"
+                                        style="width: 100%"
+                                        v-model="ques.otherInformation"
+                                        v-if="ques.afterOperation === 1"
+                                      />
                                       <a-textarea
+                                        @change="inputChange1(h.id, $event, ques.showValue, h.recordId, h.optionVos, ques.id)"
+                                        style="width: 100%; height: 150px"
                                         :max-length="500"
-                                        @change="inputChange(h.id, $event, m.showValue)"
-                                        v-else-if="m.afterOperation === 2"
-                                      ></a-textarea>
-                                      <div v-else-if="m.afterOperation === 3">qwe</div>
-                                    </a-form-item>
-                                  </div>
+                                        v-else-if="ques.afterOperation === 2"
+                                      />
+                                      <div v-else-if="ques.afterOperation === 3">当前程序已无法嵌套</div>
+                                    </div>
+                                  </a-col>
+                                </div>
+                              </a-row>
+                            </a-checkbox-group>
+                          </div>
+                          <!-- 当类型为12时，为单选+关联 -->
+                          <div v-else-if="h.type === 3">
+                            <a-radio-group
+                              @change="onChange($event, h.type, h.id, h.recordId)"
+                              class="d-flex flex-row flex-wrap"
+                              v-model="h.answer"
+                            >
+                              <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in h.optionVos">{{
+                                f.showValue
+                              }}</a-radio>
+                            </a-radio-group>
+                            <div :key="n" v-for="(m, n) in h.optionVos">
+                              <div
+                                v-if="
+                                  contentList.find(item => {
+                                    return item.testQuestionsId === h.id && item.contents === `${m.showValue}`;
+                                  }) && m.afterOperation > 0
+                                "
+                              >
+                                <a-input
+                                  :max-length="500"
+                                  @change="inputChange(h.id, $event, m.showValue)"
+                                  style="width: 200px"
+                                  v-if="m.afterOperation === 1"
+                                ></a-input>
+                                <a-textarea
+                                  :max-length="500"
+                                  style="width: 100%; height: 150px"
+                                  @change="inputChange(h.id, $event, m.showValue)"
+                                  v-else-if="m.afterOperation === 2"
+                                ></a-textarea>
+                                <div v-else-if="m.afterOperation === 3" :key="q" v-for="(p, q) in m.questionVos">
+                                  <a-form-item
+                                    :label="p.question"
+                                    :label-col="formItemLayout.labelCol"
+                                    :wrapper-col="formItemLayout.wrapperCol"
+                                    class="d-flex align-center mb-3"
+                                  >
+                                    <div>当前程序已无法嵌套</div>
+                                  </a-form-item>
                                 </div>
                               </div>
                             </div>
-                            <div v-else-if="h.type === 13">
-                              <a-input-number
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                style="width: 200px%"
-                                v-model="h.answer"
-                              />
-                              <span style="margin-left: 10px">{{ h.units }}</span>
-                            </div>
-                            <div v-else-if="h.type === 14">图片识别</div>
-                          </a-form-item>
-                        </div>
+                          </div>
+                          <div v-else-if="h.type === 13">
+                            <a-input-number @change="onChange($event, h.type, h.id, h.recordId)" style="width: 200px%" v-model="h.answer" />
+                            <span style="margin-left: 10px">{{ h.units }}</span>
+                          </div>
+                          <div v-else-if="h.type === 15">
+                            <a-time-picker placeholder="时间选择" @change="onChange($event, h.type, h.id, h.recordId)" />
+                          </div>
+                          <div v-else-if="h.type === 16">
+                            <a-date-picker placeholder="日期时间选择" @change="onChange($event, h.type, h.id, h.recordId)" show-time />
+                          </div>
+                          <div v-for="(dom, domIndex) in h.domList" :key="domIndex">
+                            <a-input v-if="h.type === 1" v-model="h.domList[domIndex]"></a-input>
+                            <a-textarea v-else-if="h.type === 2" v-model="h.domList[domIndex]"></a-textarea>
+                          </div>
+                          <div v-if="h.remark && JSON.parse(h.remark).type === 'desc'">
+                            说明：
+                            <a-input @change="explainChange(h.id, $event)" v-model="h.explains"></a-input>
+                          </div>
+                        </a-form-item>
                       </a-form-item>
+                      <a-button
+                        v-if="h.remark && JSON.parse(h.remark).type === 'add'"
+                        class="add-btn"
+                        @click="addDom('AB', a.id, index, k, h.id)"
+                      >
+                        +
+                      </a-button>
                     </div>
                   </div>
                 </div>
@@ -499,8 +578,22 @@
                 <a-input-number @change="onChange($event, a.type, a.id, a.recordId)" style="width: 200px" v-model="a.answer" />
                 <span style="margin-left: 10px">{{ a.units }}</span>
               </div>
-              <div v-else-if="a.type === 14">图片识别</div>
+              <div v-else-if="a.type === 15">
+                <a-time-picker placeholder="时间选择" @change="onChange($event, a.type, a.id, a.recordId)" />
+              </div>
+              <div v-else-if="a.type === 16">
+                <a-date-picker placeholder="日期时间选择" @change="onChange($event, a.type, a.id, a.recordId)" show-time />
+              </div>
+              <div v-for="(dom, domIndex) in a.domList" :key="domIndex">
+                <a-input v-if="a.type === 1" v-model="a.domList[domIndex]"></a-input>
+                <a-textarea style="height: 150px; width: 100%" v-else-if="a.type === 2" v-model="a.domList[domIndex]"></a-textarea>
+              </div>
+              <div v-if="a.remark && JSON.parse(a.remark).type === 'desc'">
+                说明：
+                <a-input @change="explainChange(a.id, $event)" v-model="a.explains"></a-input>
+              </div>
             </a-form-item>
+            <a-button v-if="a.remark && JSON.parse(a.remark).type === 'add'" class="add-btn" @click="addDom('AA', a.id, index)">+</a-button>
           </div>
           <!-- 一级标题下的各种二级标题（subReportCodes） -->
           <div v-for="(w, indexB) in item.subReportCodes" :key="w.name">
@@ -520,7 +613,7 @@
               </a-upload>
             </a-form-item>
             <!-- 二级标题下的各种类型 -->
-            <div :key="e.name" v-for="e in w.questionVos">
+            <div :key="e.name" v-for="e in w.questionVos" style="position: relative">
               <a-form-item :label="e.question" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
                 <a-input
                   :id="e.id"
@@ -529,40 +622,13 @@
                   v-if="e.type === 1"
                   v-model="e.answer"
                 />
-                <a-textarea
-                  :id="e.id"
-                  :max-length="500"
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  v-if="e.type === 1"
-                  v-model="e.answer"
-                />
                 <a-textarea
                   :max-length="500"
                   @change="onChange($event, e.type, e.id, e.recordId)"
-                  style="height: 100px; width: 100%"
+                  style="height: 150px; width: 100%"
                   v-else-if="e.type === 2"
                   v-model="e.answer"
                 />
-                <a-radio-group
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  class="d-flex flex-row flex-wrap"
-                  v-else-if="e.type === 3"
-                  v-model="e.answer"
-                >
-                  <a-radio :key="c" :style="radioStyle" :value="b.showValue" v-for="(b, c) in e.optionVos">{{ b.showValue }}</a-radio>
-                </a-radio-group>
-                <a-checkbox-group
-                  :default-value="getList(e.optionVos)"
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  class="d-flex flex-row flex-wrap"
-                  v-else-if="e.type === 4"
-                >
-                  <a-row>
-                    <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in e.optionVos">
-                      <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
-                    </a-col>
-                  </a-row>
-                </a-checkbox-group>
                 <a-select
                   @change="onChange($event, e.type, e.id, e.recordId)"
                   style="width: 100%"
@@ -574,7 +640,7 @@
                 <a-date-picker
                   :default-value="e.answer ? $moment(e.answer, dateFormat) : ''"
                   @change="onChange($event, e.type, e.id, e.recordId)"
-                  placeholder="日期时间选择"
+                  placeholder="日期选择"
                   show-time
                   style="width: 100%"
                   v-else-if="e.type === 6"
@@ -598,67 +664,6 @@
                     <a-icon type="upload" />点击上传
                   </a-button>
                 </a-upload>
-                <a-radio-group
-                  :default-value="getAnswer(e.answer)"
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  class="d-flex flex-row flex-wrap"
-                  style="width: 100%"
-                  v-else-if="e.type === 8"
-                >
-                  <a-radio-group @change="onChange($event, e.type, e.id)" class="d-flex flex-row flex-wrap">
-                    <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in e.optionVos">{{ f.showValue }}</a-radio>
-                  </a-radio-group>
-                  <div :key="k" v-for="(j, k) in e.optionVos">
-                    <div
-                      v-if="
-                        (contentList.find(item => {
-                          return item.testQuestionsId === e.id && item.contents === `${j.showValue}`;
-                        }) &&
-                          j.afterOperation === 1) ||
-                        (j.afterOperation === 1 &&
-                          !contentList.find(item => {
-                            return item.testQuestionsId === e.id;
-                          }))
-                      "
-                    >
-                      <a-form-item class="d-flex align-center mb-3">
-                        <a-input
-                          :max-length="500"
-                          @change="inputChange(e.id, $event, j.showValue)"
-                          style="width: 100%"
-                          v-model="j.otherInformation"
-                        ></a-input>
-                      </a-form-item>
-                    </div>
-                  </div>
-                </a-radio-group>
-                <a-checkbox-group
-                  :default-value="getList(e.optionVos)"
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  class="d-flex flex-row flex-wrap"
-                  style="width: 100%"
-                  v-else-if="e.type === 9"
-                >
-                  <a-row>
-                    <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in e.optionVos">
-                      <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
-                    </a-col>
-                    <a-col :span="100">
-                      <div :key="k" v-for="(j, k) in e.optionVos">
-                        <div v-if="j.afterOperation === 1">
-                          <a-form-item class="d-flex align-center mb-3">
-                            <a-input
-                              :max-length="500"
-                              @change="inputChange1(e.id, $event, j.showValue, e.recordId, e.optionVos)"
-                              style="width: 100%"
-                              v-model="j.otherInformation"
-                            ></a-input>
-                          </a-form-item>
-                        </div>
-                      </div>
-                    </a-col>
-                  </a-row>
-                </a-checkbox-group>
                 <div v-else-if="e.type === 10">
                   <a-select :default-value="getAnswer(e.answer)" @change="onChange($event, e.type, e.id, e.recordId)" style="width: 100%">
                     <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in e.optionVos">{{ b.showValue }}</a-select-option>
@@ -687,323 +692,506 @@
                     </div>
                   </div>
                 </div>
-                <div v-else-if="e.type === 11">
+                <div v-else-if="e.type === 4">
                   <a-checkbox-group
                     :default-value="getList(e.optionVos)"
                     @change="onChange($event, e.type, e.id, e.recordId)"
                     class="d-flex flex-row flex-wrap"
                     style="100%"
                   >
-                    <a-row>
-                      <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in e.optionVos">
-                        <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
-                      </a-col>
-                      <a-col :span="100">
-                        <div :key="c" v-for="(b, c) in e.optionVos">
-                          <div v-if="b.afterOperation > 0">
-                            <a-input
-                              :max-length="500"
-                              @change="inputChange1(e.id, $event, b.showValue, e.recordId, e.optionVos)"
-                              style="width: 100%"
-                              v-model="b.otherInformation"
-                            ></a-input>
-                          </div>
-                        </div>
-                      </a-col>
-                    </a-row>
-                    说明：
-                    <a-input :max-length="500" @change="explainChange(e.id, $event)" style="width: 100%" />
-                  </a-checkbox-group>
-                </div>
-                <!-- 当类型为12时，为单选+关联 -->
-                <div v-else-if="e.type === 12">
-                  <a-radio-group @change="onChange($event, e.type, e.id, e.recordId)" class="d-flex flex-row flex-wrap" v-model="e.answer">
-                    <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in e.optionVos">{{ f.showValue }}</a-radio>
-                  </a-radio-group>
-                  <div :key="k" v-for="(j, k) in e.optionVos">
-                    <div
-                      v-if="
-                        (contentList.find(item => {
-                          return item.testQuestionsId === e.id && item.contents === `${j.showValue}`;
-                        }) &&
-                          j.afterOperation > 0) ||
-                        (j.afterOperation > 0 && j.showValue === e.answer)
-                      "
-                    >
-                      <div :key="i" v-for="(h, i) in j.questionVos">
-                        <a-form-item
-                          :label="h.question"
-                          :label-col="formItemLayout.labelCol"
-                          :wrapper-col="formItemLayout.wrapperCol"
-                          class="d-flex align-center mb-3"
-                        >
-                          <a-input
-                            :max-length="500"
-                            @change="inputChange(e.id, $event, j.showValue)"
-                            style="width: 100%"
-                            v-if="j.afterOperation === 1"
-                          ></a-input>
-                          <a-textarea
-                            :max-length="500"
-                            @change="inputChange(e.id, $event, j.showValue)"
-                            v-else-if="j.afterOperation === 2"
-                          ></a-textarea>
-                          <div v-else-if="j.afterOperation === 3">
-                            <a-form-item class="d-flex align-center mb-3">
-                              <a-input
-                                :max-length="500"
-                                @change="onChange($event, h.type, h.id, h.h.recordId)"
-                                v-if="h.type === 1"
-                                v-model="h.answer"
-                              />
-                              <a-textarea
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                style="height: 100%"
-                                v-else-if="h.type === 2"
-                                v-model="h.answer"
-                              />
-                              <a-radio-group
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                class="d-flex flex-row flex-wrap"
-                                v-else-if="h.type === 3"
-                                v-model="h.answer"
-                              >
-                                <a-radio :key="c" :style="radioStyle" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
-                                  b.showValue
-                                }}</a-radio>
-                              </a-radio-group>
-                              <a-checkbox-group
-                                :default-value="getList(h.optionVos)"
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                class="d-flex flex-row flex-wrap"
-                                v-else-if="h.type === 4"
-                              >
-                                <a-row>
-                                  <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
-                                    <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
-                                  </a-col>
-                                </a-row>
-                              </a-checkbox-group>
-                              <a-select
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                style="width: 100%"
-                                v-else-if="h.type === 5"
-                                v-model="h.answer"
-                              >
-                                <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
-                                  b.showValue
-                                }}</a-select-option>
-                              </a-select>
-                              <a-date-picker
-                                :default-value="h.answer ? $moment(h.answer, dateFormat) : ''"
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                placeholder="日期时间选择"
-                                show-time
-                                style="width: 100%"
-                                v-else-if="h.type === 6"
-                              />
-                              <a-upload
-                                :action="action"
-                                :default-file-list="fileList"
-                                :headers="headers"
-                                @change="fileChange($event, h.id)"
-                                list-type="picture"
-                                name="files"
-                                v-else-if="h.type === 7"
-                              >
-                                <a-button
-                                  v-show="
-                                    !contentList.find(item => {
-                                      return item.testQuestionsId === h.id;
-                                    })
-                                  "
-                                >
-                                  <a-icon type="upload" />
-                                  点击上传
-                                </a-button>
-                              </a-upload>
-                              <a-radio-group
-                                :default-value="getAnswer(h.answer)"
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                class="d-flex flex-row flex-wrap"
-                                style="100%"
-                                v-else-if="h.type === 8"
-                              >
-                                <!-- <a-radio-group class="d-flex flex-row flex-wrap" @change=
-                                "onChange($event, h.type, h.id, h.recordId)"> -->
-                                <div>
-                                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in h.optionVos">{{
-                                    f.showValue
-                                  }}</a-radio>
-                                </div>
-                                <!-- </a-radio-group> -->
-                                <div :key="n" v-for="(m, n) in h.optionVos">
-                                  <div
-                                    v-if="
-                                      (contentList.find(item => {
-                                        return item.testQuestionsId === h.id && item.contents === `${m.showValue}`;
-                                      }) &&
-                                        m.afterOperation === 1) ||
-                                      (m.afterOperation === 1 &&
-                                        !contentList.find(item => {
-                                          return item.testQuestionsId === h.id;
-                                        }))
-                                    "
-                                  >
-                                    <a-form-item class="d-flex align-center mb-3">
-                                      <a-input
-                                        :max-length="500"
-                                        @change="inputChange(h.id, $event, m.showValue)"
-                                        style="width: 100%"
-                                        v-model="m.otherInformation"
-                                      ></a-input>
-                                    </a-form-item>
-                                  </div>
-                                </div>
-                              </a-radio-group>
-                              <a-checkbox-group
-                                :default-value="getList(h.optionVos)"
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                class="d-flex flex-row flex-wrap"
-                                style="width: 100%"
-                                v-else-if="h.type === 9"
-                              >
-                                <a-row>
-                                  <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
-                                    <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
-                                  </a-col>
-                                  <a-col :span="100">
-                                    <div :key="n" v-for="(m, n) in h.optionVos">
-                                      <div v-if="m.afterOperation === 1">
-                                        <a-form-item class="d-flex align-center mb-3">
-                                          <a-input
-                                            :max-length="500"
-                                            @change="inputChange1(h.id, $event, m.showValue, h.recordId, h.optionVos)"
-                                            style="width: 100%"
-                                            v-model="m.otherInformation"
-                                          ></a-input>
-                                        </a-form-item>
-                                      </div>
-                                    </div>
-                                  </a-col>
-                                </a-row>
-                              </a-checkbox-group>
-                              <div v-else-if="h.type === 10">
+                    <a-row class="flex-1 flex-wrap">
+                      <div style="width: 100%" :key="indexNum" :span="24" v-for="(ques, indexNum) in e.optionVos">
+                        <a-col>
+                          <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
+                        </a-col>
+                        <a-col>
+                          <div
+                            v-if="
+                              (contentList.find(item => {
+                                return item.testQuestionsId === e.id && item.contents === `${ques.showValue}`;
+                              }) &&
+                                ques.afterOperation > 0) ||
+                              (ques.afterOperation > 0 && ques.choose === 1)
+                            "
+                          >
+                            <a-input
+                              :max-length="500"
+                              @change="inputChange1(e.id, $event, ques.showValue, e.recordId, e.optionVos, ques.id)"
+                              style="width: 100%"
+                              v-model="ques.otherInformation"
+                              v-if="ques.afterOperation === 1"
+                            />
+                            <a-textarea
+                              @change="inputChange1(e.id, $event, ques.showValue, e.recordId, e.optionVos, ques.id)"
+                              style="width: 100%; height: 150px"
+                              :max-length="500"
+                              v-else-if="ques.afterOperation === 2"
+                            />
+                            <div
+                              v-else-if="ques.afterOperation === 3"
+                              :key="i"
+                              v-for="(h, i) in ques.questionVos"
+                              style="position: relative"
+                            >
+                              <a-form-item
+                                :label="h.question"
+                                :label-col="formItemLayout.labelCol"
+                                :wrapper-col="formItemLayout.wrapperCol"
+                                class="d-flex align-center mb-3"
+                              >
+                                <a-input
+                                  :max-length="500"
+                                  @change="onChange($event, h.type, h.id, h.h.recordId)"
+                                  v-if="h.type === 1"
+                                  v-model="h.answer"
+                                />
+                                <a-textarea
+                                  @change="onChange($event, h.type, h.id, h.recordId)"
+                                  style="height: 150px; width: 100%"
+                                  v-else-if="h.type === 2"
+                                  v-model="h.answer"
+                                />
                                 <a-select
-                                  :default-value="getAnswer(h.answer)"
                                   @change="onChange($event, h.type, h.id, h.recordId)"
                                   style="width: 100%"
+                                  v-else-if="h.type === 5"
+                                  v-model="h.answer"
                                 >
                                   <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
                                     b.showValue
                                   }}</a-select-option>
                                 </a-select>
-                                <div :key="c" v-for="(b, c) in h.optionVos">
-                                  <div
-                                    v-if="
-                                      (contentList.find(item => {
-                                        return item.testQuestionsId === h.id && item.contents === `${b.showValue}`;
-                                      }) &&
-                                        b.afterOperation === 1) ||
-                                      (b.afterOperation === 1 &&
-                                        !contentList.find(item => {
-                                          return item.testQuestionsId === h.id;
-                                        }))
-                                    "
-                                  >
-                                    <a-form-item class="d-flex align-center mb-3">
-                                      <a-input
-                                        :max-length="500"
-                                        @change="inputChange(h.id, $event, b.showValue)"
-                                        style="width: 100%"
-                                        v-model="b.otherInformation"
-                                      ></a-input>
-                                    </a-form-item>
-                                  </div>
-                                </div>
-                              </div>
-                              <div v-else-if="h.type === 11">
-                                <a-checkbox-group
-                                  :default-value="getList(h.optionVos)"
-                                  @change="onChange($event, h.type, h.id, h.recordId)"
-                                  class="d-flex flex-row flex-wrap"
-                                  style="100%"
-                                >
-                                  <a-row>
-                                    <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
-                                      <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
-                                    </a-col>
-                                    <a-col :span="100">
-                                      <div :key="c" v-for="(b, c) in h.optionVos">
-                                        <div v-if="b.afterOperation > 0">
-                                          <a-input
-                                            :max-length="500"
-                                            @change="inputChange1(h.id, $event, b.showValue, h.recordId, h.optionVos)"
-                                            style="width: 100%"
-                                            v-model="b.otherInformation"
-                                          ></a-input>
-                                        </div>
-                                      </div>
-                                    </a-col>
-                                  </a-row>
-                                  说明：
-                                  <a-input :max-length="500" @change="explainChange(h.id, $event)" style="width: 100%" />
-                                </a-checkbox-group>
-                              </div>
-                              <!-- 当类型为12时，为单选+关联 -->
-                              <div v-else-if="h.type === 12">
-                                <a-radio-group
+                                <a-date-picker
+                                  :default-value="h.answer ? $moment(h.answer, dateFormat) : ''"
                                   @change="onChange($event, h.type, h.id, h.recordId)"
-                                  class="d-flex flex-row flex-wrap"
-                                  v-model="h.answer"
+                                  placeholder="日期选择"
+                                  show-time
+                                  style="width: 100%"
+                                  v-else-if="h.type === 6"
+                                />
+                                <a-upload
+                                  :action="action"
+                                  :default-file-list="fileList"
+                                  :headers="headers"
+                                  @change="fileChange($event, h.id)"
+                                  list-type="picture"
+                                  name="files"
+                                  v-else-if="h.type === 7"
                                 >
-                                  <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in h.optionVos">{{
-                                    f.showValue
-                                  }}</a-radio>
-                                </a-radio-group>
-                                <div :key="n" v-for="(m, n) in h.optionVos">
-                                  <div
-                                    v-if="
-                                      contentList.find(item => {
-                                        return item.testQuestionsId === h.id && item.contents === `${m.showValue}`;
-                                      }) && m.afterOperation > 0
+                                  <a-button
+                                    v-show="
+                                      !contentList.find(item => {
+                                        return item.testQuestionsId === h.id;
+                                      })
                                     "
                                   >
-                                    <div :key="q" v-for="(p, q) in m.questionVos">
-                                      <a-form-item
-                                        :label="p.question"
-                                        :label-col="formItemLayout.labelCol"
-                                        :wrapper-col="formItemLayout.wrapperCol"
-                                      >
+                                    <a-icon type="upload" />
+                                    点击上传
+                                  </a-button>
+                                </a-upload>
+                                <div v-else-if="h.type === 10">
+                                  <a-select
+                                    :default-value="getAnswer(h.answer)"
+                                    @change="onChange($event, h.type, h.id, h.recordId)"
+                                    style="width: 100%"
+                                  >
+                                    <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
+                                      b.showValue
+                                    }}</a-select-option>
+                                  </a-select>
+                                  <div :key="c" v-for="(b, c) in h.optionVos">
+                                    <div
+                                      v-if="
+                                        (contentList.find(item => {
+                                          return item.testQuestionsId === h.id && item.contents === `${b.showValue}`;
+                                        }) &&
+                                          b.afterOperation === 1) ||
+                                        (b.afterOperation === 1 &&
+                                          !contentList.find(item => {
+                                            return item.testQuestionsId === h.id;
+                                          }))
+                                      "
+                                    >
+                                      <a-form-item class="d-flex align-center mb-3">
                                         <a-input
                                           :max-length="500"
-                                          @change="inputChange(h.id, $event, m.showValue)"
-                                          style="width: 200px"
-                                          v-if="m.afterOperation === 1"
+                                          @change="inputChange(h.id, $event, b.showValue)"
+                                          style="width: 100%"
+                                          v-model="b.otherInformation"
                                         ></a-input>
-                                        <a-textarea
-                                          @change="inputChange(h.id, $event, m.showValue)"
-                                          v-else-if="m.afterOperation === 2"
-                                        ></a-textarea>
-                                        <div v-else-if="m.afterOperation === 3">qwe</div>
                                       </a-form-item>
                                     </div>
                                   </div>
                                 </div>
+                                <!-- 当类型为4时，为多选  +  ===  -->
+                                <div v-else-if="h.type === 4">
+                                  <a-checkbox-group
+                                    :default-value="getList(h.optionVos)"
+                                    @change="onChange($event, h.type, h.id, h.recordId)"
+                                    class="d-flex flex-row flex-wrap"
+                                    style="100%"
+                                  >
+                                    <a-row class="flex-1 flex-wrap">
+                                      <div style="width: 100%" :key="indexANum" :span="24" v-for="(quesA, indexANum) in h.optionVos">
+                                        <a-col>
+                                          <a-checkbox :value="quesA.submitValue">{{ quesA.showValue }}</a-checkbox>
+                                        </a-col>
+                                        <a-col>
+                                          <div
+                                            v-if="
+                                              (contentList.find(item => {
+                                                return item.testQuestionsId === h.id && item.contents === `${quesA.showValue}`;
+                                              }) &&
+                                                quesA.afterOperation > 0) ||
+                                              (quesA.afterOperation > 0 && quesA.choose === 1)
+                                            "
+                                          >
+                                            <!-- <div v-if="quesA.afterOperation > 0"> -->
+                                            <a-input
+                                              :max-length="500"
+                                              @change="inputChange1(h.id, $event, quesA.showValue, h.recordId, h.optionVos, quesA.id)"
+                                              style="width: 100%"
+                                              v-model="quesA.otherInformation"
+                                              v-if="quesA.afterOperation === 1"
+                                            />
+                                            <a-textarea
+                                              @change="inputChange1(h.id, $event, quesA.showValue, h.recordId, h.optionVos, quesA.id)"
+                                              style="width: 100%; height: 150px"
+                                              :max-length="500"
+                                              v-else-if="quesA.afterOperation === 2"
+                                            />
+                                            <div v-else-if="quesA.afterOperation === 3">当前程序已无法嵌套</div>
+                                          </div>
+                                        </a-col>
+                                      </div>
+                                    </a-row>
+                                  </a-checkbox-group>
+                                </div>
+                                <!-- 当类型为3时，为单选  +  ===  -->
+                                <div v-else-if="h.type === 3">
+                                  <a-radio-group
+                                    @change="onChange($event, h.type, h.id, h.recordId)"
+                                    class="d-flex flex-row flex-wrap"
+                                    v-model="h.answer"
+                                  >
+                                    <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in h.optionVos">{{
+                                      f.showValue
+                                    }}</a-radio>
+                                  </a-radio-group>
+                                  <div :key="n" v-for="(m, n) in h.optionVos">
+                                    <div
+                                      v-if="
+                                        contentList.find(item => {
+                                          return item.testQuestionsId === h.id && item.contents === `${m.showValue}`;
+                                        }) && m.afterOperation > 0
+                                      "
+                                    >
+                                      <a-input
+                                        :max-length="500"
+                                        @change="inputChange(h.id, $event, m.showValue)"
+                                        style="width: 200px"
+                                        v-if="m.afterOperation === 1"
+                                      ></a-input>
+                                      <a-textarea
+                                        style="height: 150px; width: 100%"
+                                        @change="inputChange(h.id, $event, m.showValue)"
+                                        v-else-if="m.afterOperation === 2"
+                                      ></a-textarea>
+                                      <div v-else-if="m.afterOperation === 3" :key="q" v-for="(p, q) in m.questionVos">
+                                        <a-form-item
+                                          :label="p.question"
+                                          :label-col="formItemLayout.labelCol"
+                                          :wrapper-col="formItemLayout.wrapperCol"
+                                        >
+                                          <div>当前程序已无法嵌套</div>
+                                        </a-form-item>
+                                      </div>
+                                    </div>
+                                  </div>
+                                </div>
+                                <div v-else-if="h.type === 13">
+                                  <a-input-number
+                                    :max-length="500"
+                                    @change="onChange($event, h.type, h.id, h.recordId)"
+                                    style="width: 200px"
+                                    v-model="h.answer"
+                                  />
+                                  <span style="margin-left: 10px">{{ h.units }}</span>
+                                </div>
+                                <div v-else-if="h.type === 15">
+                                  <a-time-picker placeholder="时间选择" @change="onChange($event, h.type, h.id, h.recordId)" />
+                                </div>
+                                <div v-else-if="h.type === 16">
+                                  <a-date-picker
+                                    placeholder="日期时间选择"
+                                    @change="onChange($event, h.type, h.id, h.recordId)"
+                                    show-time
+                                  />
+                                </div>
+                                <div v-for="(dom, domIndex) in h.domList" :key="domIndex">
+                                  <a-input v-if="h.type === 1" v-model="h.domList[domIndex]"></a-input>
+                                  <a-textarea
+                                    style="height: 150px; width: 100%"
+                                    v-else-if="h.type === 2"
+                                    v-model="h.domList[domIndex]"
+                                  ></a-textarea>
+                                </div>
+                                <div v-if="h.remark && JSON.parse(h.remark).type === 'desc'">
+                                  说明：
+                                  <a-input @change="explainChange(h.id, $event)" v-model="h.explains"></a-input>
+                                </div>
+                              </a-form-item>
+                              <a-button
+                                v-if="h.remark && JSON.parse(h.remark).type === 'add'"
+                                class="add-btn"
+                                @click="addDomB('BB', index, indexB, e.id, indexNum, h.id)"
+                              >
+                                +
+                              </a-button>
+                            </div>
+                          </div>
+                        </a-col>
+                      </div>
+                    </a-row>
+                  </a-checkbox-group>
+                </div>
+                <!-- 当类型为12时，为单选+关联 -->
+                <div v-else-if="e.type === 3">
+                  <a-radio-group @change="onChange($event, e.type, e.id, e.recordId)" class="d-flex flex-row flex-wrap" v-model="e.answer">
+                    <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in e.optionVos">{{ f.showValue }}</a-radio>
+                  </a-radio-group>
+                  <div :key="k" v-for="(j, k) in e.optionVos">
+                    <div
+                      v-if="
+                        (contentList.find(item => {
+                          return item.testQuestionsId === e.id && item.contents === `${j.showValue}`;
+                        }) &&
+                          j.afterOperation > 0) ||
+                        (j.afterOperation > 0 && j.showValue === e.answer)
+                      "
+                    >
+                      <a-input
+                        :max-length="500"
+                        @change="inputChange(e.id, $event, j.showValue)"
+                        style="width: 100%"
+                        v-if="j.afterOperation === 1"
+                      ></a-input>
+                      <a-textarea
+                        :max-length="500"
+                        style="width: 100%; height: 150px"
+                        @change="inputChange(e.id, $event, j.showValue)"
+                        v-else-if="j.afterOperation === 2"
+                      ></a-textarea>
+                      <div v-else-if="j.afterOperation === 3" :key="i" v-for="(h, i) in j.questionVos" style="position: relative">
+                        <a-form-item
+                          :label="h.question"
+                          :label-col="formItemLayout.labelCol"
+                          :wrapper-col="formItemLayout.wrapperCol"
+                          class="d-flex align-center mb-3"
+                        >
+                          <a-input
+                            :max-length="500"
+                            @change="onChange($event, h.type, h.id, h.h.recordId)"
+                            v-if="h.type === 1"
+                            v-model="h.answer"
+                          />
+                          <a-textarea
+                            @change="onChange($event, h.type, h.id, h.recordId)"
+                            style="height: 150px; width: 100%"
+                            v-else-if="h.type === 2"
+                            v-model="h.answer"
+                          />
+                          <a-select
+                            @change="onChange($event, h.type, h.id, h.recordId)"
+                            style="width: 100%"
+                            v-else-if="h.type === 5"
+                            v-model="h.answer"
+                          >
+                            <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in h.optionVos">{{ b.showValue }}</a-select-option>
+                          </a-select>
+                          <a-date-picker
+                            :default-value="h.answer ? $moment(h.answer, dateFormat) : ''"
+                            @change="onChange($event, h.type, h.id, h.recordId)"
+                            placeholder="日期选择"
+                            show-time
+                            style="width: 100%"
+                            v-else-if="h.type === 6"
+                          />
+                          <a-upload
+                            :action="action"
+                            :default-file-list="fileList"
+                            :headers="headers"
+                            @change="fileChange($event, h.id)"
+                            list-type="picture"
+                            name="files"
+                            v-else-if="h.type === 7"
+                          >
+                            <a-button
+                              v-show="
+                                !contentList.find(item => {
+                                  return item.testQuestionsId === h.id;
+                                })
+                              "
+                            >
+                              <a-icon type="upload" />
+                              点击上传
+                            </a-button>
+                          </a-upload>
+                          <div v-else-if="h.type === 10">
+                            <a-select
+                              :default-value="getAnswer(h.answer)"
+                              @change="onChange($event, h.type, h.id, h.recordId)"
+                              style="width: 100%"
+                            >
+                              <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in h.optionVos">{{
+                                b.showValue
+                              }}</a-select-option>
+                            </a-select>
+                            <div :key="c" v-for="(b, c) in h.optionVos">
+                              <div
+                                v-if="
+                                  (contentList.find(item => {
+                                    return item.testQuestionsId === h.id && item.contents === `${b.showValue}`;
+                                  }) &&
+                                    b.afterOperation === 1) ||
+                                  (b.afterOperation === 1 &&
+                                    !contentList.find(item => {
+                                      return item.testQuestionsId === h.id;
+                                    }))
+                                "
+                              >
+                                <a-form-item class="d-flex align-center mb-3">
+                                  <a-input
+                                    :max-length="500"
+                                    @change="inputChange(h.id, $event, b.showValue)"
+                                    style="width: 100%"
+                                    v-model="b.otherInformation"
+                                  ></a-input>
+                                </a-form-item>
                               </div>
-                              <div v-else-if="h.type === 13">
-                                <a-input-number
+                            </div>
+                          </div>
+                          <!-- 当类型为4时，为多选  +  ===  -->
+                          <div v-else-if="h.type === 4">
+                            <a-checkbox-group
+                              :default-value="getList(h.optionVos)"
+                              @change="onChange($event, h.type, h.id, h.recordId)"
+                              class="d-flex flex-row flex-wrap"
+                              style="100%"
+                            >
+                              <a-row class="flex-1 flex-wrap">
+                                <div style="width: 100%" :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
+                                  <a-col>
+                                    <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
+                                  </a-col>
+                                  <a-col>
+                                    <div
+                                      v-if="
+                                        (contentList.find(item => {
+                                          return item.testQuestionsId === h.id && item.contents === `${ques.showValue}`;
+                                        }) &&
+                                          ques.afterOperation > 0) ||
+                                        (ques.afterOperation > 0 && ques.choose === 1)
+                                      "
+                                    >
+                                      <!-- <div v-if="ques.afterOperation > 0"> -->
+                                      <a-input
+                                        :max-length="500"
+                                        @change="inputChange1(h.id, $event, ques.showValue, h.recordId, h.optionVos, ques.id)"
+                                        style="width: 100%"
+                                        v-model="ques.otherInformation"
+                                        v-if="ques.afterOperation === 1"
+                                      />
+                                      <a-textarea
+                                        @change="inputChange1(h.id, $event, ques.showValue, h.recordId, h.optionVos, ques.id)"
+                                        style="width: 100%; height: 150px"
+                                        :max-length="500"
+                                        v-else-if="ques.afterOperation === 2"
+                                      />
+                                      <div v-else-if="ques.afterOperation === 3">当前程序已无法嵌套</div>
+                                    </div>
+                                  </a-col>
+                                </div>
+                              </a-row>
+                            </a-checkbox-group>
+                          </div>
+                          <!-- 当类型为3时，为单选  +  ===  -->
+                          <div v-else-if="h.type === 3">
+                            <a-radio-group
+                              @change="onChange($event, h.type, h.id, h.recordId)"
+                              class="d-flex flex-row flex-wrap"
+                              v-model="h.answer"
+                            >
+                              <a-radio :key="g" :style="radioStyle" :value="f.showValue" v-for="(f, g) in h.optionVos">{{
+                                f.showValue
+                              }}</a-radio>
+                            </a-radio-group>
+                            <div :key="n" v-for="(m, n) in h.optionVos">
+                              <div
+                                v-if="
+                                  contentList.find(item => {
+                                    return item.testQuestionsId === h.id && item.contents === `${m.showValue}`;
+                                  }) && m.afterOperation > 0
+                                "
+                              >
+                                <a-input
                                   :max-length="500"
-                                  @change="onChange($event, h.type, h.id, h.recordId)"
+                                  @change="inputChange(h.id, $event, m.showValue)"
                                   style="width: 200px"
-                                  v-model="h.answer"
-                                />
-                                <span style="margin-left: 10px">{{ h.units }}</span>
+                                  v-if="m.afterOperation === 1"
+                                ></a-input>
+                                <a-textarea
+                                  style="height: 150px; width: 100%"
+                                  @change="inputChange(h.id, $event, m.showValue)"
+                                  v-else-if="m.afterOperation === 2"
+                                ></a-textarea>
+                                <div v-else-if="m.afterOperation === 3" :key="q" v-for="(p, q) in m.questionVos">
+                                  <a-form-item
+                                    :label="p.question"
+                                    :label-col="formItemLayout.labelCol"
+                                    :wrapper-col="formItemLayout.wrapperCol"
+                                  >
+                                    <div>当前程序已无法嵌套</div>
+                                  </a-form-item>
+                                </div>
                               </div>
-                              <div v-else-if="h.type === 14">图片识别</div>
-                            </a-form-item>
+                            </div>
+                          </div>
+                          <div v-else-if="h.type === 13">
+                            <a-input-number
+                              :max-length="500"
+                              @change="onChange($event, h.type, h.id, h.recordId)"
+                              style="width: 200px"
+                              v-model="h.answer"
+                            />
+                            <span style="margin-left: 10px">{{ h.units }}</span>
+                          </div>
+                          <div v-else-if="h.type === 15">
+                            <a-time-picker placeholder="时间选择" @change="onChange($event, h.type, h.id, h.recordId)" />
+                          </div>
+                          <div v-else-if="h.type === 16">
+                            <a-date-picker placeholder="日期时间选择" @change="onChange($event, h.type, h.id, h.recordId)" show-time />
+                          </div>
+                          <div v-for="(dom, domIndex) in h.domList" :key="domIndex">
+                            <a-input v-if="h.type === 1" v-model="h.domList[domIndex]"></a-input>
+                            <a-textarea
+                              style="height: 150px; width: 100%"
+                              v-else-if="h.type === 2"
+                              v-model="h.domList[domIndex]"
+                            ></a-textarea>
+                          </div>
+                          <div v-if="h.remark && JSON.parse(h.remark).type === 'desc'">
+                            说明：
+                            <a-input @change="explainChange(h.id, $event)" v-model="h.explains"></a-input>
                           </div>
                         </a-form-item>
+                        <a-button
+                          v-if="h.remark && JSON.parse(h.remark).type === 'add'"
+                          class="add-btn"
+                          @click="addDomB('BB', index, indexB, e.id, k, h.id)"
+                        >
+                          +
+                        </a-button>
                       </div>
                     </div>
                   </div>
@@ -1012,8 +1200,24 @@
                   <a-input-number @change="onChange($event, e.type, e.id, e.recordId)" style="width: 200px" v-model="e.answer" />
                   <span style="margin-left: 10px">{{ e.units }}</span>
                 </div>
-                <div v-else-if="e.type === 14">图片识别</div>
+                <div v-else-if="e.type === 15">
+                  <a-time-picker placeholder="时间选择" @change="onChange($event, e.type, e.id, e.recordId)" />
+                </div>
+                <div v-else-if="e.type === 16">
+                  <a-date-picker placeholder="日期时间选择" @change="onChange($event, e.type, e.id, e.recordId)" show-time />
+                </div>
+                <div v-for="(dom, domIndex) in e.domList" :key="domIndex">
+                  <a-input v-if="e.type === 1" v-model="e.domList[domIndex]"></a-input>
+                  <a-textarea style="height: 150px; width: 100%" v-else-if="e.type === 2" v-model="e.domList[domIndex]"></a-textarea>
+                </div>
+                <div v-if="e.remark && JSON.parse(e.remark).type === 'desc'">
+                  说明：
+                  <a-input @change="explainChange(e.id, $event)" v-model="e.explains"></a-input>
+                </div>
               </a-form-item>
+              <a-button v-if="e.remark && JSON.parse(e.remark).type === 'add'" class="add-btn" @click="addDomB('BA', index, indexB, e.id)">
+                +
+              </a-button>
             </div>
           </div>
         </a-collapse-panel>
@@ -1030,21 +1234,16 @@
       @change="changeDate"
     />-->
     <div class="bot-right-tips">
-      当前选择患者的住院号为：
+      当前选择患者的编号为：
       <span style="color: green">{{ hospitalization }}</span>
     </div>
-    <a-button
-      @click="showModal"
-      class="white--text px-10 bot-right-btn"
-      style="margin-top: 40px"
-      type="primary"
-      v-if="list.length > 0 && getCode"
-    >
+    <a-button @click="showModal" class="white--text px-10 bot-right-btn" style="margin-top: 40px" type="primary">
       提交
+      <!-- v-if="list.length > 0 && getCode" -->
     </a-button>
     <a-modal :confirm-loading="confirmLoading" :visible="visible" @cancel="handleCancel" @ok="setData" title="提示">
       <p>
-        是否提交住院号为：
+        是否提交患者编号为：
         <span style="color: green">{{ hospitalization }}</span> 的患者的信息
       </p>
     </a-modal>
@@ -1124,10 +1323,33 @@ export default {
     await this.getQuery();
   },
   methods: {
+    // 'AB',a.id, index,k,h.id
+    addDom(type, id, index, quesIndex, quesId) {
+      const { list } = this;
+      let quesObj = null;
+      if (type === 'AA') {
+        quesObj = list[index].questionVos.find(item => item.id === id);
+      } else if (type === 'AB') {
+        const ques = list[index].questionVos.find(item => item.id === id);
+        quesObj = ques.optionVos[quesIndex].questionVos.find(item => item.id === quesId);
+      }
+      quesObj.domList.push('');
+      this.list = [...list];
+    },
+    addDomB(type, index, indexB, id, quesIndex, quesId) {
+      const { list } = this;
+      let quesObj = null;
+      if (type === 'BA') {
+        const ques = list[index].subReportCodes[indexB].questionVos.find(item => item.id === id);
+        quesObj = ques.optionVos[quesIndex].questionVos.find(item => item.id === quesId);
+      }
+      quesObj.domList.push('');
+      this.list = [...list];
+    },
     showModal() {
       this.visible = true;
     },
-    handleCancel(e) {
+    handleCancel() {
       this.visible = false;
     },
     getList(obj) {
@@ -1164,7 +1386,29 @@ export default {
         const { code, data, msg } = res.data;
         if (code === 200) {
           // console.log(data);
+          // data.forEach(item => {
+          //   if (item.questionVos && item.questionVos.length) {
+          //     item.questionVos.forEach(ques => {
+          //       if (ques.remark && JSON.parse(ques.remark).type === 'add') {
+          //         ques.domList = [];
+          //       }
+          //       if (ques.optionVos && ques.optionVos.length) {
+          //         ques.optionVos.forEach(quesVos => {
+          //           if (quesVos.questionVos && quesVos.questionVos.length) {
+          //             quesVos.questionVos.forEach(vosItem => {
+          //               if (quesVos.remark && JSON.parse(quesVos.remark).type === 'add') {
+          //                 vosItem.domList = [];
+          //               }
+          //             });
+          //           }
+          //         });
+          //       }
+          //     });
+          //   }
+          // });
+
           this.list = data;
+          console.log(this.list);
           if (this.getCode) {
             if (data[0].reportType === 0) {
               this.tabList = [];
@@ -1208,8 +1452,8 @@ export default {
           // 下拉框
           this.forFn(id, e, recordId);
         } else if (type === 6) {
-          // 日期时间选择器，给后台返回的值是  2020-01-01 00:00:00 的格式
-          this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'), recordId);
+          // 日期选择器，给后台返回的值是  2020-01-01 的格式
+          this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD'), recordId);
         } else if (type === 7) {
           alert('上传文件，先空下');
         } else if (type === 8) {
@@ -1256,8 +1500,12 @@ export default {
         } else if (type === 13) {
           // 数字类型
           this.forFn(id, e, recordId);
-        } else if (type === 14) {
-          // 图片识别 暂时不做
+        } else if (type === 15) {
+          // 时间选择 返回格式为 00:00:00
+          this.forFn(id, this.$moment(e._d).format('HH:mm:ss'), recordId);
+        } else if (type === 16) {
+          // 日期+时间选择 返回格式为 2020:01:01 00:00:00
+          this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'), recordId);
         }
       } else {
         if (type === 1) {
@@ -1271,13 +1519,17 @@ export default {
           this.failFn(id, e.target.value, recordId);
         } else if (type === 4) {
           // 多选
-          this.failFn(id, e, recordId);
+          // 遍历本次答案，添加到数组中
+          for (let i = 0; i < e.length; i++) {
+            this.failFn(id, e[i], recordId);
+          }
         } else if (type === 5) {
           // 下拉框
           this.failFn(id, e, recordId);
         } else if (type === 6) {
           // 日期时间选择器，给后台返回的值是  2020-01-01 00:00:00 的格式
-          this.failFn(id, this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'), recordId);
+          this.failFn(id, this.$moment(e._d).format('YYYY-MM-DD'), recordId);
+          // console.log(this.$moment(e._d).format('YYYY-MM-DD'));
         } else if (type === 7) {
           alert('上传文件，先空下');
         } else if (type === 8) {
@@ -1302,8 +1554,12 @@ export default {
         } else if (type === 13) {
           // 数字类型
           this.failFn(id, e, recordId);
-        } else if (type === 14) {
-          // 图片识别 暂时不做
+        } else if (type === 15) {
+          // 时间选择 返回格式为 00:00:00
+          this.failFn(id, this.$moment(e._d).format('HH:mm:ss'), recordId);
+        } else if (type === 16) {
+          // 日期+时间选择 返回格式为 2020:01:01 00:00:00
+          this.failFn(id, this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'), recordId);
         }
       }
     },
@@ -1359,9 +1615,10 @@ export default {
         };
         this.contentList.push(obj);
       }
+      console.log(this.contentList);
     },
     // 多选其他输入框发生改变时
-    inputChange1(id, e, value, recordId, list) {
+    inputChange1(id, e, value, recordId, list, str) {
       let listArr = this.getList(list);
       console.log(listArr);
       console.log(id);
@@ -1383,7 +1640,8 @@ export default {
         }
       }
       for (let i = 0; i < this.contentList.length; i++) {
-        if (this.contentList[i].testQuestionsId === id && this.contentList[i].contentsType === 1) {
+        const item = this.contentList[i];
+        if (item.testQuestionsId === id && item.contentsType === 1 && item.writeType === str) {
           this.contentList.splice(i, 1);
           i -= 1;
         }
@@ -1394,6 +1652,7 @@ export default {
           contents: value + ':' + e.target.value,
           patientRecordId: recordId ? recordId : '',
           contentsType: 1,
+          writeType: str,
         };
         this.contentList.push(obj);
       }
@@ -1498,14 +1757,97 @@ export default {
         }
       }
     },
-    // 改变提交时间
-    // changeDate(date) {
-    //   this.subDateTime = this.$moment(date._d).format('YYYY-MM-DD HH:mm:ss');
-    // },
     // 提交表单
     async setData() {
       try {
         this.confirmLoading = true;
+        for (let i = 0; i < this.list.length; i++) {
+          const item = this.list[i];
+          if (item.questionVos && item.questionVos.length) {
+            for (let k = 0; k < item.questionVos.length; k++) {
+              const itemADom = item.questionVos[k];
+              if (itemADom.domList && itemADom.domList.length) {
+                for (let m = 0; m < itemADom.domList.length; m++) {
+                  const listItem = itemADom.domList[m];
+                  if (listItem !== '') {
+                    let obj = {
+                      testQuestionsId: itemADom.id,
+                      contents: listItem,
+                    };
+                    this.contentList.push(obj);
+                  }
+                }
+              }
+              if (itemADom.optionVos && itemADom.optionVos.length) {
+                for (let m = 0; m < itemADom.optionVos.length; m++) {
+                  const itemBDom = itemADom.optionVos[m];
+                  if (itemBDom.questionVos && itemBDom.questionVos.length) {
+                    for (let n = 0; n < itemBDom.questionVos.length; n++) {
+                      const itemCDOM = itemBDom.questionVos[n];
+                      if (itemCDOM.domList && itemCDOM.domList.length) {
+                        for (let p = 0; p < itemCDOM.domList.length; p++) {
+                          const listItem = itemCDOM.domList[p];
+                          if (listItem !== '') {
+                            let obj = {
+                              testQuestionsId: itemCDOM.id,
+                              contents: listItem,
+                            };
+                            this.contentList.push(obj);
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+          if (item.subReportCodes && item.subReportCodes.length) {
+            const itemSub = item.subReportCodes;
+            for (let k = 0; k < itemSub.length; k++) {
+              const subVos = itemSub[k].questionVos;
+              if (subVos && subVos.length) {
+                for (let q = 0; q < subVos.length; q++) {
+                  const itemADom = subVos[q];
+                  if (itemADom.domList && itemADom.domList.length) {
+                    for (let m = 0; m < itemADom.domList.length; m++) {
+                      const listItem = itemADom.domList[m];
+                      if (listItem !== '') {
+                        let obj = {
+                          testQuestionsId: itemADom.id,
+                          contents: listItem,
+                        };
+                        this.contentList.push(obj);
+                      }
+                    }
+                  }
+                  if (itemADom.optionVos && itemADom.optionVos.length) {
+                    for (let m = 0; m < itemADom.optionVos.length; m++) {
+                      const itemBDom = itemADom.optionVos[m];
+                      if (itemBDom.questionVos && itemBDom.questionVos.length) {
+                        for (let n = 0; n < itemBDom.questionVos.length; n++) {
+                          const itemCDOM = itemBDom.questionVos[n];
+                          if (itemCDOM.domList && itemCDOM.domList.length) {
+                            for (let p = 0; p < itemCDOM.domList.length; p++) {
+                              const listItem = itemCDOM.domList[p];
+                              if (listItem !== '') {
+                                let obj = {
+                                  testQuestionsId: itemCDOM.id,
+                                  contents: listItem,
+                                };
+                                this.contentList.push(obj);
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
         const params = {
           param: {
             list: this.contentList,
@@ -1518,9 +1860,12 @@ export default {
         const { code, msg, data } = res.data;
         if (code === 200) {
           this.$message.success('提交成功');
+          this.confirmLoading = false;
           this.visible = false;
+          this.contentList = [];
         } else {
           this.$message.error('提交失败');
+          this.confirmLoading = false;
         }
       } catch (error) {
         this.$message.error('error');
@@ -1538,4 +1883,10 @@ export default {
   margin-left: 24px;
   color: rgba(0, 0, 0, 0.75);
 }
+
+.add-btn {
+  position: absolute;
+  right: 18%;
+  top: 0px;
+}
 </style>
diff --git a/src/views/PersonalStats/components/AdjacentTasks.vue b/src/views/PersonalStats/components/AdjacentTasks.vue
index f2336c4..45d4d99 100644
--- a/src/views/PersonalStats/components/AdjacentTasks.vue
+++ b/src/views/PersonalStats/components/AdjacentTasks.vue
@@ -25,7 +25,7 @@
 import { mapMutations, mapState } from 'vuex';
 const columns = [
   {
-    title: '住院号',
+    title: '患者编号',
     align: 'center',
     dataIndex: 'hospitalization',
     key: 'hospitalization',