diff --git a/package-lock.json b/package-lock.json
index 4a10d0a..8fc02c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1808,16 +1808,6 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "cacache": {
           "version": "13.0.1",
           "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1594427999421&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz",
@@ -1850,34 +1840,6 @@
           "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=",
           "dev": true
         },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
         "css-loader": {
           "version": "3.6.0",
           "resolved": "https://registry.npm.taobao.org/css-loader/download/css-loader-3.6.0.tgz?cache=0&sync_timestamp=1604507107408&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-loader%2Fdownload%2Fcss-loader-3.6.0.tgz",
@@ -1931,13 +1893,6 @@
             "universalify": "^0.1.0"
           }
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
         "icss-utils": {
           "version": "4.1.1",
           "resolved": "https://registry.npm.taobao.org/icss-utils/download/icss-utils-4.1.1.tgz?cache=0&sync_timestamp=1602527330977&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ficss-utils%2Fdownload%2Ficss-utils-4.1.1.tgz",
@@ -2052,16 +2007,6 @@
             "minipass": "^3.1.1"
           }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
         "terser-webpack-plugin": {
           "version": "2.3.8",
           "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1603881757308&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz",
@@ -2078,32 +2023,6 @@
             "terser": "^4.6.12",
             "webpack-sources": "^1.4.3"
           }
-        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.1.2",
-          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz",
-          "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          },
-          "dependencies": {
-            "loader-utils": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-              "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "big.js": "^5.2.2",
-                "emojis-list": "^3.0.0",
-                "json5": "^2.1.2"
-              }
-            }
-          }
         }
       }
     },
@@ -12677,6 +12596,87 @@
         }
       }
     },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.2.0",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
+      "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "vue-quill-editor": {
       "version": "3.0.6",
       "resolved": "https://registry.npm.taobao.org/vue-quill-editor/download/vue-quill-editor-3.0.6.tgz",
diff --git a/src/App.vue b/src/App.vue
index 2e3a7d7..f01d785 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,13 +3,13 @@
  * @email: 18603454788@163.com
  * @Date: 2021-02-22 09:20:03
  * @LastEditors: wally
- * @LastEditTime: 2021-04-14 19:12:11
+ * @LastEditTime: 2021-04-20 10:11:13
 -->
 
 <template>
   <a-config-provider :locale="zh_CN">
     <div class="d-flex flex-row flex-nowrap" id="app">
-      <!-- <btn-con /> -->
+      <btn-con />
       <router-view class="flex-1 bg pa-3"></router-view>
     </div>
   </a-config-provider>
@@ -18,12 +18,12 @@
 <script>
 import { mapState, mapActions, mapMutations } from 'vuex';
 import zh_CN from 'ant-design-vue/lib/locale-provider/zh_CN';
-// import BtnCon from 'components/BtnCom/BtnCon.vue';
+import BtnCon from 'components/BtnCom/BtnCon.vue';
 import { getHId } from 'config/api';
 
 export default {
   name: 'App',
-  // components: { BtnCon },
+  components: { BtnCon },
   data() {
     return { zh_CN };
   },
@@ -40,11 +40,11 @@ export default {
       }
     },
   },
-  created() {
-    // const userId = '1218763410024566784';
-    // const params = { userId };
-    // await this.getUserId(params);
-    // await this.getToken();
+  async created() {
+    const userId = '1218763410024566784';
+    const params = { userId };
+    await this.getUserId(params);
+    await this.getToken();
     if (localStorage.getItem('patientId')) {
       this.setPatientId(localStorage.getItem('patientId'));
     }
diff --git a/src/common/portrait.styl b/src/common/portrait.styl
index 09b49ce..b76b8d6 100644
--- a/src/common/portrait.styl
+++ b/src/common/portrait.styl
@@ -195,7 +195,7 @@
 
 .white--text{
   color: #fff;
-  width: 200px;
+  width: 100px;
   margin: 0 auto
 }
 .bot-right-btn{
@@ -208,7 +208,7 @@
   position: fixed;
   height: 40px;
   font-size: 14px;
-  right: 50px;
+  right: 12px;
   top: 50px;
 }
 // flex
diff --git a/src/components/PatientInfo/PatientAdd.vue b/src/components/PatientInfo/PatientAdd.vue
index 3fe0b14..62494ff 100644
--- a/src/components/PatientInfo/PatientAdd.vue
+++ b/src/components/PatientInfo/PatientAdd.vue
@@ -3,7 +3,7 @@
  * @email: 18603454788@163.com
  * @Date: 2021-02-22 09:20:03
  * @LastEditors: wally
- * @LastEditTime: 2021-04-14 18:33:40
+ * @LastEditTime: 2021-04-20 17:20:18
 -->
 <template>
   <div class="d-flex flex-wrap pb-3">
@@ -11,21 +11,21 @@
     <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个字符' },
+                  { 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: '对照组不能为空' }] }]">
diff --git a/src/components/PatientInfo/PatientTable.vue b/src/components/PatientInfo/PatientTable.vue
index a4f1960..03cdf8b 100644
--- a/src/components/PatientInfo/PatientTable.vue
+++ b/src/components/PatientInfo/PatientTable.vue
@@ -38,7 +38,7 @@
       </a-table>
     </div>
     <a-empty v-else />
-    <a-modal title="会议记录预览" width="600px" v-model="visible" @ok="handleOk" @cancel="handleCancel">
+    <a-modal title="选择患者" width="600px" v-model="visible" @ok="handleOk" @cancel="handleCancel">
       是否要录入患者编号为：
       <span style="color: green">{{ hospitalization }}</span>
       的患者的相关数据
@@ -58,7 +58,13 @@ const columns = [
     scopedSlots: { customRender: 'id' },
   },
   {
-    title: '编号',
+    title: '研究编号',
+    align: 'center',
+    dataIndex: 'code',
+    key: 'code',
+  },
+  {
+    title: '住院号',
     align: 'center',
     dataIndex: 'hospitalization',
     key: 'hospitalization',
@@ -96,6 +102,7 @@ export default {
       columns,
       loading: false,
       visible: false,
+      hasPatientId: false,
       patientId: '',
       hospitalization: '',
     };
@@ -121,9 +128,11 @@ export default {
     },
     handleCancel(e) {
       this.visible = false;
+      this.visible1 = false;
     },
     handleOk() {
       this.chooseItem(this.patientId, this.hospitalization);
+      this.visible1 = true;
     },
     // 选择病患
     async chooseItem(id, hospitalization) {
diff --git a/src/components/PatientInfo/Search.vue b/src/components/PatientInfo/Search.vue
index e43329e..96cc0f4 100644
--- a/src/components/PatientInfo/Search.vue
+++ b/src/components/PatientInfo/Search.vue
@@ -1,10 +1,17 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-04-19 10:23:19
+ * @LastEditors: wally
+ * @LastEditTime: 2021-04-20 17:19:13
+-->
 <template>
   <!-- search -->
   <div>
     <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>
@@ -14,7 +21,7 @@
         <a-button class="mr-4" html-type="submit" icon="search" type="primary">搜索</a-button>
       </a-form>
       <div class="flex-1"></div>
-      <a-button @click="showModal" html-type="submit" icon="plus" type="primary">新增</a-button>
+      <a-button @click="showModal" class="mt-1" html-type="submit" icon="plus" type="primary">新增</a-button>
     </div>
     <patient-add :visible="visible" @closeModal="closeModal" @searchMes="searchMes" />
   </div>
diff --git a/src/components/TypeTable/TypeTable.vue b/src/components/TypeTable/TypeTable.vue
new file mode 100644
index 0000000..ba864d5
--- /dev/null
+++ b/src/components/TypeTable/TypeTable.vue
@@ -0,0 +1,104 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-04-20 17:44:23
+ * @LastEditors: wally
+ * @LastEditTime: 2021-04-20 21:32:09
+-->
+<template>
+  <div>
+    <a-table :columns="columns" :pagination="false" :row-key="record => record.title" :data-source="propData" bordered class="white pa-3">
+      <template :slot="firstData" slot-scope="text, record">
+        <span>{{ record.titleHead }}</span>
+      </template>
+
+      <template v-for="(item, itemIndex) in columns.slice(1, columns.length)" :slot="item.title" slot-scope="text, record, index">
+        <!-- <a-input :key="item" v-model="record.render" /> -->
+        <!-- {{ index }}{{ itemIndex }} -->
+        <a-input-number
+          :key="JSON.stringify(item)"
+          id="inputNumber"
+          v-model="list[index * rowNum + itemIndex].answer"
+          @change="onChange($event, list[index * rowNum + itemIndex].type, list[index * rowNum + itemIndex].id)"
+        />
+      </template>
+    </a-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TypeTable',
+  props: {
+    remark: {
+      type: String,
+      default: '',
+    },
+    list: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      columns: [],
+      firstData: '',
+      propData: [],
+      colNum: 0, // 行数
+      rowNum: 0, // 列数
+      contentList: [], // 答题数据
+    };
+  },
+  created() {
+    // 获取remark数据
+    const data = JSON.parse(this.remark);
+    this.changeRow(data.param);
+    this.changeCol(data.param);
+    console.log(this.list);
+  },
+  methods: {
+    /**
+     * 获取列
+     */
+    changeRow(data) {
+      this.columns = [];
+      if (data.rowTitle && data.rowTitle.length) {
+        this.firstData = data.rowTitle[0];
+        this.rowNum = data.rowTitle.length - 1;
+        for (let i = 0; i < data.rowTitle.length; i++) {
+          const item = data.rowTitle[i];
+          let obj = {
+            title: item,
+            align: 'center',
+            dataIndex: item,
+            key: item,
+            scopedSlots: { customRender: item },
+            render: i,
+          };
+          this.columns.push(obj);
+        }
+      }
+    },
+    /**
+     * 获取行
+     */
+    changeCol(data) {
+      this.propData = [];
+      if (data.colTitle && data.colTitle.length) {
+        this.colNum = data.colTitle.length;
+        for (let i = 0; i < data.colTitle.length; i++) {
+          const item = data.colTitle[i];
+          let obj = { titleHead: item };
+          this.propData.push(obj);
+        }
+      }
+    },
+    /**
+     * 改变输入框内的内容时
+     */
+    onChange(e, type, id) {
+      this.$emit('getTableAnswer', e, 13, id);
+    },
+  },
+};
+</script>
diff --git a/src/views/BiologicalSamples/BiologicalSamples.vue b/src/views/BiologicalSamples/BiologicalSamples.vue
index c0b530c..e431d55 100644
--- a/src/views/BiologicalSamples/BiologicalSamples.vue
+++ b/src/views/BiologicalSamples/BiologicalSamples.vue
@@ -1,56 +1,59 @@
 <template>
   <div>
-    <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-input
-              placeholder="患者编号"
-              v-decorator="[
-                'inpatientNumber',
-                {
-                  rules: [
-                    { 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="样本类型" 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="采集时间" 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>
-          </a-form-item>
+    <div style="width: 100%">
+      <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-input
+                placeholder="患者编号"
+                v-decorator="[
+                  'inpatientNumber',
+                  {
+                    rules: [
+                      { 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="样本类型" 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="采集时间" 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>
+            </a-form-item>
 
-          <a-form-item class="d-flex flex-row-reverse">
-            <a-button class="white--text px-10" html-type="submit" type="primary">提交</a-button>
-          </a-form-item>
-        </a-form>
-      </a-card>
+            <a-form-item class="d-flex flex-row-reverse">
+              <a-button class="white--text px-10" html-type="submit" type="primary">提交</a-button>
+            </a-form-item>
+          </a-form>
+        </a-card>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 import { addBiologicalSamples } from 'config/api';
+
 const formItemLayout = {
   labelCol: { span: 4 },
   wrapperCol: { span: 18 },
 };
 const tailItemLayout = { wrapperCol: { span: 18, offset: 4 } };
 export default {
-  name: 'Meeting',
+  name: 'BiologicalSamples',
   data() {
     return {
       formItemLayout,
diff --git a/src/views/CaseAnalysis/CaseAnalysis.vue b/src/views/CaseAnalysis/CaseAnalysis.vue
index 5926b3a..709681e 100644
--- a/src/views/CaseAnalysis/CaseAnalysis.vue
+++ b/src/views/CaseAnalysis/CaseAnalysis.vue
@@ -31,42 +31,33 @@
         <!-- 首先遍历整个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>{{ item.name }}：</h2>
-          </a-form-item>-->
           <!-- 一级标题下的各种问题（questionVos），判断类型1-12，展示不同需要填写的内容 -->
-          <div :key="a.name" v-for="a in item.questionVos">
-            <a-form-item
-              :label="a.question"
-              :label-col="formItemLayout.labelCol"
-              :wrapper-col="formItemLayout.wrapperCol"
-              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-radio-group
+          <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)"
-                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-group>
-              <a-checkbox-group
+                style="height: 150px; width: 100%"
+                v-else-if="a.type === 2"
+                v-model="a.answer"
+              />
+              <a-select
                 @change="onChange($event, a.type, a.id, a.recordId)"
-                class="d-flex flex-row flex-wrap"
-                v-else-if="a.type === 4"
+                style="width: 100%"
+                v-else-if="a.type === 5"
+                v-model="a.answer"
               >
-                <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: 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-date-picker
+                :default-value="a.answer ? $moment(a.answer, dateFormat) : ''"
+                @change="onChange($event, a.type, a.id, a.recordId)"
+                placeholder="日期选择"
+                style="width: 100%"
+                :input-read-only="true"
+                v-else-if="a.type === 6"
+              />
               <a-upload
                 :action="action"
                 :default-file-list="fileList"
@@ -86,411 +77,633 @@
                   <a-icon type="upload" />点击上传
                 </a-button>
               </a-upload>
-              <a-radio-group
-                @change="onChange($event, a.type, a.id, a.recordId)"
-                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>
-                <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
-                    "
-                  >
-                    <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-form-item>
-                  </div>
-                </div>
-              </a-radio-group>
-              <a-checkbox-group
-                @change="onChange($event, a.type, a.id, a.recordId)"
-                class="d-flex flex-row flex-wrap"
-                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="
-                      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-form-item>
-                  </div>
-                </div>
-                <!-- </a-col>
-                </a-row>-->
-              </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 :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>
                 </a-select>
                 <div :key="c" v-for="(b, c) in a.optionVos">
                   <div
                     v-if="
-                      contentList.find(item => {
+                      (contentList.find(item => {
                         return item.testQuestionsId === a.id && item.contents === `${b.showValue}`;
-                      }) && b.afterOperation === 1
+                      }) &&
+                        b.afterOperation === 1) ||
+                      (b.afterOperation === 1 &&
+                        !contentList.find(item => {
+                          return item.testQuestionsId === a.id;
+                        }))
                     "
                   >
-                    <a-form-item
-                      :label-col="formItemLayout.labelCol"
-                      :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-form-item class="d-flex align-center mb-3">
+                      <a-input
+                        :max-length="500"
+                        @change="inputChange(a.id, $event, b.showValue)"
+                        style="width: 100%"
+                        v-model="b.otherInformation"
+                      ></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-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-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 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.find(content => content === `${b.showValue}`);
-                            }) && b.afterOperation > 0
+                            (contentList.find(item => {
+                              return item.testQuestionsId === a.id && item.contents === `${ques.showValue}`;
+                            }) &&
+                              ques.afterOperation > 0) ||
+                            (ques.afterOperation > 0 && ques.choose === 1)
                           "
                         >
-                          <a-input @change="inputChange(a.id, $event, b.showValue)" style="width: 200px"></a-input>
-                        </div>
-                      </div>
-                    </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>
-                <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 > 0
-                    "
-                  >
-                    <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
-                          @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">
-                          <div :key="ohter.id" v-for="ohter in j.questionVos">
+                          <!-- <div v-if="ques.afterOperation > 0"> -->
+                          <a-input
+                            :max-length="500"
+                            @change="inputChange1(a.id, $event, ques.showValue, a.recordId, a.optionVos, ques.id)"
+                            style="width: 100%"
+                            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="ohter.question"
+                              :label="h.question"
                               :label-col="formItemLayout.labelCol"
                               :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
+                                :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, ohter.type, ohter.id)"
-                                style="height: 100px"
-                                v-else-if="ohter.type === 2"
+                                @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-radio-group
-                                @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                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-group>
-                              <a-checkbox-group
-                                @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                class="d-flex flex-row flex-wrap"
-                                v-else-if="ohter.type === 4"
-                              >
-                                <a-row>
-                                  <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>
-                              </a-checkbox-group>
                               <a-select
-                                @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                style="width: 120px"
-                                v-else-if="ohter.type === 5"
+                                @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 ohter.optionVos">{{
+                                <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, ohter.type, ohter.id, ohter.recordId)"
+                              <a-date-picker
+                                :default-value="h.answer ? $moment(h.answer, dateFormat) : ''"
+                                @change="onChange($event, h.type, h.id, h.recordId)"
+                                placeholder="日期选择"
                                 show-time
-                                v-else-if="ohter.type === 6"
+                                style="width: 100%"
+                                :input-read-only="true"
+                                v-else-if="h.type === 6"
                               />
                               <a-upload
                                 :action="action"
                                 :default-file-list="fileList"
                                 :headers="headers"
-                                @change="fileChange($event, ohter.id)"
+                                @change="fileChange($event, h.id)"
                                 list-type="picture"
                                 name="files"
-                                v-else-if="ohter.type === 7"
+                                v-else-if="h.type === 7"
                               >
                                 <a-button
                                   v-show="
                                     !contentList.find(item => {
-                                      return item.testQuestionsId === ohter.id;
+                                      return item.testQuestionsId === h.id;
                                     })
                                   "
                                 >
-                                  <a-icon type="upload" />点击上传
+                                  <a-icon type="upload" />
+                                  点击上传
                                 </a-button>
                               </a-upload>
-                              <a-radio-group
-                                @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                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>
-                                <div :key="n" v-for="(m, n) in ohter.optionVos">
-                                  <div
-                                    v-if="
-                                      contentList.find(item => {
-                                        return item.testQuestionsId === ohter.id && item.contents === `${m.showValue}`;
-                                      }) && m.afterOperation === 1
-                                    "
-                                  >
-                                    <a-form-item
-                                      :label-col="formItemLayout.labelCol"
-                                      :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-form-item>
-                                  </div>
-                                </div>
-                              </a-radio-group>
-                              <a-checkbox-group
-                                @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                class="d-flex flex-row flex-wrap"
-                                v-else-if="ohter.type === 9"
-                              >
-                                <a-row>
-                                  <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">
-                                    <div :key="n" v-for="(m, n) in ohter.optionVos">
-                                      <div
-                                        v-if="
-                                          contentList.find(item => {
-                                            return item.testQuestionsId === ohter.id && item.contents === `${m.showValue}`;
-                                          }) && m.afterOperation === 1
-                                        "
-                                      >
-                                        <a-form-item
-                                          :label-col="formItemLayout.labelCol"
-                                          :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-form-item>
-                                      </div>
-                                    </div>
-                                  </a-col>
-                                </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">{{
+                              <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 ohter.optionVos">
+                                <div :key="c" v-for="(b, c) in h.optionVos">
                                   <div
                                     v-if="
-                                      contentList.find(item => {
-                                        return item.testQuestionsId === ohter.id && item.contents === `${b.showValue}`;
-                                      }) && b.afterOperation === 1
+                                      (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
-                                      :label-col="formItemLayout.labelCol"
-                                      :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-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="ohter.type === 11">
+                              <!-- 当类型为4时，为多选  +  ===  -->
+                              <div v-else-if="h.type === 4">
                                 <a-checkbox-group
-                                  @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
+                                  :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 ohter.optionVos">
-                                      <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
-                                    </a-col>
-                                    <a-col :span="100">
-                                      <div :key="c" v-for="(b, c) in ohter.optionVos">
+                                  <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 === ohter.id &&
-                                                item.contents.find(content => content === `${b.showValue}`)
-                                              );
-                                            }) && b.afterOperation > 0
+                                            (contentList.find(item => {
+                                              return item.testQuestionsId === h.id && item.contents === `${quesA.showValue}`;
+                                            }) &&
+                                              quesA.afterOperation > 0) ||
+                                            (quesA.afterOperation > 0 && quesA.choose === 1)
                                           "
                                         >
-                                          <a-input @change="inputChange(ohter.id, $event, b.showValue)" style="width: 200px"></a-input>
+                                          <!-- <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>
-                                      </div>
-                                    </a-col> </a-row
-                                  >说明：
-                                  <a-input @change="explainChange(ohter.id, $event)" style="width: 200px" />
+                                      </a-col>
+                                    </div>
+                                  </a-row>
                                 </a-checkbox-group>
                               </div>
-                              <!-- 当类型为12时，为单选+关联 -->
-                              <div v-else-if="ohter.type === 12">
+                              <!-- 当类型为3时，为单选  +  ===  -->
+                              <div v-else-if="h.type === 3">
                                 <a-radio-group
-                                  @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
+                                  @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 ohter.optionVos">{{
+                                  <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 ohter.optionVos">
+                                <div :key="n" v-for="(m, n) in h.optionVos">
                                   <div
                                     v-if="
                                       contentList.find(item => {
-                                        return item.testQuestionsId === ohter.id && item.contents === `${m.showValue}`;
+                                        return item.testQuestionsId === h.id && item.contents === `${m.showValue}`;
                                       }) && m.afterOperation > 0
                                     "
                                   >
-                                    <div :key="q" v-for="(p, q) in m.questionVos">
+                                    <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"
-                                        class="d-flex align-center mb-3"
                                       >
-                                        <a-input
-                                          @change="inputChange(ohter.id, $event, m.showValue)"
-                                          style="width: 200px"
-                                          v-if="m.afterOperation === 1"
-                                        ></a-input>
-                                        <a-textarea
-                                          @change="inputChange(ohter.id, $event, m.showValue)"
-                                          v-else-if="m.afterOperation === 2"
-                                        ></a-textarea>
-                                        <div v-else-if="m.afterOperation === 3">qwe</div>
+                                        <div>当前程序已无法嵌套</div>
                                       </a-form-item>
                                     </div>
                                   </div>
                                 </div>
                               </div>
-                              <div v-else-if="ohter.type === 13">
-                                <a-input-number @change="onChange($event, ohter.type, ohter.id, ohter.recordId)" />
-                                <span style="margin-left: 10px">{{ other.units }}</span>
+                              <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"
+                                />
+                              </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="日期时间选择"
+                                  :input-read-only="true"
+                                  @change="onChange($event, h.type, h.id, h.recordId)"
+                                  show-time
+                                />
                               </div>
-                              <div v-else-if="ohter.type === 14">图片识别</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-textarea @change="explainChange(h.id, $event)" v-model="h.explains" />
+                              </div>
+                              <p class="units-position" style="margin-left: 10px">
+                                <span v-if="h.units">{{ h.units }}</span>
+                                <span v-if="typeof h.referenceLower === 'number'">
+                                  ({{ h.referenceLower + '-' }}{{ h.referenceUpper }})
+                                </span>
+                              </p>
                             </a-form-item>
+                            <a-button
+                              v-if="h.remark && JSON.parse(h.remark).type === 'add'"
+                              class="add-btn"
+                              @click="addDom('AB', a.id, index, indexNum, h.id)"
+                            >
+                              +
+                            </a-button>
                           </div>
                         </div>
+                      </a-col>
+                    </div>
+                  </a-row>
+                </a-checkbox-group>
+              </div>
+              <!-- 当类型为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>
+                <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 > 0) ||
+                      (j.afterOperation > 0 && j.showValue === a.answer)
+                    "
+                  >
+                    <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-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-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="日期选择"
+                            :input-read-only="true"
+                            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>
+                          <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>
+                                    <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>
+                          <!-- 当类型为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>
+                          <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" />
+                          </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="日期时间选择"
+                              :input-read-only="true"
+                              @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-textarea @change="explainChange(h.id, $event)" v-model="h.explains" />
+                          </div>
+                          <p class="units-position" style="margin-left: 10px">
+                            <span v-if="h.units">{{ h.units }}</span>
+                            <span v-if="typeof h.referenceLower === 'number'"> ({{ h.referenceLower + '-' }}{{ h.referenceUpper }}) </span>
+                          </p>
+                        </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>
               </div>
               <div v-else-if="a.type === 13">
-                <a-input-number @change="onChange($event, a.type, a.id, a.recordId)" />
-                <span style="margin-left: 10px">{{ a.units }}</span>
+                <a-input-number @change="onChange($event, a.type, a.id, a.recordId)" style="width: 200px" v-model="a.answer" />
               </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="日期时间选择"
+                  :input-read-only="true"
+                  @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-textarea @change="explainChange(a.id, $event)" v-model="a.explains" />
+              </div>
+              <p class="units-position" style="margin-left: 10px">
+                <span v-if="a.units">{{ a.units }}</span>
+                <span v-if="typeof a.referenceLower === 'number'">({{ a.referenceLower + '-' }}{{ a.referenceUpper }})</span>
+              </p>
             </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 :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">
+          <div v-for="(w, indexB) in item.subReportCodes" :key="w.name">
+            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <!-- 二级大标题 -->
-              <h3 class="font-bold">{{ w.name }}：</h3>
+              <span class="hhh2">{{ w.name }}：</span>
+              <a-upload
+                v-if="w.recordType"
+                name="files"
+                :multiple="true"
+                :action="action"
+                :headers="headers"
+                @change="handleChange($event, w.code, w.recordId, index, indexB)"
+              >
+                <!-- <a-upload :multiple="true" :action="action" :headers="headers" @change="handleChange"> -->
+                <a-button> <a-icon type="upload" />上传图片 </a-button>
+              </a-upload>
             </a-form-item>
             <!-- 二级标题下的各种类型 -->
-            <div :key="e.name" v-for="e in w.questionVos">
-              <a-form-item
-                :label="e.question"
-                :label-col="formItemLayout.labelCol"
-                :wrapper-col="formItemLayout.wrapperCol"
-                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-radio-group
+            <type-table
+              @getTableAnswer="onChange"
+              v-if="w.remark && JSON.parse(w.remark).type === 'table'"
+              :remark="w.remark"
+              :list="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"
+                  :max-length="500"
                   @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-group>
-                <a-checkbox-group
+                  v-if="e.type === 1"
+                  v-model="e.answer"
+                />
+                <a-textarea
+                  :max-length="500"
                   @change="onChange($event, e.type, e.id, e.recordId)"
-                  class="d-flex flex-row flex-wrap"
-                  v-else-if="e.type === 4"
+                  style="height: 150px; width: 100%"
+                  v-else-if="e.type === 2"
+                  v-model="e.answer"
+                />
+                <a-select
+                  @change="onChange($event, e.type, e.id, e.recordId)"
+                  style="width: 100%"
+                  v-else-if="e.type === 5"
+                  v-model="e.answer"
                 >
-                  <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: 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-date-picker
+                  :default-value="e.answer ? $moment(e.answer, dateFormat) : ''"
+                  @change="onChange($event, e.type, e.id, e.recordId)"
+                  placeholder="日期选择"
+                  :input-read-only="true"
+                  show-time
+                  style="width: 100%"
+                  v-else-if="e.type === 6"
+                />
                 <a-upload
                   :action="action"
                   :default-file-list="fileList"
@@ -510,121 +723,332 @@
                     <a-icon type="upload" />点击上传
                   </a-button>
                 </a-upload>
-                <a-radio-group
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  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>
-                  <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
-                      "
-                    >
-                      <a-form-item
-                        :label-col="formItemLayout.labelCol"
-                        :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-form-item>
-                    </div>
-                  </div>
-                </a-radio-group>
-                <a-checkbox-group
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  class="d-flex flex-row flex-wrap"
-                  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="
-                            contentList.find(item => {
-                              return item.testQuestionsId === e.id && item.contents === `${j.showValue}`;
-                            }) && j.afterOperation === 1
-                          "
-                        >
-                          <a-form-item
-                            :label-col="formItemLayout.labelCol"
-                            :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-form-item>
-                        </div>
-                      </div>
-                    </a-col>
-                  </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 :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>
                   </a-select>
                   <div :key="c" v-for="(b, c) in e.optionVos">
                     <div
                       v-if="
-                        contentList.find(item => {
+                        (contentList.find(item => {
                           return item.testQuestionsId === e.id && item.contents === `${b.showValue}`;
-                        }) && b.afterOperation === 1
+                        }) &&
+                          b.afterOperation === 1) ||
+                        (b.afterOperation === 1 &&
+                          !contentList.find(item => {
+                            return item.testQuestionsId === e.id;
+                          }))
                       "
                     >
-                      <a-form-item
-                        :label-col="formItemLayout.labelCol"
-                        :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-form-item class="d-flex align-center mb-3">
+                        <a-input
+                          :max-length="500"
+                          @change="inputChange(e.id, $event, b.showValue)"
+                          style="width: 100%"
+                          v-model="b.otherInformation"
+                        ></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-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-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 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.find(content => content === `${b.showValue}`);
-                              }) && b.afterOperation > 0
+                              (contentList.find(item => {
+                                return item.testQuestionsId === e.id && item.contents === `${ques.showValue}`;
+                              }) &&
+                                ques.afterOperation > 0) ||
+                              (ques.afterOperation > 0 && ques.choose === 1)
                             "
                           >
-                            <a-input @change="inputChange(e.id, $event, b.showValue)" style="width: 200px"></a-input>
+                            <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
+                                  @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="日期选择"
+                                  :input-read-only="true"
+                                  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"
+                                  />
+                                </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)"
+                                    :input-read-only="true"
+                                    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-textarea @change="explainChange(h.id, $event)" v-model="h.explains" />
+                                </div>
+                                <p class="units-position" style="margin-left: 10px">
+                                  <span v-if="h.units">{{ h.units }}</span>
+                                  <span v-if="typeof h.referenceLower === 'number'">
+                                    ({{ h.referenceLower + '-' }}{{ h.referenceUpper }})
+                                  </span>
+                                </p>
+                              </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>
-                        </div>
-                      </a-col> </a-row
-                    >说明：
-                    <a-input @change="explainChange(e.id, $event)" style="width: 200px" />
+                        </a-col>
+                      </div>
+                    </a-row>
                   </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">
+                <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 => {
+                        (contentList.find(item => {
                           return item.testQuestionsId === e.id && item.contents === `${j.showValue}`;
-                        }) && j.afterOperation > 0
+                        }) &&
+                          j.afterOperation > 0) ||
+                        (j.afterOperation > 0 && j.showValue === e.answer)
                       "
                     >
-                      <div :key="i" v-for="(h, i) in j.questionVos">
+                      <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"
@@ -632,225 +1056,251 @@
                           class="d-flex align-center mb-3"
                         >
                           <a-input
-                            @change="inputChange(e.id, $event, j.showValue)"
-                            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>
-                          <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-textarea
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                style="height: 100px"
-                                v-else-if="h.type === 2"
-                              />
-                              <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"
-                              >
-                                <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)"
-                                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: 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-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="
+                            :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="日期选择"
+                            :input-read-only="true"
+                            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-icon type="upload" />点击上传
-                                </a-button>
-                              </a-upload>
-                              <a-radio-group
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                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>
-                                <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
-                                    "
-                                  >
-                                    <a-form-item
-                                      :label-col="formItemLayout.labelCol"
-                                      :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-form-item>
-                                  </div>
-                                </div>
-                              </a-radio-group>
-                              <a-checkbox-group
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                class="d-flex flex-row flex-wrap"
-                                v-else-if="h.type === 9"
-                              >
-                                <a-row>
-                                  <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
+                                <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="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="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
-                                        "
-                                      >
-                                        <a-form-item
-                                          :label-col="formItemLayout.labelCol"
-                                          :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-form-item>
-                                      </div>
+                                  <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>
-                                </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>
-                                <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
-                                    "
-                                  >
-                                    <a-form-item
-                                      :label-col="formItemLayout.labelCol"
-                                      :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-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-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="
-                                            contentList.find(item => {
-                                              return (
-                                                item.testQuestionsId === h.id && item.contents.find(content => content === `${b.showValue}`)
-                                              );
-                                            }) && b.afterOperation > 0
-                                          "
-                                        >
-                                          <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-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>
-                                <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-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 :key="q" v-for="(p, q) in m.questionVos">
-                                      <a-form-item
-                                        :label="p.question"
-                                        :label-col="formItemLayout.labelCol"
-                                        :wrapper-col="formItemLayout.wrapperCol"
-                                      >
-                                        <a-input
-                                          @change="inputChange(h.id, $event, m.showValue)"
-                                          style="width: 200px"
-                                          v-if="m.afterOperation === 1"
-                                        ></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>当前程序已无法嵌套</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)" />
-                                <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
+                              :max-length="500"
+                              @change="onChange($event, h.type, h.id, h.recordId)"
+                              style="width: 200px"
+                              v-model="h.answer"
+                            />
+                          </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="日期时间选择"
+                              :input-read-only="true"
+                              @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-textarea @change="explainChange(h.id, $event)" v-model="h.explains" />
+                          </div>
+                          <p class="units-position" style="margin-left: 10px">
+                            <span v-if="h.units">{{ h.units }}</span>
+                            <span v-if="typeof h.referenceLower === 'number'"> ({{ h.referenceLower + '-' }}{{ h.referenceUpper }}) </span>
+                          </p>
                         </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>
                 </div>
                 <div v-else-if="e.type === 13">
-                  <a-input-number @change="onChange($event, e.type, e.id, e.recordId)" />
-                  <span style="margin-left: 10px">{{ e.units }}</span>
+                  <a-input-number @change="onChange($event, e.type, e.id, e.recordId)" style="width: 200px" v-model="e.answer" />
                 </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="日期时间选择"
+                    :input-read-only="true"
+                    @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-textarea @change="explainChange(e.id, $event)" v-model="e.explains" />
+                </div>
+                <p class="units-position" style="margin-left: 10px">
+                  <span v-if="e.units">{{ e.units }}</span>
+                  <span v-if="typeof e.referenceLower === 'number'">({{ e.referenceLower + '-' }}{{ e.referenceUpper }})</span>
+                </p>
               </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>
@@ -874,7 +1324,7 @@
         placeholder="请选择类型"
         style="width: 200px"
       />
-      <a-select @change="handleChange" mode="multiple" placeholder="请选择对照组" size="default" style="width: 450px; margin-left: 40px">
+      <a-select @change="changeList" 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>
@@ -890,17 +1340,24 @@ import { mapState, mapActions } from 'vuex';
 import { getHList, selSearchCriteriaList, queryAll, countAnalysis, upload, queryQuestion, searchParam } from 'config/api';
 import CaseKTOne from 'components/CaseTable/CaseKTOne.vue';
 import Analysis from 'components/Echarts/Analysis';
+import TypeTable from 'components/TypeTable/TypeTable.vue';
+
 const formItemLayout = {
   labelCol: { span: 6 },
   wrapperCol: { span: 9 },
 };
+const formItemLayout1 = {
+  labelCol: { span: 0 },
+  wrapperCol: { span: 24 },
+};
 const tailItemLayout = { wrapperCol: { span: 18, offset: 4 } };
 export default {
   name: 'CaseAnalysis',
-  components: { Analysis, CaseKTOne },
+  components: { Analysis, CaseKTOne, TypeTable },
   data() {
     return {
       formItemLayout,
+      formItemLayout1,
       tailItemLayout,
       form: this.$form.createForm(this, { name: 'page-add' }),
       form1: this.$form.createForm(this, { name: 'search' }),
@@ -1029,6 +1486,46 @@ export default {
 
   methods: {
     ...mapActions('home', ['getControlGroups']),
+    // '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];
+    },
+    getList(obj) {
+      let arr = [];
+      for (let i = 0; i < obj.length; i++) {
+        if (obj[i].choose - 0 === 1) {
+          arr.push(obj[i].showValue);
+        }
+      }
+      return arr;
+    },
+    getAnswer(str) {
+      if (str) {
+        let strArr = str.split(':');
+        return strArr[0];
+      } else {
+        return '';
+      }
+    },
     // 选择医院
     chooseHos(e, type) {
       if (type === 1) {
@@ -1070,6 +1567,7 @@ export default {
       }
     },
     onChange(e, type, id, recordId) {
+      // console.log(e);
       // 监听所有得题目类型得填写情况（改变事件）
       if (this.contentList.find(item => item.testQuestionsId === id)) {
         if (type === 1) {
@@ -1093,18 +1591,12 @@ 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);
-          const { conditionListDate } = this;
-          for (let i = 0; i < conditionListDate.length; i++) {
-            if (conditionListDate[i].testQuestionsId === id) {
-              conditionListDate[i].startTime = this.$moment(e[0]._d).format('YYYY-MM-DD');
-              conditionListDate[i].endTime = this.$moment(e[1]._d).format('YYYY-MM-DD');
-              break;
-            }
+          // 日期选择器，给后台返回的值是  2020-01-01 的格式
+          if (e) {
+            this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD'), recordId);
+          } else {
+            this.forFn(id, '', recordId);
           }
-          this.conditionListDate = [...conditionListDate];
-          console.log(this.conditionListDate);
         } else if (type === 7) {
           alert('上传文件，先空下');
         } else if (type === 8) {
@@ -1116,7 +1608,7 @@ export default {
           // 多选 + 其他
           // 如果type === 9 : 删除所有选项，重新添加，文本框继续存在，可以存给后台
           for (let i = 0; i < this.contentList.length; i++) {
-            if (id === this.contentList[i].testQuestionsId && !this.contentList[i].type) {
+            if (id === this.contentList[i].testQuestionsId && !this.contentList[i].contentsType) {
               this.contentList.splice(i, 1);
               i -= 1;
             }
@@ -1150,9 +1642,21 @@ export default {
           this.forFn(id, e.target.value, recordId);
         } else if (type === 13) {
           // 数字类型
-          this.forFn(id, e.target.value, recordId);
-        } else if (type === 14) {
-          // 图片识别 暂时不做
+          this.forFn(id, e, recordId);
+        } else if (type === 15) {
+          // 时间选择 返回格式为 00:00:00
+          if (e) {
+            this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD'), recordId);
+          } else {
+            this.forFn(id, '', recordId);
+          }
+        } else if (type === 16) {
+          // 日期+时间选择 返回格式为 2020:01:01 00:00:00
+          if (e) {
+            this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD'), recordId);
+          } else {
+            this.forFn(id, '', recordId);
+          }
         }
       } else {
         if (type === 1) {
@@ -1166,22 +1670,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 的格式
-          const { conditionListDate } = this;
-          let obj = {
-            testQuestionsId: id,
-            startTime: this.$moment(e[0]._d).format('YYYY-MM-DD'),
-            endTime: this.$moment(e[1]._d).format('YYYY-MM-DD'),
-          };
-          conditionListDate.push(obj);
-          this.conditionListDate = [...conditionListDate];
-          console.log(this.conditionListDate);
-          // 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) {
@@ -1205,28 +1704,37 @@ export default {
           this.failFn(id, e.target.value, recordId);
         } else if (type === 13) {
           // 数字类型
-          this.failFn(id, e.target.value, recordId);
-        } else if (type === 14) {
-          // 图片识别 暂时不做
+          this.failFn(id, e, recordId);
+        } 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);
         }
       }
     },
     // for循环封装函数
     forFn(id, value, recordId) {
       const { contentList } = this;
-      console.log(value);
-      for (let i = 0; i < contentList.length; i++) {
-        if (contentList[i].testQuestionsId === id) {
-          if (value === '') {
-            contentList.splice(i, 1);
-          } else {
+      // console.log(value);
+      if (value || value === 0) {
+        for (let i = 0; i < contentList.length; i++) {
+          if (contentList[i].testQuestionsId === id) {
             contentList[i].contents = value;
+            break;
+          }
+        }
+      } else {
+        for (let i = 0; i < contentList.length; i++) {
+          if (contentList[i].testQuestionsId === id) {
+            contentList.splice(i, 1);
+            break;
           }
-          break;
         }
       }
       this.contentList = [...contentList];
-      console.log(this.contentList);
+      // console.log(this.contentList);
     },
     // 第一次填写题目答案得时候（在已经填写好的题目答案数组中没有找到当前所填得题）
     failFn(id, value, recordId) {
@@ -1244,7 +1752,7 @@ export default {
     // 遍历数组，删除本题已经答过的所有答案
     ergodicList(id) {
       for (let i = 0; i < this.contentList.length; i++) {
-        if (this.contentList[i].testQuestionsId === id) {
+        if (this.contentList[i].testQuestionsId === id && !this.contentList[i].contentsType) {
           this.contentList.splice(i, 1);
           i -= 1;
         }
@@ -1253,7 +1761,47 @@ export default {
     // 其他输入框发生改变时
     inputChange(id, e, value, recordId) {
       for (let i = 0; i < this.contentList.length; i++) {
-        if (this.contentList[i].testQuestionsId === id && this.contentList[i].type === 1) {
+        if (this.contentList[i].testQuestionsId === id && this.contentList[i].contentsType === 1) {
+          this.contentList.splice(i, 1);
+          i -= 1;
+        }
+      }
+      if (e.target.value !== '') {
+        let obj = {
+          testQuestionsId: id,
+          contents: value + ':' + e.target.value,
+          patientRecordId: recordId ? recordId : '',
+          contentsType: 1,
+        };
+        this.contentList.push(obj);
+      }
+      console.log(this.contentList);
+    },
+    // 多选其他输入框发生改变时
+    inputChange1(id, e, value, recordId, list, str) {
+      let listArr = this.getList(list);
+      console.log(listArr);
+      console.log(id);
+      let numkg = 0;
+      for (let i = 0; i < this.contentList.length; i++) {
+        if (this.contentList[i].testQuestionsId === id) {
+          numkg = 1;
+        }
+      }
+      if (numkg === 0) {
+        for (let i = 0; i < listArr.length; i++) {
+          let obj11 = {
+            testQuestionsId: id,
+            contents: listArr[i],
+            patientRecordId: recordId ? recordId : '',
+            contentsType: 0,
+          };
+          this.contentList.push(obj11);
+        }
+      }
+      for (let i = 0; i < this.contentList.length; i++) {
+        const item = this.contentList[i];
+        if (item.testQuestionsId === id && item.contentsType === 1 && item.writeType === str) {
           this.contentList.splice(i, 1);
           i -= 1;
         }
@@ -1263,7 +1811,8 @@ export default {
           testQuestionsId: id,
           contents: value + ':' + e.target.value,
           patientRecordId: recordId ? recordId : '',
-          type: 1,
+          contentsType: 1,
+          writeType: str,
         };
         this.contentList.push(obj);
       }
@@ -1272,7 +1821,7 @@ export default {
     // 说明输入框发生改变时
     explainChange(id, e, recordId) {
       for (let i = 0; i < this.contentList.length; i++) {
-        if (this.contentList[i].testQuestionsId === id && this.contentList[i].type === 2) {
+        if (this.contentList[i].testQuestionsId === id && this.contentList[i].contentsType === 2) {
           this.contentList.splice(i, 1);
         }
       }
@@ -1280,12 +1829,11 @@ export default {
         let obj = {
           testQuestionsId: id,
           contents: e.target.value,
-          type: 2,
+          contentsType: 2,
           patientRecordId: recordId ? recordId : '',
         };
         this.contentList.push(obj);
       }
-      console.log(this.contentList);
     },
     // 上传图片事件
     fileChange(info, id, recordId) {
@@ -1338,16 +1886,165 @@ export default {
     displayRender({ labels }) {
       return labels[labels.length - 1];
     },
-    handleChange(value) {
+    /**
+     * 选择对照组
+     */
+    changeList(value) {
       console.log(`Selected: ${value}`);
       this.inpatientList = [];
       for (let i = 0; i < value.length; i++) {
         this.inpatientList.push(parseInt(value[i]));
       }
     },
+    // 图像识别
+    async handleChange(info, title, recordId, indexA, indexB) {
+      if (info.file.status === 'done') {
+        const { list } = this;
+        const objList = list[indexA].subReportCodes[indexB];
+        const params = {
+          param: {
+            hospitalId: this.hospitalId,
+            code: title,
+            url: info.file.response.data[0].visitUrl,
+          },
+        };
+        const res = await basic(params);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          for (let k = 0; k < data.length; k++) {
+            for (let i = 0; i < objList.questionVos.length; i++) {
+              if (objList.questionVos[i].id === data[k].questionId) {
+                objList.questionVos[i].answer = data[k].content;
+              }
+            }
+            if (this.contentList.length > 0) {
+              for (let i = 0; i < this.contentList.length; i++) {
+                // 如果当前题目的答案已经更改过
+                if (data[k].questionId === this.contentList[i].testQuestionsId) {
+                  this.contentList[i].contents = data[k].content;
+                  break;
+                  // 如果当前题目的答案未更改过
+                } else if (i === this.contentList.length - 1) {
+                  let obj = {
+                    testQuestionsId: data[k].questionId,
+                    contents: data[k].content,
+                  };
+                  this.contentList.push(obj);
+                  break;
+                }
+              }
+            } else {
+              let obj = {
+                testQuestionsId: data[k].questionId,
+                contents: data[k].content,
+              };
+              this.contentList.push(obj);
+            }
+          }
+
+          list[indexA].subReportCodes[indexB] = { ...objList };
+          this.list = [...list];
+        } else {
+          console.log(msg);
+        }
+      }
+    },
     // 搜索数据
     async setData() {
       try {
+        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);
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+        for (let i = 0; i < this.contentList.length; i++) {
+          const item = this.contentList[i];
+          if (item.contents === null) {
+            this.contentList.splice(i, 1);
+          }
+        }
         const params = {
           param: {
             conditionList: this.contentList,
@@ -1388,5 +2085,23 @@ export default {
   },
 };
 </script>
+<style lang="stylus" scoped>
+.hhh2 {
+  font-size: 20px;
+  font-weight: bold;
+  margin-left: 24px;
+  color: rgba(0, 0, 0, 0.75);
+}
+
+.add-btn {
+  position: absolute;
+  right: 18%;
+  top: 0px;
+}
 
-<style lang="stylus" scoped></style>
+.units-position {
+  position: absolute;
+  right: -10px;
+  transform: translate3d(100%, -100%, 0);
+}
+</style>
diff --git a/src/views/CaseSearch/CaseSearch.vue b/src/views/CaseSearch/CaseSearch.vue
index 7c4b0bd..6450815 100644
--- a/src/views/CaseSearch/CaseSearch.vue
+++ b/src/views/CaseSearch/CaseSearch.vue
@@ -28,42 +28,33 @@
         <!-- 首先遍历整个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>{{ item.name }}：</h2>
-          </a-form-item>-->
           <!-- 一级标题下的各种问题（questionVos），判断类型1-12，展示不同需要填写的内容 -->
-          <div :key="a.name" v-for="a in item.questionVos">
-            <a-form-item
-              :label="a.question"
-              :label-col="formItemLayout.labelCol"
-              :wrapper-col="formItemLayout.wrapperCol"
-              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-radio-group
+          <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)"
-                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-group>
-              <a-checkbox-group
+                style="height: 150px; width: 100%"
+                v-else-if="a.type === 2"
+                v-model="a.answer"
+              />
+              <a-select
                 @change="onChange($event, a.type, a.id, a.recordId)"
-                class="d-flex flex-row flex-wrap"
-                v-else-if="a.type === 4"
+                style="width: 100%"
+                v-else-if="a.type === 5"
+                v-model="a.answer"
               >
-                <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="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-date-picker
+                :default-value="a.answer ? $moment(a.answer, dateFormat) : ''"
+                @change="onChange($event, a.type, a.id, a.recordId)"
+                placeholder="日期选择"
+                style="width: 100%"
+                :input-read-only="true"
+                v-else-if="a.type === 6"
+              />
               <a-upload
                 :action="action"
                 :default-file-list="fileList"
@@ -83,380 +74,633 @@
                   <a-icon type="upload" />点击上传
                 </a-button>
               </a-upload>
-              <a-radio-group
-                @change="onChange($event, a.type, a.id, a.recordId)"
-                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>
-                <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
-                    "
-                  >
-                    <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>
-              </a-radio-group>
-              <a-checkbox-group
-                @change="onChange($event, a.type, a.id, a.recordId)"
-                class="d-flex flex-row flex-wrap"
-                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="
-                      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>
-                  </div>
-                </div>
-                <!-- </a-col>
-                </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 :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>
                 </a-select>
                 <div :key="c" v-for="(b, c) in a.optionVos">
                   <div
                     v-if="
-                      contentList.find(item => {
+                      (contentList.find(item => {
                         return item.testQuestionsId === a.id && item.contents === `${b.showValue}`;
-                      }) && b.afterOperation === 1
+                      }) &&
+                        b.afterOperation === 1) ||
+                      (b.afterOperation === 1 &&
+                        !contentList.find(item => {
+                          return item.testQuestionsId === a.id;
+                        }))
                     "
                   >
-                    <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 class="d-flex align-center mb-3">
+                      <a-input
+                        :max-length="500"
+                        @change="inputChange(a.id, $event, b.showValue)"
+                        style="width: 100%"
+                        v-model="b.otherInformation"
+                      ></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-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-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 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.find(content => content === `${b.showValue}`);
-                            }) && b.afterOperation > 0
+                            (contentList.find(item => {
+                              return item.testQuestionsId === a.id && item.contents === `${ques.showValue}`;
+                            }) &&
+                              ques.afterOperation > 0) ||
+                            (ques.afterOperation > 0 && ques.choose === 1)
                           "
                         >
-                          <a-input @change="inputChange(a.id, $event, b.showValue)" style="width: 200px"></a-input>
-                        </div>
-                      </div>
-                    </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>
-                <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 > 0
-                    "
-                  >
-                    <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-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>
-                        <div v-else-if="j.afterOperation === 3">
-                          <div :key="ohter.id" v-for="ohter in j.questionVos">
+                          <!-- <div v-if="ques.afterOperation > 0"> -->
+                          <a-input
+                            :max-length="500"
+                            @change="inputChange1(a.id, $event, ques.showValue, a.recordId, a.optionVos, ques.id)"
+                            style="width: 100%"
+                            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="ohter.question"
+                              :label="h.question"
                               :label-col="formItemLayout.labelCol"
                               :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
+                                :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, ohter.type, ohter.id)"
-                                style="height: 100px"
-                                v-else-if="ohter.type === 2"
+                                @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-radio-group
-                                @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                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-group>
-                              <a-checkbox-group
-                                @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                class="d-flex flex-row flex-wrap"
-                                v-else-if="ohter.type === 4"
-                              >
-                                <a-row>
-                                  <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>
-                              </a-checkbox-group>
                               <a-select
-                                @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                style="min-width: 120px"
-                                v-else-if="ohter.type === 5"
+                                @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 ohter.optionVos">{{
+                                <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, ohter.type, ohter.id, ohter.recordId)"
+                              <a-date-picker
+                                :default-value="h.answer ? $moment(h.answer, dateFormat) : ''"
+                                @change="onChange($event, h.type, h.id, h.recordId)"
+                                placeholder="日期选择"
                                 show-time
-                                v-else-if="ohter.type === 6"
+                                style="width: 100%"
+                                :input-read-only="true"
+                                v-else-if="h.type === 6"
                               />
                               <a-upload
                                 :action="action"
                                 :default-file-list="fileList"
                                 :headers="headers"
-                                @change="fileChange($event, ohter.id)"
+                                @change="fileChange($event, h.id)"
                                 list-type="picture"
                                 name="files"
-                                v-else-if="ohter.type === 7"
+                                v-else-if="h.type === 7"
                               >
                                 <a-button
                                   v-show="
                                     !contentList.find(item => {
-                                      return item.testQuestionsId === ohter.id;
+                                      return item.testQuestionsId === h.id;
                                     })
                                   "
                                 >
-                                  <a-icon type="upload" />点击上传
+                                  <a-icon type="upload" />
+                                  点击上传
                                 </a-button>
                               </a-upload>
-                              <a-radio-group
-                                @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                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>
-                                <div :key="n" v-for="(m, n) in ohter.optionVos">
-                                  <div
-                                    v-if="
-                                      contentList.find(item => {
-                                        return item.testQuestionsId === ohter.id && item.contents === `${m.showValue}`;
-                                      }) && 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>
-                                  </div>
-                                </div>
-                              </a-radio-group>
-                              <a-checkbox-group
-                                @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
-                                class="d-flex flex-row flex-wrap"
-                                v-else-if="ohter.type === 9"
-                              >
-                                <a-row>
-                                  <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">
-                                    <div :key="n" v-for="(m, n) in ohter.optionVos">
-                                      <div
-                                        v-if="
-                                          contentList.find(item => {
-                                            return item.testQuestionsId === ohter.id && item.contents === `${m.showValue}`;
-                                          }) && 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>
-                                      </div>
-                                    </div>
-                                  </a-col>
-                                </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">{{
+                              <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 ohter.optionVos">
+                                <div :key="c" v-for="(b, c) in h.optionVos">
                                   <div
                                     v-if="
-                                      contentList.find(item => {
-                                        return item.testQuestionsId === ohter.id && item.contents === `${b.showValue}`;
-                                      }) && b.afterOperation === 1
+                                      (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 :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 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="ohter.type === 11">
+                              <!-- 当类型为4时，为多选  +  ===  -->
+                              <div v-else-if="h.type === 4">
                                 <a-checkbox-group
-                                  @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
+                                  :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 ohter.optionVos">
-                                      <a-checkbox :value="ques.submitValue">{{ ques.showValue }}</a-checkbox>
-                                    </a-col>
-                                    <a-col :span="100">
-                                      <div :key="c" v-for="(b, c) in ohter.optionVos">
+                                  <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 === ohter.id &&
-                                                item.contents.find(content => content === `${b.showValue}`)
-                                              );
-                                            }) && b.afterOperation > 0
+                                            (contentList.find(item => {
+                                              return item.testQuestionsId === h.id && item.contents === `${quesA.showValue}`;
+                                            }) &&
+                                              quesA.afterOperation > 0) ||
+                                            (quesA.afterOperation > 0 && quesA.choose === 1)
                                           "
                                         >
-                                          <a-input @change="inputChange(ohter.id, $event, b.showValue)" style="width: 200px"></a-input>
+                                          <!-- <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>
-                                      </div>
-                                    </a-col> </a-row
-                                  >说明：
-                                  <a-input @change="explainChange(ohter.id, $event)" style="width: 200px" />
+                                      </a-col>
+                                    </div>
+                                  </a-row>
                                 </a-checkbox-group>
                               </div>
-                              <!-- 当类型为12时，为单选+关联 -->
-                              <div v-else-if="ohter.type === 12">
+                              <!-- 当类型为3时，为单选  +  ===  -->
+                              <div v-else-if="h.type === 3">
                                 <a-radio-group
-                                  @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
+                                  @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 ohter.optionVos">{{
+                                  <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 ohter.optionVos">
+                                <div :key="n" v-for="(m, n) in h.optionVos">
                                   <div
                                     v-if="
                                       contentList.find(item => {
-                                        return item.testQuestionsId === ohter.id && item.contents === `${m.showValue}`;
+                                        return item.testQuestionsId === h.id && item.contents === `${m.showValue}`;
                                       }) && m.afterOperation > 0
                                     "
                                   >
-                                    <div :key="q" v-for="(p, q) in m.questionVos">
+                                    <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"
                                       >
-                                        <a-input
-                                          @change="inputChange(ohter.id, $event, m.showValue)"
-                                          style="width: 200px"
-                                          v-if="m.afterOperation === 1"
-                                        ></a-input>
-                                        <a-textarea
-                                          @change="inputChange(ohter.id, $event, m.showValue)"
-                                          v-else-if="m.afterOperation === 2"
-                                        ></a-textarea>
-                                        <div v-else-if="m.afterOperation === 3">qwe</div>
+                                        <div>当前程序已无法嵌套</div>
                                       </a-form-item>
                                     </div>
                                   </div>
                                 </div>
                               </div>
-                              <div v-else-if="ohter.type === 13">
-                                <a-input-number @change="onChange($event, ohter.type, ohter.id, ohter.recordId)" />
-                                <span style="margin-left: 10px">{{ other.units }}</span>
+                              <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"
+                                />
+                              </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="ohter.type === 14">图片识别</div>
+                              <div v-else-if="h.type === 16">
+                                <a-date-picker
+                                  placeholder="日期时间选择"
+                                  :input-read-only="true"
+                                  @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-textarea @change="explainChange(h.id, $event)" v-model="h.explains" />
+                              </div>
+                              <p class="units-position" style="margin-left: 10px">
+                                <span v-if="h.units">{{ h.units }}</span>
+                                <span v-if="typeof h.referenceLower === 'number'">
+                                  ({{ h.referenceLower + '-' }}{{ h.referenceUpper }})
+                                </span>
+                              </p>
                             </a-form-item>
+                            <a-button
+                              v-if="h.remark && JSON.parse(h.remark).type === 'add'"
+                              class="add-btn"
+                              @click="addDom('AB', a.id, index, indexNum, h.id)"
+                            >
+                              +
+                            </a-button>
                           </div>
                         </div>
+                      </a-col>
+                    </div>
+                  </a-row>
+                </a-checkbox-group>
+              </div>
+              <!-- 当类型为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>
+                <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 > 0) ||
+                      (j.afterOperation > 0 && j.showValue === a.answer)
+                    "
+                  >
+                    <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-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-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="日期选择"
+                            :input-read-only="true"
+                            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>
+                          <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>
+                                    <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>
+                          <!-- 当类型为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>
+                          <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" />
+                          </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="日期时间选择"
+                              :input-read-only="true"
+                              @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-textarea @change="explainChange(h.id, $event)" v-model="h.explains" />
+                          </div>
+                          <p class="units-position" style="margin-left: 10px">
+                            <span v-if="h.units">{{ h.units }}</span>
+                            <span v-if="typeof h.referenceLower === 'number'"> ({{ h.referenceLower + '-' }}{{ h.referenceUpper }}) </span>
+                          </p>
+                        </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>
               </div>
               <div v-else-if="a.type === 13">
-                <a-input-number @change="onChange($event, a.type, a.id, a.recordId)" />
-                <span style="margin-left: 10px">{{ a.units }}</span>
+                <a-input-number @change="onChange($event, a.type, a.id, a.recordId)" style="width: 200px" v-model="a.answer" />
+              </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="日期时间选择"
+                  :input-read-only="true"
+                  @change="onChange($event, a.type, a.id, a.recordId)"
+                  show-time
+                />
               </div>
-              <div v-else-if="a.type === 14">图片识别</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-textarea @change="explainChange(a.id, $event)" v-model="a.explains" />
+              </div>
+              <p class="units-position" style="margin-left: 10px">
+                <span v-if="a.units">{{ a.units }}</span>
+                <span v-if="typeof a.referenceLower === 'number'">({{ a.referenceLower + '-' }}{{ a.referenceUpper }})</span>
+              </p>
             </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 :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">
+          <div v-for="(w, indexB) in item.subReportCodes" :key="w.name">
+            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <!-- 二级大标题 -->
-              <h3 class="font-bold">{{ w.name }}：</h3>
+              <span class="hhh2">{{ w.name }}：</span>
+              <a-upload
+                v-if="w.recordType"
+                name="files"
+                :multiple="true"
+                :action="action"
+                :headers="headers"
+                @change="handleChange($event, w.code, w.recordId, index, indexB)"
+              >
+                <!-- <a-upload :multiple="true" :action="action" :headers="headers" @change="handleChange"> -->
+                <a-button> <a-icon type="upload" />上传图片 </a-button>
+              </a-upload>
             </a-form-item>
             <!-- 二级标题下的各种类型 -->
-            <div :key="e.name" v-for="e in w.questionVos">
-              <a-form-item
-                :label="e.question"
-                :label-col="formItemLayout.labelCol"
-                :wrapper-col="formItemLayout.wrapperCol"
-                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-radio-group
+            <type-table
+              @getTableAnswer="onChange"
+              v-if="w.remark && JSON.parse(w.remark).type === 'table'"
+              :remark="w.remark"
+              :list="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"
+                  :max-length="500"
                   @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-group>
-                <a-checkbox-group
+                  v-if="e.type === 1"
+                  v-model="e.answer"
+                />
+                <a-textarea
+                  :max-length="500"
                   @change="onChange($event, e.type, e.id, e.recordId)"
-                  class="d-flex flex-row flex-wrap"
-                  v-else-if="e.type === 4"
+                  style="height: 150px; width: 100%"
+                  v-else-if="e.type === 2"
+                  v-model="e.answer"
+                />
+                <a-select
+                  @change="onChange($event, e.type, e.id, e.recordId)"
+                  style="width: 100%"
+                  v-else-if="e.type === 5"
+                  v-model="e.answer"
                 >
-                  <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="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-date-picker
+                  :default-value="e.answer ? $moment(e.answer, dateFormat) : ''"
+                  @change="onChange($event, e.type, e.id, e.recordId)"
+                  placeholder="日期选择"
+                  :input-read-only="true"
+                  show-time
+                  style="width: 100%"
+                  v-else-if="e.type === 6"
+                />
                 <a-upload
                   :action="action"
                   :default-file-list="fileList"
@@ -476,121 +720,332 @@
                     <a-icon type="upload" />点击上传
                   </a-button>
                 </a-upload>
-                <a-radio-group
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  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>
-                  <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
-                      "
-                    >
-                      <a-form-item
-                        :label-col="formItemLayout.labelCol"
-                        :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-form-item>
-                    </div>
-                  </div>
-                </a-radio-group>
-                <a-checkbox-group
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  class="d-flex flex-row flex-wrap"
-                  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="
-                            contentList.find(item => {
-                              return item.testQuestionsId === e.id && item.contents === `${j.showValue}`;
-                            }) && j.afterOperation === 1
-                          "
-                        >
-                          <a-form-item
-                            :label-col="formItemLayout.labelCol"
-                            :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-form-item>
-                        </div>
-                      </div>
-                    </a-col>
-                  </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 :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>
                   </a-select>
                   <div :key="c" v-for="(b, c) in e.optionVos">
                     <div
                       v-if="
-                        contentList.find(item => {
+                        (contentList.find(item => {
                           return item.testQuestionsId === e.id && item.contents === `${b.showValue}`;
-                        }) && b.afterOperation === 1
+                        }) &&
+                          b.afterOperation === 1) ||
+                        (b.afterOperation === 1 &&
+                          !contentList.find(item => {
+                            return item.testQuestionsId === e.id;
+                          }))
                       "
                     >
-                      <a-form-item
-                        :label-col="formItemLayout.labelCol"
-                        :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-form-item class="d-flex align-center mb-3">
+                        <a-input
+                          :max-length="500"
+                          @change="inputChange(e.id, $event, b.showValue)"
+                          style="width: 100%"
+                          v-model="b.otherInformation"
+                        ></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-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-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 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.find(content => content === `${b.showValue}`);
-                              }) && b.afterOperation > 0
+                              (contentList.find(item => {
+                                return item.testQuestionsId === e.id && item.contents === `${ques.showValue}`;
+                              }) &&
+                                ques.afterOperation > 0) ||
+                              (ques.afterOperation > 0 && ques.choose === 1)
                             "
                           >
-                            <a-input @change="inputChange(e.id, $event, b.showValue)" style="width: 200px"></a-input>
+                            <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
+                                  @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="日期选择"
+                                  :input-read-only="true"
+                                  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"
+                                  />
+                                </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)"
+                                    :input-read-only="true"
+                                    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-textarea @change="explainChange(h.id, $event)" v-model="h.explains" />
+                                </div>
+                                <p class="units-position" style="margin-left: 10px">
+                                  <span v-if="h.units">{{ h.units }}</span>
+                                  <span v-if="typeof h.referenceLower === 'number'">
+                                    ({{ h.referenceLower + '-' }}{{ h.referenceUpper }})
+                                  </span>
+                                </p>
+                              </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>
-                        </div>
-                      </a-col> </a-row
-                    >说明：
-                    <a-input @change="explainChange(e.id, $event)" style="width: 200px" />
+                        </a-col>
+                      </div>
+                    </a-row>
                   </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">
+                <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 => {
+                        (contentList.find(item => {
                           return item.testQuestionsId === e.id && item.contents === `${j.showValue}`;
-                        }) && j.afterOperation > 0
+                        }) &&
+                          j.afterOperation > 0) ||
+                        (j.afterOperation > 0 && j.showValue === e.answer)
                       "
                     >
-                      <div :key="i" v-for="(h, i) in j.questionVos">
+                      <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"
@@ -598,230 +1053,251 @@
                           class="d-flex align-center mb-3"
                         >
                           <a-input
-                            @change="inputChange(e.id, $event, j.showValue)"
-                            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>
-                          <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-textarea
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                style="height: 100px"
-                                v-else-if="h.type === 2"
-                              />
-                              <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"
-                              >
-                                <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)"
-                                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="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>
-                              <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"
-                                :headers="headers"
-                                @change="fileChange($event, h.id)"
-                                list-type="picture"
-                                name="files"
-                                v-else-if="h.type === 7"
-                              >
-                                <a-button
-                                  v-show="
+                            :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="日期选择"
+                            :input-read-only="true"
+                            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-icon type="upload" />点击上传
-                                </a-button>
-                              </a-upload>
-                              <a-radio-group
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                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>
-                                <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
-                                    "
-                                  >
-                                    <a-form-item
-                                      :label-col="formItemLayout.labelCol"
-                                      :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-form-item>
-                                  </div>
-                                </div>
-                              </a-radio-group>
-                              <a-checkbox-group
-                                @change="onChange($event, h.type, h.id, h.recordId)"
-                                class="d-flex flex-row flex-wrap"
-                                v-else-if="h.type === 9"
-                              >
-                                <a-row>
-                                  <a-col :key="indexNum" :span="24" v-for="(ques, indexNum) in h.optionVos">
+                                <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="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="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
-                                        "
-                                      >
-                                        <a-form-item
-                                          :label-col="formItemLayout.labelCol"
-                                          :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-form-item>
-                                      </div>
+                                  <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>
-                                </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>
-                                <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
-                                    "
-                                  >
-                                    <a-form-item
-                                      :label-col="formItemLayout.labelCol"
-                                      :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-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-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="
-                                            contentList.find(item => {
-                                              return (
-                                                item.testQuestionsId === h.id && item.contents.find(content => content === `${b.showValue}`)
-                                              );
-                                            }) && b.afterOperation > 0
-                                          "
-                                        >
-                                          <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-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>
-                                <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-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 :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-input
-                                          @change="inputChange(h.id, $event, m.showValue)"
-                                          style="width: 200px"
-                                          v-if="m.afterOperation === 1"
-                                        ></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>当前程序已无法嵌套</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)" />
-                                <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
+                              :max-length="500"
+                              @change="onChange($event, h.type, h.id, h.recordId)"
+                              style="width: 200px"
+                              v-model="h.answer"
+                            />
+                          </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="日期时间选择"
+                              :input-read-only="true"
+                              @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-textarea @change="explainChange(h.id, $event)" v-model="h.explains" />
+                          </div>
+                          <p class="units-position" style="margin-left: 10px">
+                            <span v-if="h.units">{{ h.units }}</span>
+                            <span v-if="typeof h.referenceLower === 'number'"> ({{ h.referenceLower + '-' }}{{ h.referenceUpper }}) </span>
+                          </p>
                         </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>
                 </div>
                 <div v-else-if="e.type === 13">
-                  <a-input-number @change="onChange($event, e.type, e.id, e.recordId)" />
-                  <span style="margin-left: 10px">{{ e.units }}</span>
+                  <a-input-number @change="onChange($event, e.type, e.id, e.recordId)" style="width: 200px" v-model="e.answer" />
+                </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 === 14">图片识别</div>
+                <div v-else-if="e.type === 16">
+                  <a-date-picker
+                    placeholder="日期时间选择"
+                    :input-read-only="true"
+                    @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-textarea @change="explainChange(e.id, $event)" v-model="e.explains" />
+                </div>
+                <p class="units-position" style="margin-left: 10px">
+                  <span v-if="e.units">{{ e.units }}</span>
+                  <span v-if="typeof e.referenceLower === 'number'">({{ e.referenceLower + '-' }}{{ e.referenceUpper }})</span>
+                </p>
               </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>
@@ -843,17 +1319,24 @@ import { mapState, mapActions } from 'vuex';
 import { getHList, selSearchCriteriaList, queryAll, selPatientMesList, upload, searchParam } from 'config/api';
 import CaseTable from 'components/CaseTable/CaseTable.vue';
 import CaseKTOne from 'components/CaseTable/CaseKTOne.vue';
+import TypeTable from 'components/TypeTable/TypeTable.vue';
+
 const formItemLayout = {
   labelCol: { span: 6 },
   wrapperCol: { span: 9 },
 };
+const formItemLayout1 = {
+  labelCol: { span: 0 },
+  wrapperCol: { span: 24 },
+};
 const tailItemLayout = { wrapperCol: { span: 18, offset: 4 } };
 export default {
   name: 'CaseSearch',
-  components: { CaseTable, CaseKTOne },
+  components: { CaseTable, CaseKTOne, TypeTable },
   data() {
     return {
       formItemLayout,
+      formItemLayout1,
       tailItemLayout,
       form: this.$form.createForm(this, { name: 'page-add' }),
       form1: this.$form.createForm(this, { name: 'search' }),
@@ -978,6 +1461,46 @@ export default {
 
   methods: {
     ...mapActions('home', ['getControlGroups']),
+    // '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];
+    },
+    getList(obj) {
+      let arr = [];
+      for (let i = 0; i < obj.length; i++) {
+        if (obj[i].choose - 0 === 1) {
+          arr.push(obj[i].showValue);
+        }
+      }
+      return arr;
+    },
+    getAnswer(str) {
+      if (str) {
+        let strArr = str.split(':');
+        return strArr[0];
+      } else {
+        return '';
+      }
+    },
     // 选择医院
     chooseHos(e, type) {
       if (type === 1) {
@@ -1019,6 +1542,7 @@ export default {
       }
     },
     onChange(e, type, id, recordId) {
+      // console.log(e);
       // 监听所有得题目类型得填写情况（改变事件）
       if (this.contentList.find(item => item.testQuestionsId === id)) {
         if (type === 1) {
@@ -1042,18 +1566,12 @@ 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);
-          const { conditionListDate } = this;
-          for (let i = 0; i < conditionListDate.length; i++) {
-            if (conditionListDate[i].testQuestionsId === id) {
-              conditionListDate[i].startTime = this.$moment(e[0]._d).format('YYYY-MM-DD');
-              conditionListDate[i].endTime = this.$moment(e[1]._d).format('YYYY-MM-DD');
-              break;
-            }
+          // 日期选择器，给后台返回的值是  2020-01-01 的格式
+          if (e) {
+            this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD'), recordId);
+          } else {
+            this.forFn(id, '', recordId);
           }
-          this.conditionListDate = [...conditionListDate];
-          console.log(this.conditionListDate);
         } else if (type === 7) {
           alert('上传文件，先空下');
         } else if (type === 8) {
@@ -1065,7 +1583,7 @@ export default {
           // 多选 + 其他
           // 如果type === 9 : 删除所有选项，重新添加，文本框继续存在，可以存给后台
           for (let i = 0; i < this.contentList.length; i++) {
-            if (id === this.contentList[i].testQuestionsId && !this.contentList[i].type) {
+            if (id === this.contentList[i].testQuestionsId && !this.contentList[i].contentsType) {
               this.contentList.splice(i, 1);
               i -= 1;
             }
@@ -1099,9 +1617,21 @@ export default {
           this.forFn(id, e.target.value, recordId);
         } else if (type === 13) {
           // 数字类型
-          this.forFn(id, e.target.value, recordId);
-        } else if (type === 14) {
-          // 图片识别 暂时不做
+          this.forFn(id, e, recordId);
+        } else if (type === 15) {
+          // 时间选择 返回格式为 00:00:00
+          if (e) {
+            this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD'), recordId);
+          } else {
+            this.forFn(id, '', recordId);
+          }
+        } else if (type === 16) {
+          // 日期+时间选择 返回格式为 2020:01:01 00:00:00
+          if (e) {
+            this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD'), recordId);
+          } else {
+            this.forFn(id, '', recordId);
+          }
         }
       } else {
         if (type === 1) {
@@ -1115,22 +1645,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 的格式
-          const { conditionListDate } = this;
-          let obj = {
-            testQuestionsId: id,
-            startTime: this.$moment(e[0]._d).format('YYYY-MM-DD'),
-            endTime: this.$moment(e[1]._d).format('YYYY-MM-DD'),
-          };
-          conditionListDate.push(obj);
-          this.conditionListDate = [...conditionListDate];
-          console.log(this.conditionListDate);
-          // 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) {
@@ -1154,28 +1679,37 @@ export default {
           this.failFn(id, e.target.value, recordId);
         } else if (type === 13) {
           // 数字类型
-          this.failFn(id, e.target.value, recordId);
-        } else if (type === 14) {
-          // 图片识别 暂时不做
+          this.failFn(id, e, recordId);
+        } 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);
         }
       }
     },
     // for循环封装函数
     forFn(id, value, recordId) {
       const { contentList } = this;
-      console.log(value);
-      for (let i = 0; i < contentList.length; i++) {
-        if (contentList[i].testQuestionsId === id) {
-          if (value === '') {
-            contentList.splice(i, 1);
-          } else {
+      // console.log(value);
+      if (value || value === 0) {
+        for (let i = 0; i < contentList.length; i++) {
+          if (contentList[i].testQuestionsId === id) {
             contentList[i].contents = value;
+            break;
+          }
+        }
+      } else {
+        for (let i = 0; i < contentList.length; i++) {
+          if (contentList[i].testQuestionsId === id) {
+            contentList.splice(i, 1);
+            break;
           }
-          break;
         }
       }
       this.contentList = [...contentList];
-      console.log(this.contentList);
+      // console.log(this.contentList);
     },
     // 第一次填写题目答案得时候（在已经填写好的题目答案数组中没有找到当前所填得题）
     failFn(id, value, recordId) {
@@ -1193,7 +1727,7 @@ export default {
     // 遍历数组，删除本题已经答过的所有答案
     ergodicList(id) {
       for (let i = 0; i < this.contentList.length; i++) {
-        if (this.contentList[i].testQuestionsId === id) {
+        if (this.contentList[i].testQuestionsId === id && !this.contentList[i].contentsType) {
           this.contentList.splice(i, 1);
           i -= 1;
         }
@@ -1202,7 +1736,7 @@ export default {
     // 其他输入框发生改变时
     inputChange(id, e, value, recordId) {
       for (let i = 0; i < this.contentList.length; i++) {
-        if (this.contentList[i].testQuestionsId === id && this.contentList[i].type === 1) {
+        if (this.contentList[i].testQuestionsId === id && this.contentList[i].contentsType === 1) {
           this.contentList.splice(i, 1);
           i -= 1;
         }
@@ -1212,7 +1746,48 @@ export default {
           testQuestionsId: id,
           contents: value + ':' + e.target.value,
           patientRecordId: recordId ? recordId : '',
-          type: 1,
+          contentsType: 1,
+        };
+        this.contentList.push(obj);
+      }
+      console.log(this.contentList);
+    },
+    // 多选其他输入框发生改变时
+    inputChange1(id, e, value, recordId, list, str) {
+      let listArr = this.getList(list);
+      console.log(listArr);
+      console.log(id);
+      let numkg = 0;
+      for (let i = 0; i < this.contentList.length; i++) {
+        if (this.contentList[i].testQuestionsId === id) {
+          numkg = 1;
+        }
+      }
+      if (numkg === 0) {
+        for (let i = 0; i < listArr.length; i++) {
+          let obj11 = {
+            testQuestionsId: id,
+            contents: listArr[i],
+            patientRecordId: recordId ? recordId : '',
+            contentsType: 0,
+          };
+          this.contentList.push(obj11);
+        }
+      }
+      for (let i = 0; i < this.contentList.length; i++) {
+        const item = this.contentList[i];
+        if (item.testQuestionsId === id && item.contentsType === 1 && item.writeType === str) {
+          this.contentList.splice(i, 1);
+          i -= 1;
+        }
+      }
+      if (e.target.value !== '') {
+        let obj = {
+          testQuestionsId: id,
+          contents: value + ':' + e.target.value,
+          patientRecordId: recordId ? recordId : '',
+          contentsType: 1,
+          writeType: str,
         };
         this.contentList.push(obj);
       }
@@ -1221,7 +1796,7 @@ export default {
     // 说明输入框发生改变时
     explainChange(id, e, recordId) {
       for (let i = 0; i < this.contentList.length; i++) {
-        if (this.contentList[i].testQuestionsId === id && this.contentList[i].type === 2) {
+        if (this.contentList[i].testQuestionsId === id && this.contentList[i].contentsType === 2) {
           this.contentList.splice(i, 1);
         }
       }
@@ -1229,12 +1804,11 @@ export default {
         let obj = {
           testQuestionsId: id,
           contents: e.target.value,
-          type: 2,
+          contentsType: 2,
           patientRecordId: recordId ? recordId : '',
         };
         this.contentList.push(obj);
       }
-      console.log(this.contentList);
     },
     // 上传图片事件
     fileChange(info, id, recordId) {
@@ -1265,9 +1839,58 @@ export default {
         }
       }
     },
-    // 改变提交时间
-    changeDate(date) {
-      this.subDateTime = this.$moment(date._d).format('YYYY-MM-DD');
+    // 图像识别
+    async handleChange(info, title, recordId, indexA, indexB) {
+      if (info.file.status === 'done') {
+        const { list } = this;
+        const objList = list[indexA].subReportCodes[indexB];
+        const params = {
+          param: {
+            hospitalId: this.hospitalId,
+            code: title,
+            url: info.file.response.data[0].visitUrl,
+          },
+        };
+        const res = await basic(params);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          for (let k = 0; k < data.length; k++) {
+            for (let i = 0; i < objList.questionVos.length; i++) {
+              if (objList.questionVos[i].id === data[k].questionId) {
+                objList.questionVos[i].answer = data[k].content;
+              }
+            }
+            if (this.contentList.length > 0) {
+              for (let i = 0; i < this.contentList.length; i++) {
+                // 如果当前题目的答案已经更改过
+                if (data[k].questionId === this.contentList[i].testQuestionsId) {
+                  this.contentList[i].contents = data[k].content;
+                  break;
+                  // 如果当前题目的答案未更改过
+                } else if (i === this.contentList.length - 1) {
+                  let obj = {
+                    testQuestionsId: data[k].questionId,
+                    contents: data[k].content,
+                  };
+                  this.contentList.push(obj);
+                  break;
+                }
+              }
+            } else {
+              let obj = {
+                testQuestionsId: data[k].questionId,
+                contents: data[k].content,
+              };
+              this.contentList.push(obj);
+            }
+          }
+
+          list[indexA].subReportCodes[indexB] = { ...objList };
+          this.list = [...list];
+        } else {
+          console.log(msg);
+        }
+      }
     },
     // 搜索数据
     async setData(current) {
@@ -1276,6 +1899,99 @@ export default {
         this.pageNum = current;
       }
       try {
+        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);
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+        for (let i = 0; i < this.contentList.length; i++) {
+          const item = this.contentList[i];
+          if (item.contents === null) {
+            this.contentList.splice(i, 1);
+          }
+        }
         const params = {
           param: {
             conditionList: this.contentList,
@@ -1318,4 +2034,23 @@ export default {
 };
 </script>
 
-<style lang="stylus" scoped></style>
+<style lang="stylus" scoped>
+.hhh2 {
+  font-size: 20px;
+  font-weight: bold;
+  margin-left: 24px;
+  color: rgba(0, 0, 0, 0.75);
+}
+
+.add-btn {
+  position: absolute;
+  right: 18%;
+  top: 0px;
+}
+
+.units-position {
+  position: absolute;
+  right: -10px;
+  transform: translate3d(100%, -100%, 0);
+}
+</style>
diff --git a/src/views/PatientInfo/PatientInfo.vue b/src/views/PatientInfo/PatientInfo.vue
index 283c2d4..3fa8810 100644
--- a/src/views/PatientInfo/PatientInfo.vue
+++ b/src/views/PatientInfo/PatientInfo.vue
@@ -32,6 +32,7 @@
                 @change="onChange($event, a.type, a.id, a.recordId)"
                 placeholder="日期选择"
                 style="width: 100%"
+                :input-read-only="true"
                 v-else-if="a.type === 6"
               />
               <a-upload
@@ -152,6 +153,7 @@
                                 placeholder="日期选择"
                                 show-time
                                 style="width: 100%"
+                                :input-read-only="true"
                                 v-else-if="h.type === 6"
                               />
                               <a-upload
@@ -301,13 +303,17 @@
                                   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 />
+                                <a-date-picker
+                                  placeholder="日期时间选择"
+                                  :input-read-only="true"
+                                  @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>
@@ -319,8 +325,14 @@
                               </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>
+                                <a-textarea @change="explainChange(h.id, $event)" v-model="h.explains" />
                               </div>
+                              <p class="units-position" style="margin-left: 10px">
+                                <span v-if="h.units">{{ h.units }}</span>
+                                <span v-if="typeof h.referenceLower === 'number'">
+                                  ({{ h.referenceLower + '-' }}{{ h.referenceUpper }})
+                                </span>
+                              </p>
                             </a-form-item>
                             <a-button
                               v-if="h.remark && JSON.parse(h.remark).type === 'add'"
@@ -399,6 +411,7 @@
                             :default-value="h.answer ? $moment(h.answer, dateFormat) : ''"
                             @change="onChange($event, h.type, h.id, h.recordId)"
                             placeholder="日期选择"
+                            :input-read-only="true"
                             show-time
                             style="width: 100%"
                             v-else-if="h.type === 6"
@@ -545,13 +558,17 @@
                           </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 />
+                            <a-date-picker
+                              placeholder="日期时间选择"
+                              :input-read-only="true"
+                              @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>
@@ -559,8 +576,12 @@
                           </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>
+                            <a-textarea @change="explainChange(h.id, $event)" v-model="h.explains" />
                           </div>
+                          <p class="units-position" style="margin-left: 10px">
+                            <span v-if="h.units">{{ h.units }}</span>
+                            <span v-if="typeof h.referenceLower === 'number'"> ({{ h.referenceLower + '-' }}{{ h.referenceUpper }}) </span>
+                          </p>
                         </a-form-item>
                       </a-form-item>
                       <a-button
@@ -576,13 +597,17 @@
               </div>
               <div v-else-if="a.type === 13">
                 <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 === 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 />
+                <a-date-picker
+                  placeholder="日期时间选择"
+                  :input-read-only="true"
+                  @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>
@@ -590,8 +615,12 @@
               </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>
+                <a-textarea @change="explainChange(a.id, $event)" v-model="a.explains" />
               </div>
+              <p class="units-position" style="margin-left: 10px">
+                <span v-if="a.units">{{ a.units }}</span>
+                <span v-if="typeof a.referenceLower === 'number'">({{ a.referenceLower + '-' }}{{ a.referenceUpper }})</span>
+              </p>
             </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>
@@ -613,615 +642,659 @@
               </a-upload>
             </a-form-item>
             <!-- 二级标题下的各种类型 -->
-            <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"
-                  :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: 150px; width: 100%"
-                  v-else-if="e.type === 2"
-                  v-model="e.answer"
-                />
-                <a-select
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  style="width: 100%"
-                  v-else-if="e.type === 5"
-                  v-model="e.answer"
-                >
-                  <a-select-option :key="c" :value="b.showValue" v-for="(b, c) in e.optionVos">{{ b.showValue }}</a-select-option>
-                </a-select>
-                <a-date-picker
-                  :default-value="e.answer ? $moment(e.answer, dateFormat) : ''"
-                  @change="onChange($event, e.type, e.id, e.recordId)"
-                  placeholder="日期选择"
-                  show-time
-                  style="width: 100%"
-                  v-else-if="e.type === 6"
-                />
-                <a-upload
-                  :action="action"
-                  :default-file-list="fileList"
-                  :headers="headers"
-                  @change="fileChange($event, e.id, e.recordId)"
-                  list-type="picture"
-                  name="files"
-                  v-else-if="e.type === 7"
-                >
-                  <a-button
-                    v-show="
-                      !contentList.find(item => {
-                        return item.testQuestionsId === e.id;
-                      })
-                    "
+            <type-table
+              @getTableAnswer="onChange"
+              v-if="w.remark && JSON.parse(w.remark).type === 'table'"
+              :remark="w.remark"
+              :list="w.questionVos"
+            />
+            <div :key="e.name" v-for="(e, eIndex) in w.questionVos" style="position: relative">
+              <div v-if="w.remark === '' || eIndex > JSON.parse(w.remark).param.total - 1">
+                <a-form-item :label="e.question" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+                  <a-input
+                    :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: 150px; width: 100%"
+                    v-else-if="e.type === 2"
+                    v-model="e.answer"
+                  />
+                  <a-select
+                    @change="onChange($event, e.type, e.id, e.recordId)"
+                    style="width: 100%"
+                    v-else-if="e.type === 5"
+                    v-model="e.answer"
                   >
-                    <a-icon type="upload" />点击上传
-                  </a-button>
-                </a-upload>
-                <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>
                   </a-select>
-                  <div :key="c" v-for="(b, c) in e.optionVos">
-                    <div
-                      v-if="
-                        (contentList.find(item => {
-                          return item.testQuestionsId === e.id && item.contents === `${b.showValue}`;
-                        }) &&
-                          b.afterOperation === 1) ||
-                        (b.afterOperation === 1 &&
-                          !contentList.find(item => {
-                            return item.testQuestionsId === e.id;
-                          }))
+                  <a-date-picker
+                    :default-value="e.answer ? $moment(e.answer, dateFormat) : ''"
+                    @change="onChange($event, e.type, e.id, e.recordId)"
+                    placeholder="日期选择"
+                    :input-read-only="true"
+                    show-time
+                    style="width: 100%"
+                    v-else-if="e.type === 6"
+                  />
+                  <a-upload
+                    :action="action"
+                    :default-file-list="fileList"
+                    :headers="headers"
+                    @change="fileChange($event, e.id, e.recordId)"
+                    list-type="picture"
+                    name="files"
+                    v-else-if="e.type === 7"
+                  >
+                    <a-button
+                      v-show="
+                        !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, b.showValue)"
-                          style="width: 100%"
-                          v-model="b.otherInformation"
-                        ></a-input>
-                      </a-form-item>
+                      <a-icon type="upload" />点击上传
+                    </a-button>
+                  </a-upload>
+                  <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>
+                    </a-select>
+                    <div :key="c" v-for="(b, c) in e.optionVos">
+                      <div
+                        v-if="
+                          (contentList.find(item => {
+                            return item.testQuestionsId === e.id && item.contents === `${b.showValue}`;
+                          }) &&
+                            b.afterOperation === 1) ||
+                          (b.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, b.showValue)"
+                            style="width: 100%"
+                            v-model="b.otherInformation"
+                          ></a-input>
+                        </a-form-item>
+                      </div>
                     </div>
                   </div>
-                </div>
-                <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 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="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 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-else-if="ques.afterOperation === 3"
-                              :key="i"
-                              v-for="(h, i) in ques.questionVos"
-                              style="position: relative"
+                              v-if="
+                                (contentList.find(item => {
+                                  return item.testQuestionsId === e.id && item.contents === `${ques.showValue}`;
+                                }) &&
+                                  ques.afterOperation > 0) ||
+                                (ques.afterOperation > 0 && ques.choose === 1)
+                              "
                             >
-                              <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="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-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-form-item
+                                  :label="h.question"
+                                  :label-col="formItemLayout.labelCol"
+                                  :wrapper-col="formItemLayout.wrapperCol"
+                                  class="d-flex align-center mb-3"
                                 >
-                                  <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-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-date-picker
+                                    :default-value="h.answer ? $moment(h.answer, dateFormat) : ''"
+                                    @change="onChange($event, h.type, h.id, h.recordId)"
+                                    placeholder="日期选择"
+                                    :input-read-only="true"
+                                    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-form-item class="d-flex align-center mb-3">
+                                      <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, b.showValue)"
-                                          style="width: 100%"
-                                          v-model="b.otherInformation"
+                                          @change="inputChange(h.id, $event, m.showValue)"
+                                          style="width: 200px"
+                                          v-if="m.afterOperation === 1"
                                         ></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)
-                                            "
+                                        <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 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>
+                                          </a-form-item>
+                                        </div>
                                       </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 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"
+                                    />
+                                  </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)"
+                                      :input-read-only="true"
+                                      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-textarea @change="explainChange(h.id, $event)" v-model="h.explains" />
+                                  </div>
+                                  <p class="units-position" style="margin-left: 10px">
+                                    <span v-if="h.units">{{ h.units }}</span>
+                                    <span v-if="typeof h.referenceLower === 'number'">
+                                      ({{ h.referenceLower + '-' }}{{ h.referenceUpper }})
+                                    </span>
+                                  </p>
+                                </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>
-                          </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-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-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-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-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-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-date-picker
+                              :default-value="h.answer ? $moment(h.answer, dateFormat) : ''"
+                              @change="onChange($event, h.type, h.id, h.recordId)"
+                              placeholder="日期选择"
+                              :input-read-only="true"
+                              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-form-item class="d-flex align-center mb-3">
+                                <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="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="inputChange(h.id, $event, b.showValue)"
-                                    style="width: 100%"
-                                    v-model="b.otherInformation"
+                                    @change="inputChange(h.id, $event, m.showValue)"
+                                    style="width: 200px"
+                                    v-if="m.afterOperation === 1"
                                   ></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="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)
-                                      "
+                                  <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 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="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>
+                                    </a-form-item>
+                                  </div>
                                 </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, k, h.id)"
-                        >
-                          +
-                        </a-button>
+                            <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"
+                              />
+                            </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="日期时间选择"
+                                :input-read-only="true"
+                                @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-textarea @change="explainChange(h.id, $event)" v-model="h.explains" />
+                            </div>
+                            <p class="units-position" style="margin-left: 10px">
+                              <span v-if="h.units">{{ h.units }}</span>
+                              <span v-if="typeof h.referenceLower === 'number'">
+                                ({{ h.referenceLower + '-' }}{{ h.referenceUpper }})
+                              </span>
+                            </p>
+                          </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>
                   </div>
-                </div>
-                <div v-else-if="e.type === 13">
-                  <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 === 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 v-else-if="e.type === 13">
+                    <a-input-number @change="onChange($event, e.type, e.id, e.recordId)" style="width: 200px" v-model="e.answer" />
+                  </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="日期时间选择"
+                      :input-read-only="true"
+                      @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-textarea @change="explainChange(e.id, $event)" v-model="e.explains" />
+                  </div>
+                  <p class="units-position" style="margin-left: 10px">
+                    <span v-if="e.units">{{ e.units }}</span>
+                    <span v-if="typeof e.referenceLower === 'number'">({{ e.referenceLower + '-' }}{{ e.referenceUpper }})</span>
+                  </p>
+                </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>
           </div>
         </a-collapse-panel>
-
         <!-- </div> -->
       </a-collapse>
     </a-form>
@@ -1237,9 +1310,14 @@
       当前选择患者的编号为：
       <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">
+    <a-button
+      v-if="list.length > 0 && (getCode || code)"
+      @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>
@@ -1253,6 +1331,8 @@
 <script>
 import { mapState } from 'vuex';
 import { queryAll, saveCaseMes, upload, basic } from 'config/api';
+import TypeTable from 'components/TypeTable/TypeTable.vue';
+
 const formItemLayout = {
   labelCol: { span: 6 },
   wrapperCol: { span: 12 },
@@ -1264,6 +1344,14 @@ const formItemLayout1 = {
 const tailItemLayout = { wrapperCol: { span: 18, offset: 4 } };
 export default {
   name: 'PatientInfo',
+  components: { TypeTable },
+  props: {
+    code: {
+      type: String,
+      default: '',
+    },
+  },
+
   data() {
     return {
       formItemLayout,
@@ -1377,46 +1465,18 @@ export default {
       try {
         const params = {
           param: {
-            code: this.getCode ? this.getCode : '',
-            id: this.patientId ? this.patientId : '',
+            code: this.code ? this.code : this.getCode ? this.getCode : '',
+            id: this.patientId ? this.patientId : '1377810337931468800',
             nums: this.tabNums,
           },
         };
         const res = await queryAll(params);
         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 = [];
-            } else if (data[0].reportType === 1) {
-              this.tabList = [0, 14, 90];
-            } else {
-              this.tabList = [180, 365];
-            }
+          if (this.getCode || this.code) {
+            console.log(data);
+            this.tabList = data[0].reportTypes;
           } else {
             this.tabList = [0, 14, 90, 180, 365, '认知量表'];
           }
@@ -1453,7 +1513,11 @@ export default {
           this.forFn(id, e, recordId);
         } else if (type === 6) {
           // 日期选择器，给后台返回的值是  2020-01-01 的格式
-          this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD'), recordId);
+          if (e) {
+            this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD'), recordId);
+          } else {
+            this.forFn(id, '', recordId);
+          }
         } else if (type === 7) {
           alert('上传文件，先空下');
         } else if (type === 8) {
@@ -1502,10 +1566,18 @@ export default {
           this.forFn(id, e, recordId);
         } else if (type === 15) {
           // 时间选择 返回格式为 00:00:00
-          this.forFn(id, this.$moment(e._d).format('HH:mm:ss'), recordId);
+          if (e) {
+            this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD'), recordId);
+          } else {
+            this.forFn(id, '', 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);
+          if (e) {
+            this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD'), recordId);
+          } else {
+            this.forFn(id, '', recordId);
+          }
         }
       } else {
         if (type === 1) {
@@ -1562,15 +1634,25 @@ export default {
           this.failFn(id, this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'), recordId);
         }
       }
+      console.log(this.contentList);
     },
     // for循环封装函数
     forFn(id, value, recordId) {
       const { contentList } = this;
       // console.log(value);
-      for (let i = 0; i < contentList.length; i++) {
-        if (contentList[i].testQuestionsId === id) {
-          contentList[i].contents = value;
-          break;
+      if (value || value === 0) {
+        for (let i = 0; i < contentList.length; i++) {
+          if (contentList[i].testQuestionsId === id) {
+            contentList[i].contents = value;
+            break;
+          }
+        }
+      } else {
+        for (let i = 0; i < contentList.length; i++) {
+          if (contentList[i].testQuestionsId === id) {
+            contentList.splice(i, 1);
+            break;
+          }
         }
       }
       this.contentList = [...contentList];
@@ -1848,6 +1930,12 @@ export default {
             }
           }
         }
+        for (let i = 0; i < this.contentList.length; i++) {
+          const item = this.contentList[i];
+          if (item.contents === null) {
+            this.contentList.splice(i, 1);
+          }
+        }
         const params = {
           param: {
             list: this.contentList,
@@ -1889,4 +1977,10 @@ export default {
   right: 18%;
   top: 0px;
 }
+
+.units-position {
+  position: absolute;
+  right: -10px;
+  transform: translate3d(100%, -100%, 0);
+}
 </style>
diff --git a/src/views/SelectPatient/SelectPatient.vue b/src/views/SelectPatient/SelectPatient.vue
index ef4eda9..5d87e66 100644
--- a/src/views/SelectPatient/SelectPatient.vue
+++ b/src/views/SelectPatient/SelectPatient.vue
@@ -1,35 +1,88 @@
 <template>
   <div class="d-flex flex-column">
-    <search @searchPatientMes="searchPatientMes" />
-    <patient-table :lists="lists" @handleSelPatientMes="handleSelPatientMes" class="mt-3" />
+    <div v-if="!patientId">
+      <search @searchPatientMes="searchPatientMes" />
+      <patient-table :lists="lists" @handleSelPatientMes="handleSelPatientMes" class="mt-3" />
+    </div>
+    <div v-else style="position: relative">
+      <a-tabs default-active-key="OTHER">
+        <a-tab-pane v-for="item in codeTypeList" :key="item.code" :tab="item.name">
+          <div v-if="item.code === 'SWYB'">
+            <biological-samples />
+          </div>
+          <div v-else-if="item.code === 'RZLB'">
+            <iframe style="width: 100%; heigt: 100%" height="100%" :src="rzlbSrc"></iframe>
+          </div>
+          <div v-else-if="item.code !== 'SWYB' && item.code !== 'RZLB'">
+            <patient-info :code="item.code" />
+          </div>
+        </a-tab-pane>
+      </a-tabs>
+      <a-button @click="choosePatient" class="choose-btn" type="primary">
+        <a-icon type="retweet" />
+        重新选择患者
+      </a-button>
+    </div>
   </div>
 </template>
 
 <script>
 import Search from 'components/PatientInfo/Search.vue';
 import PatientTable from 'components/PatientInfo/PatientTable.vue';
+import PatientInfo from 'views/PatientInfo/PatientInfo.vue';
+import BiologicalSamples from 'views/BiologicalSamples/BiologicalSamples.vue';
 import { selPatientMes } from 'config/api';
-import { mapState, mapActions } from 'vuex';
+import { mapState, mapActions, mapMutations } from 'vuex';
 
 export default {
   name: 'SelectPatient',
-  components: { Search, PatientTable },
+  components: { Search, PatientTable, PatientInfo, BiologicalSamples },
   data() {
     return {
       lists: { pageNum: 1, pageSize: 10, total: 1, list: [] },
       hospitalization: '',
       inpatientId: '',
+      codeTypeList: [
+        {
+          code: 'OTHER',
+          name: '基础信息',
+        },
+        {
+          code: 'ZLXG',
+          name: '诊疗相关',
+        },
+        {
+          code: 'XYJC',
+          name: '血液检查',
+        },
+        {
+          code: 'QXJC',
+          name: '器械检查',
+        },
+        {
+          code: 'SWYB',
+          name: '生物样本',
+        },
+        {
+          code: 'RZLB',
+          name: '认知量表',
+        },
+      ],
+      rzlbSrc: `http://sxzxyzzlm.tall.wiki/ht-common?code=KT&userId=1218763410024566784`,
     };
   },
 
+  computed: mapState('home', ['patientId', 'ptProps', 'user']),
+
   created() {
     this.handleSelPatientMes();
     this.getControlGroups();
+    this.rzlbSrc = `http://sxzxyzzlm.tall.wiki/ht-common?code=KT&userId=${this.user.id}`;
   },
 
   methods: {
     ...mapActions('home', ['getControlGroups']),
-
+    ...mapMutations('home', ['setPatientId']),
     searchPatientMes(value) {
       if (value) {
         this.hospitalization = value.inpatientNumber;
@@ -62,8 +115,21 @@ export default {
         throw new Error(error);
       }
     },
+
+    /**
+     * 重新选择患者
+     */
+    choosePatient() {
+      this.setPatientId('');
+    },
   },
 };
 </script>
 
-<style lang="stylus" scoped></style>
+<style lang="stylus" scoped>
+.choose-btn {
+  position: fixed;
+  top: 12px;
+  right: 12px;
+}
+</style>