diff --git a/package-lock.json b/package-lock.json
index e094c48..4a10d0a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1808,6 +1808,16 @@
           "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",
@@ -1840,6 +1850,34 @@
           "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",
@@ -1893,6 +1931,13 @@
             "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",
@@ -2007,6 +2052,16 @@
             "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",
@@ -2023,6 +2078,32 @@
             "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"
+              }
+            }
+          }
         }
       }
     },
@@ -12596,87 +12677,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.1.2",
-      "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.1.2.tgz",
-      "integrity": "sha1-XAO2xQ0qX5g8fOuhXFDXjKKymPQ=",
-      "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.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1611327117754&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
-          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz?cache=0&sync_timestamp=1591686984650&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-4.1.0.tgz",
-          "integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
-          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
-          "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.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1611394043517&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-          "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 061d798..99edf30 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,10 +1,3 @@
-<!--
- * @Author: wally
- * @email: 18603454788@163.com
- * @Date: 2021-02-19 17:44:32
- * @LastEditors: wally
- * @LastEditTime: 2021-02-20 09:15:41
--->
 <template>
   <a-config-provider :locale="zh_CN">
     <div class="d-flex flex-row flex-nowrap" id="app">
@@ -18,6 +11,7 @@
 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 { getHId } from 'config/api';
 
 export default {
   name: 'App',
@@ -38,9 +32,13 @@ export default {
   },
 
   created() {
-    // const userId = '1218763410024566784';
-    // const params = { userId };
-    // this.getUserId(params);
+    const userId = '1218763410024566784';
+    const params = { userId };
+    this.getUserId(params);
+    this.getHospitalId();
+    if (sessionStorage.getItem('patientId')) {
+      this.setPatientId(sessionStorage.getItem('patientId'));
+    }
     const that = this;
     window.plugin = window.TallPlugin.init();
     // 调用created方法 向主窗体发送created消息，以便来接受、存储主窗体传递来的参数
@@ -54,7 +52,21 @@ export default {
 
   methods: {
     ...mapActions('home', ['getUserId']),
-    ...mapMutations('home', ['setPtProps']),
+    ...mapMutations('home', ['setPtProps', 'setHospitalId', 'setPatientId']),
+
+    async getHospitalId() {
+      try {
+        const res = await getHId(1);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          this.setHospitalId(data.id);
+        } else {
+          this.$message.error('医院查询失败');
+        }
+      } catch (error) {
+        this.$message.error(error);
+      }
+    },
   },
 };
 </script>
diff --git a/src/common/portrait.styl b/src/common/portrait.styl
index 8ed1191..c523727 100644
--- a/src/common/portrait.styl
+++ b/src/common/portrait.styl
@@ -183,6 +183,8 @@
 
 .white--text{
   color: #fff;
+  width: 200px;
+  margin: 0 auto
 }
 
 
diff --git a/src/components/BiologicalSampleSearch/Search.vue b/src/components/BiologicalSampleSearch/Search.vue
index 79cd84c..d856d86 100644
--- a/src/components/BiologicalSampleSearch/Search.vue
+++ b/src/components/BiologicalSampleSearch/Search.vue
@@ -5,7 +5,7 @@
       <a-form :form="form" @submit="handleSubmit" class="d-flex flex-nowrap align-center" layout="inline">
         <a-form-item>
           <a-select placeholder="请选择医院" style="min-width: 150px" v-decorator="['hospital']">
-            <a-select-option :key="item.id" :value="item.id" v-for="item in hospitals">{{ item.title }}</a-select-option>
+            <a-select-option :key="item.id" :value="item.id" v-for="item in hospitals">{{ item.name }}</a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item>
@@ -29,29 +29,13 @@
 </template>
 
 <script>
+import { getHList } from 'config/api';
 export default {
   name: 'Search',
   data() {
     return {
       form: this.$form.createForm(this, { name: 'search' }),
-      hospitals: [
-        {
-          id: 1,
-          title: '山西中医大学附属医院',
-        },
-        {
-          id: 2,
-          title: '山西人民医院',
-        },
-        {
-          id: 3,
-          title: '大同第五人民医院',
-        },
-        {
-          id: 4,
-          title: '大同国药同煤总医院',
-        },
-      ],
+      hospitals: [],
       types: [
         {
           id: 0,
@@ -86,7 +70,19 @@ export default {
       ],
     };
   },
-
+  async created() {
+    try {
+      const res = await getHList();
+      const { code, msg, data } = res.data;
+      if (code === 200) {
+        this.hospitals = data;
+      } else {
+        this.$message.error('查询医院列表失败');
+      }
+    } catch (error) {
+      this.$message.error('查询医院列表失败');
+    }
+  },
   methods: {
     // 提交
     handleSubmit(e) {
diff --git a/src/components/CaseTable/CaseTable.vue b/src/components/CaseTable/CaseTable.vue
new file mode 100644
index 0000000..14c6c79
--- /dev/null
+++ b/src/components/CaseTable/CaseTable.vue
@@ -0,0 +1,99 @@
+<template>
+  <div>
+    <!-- search -->
+    <div style="width: 100%" v-if="lists && lists.list && lists.list.length > 0">
+      <a-table
+        :columns="columns"
+        :data-source="lists.list"
+        :loading="loading"
+        :pagination="pagination"
+        :row-key="record => record.id"
+        @change="setData"
+        bordered
+        class="white pa-3"
+      >
+        <template slot="hospitalId" slot-scope="text, record">
+          <span>{{ record.hospitalId }}</span>
+        </template>
+        <template slot="inputStatus" slot-scope="text, record">
+          <span v-if="record.inputStatus === 0">新建</span>
+          <span v-else-if="record.inputStatus === 1">数据搜集中</span>
+          <span v-else-if="record.inputStatus === 2">数据搜集完成</span>
+          <span v-else-if="record.inputStatus === 3">数据搜集超时</span>
+          <span v-else-if="record.inputStatus === 4">废弃</span>
+        </template>
+      </a-table>
+    </div>
+    <a-empty v-else />
+  </div>
+</template>
+
+<script>
+import { mapMutations, mapState } from 'vuex';
+const columns = [
+  {
+    title: '住院号',
+    align: 'center',
+    dataIndex: 'hospitalization',
+    key: 'hospitalization',
+  },
+  {
+    title: '医院',
+    align: 'center',
+    dataIndex: 'hosName',
+    key: 'hosName',
+    scopedSlots: { customRender: 'hosName' },
+  },
+  {
+    title: '对照组',
+    align: 'center',
+    dataIndex: 'name',
+    key: 'name',
+    scopedSlots: { customRender: 'name' },
+  },
+  {
+    title: '录入状态',
+    align: 'center',
+    dataIndex: 'inputStatus',
+    key: 'inputStatus',
+    scopedSlots: { customRender: 'inputStatus' },
+  },
+];
+
+export default {
+  name: 'CaseTable',
+
+  props: { lists: { type: Object, default: null } },
+
+  data() {
+    return {
+      columns,
+      loading: false,
+    };
+  },
+
+  computed: {
+    pagination() {
+      const { pageNum, pageSize, total } = this.lists;
+      return {
+        current: pageNum,
+        pageSize,
+        total: +total,
+      };
+    },
+  },
+
+  methods: {
+    ...mapMutations('home', ['setPatientId']),
+
+    // 选择病患
+    chooseItem(id) {
+      this.setPatientId(id);
+    },
+    setData(pagination) {
+      const { current } = pagination;
+      this.$emit('setData', current);
+    },
+  },
+};
+</script>
diff --git a/src/components/Echarts/Categorymap.vue b/src/components/Echarts/Categorymap.vue
index 4fc23b7..deeb8ef 100644
--- a/src/components/Echarts/Categorymap.vue
+++ b/src/components/Echarts/Categorymap.vue
@@ -12,7 +12,7 @@
   </div>
 </template>
 <script>
-import { countAnalysis } from 'config/api';
+import { HospitalComplete } from 'config/api';
 export default {
   name: 'Categorymap',
   data() {
@@ -22,26 +22,32 @@ export default {
       height: '',
       timer: null,
       list: [],
+      xDataList: [],
+      aList: [], // 未完成数组
+      bList: [], // 已完成数组
+      cList: [], // 进行中数组
+      dList: [], // 废弃的数组
+      eList: [], // 超时的数组
     };
   },
   mounted() {
     this.drawLine();
-    this.timer = setInterval(() => {
-      this.drawLine();
-    }, 10000);
-    let wh = window.innerWidth;
-    let hg = window.innerHeight;
-    this.width = wh + 'px';
-    this.height = hg + 'px';
-    console.log(this.height);
-    window.onresize = () => {
-      return (() => {
-        wh = window.innerWidth;
-        hg = window.innerHeight;
-        this.width = wh + 'px';
-        this.height = hg + 'px';
-      })();
-    };
+    // this.timer = setInterval(() => {
+    //   this.drawLine();
+    // }, 10000);
+    // let wh = window.innerWidth;
+    // let hg = window.innerHeight;
+    // this.width = wh + 'px';
+    // this.height = hg + 'px';
+    // console.log(this.height);
+    // window.onresize = () => {
+    //   return (() => {
+    //     wh = window.innerWidth;
+    //     hg = window.innerHeight;
+    //     this.width = wh + 'px';
+    //     this.height = hg + 'px';
+    //   })();
+    // };
   },
   destroyed() {
     clearInterval(this.timer);
@@ -50,17 +56,18 @@ export default {
     async drawLine() {
       // 基于准备好的dom，初始化echarts实例
       let myChart = this.$echarts.init(document.getElementById('Categorymap'));
+      await this.getData();
       // 绘制图表
       var option = {
         legend: {
-          data: ['未完成', '已完成', '进行中', '废弃'],
+          data: ['未完成', '已完成', '进行中', '废弃', '数据采集超时'],
           top: 30,
         },
         xAxis: [
           {
             type: 'category',
             axisTick: { show: false },
-            data: ['附属医院', '人民医院', '第五人民医院', '国药同煤总医院'],
+            data: this.xDataList,
           },
         ],
         yAxis: [{ type: 'value' }],
@@ -71,7 +78,7 @@ export default {
             barGap: 0,
             // label: labelOption,
             emphasis: { focus: 'series' },
-            data: [320, 332, 301, 334],
+            data: this.aList,
             barWidth: 20,
             itemStyle: {
               normal: {
@@ -102,7 +109,7 @@ export default {
             type: 'bar',
             // label: labelOption,
             emphasis: { focus: 'series' },
-            data: [220, 182, 191, 234],
+            data: this.bList,
             barWidth: 20,
             itemStyle: {
               normal: {
@@ -133,7 +140,7 @@ export default {
             type: 'bar',
             // label: labelOption,
             emphasis: { focus: 'series' },
-            data: [150, 232, 201, 154],
+            data: this.cList,
             barWidth: 20,
             itemStyle: {
               normal: {
@@ -164,7 +171,38 @@ export default {
             type: 'bar',
             // label: labelOption,
             emphasis: { focus: 'series' },
-            data: [98, 77, 101, 99],
+            data: this.dList,
+            barWidth: 20,
+            itemStyle: {
+              normal: {
+                label: {
+                  formatter: '{c}',
+                  show: true,
+                  position: 'top',
+                  textStyle: {
+                    fontSize: '12',
+                    color: '#000',
+                  },
+                },
+                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  { offset: 0, color: '#f00' }, //柱图渐变色
+                  { offset: 1, color: '#F00' }, //柱图渐变色
+                ]),
+              },
+              emphasis: {
+                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  { offset: 0, color: '#F00' }, //柱图高亮渐变色
+                  { offset: 1, color: '#F00' }, //柱图高亮渐变色
+                ]),
+              },
+            },
+          },
+          {
+            name: '数据采集超时',
+            type: 'bar',
+            // label: labelOption,
+            emphasis: { focus: 'series' },
+            data: this.eList,
             barWidth: 20,
             itemStyle: {
               normal: {
@@ -196,28 +234,29 @@ export default {
     },
     async getData() {
       try {
-        const params = {
-          param: {
-            conditionList: [],
-            conditionListDate: [],
-            hospitalId: '',
-            hospitalization: '',
-            inpatientId: '',
-            inputStatus: '',
-            testQuestionsId: '',
-          },
-        };
-        const res = await countAnalysis(params);
+        const params = { param: {} };
+        const res = await HospitalComplete(params);
         const { code, msg, data } = res.data;
         if (code === 200) {
-          this.list = data;
+          console.log(data);
+          for (let i = 0; i < data.length; i++) {
+            this.forList(data[i]);
+          }
         } else {
-          console.log(msg);
+          this.$message.error('获取数据失败');
         }
       } catch (error) {
         this.$message.error('获取数据失败');
       }
     },
+    forList(obj) {
+      this.xDataList.push(obj.hospitalName);
+      this.aList.push(obj.unfinished);
+      this.bList.push(obj.completed);
+      this.cList.push(obj.underway);
+      this.dList.push(obj.discarded);
+      this.eList.push(obj.overtime);
+    },
   },
 };
 </script>
diff --git a/src/components/Echarts/Cisualmap.vue b/src/components/Echarts/Cisualmap.vue
index 2ed25a3..9757f49 100644
--- a/src/components/Echarts/Cisualmap.vue
+++ b/src/components/Echarts/Cisualmap.vue
@@ -16,46 +16,63 @@ export default {
       height: '',
       timer: null,
       list: [],
+      dateList1: [], // 新建日期数组
+      dataList1: [], // 新建数据数组
+      dateList2: [], // 已完成日期数组
+      dataList2: [], // 已完成数据数组
     };
   },
   mounted() {
     this.drawLine();
-    this.timer = setInterval(() => {
-      this.drawLine();
-    }, 10000);
-    let wh = window.innerWidth;
-    let hg = window.innerHeight;
-    this.width = wh + 'px';
-    this.height = hg + 'px';
-    console.log(this.height);
-    window.onresize = () => {
-      return (() => {
-        wh = window.innerWidth;
-        hg = window.innerHeight;
-        this.width = wh + 'px';
-        this.height = hg + 'px';
-      })();
-    };
+    // this.timer = setInterval(() => {
+    //   this.drawLine();
+    // }, 10000);
+    // let wh = window.innerWidth;
+    // let hg = window.innerHeight;
+    // this.width = wh + 'px';
+    // this.height = hg + 'px';
+    // console.log(this.height);
+    // window.onresize = () => {
+    //   return (() => {
+    //     wh = window.innerWidth;
+    //     hg = window.innerHeight;
+    //     this.width = wh + 'px';
+    //     this.height = hg + 'px';
+    //   })();
+    // };
   },
   methods: {
     async drawLine() {
       // 基于准备好的dom，初始化echarts实例
       let myChart1 = this.$echarts.init(document.getElementById('Cisualmap1'));
       let myChart2 = this.$echarts.init(document.getElementById('Cisualmap2'));
+      await this.getData();
       // 绘制图表
       var option1 = {
         title: {
           left: 'center',
           text: '新建病例',
         },
+        dataZoom: [
+          {
+            type: 'slider',
+            xAxisIndex: 0,
+            filterMode: 'empty',
+          },
+          {
+            type: 'inside',
+            xAxisIndex: 0,
+            filterMode: 'empty',
+          },
+        ],
         xAxis: {
           type: 'category',
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          data: this.dateList1,
         },
         yAxis: { type: 'value' },
         series: [
           {
-            data: [820, 932, 901, 934, 1290, 1330, 1320],
+            data: this.dataList1,
             type: 'line',
             areaStyle: { color: 'rgba(229,244,254,1)' },
             lineStyle: { color: 'rgb(45,151,213)' },
@@ -69,14 +86,26 @@ export default {
           left: 'center',
           text: '已完成病例',
         },
+        dataZoom: [
+          {
+            type: 'slider',
+            xAxisIndex: 0,
+            filterMode: 'empty',
+          },
+          {
+            type: 'inside',
+            xAxisIndex: 0,
+            filterMode: 'empty',
+          },
+        ],
         xAxis: {
           type: 'category',
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          data: this.dateList2,
         },
         yAxis: { type: 'value' },
         series: [
           {
-            data: [820, 932, 901, 934, 1290, 1330, 1320],
+            data: this.dataList2,
             type: 'line',
             areaStyle: { color: 'rgba(229,244,254,1)' },
             lineStyle: { color: 'rgb(45,151,213)' },
@@ -101,7 +130,12 @@ export default {
         const res = await countCase(params);
         const { code, msg, data } = res.data;
         if (code === 200) {
-          this.list = data;
+          for (let i = 0; i < data.newNums.length; i++) {
+            this.forNewList(data.newNums[i]);
+          }
+          for (let i = 0; i < data.overNums.length; i++) {
+            this.forOverList(data.overNums[i]);
+          }
         } else {
           console.log(msg);
         }
@@ -109,6 +143,14 @@ export default {
         this.$message.error('获取数据失败');
       }
     },
+    forNewList(obj) {
+      this.dateList1.push(obj.shijian);
+      this.dataList1.push(obj.nums);
+    },
+    forOverList(obj) {
+      this.dateList2.push(obj.shijian);
+      this.dataList2.push(obj.nums);
+    },
   },
 };
 </script>
diff --git a/src/components/Echarts/Piemap.vue b/src/components/Echarts/Piemap.vue
index 0d84440..a0a9adb 100644
--- a/src/components/Echarts/Piemap.vue
+++ b/src/components/Echarts/Piemap.vue
@@ -5,6 +5,7 @@
   </div>
 </template>
 <script>
+import { selAllYBS } from 'config/api';
 export default {
   name: 'Piemap',
   data() {
@@ -13,26 +14,27 @@ export default {
       width: '',
       height: '',
       timer: null,
+      dataList: [],
     };
   },
   mounted() {
     this.drawLine();
-    this.timer = setInterval(() => {
-      this.drawLine();
-    }, 10000);
-    let wh = window.innerWidth;
-    let hg = window.innerHeight;
-    this.width = wh + 'px';
-    this.height = hg + 'px';
-    console.log(this.height);
-    window.onresize = () => {
-      return (() => {
-        wh = window.innerWidth;
-        hg = window.innerHeight;
-        this.width = wh + 'px';
-        this.height = hg + 'px';
-      })();
-    };
+    // this.timer = setInterval(() => {
+    //   this.drawLine();
+    // }, 10000);
+    // let wh = window.innerWidth;
+    // let hg = window.innerHeight;
+    // this.width = wh + 'px';
+    // this.height = hg + 'px';
+    // console.log(this.height);
+    // window.onresize = () => {
+    //   return (() => {
+    //     wh = window.innerWidth;
+    //     hg = window.innerHeight;
+    //     this.width = wh + 'px';
+    //     this.height = hg + 'px';
+    //   })();
+    // };
   },
   destroyed() {
     clearInterval(this.timer);
@@ -42,6 +44,7 @@ export default {
       // 基于准备好的dom，初始化echarts实例
       let myChart = this.$echarts.init(document.getElementById('Piemap'));
       // 绘制图表
+      await this.getData();
       var option = {
         color: ['#FE9C58', '#7AEBFF', '#FFCC00', '#744CFF'],
         legend: { top: 'bottom' },
@@ -49,21 +52,36 @@ export default {
           {
             name: '面积模式',
             type: 'pie',
-            radius: [20, 120],
+            radius: [20, 100],
             center: ['50%', '50%'],
             roseType: 'area',
             itemStyle: { borderRadius: 8 },
-            data: [
-              { value: 40, name: '附属医院' },
-              { value: 38, name: '人民医院' },
-              { value: 32, name: '第五医院' },
-              { value: 30, name: '国药同煤总医院' },
-            ],
+            data: this.dataList,
           },
         ],
       };
       myChart.setOption(option);
     },
+    async getData() {
+      try {
+        const res = await selAllYBS();
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          // console.log(data);
+          for (let i = 0; i < data.length; i++) {
+            var obj = {
+              value: data[i].nums,
+              name: data[i].name,
+            };
+            this.dataList.push(obj);
+          }
+        } else {
+          console.log(msg);
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
   },
 };
 </script>
diff --git a/src/components/Echarts/Treemap.vue b/src/components/Echarts/Treemap.vue
index b600273..3805006 100644
--- a/src/components/Echarts/Treemap.vue
+++ b/src/components/Echarts/Treemap.vue
@@ -12,6 +12,7 @@
   </div>
 </template>
 <script>
+import { mapState } from 'vuex';
 import { complete } from 'config/api';
 export default {
   name: 'Treemap',
@@ -24,24 +25,25 @@ export default {
       timer: null,
     };
   },
+  computed: mapState('home', ['ptProps', 'hospitalId']),
   mounted() {
+    // this.drawLine();
+    // this.timer = setInterval(() => {
     this.drawLine();
-    this.timer = setInterval(() => {
-      this.drawLine();
-    }, 10000);
-    let wh = window.innerWidth;
-    let hg = window.innerHeight;
-    this.width = wh + 'px';
-    this.height = hg + 'px';
-    console.log(this.height);
-    window.onresize = () => {
-      return (() => {
-        wh = window.innerWidth;
-        hg = window.innerHeight;
-        this.width = wh + 'px';
-        this.height = hg + 'px';
-      })();
-    };
+    // }, 10000);
+    // let wh = window.innerWidth;
+    // let hg = window.innerHeight;
+    // this.width = wh + 'px';
+    // this.height = hg + 'px';
+    // console.log(this.height);
+    // window.onresize = () => {
+    //   return (() => {
+    //     wh = window.innerWidth;
+    //     hg = window.innerHeight;
+    //     this.width = wh + 'px';
+    //     this.height = hg + 'px';
+    //   })();
+    // };
   },
   destroyed() {
     clearInterval(this.timer);
@@ -50,6 +52,7 @@ export default {
     async drawLine() {
       // 基于准备好的dom，初始化echarts实例
       await this.getData();
+      console.log(this.valueList);
       let myChart = this.$echarts.init(document.getElementById('Treemap'));
       // 绘制图表
       var option = {
@@ -87,8 +90,8 @@ export default {
     async getData() {
       const params = {
         param: {
-          hospitalId: '',
-          userId: '',
+          hospitalId: this.ptProps && this.ptProps.hospitalId ? this.ptProps.hospitalId : '',
+          userId: this.ptProps && this.ptProps.userId ? this.ptProps.userId : '',
         },
       };
       const res = await complete(params);
diff --git a/src/components/PatientInfo/PatientTable.vue b/src/components/PatientInfo/PatientTable.vue
index 5b4792d..d296bc1 100644
--- a/src/components/PatientInfo/PatientTable.vue
+++ b/src/components/PatientInfo/PatientTable.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- search -->
-    <div style="width:100%" v-if="lists && lists.list && lists.list.length > 0">
+    <div style="width: 100%" v-if="lists && lists.list && lists.list.length > 0">
       <a-table
         :columns="columns"
         :data-source="lists.list"
@@ -18,11 +18,17 @@
 
         <template slot="inputStatus" slot-scope="text, record">
           <span>
-            {{ record.inputStatus === 0 ? '新建'
-            : record.inputStatus === 1 ? '数据搜集中'
-            : record.inputStatus === 2 ? '数据搜集完成'
-            : record.inputStatus === 3 ? '数据搜集超时'
-            : '废弃' }}
+            {{
+              record.inputStatus === 0
+                ? '新建'
+                : record.inputStatus === 1
+                ? '数据搜集中'
+                : record.inputStatus === 2
+                ? '数据搜集完成'
+                : record.inputStatus === 3
+                ? '数据搜集超时'
+                : '废弃'
+            }}
           </span>
         </template>
 
@@ -104,6 +110,7 @@ export default {
     // 选择病患
     chooseItem(id) {
       this.setPatientId(id);
+      sessionStorage.setItem('patientId', id);
     },
 
     handleTableChange(pagination) {
diff --git a/src/components/PatientInfo/Search.vue b/src/components/PatientInfo/Search.vue
index 43cf199..c0b7a63 100644
--- a/src/components/PatientInfo/Search.vue
+++ b/src/components/PatientInfo/Search.vue
@@ -2,22 +2,13 @@
   <!-- 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 :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-form-item>
         <a-form-item>
-          <a-select placeholder="请选择对照组" style="min-width: 150px" v-decorator="['groupValue']">
-            <a-select-option
-              :key="item.id"
-              :value="item.id"
-              v-for="item in controlGroups"
-            >{{ item.name }}</a-select-option>
+          <a-select placeholder="请选择对照组" style="min-width: 450px" v-decorator="['groupValue']">
+            <a-select-option :key="item.id" :value="item.id" v-for="item in controlGroups">{{ item.name }}</a-select-option>
           </a-select>
         </a-form-item>
         <a-button class="mr-4" html-type="submit" icon="search" type="primary">搜索</a-button>
diff --git a/src/config/api.js b/src/config/api.js
index beb2b32..453ae5e 100644
--- a/src/config/api.js
+++ b/src/config/api.js
@@ -15,7 +15,16 @@ const inpatient = `${tcm}/inpatient`; // 对照组接口
 const statistics = `${tcm}/statistics`; // 数据统计相关接口
 const conferenceRecords = `${tcm}/conferenceRecords`; // 会议纪要相关接口
 const biologicalSamples = `${tcm}/biologicalSamples`; // 生物样本相关接口
+const hospatil = `${tcm}/hospatil`; // 医院相关接口
+const file = `${tcm}/file`; // 文件相关接口
 
+// 上传文件
+export const upload = `${file}/upload`;
+
+// 通过任务Id查询项目Id
+export const getHId = params => axios.get(`${hospatil}/byProjectId?projectId=${params}`);
+// 查询医院列表
+export const getHList = params => axios.get(`${hospatil}/selHospatil`);
 // 保存患者病例信息
 export const saveCaseMes = params => axios.post(`${patient}/saveCaseMes`, params);
 
@@ -32,7 +41,8 @@ export const selPatientMesList = params => axios.post(`${patient}/selPatientMesL
 export const selSearchCriteriaList = params => axios.post(`${patient}/selSearchCriteriaList`, params);
 
 // 试题相关接口：按code查看题目信息，code为空则查询全部
-export const queryAll = params => axios.post(`${tcm}/question/queryAll`, params);
+export const queryAll = params => axios.post(`${tcm}/question/query`, params);
+
 // 查询所有对照组的信息
 export const getQuery = params => axios.post(`${inpatient}/query`, params);
 
@@ -42,9 +52,15 @@ export const complete = params => axios.post(`${statistics}/complete`, params);
 // 查询病例分析
 export const countAnalysis = params => axios.post(`${statistics}/countAnalysis`, params);
 
+// 查询各医院病例完成情况
+export const HospitalComplete = params => axios.post(`${statistics}/hospital/complete`, params);
+
 // 查询每日病例统计
 export const countCase = params => axios.post(`${statistics}/countCase`, params);
 
+// 统计生物样本数量
+export const selAllYBS = params => axios.get(`${biologicalSamples}/selAllYBS`);
+
 // 添加会议记录
 export const saveConRec = params => axios.post(`${conferenceRecords}/save`, params);
 
diff --git a/src/store/modules/home/mutations.js b/src/store/modules/home/mutations.js
index 4243873..bd5bb3b 100644
--- a/src/store/modules/home/mutations.js
+++ b/src/store/modules/home/mutations.js
@@ -55,6 +55,15 @@ const mutations = {
   setPtProps(state, data) {
     state.ptProps = data;
   },
+
+  /**
+   * 设置医院Id
+   * @param {object} state
+   * @param {string} data
+   */
+  setHospitalId(state, data) {
+    state.hospitalId = data;
+  },
 };
 
 export default mutations;
diff --git a/src/store/modules/home/state.js b/src/store/modules/home/state.js
index 94f0536..f22404e 100644
--- a/src/store/modules/home/state.js
+++ b/src/store/modules/home/state.js
@@ -5,6 +5,7 @@ const state = {
   patientId: '', // 病患id
   previewInfo: { host: '', place: '', startTime: '', endTime: '', participants: '', meetingMinutes: '', discussionContent: '' }, // 预览信息
   ptProps: null, // 接受PT传过来的 pluginId，projectId，roleId，taskId，userId
+  hospitalId: '',
 };
 
 export default state;
diff --git a/src/views/CaseSearch/CaseSearch.vue b/src/views/CaseSearch/CaseSearch.vue
index f92d78f..fb77717 100644
--- a/src/views/CaseSearch/CaseSearch.vue
+++ b/src/views/CaseSearch/CaseSearch.vue
@@ -1,6 +1,30 @@
 <template>
   <div class="flex-column">
-    病例搜索
+    <div>
+      <div class="d-flex flex-row flex-wrap">
+        <a-form :form="form1" class="d-flex flex-wrap align-center" layout="inline">
+          <a-form-item>
+            <a-select placeholder="请选择医院" style="min-width: 150px" v-decorator="['hospital']" @change="chooseHos($event, 1)">
+              <a-select-option :key="item.id" :value="item.id" v-for="item in hospitals">{{ item.name }}</a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item>
+            <a-input placeholder="患者住院号" style="width: 14em" v-model="setObj.hospitalization" />
+          </a-form-item>
+          <a-form-item>
+            <a-select placeholder="请选择对照组" style="min-width: 450px" @change="chooseHos($event, 2)">
+              <a-select-option :key="item.id" :value="item.id" v-for="item in controlGroups">{{ item.name }}</a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item>
+            <a-select placeholder="请选择录入状态" style="min-width: 150px" @change="chooseHos($event, 3)">
+              <a-select-option :key="item.id" :value="item.id" v-for="item in statusList">{{ item.name }}</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-form>
+        <div class="flex-1"></div>
+      </div>
+    </div>
     <a-form :form="form">
       <!-- 首先遍历整个data大数组 -->
       <div v-for="(item, index) in list" :key="index">
@@ -11,250 +35,686 @@
         <!-- 一级标题下的各种问题（questionVos），判断类型1-12，展示不同需要填写的内容 -->
         <div v-for="a in item.questionVos" :key="a.name">
           <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" :label="a.question">
-            <a-input v-if="a.type === 1" @change="onChange($event, a.type, a.id)" />
-            <a-textarea v-else-if="a.type === 2" style="height: 100px" @change="onChange($event, a.type, a.id)" />
-            <a-radio-group v-else-if="a.type === 3" v-model="value" @change="onChange($event, a.type, a.id)">
-              <a-radio :style="radioStyle" value="高血压"> 没有单选题 </a-radio>
-              <a-radio :style="radioStyle" value="高血脂"> 没有单选题 </a-radio>
-              <a-radio :style="radioStyle" value="高血糖"> 没有单选题 </a-radio>
+            <a-input v-if="a.type === 1" @change="onChange($event, a.type, a.id, a.recordId)" />
+            <a-textarea v-else-if="a.type === 2" style="height: 100px" @change="onChange($event, a.type, a.id, a.recordId)" />
+            <a-radio-group v-else-if="a.type === 3" v-model="value" @change="onChange($event, a.type, a.id, a.recordId)">
+              <a-radio v-for="(b, c) in a.optionVos" :key="c" :style="radioStyle" :value="b.showValue"> {{ b.showValue }} </a-radio>
             </a-radio-group>
-            <a-checkbox-group v-else-if="a.type === 4" @change="onChange($event, a.type, a.id)">
+            <a-checkbox-group v-else-if="a.type === 4" @change="onChange($event, a.type, a.id, a.recordId)">
               <a-row>
-                <a-col :span="8">
-                  <a-checkbox value="A"> A </a-checkbox>
-                </a-col>
-                <a-col :span="8">
-                  <a-checkbox value="B"> B </a-checkbox>
-                </a-col>
-                <a-col :span="8">
-                  <a-checkbox value="C"> C </a-checkbox>
+                <a-col :span="24" v-for="(ques, indexNum) in a.optionVos" :key="indexNum">
+                  <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
                 </a-col>
               </a-row>
             </a-checkbox-group>
-            <a-select v-else-if="a.type === 5" default-value="lucy" style="width: 120px" loading @change="onChange($event, a.type, a.id)">
-              <a-select-option value="1"> Lucy1 </a-select-option>
-              <a-select-option value="2"> Lucy2 </a-select-option>
-              <a-select-option value="3"> Lucy3 </a-select-option>
-              <a-select-option value="4"> Lucy4 </a-select-option>
+            <a-select v-else-if="a.type === 5" style="width: 120px" @change="onChange($event, a.type, a.id, a.recordId)">
+              <a-select-option v-for="(b, c) in a.optionVos" :key="c" :value="b.showValue"> {{ b.showValue }} </a-select-option>
             </a-select>
-            <a-date-picker show-time placeholder="日期时间选择" v-else-if="a.type === 6" @change="onChange($event, a.type, a.id)" />
-            <a-upload v-else-if="a.type === 7">
-              <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
-              <div v-else>
-                <a-icon :type="loading ? 'loading' : 'plus'" />
-                <div class="ant-upload-text">Upload</div>
-              </div>
+            <a-date-picker
+              show-time
+              placeholder="日期时间选择"
+              v-else-if="a.type === 6"
+              @change="onChange($event, a.type, a.id, a.recordId)"
+            />
+            <a-upload
+              v-else-if="a.type === 7"
+              :action="action"
+              :default-file-list="fileList"
+              :headers="headers"
+              list-type="picture"
+              @change="fileChange($event, a.id)"
+              name="files"
+            >
+              <a-button v-show="fileList.length === 0"> <a-icon type="upload" /> 点击上传 </a-button>
             </a-upload>
-            <a-radio-group v-else-if="a.type === 8" v-model="value" @change="onChange($event, a.type, a.id)">
-              <a-radio :style="radioStyle" value="高血压"> 高血压 </a-radio>
-              <a-radio :style="radioStyle" value="高血脂"> 高血脂 </a-radio>
-              <a-radio :style="radioStyle" value="高血糖"> 高血糖 </a-radio>
-              <!-- <a-radio :style="radioStyle" :value="4">
-                其它
-                <a-input v-if="value === 4" :style="{ width: 100, marginLeft: 10 }" />
-              </a-radio> -->
+            <a-radio-group v-else-if="a.type === 8" v-model="value" @change="onChange($event, a.type, a.id, a.recordId)">
+              <a-radio-group @change="onChange($event, a.type, a.id, a.recordId)">
+                <a-radio v-for="(f, g) in a.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                  {{ f.showValue }}
+                </a-radio>
+              </a-radio-group>
+              <div v-for="(j, k) in a.optionVos" :key="k">
+                <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">
+                    <a-input style="width: 200px" @change="inputChange(a.id, $event, j.showValue)"></a-input>
+                  </a-form-item>
+                </div>
+              </div>
             </a-radio-group>
-            <a-checkbox-group v-else-if="a.type === 9" @change="onChange($event, a.type, a.id)">
+            <a-checkbox-group v-else-if="a.type === 9" @change="onChange($event, a.type, a.id, a.recordId)">
               <a-row>
                 <a-col :span="24" v-for="(ques, indexNum) in a.optionVos" :key="indexNum">
                   <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
                 </a-col>
                 <a-col :span="100">
-                  <a-input
-                    v-if="
-                      contentList.find(item => {
-                        return (
-                          item.testQuestionsId === a.id &&
-                          item.contents.find(a => {
-                            return a === '其他';
-                          })
-                        );
-                      })
-                    "
-                    :style="{ width: 100, marginLeft: 10 }"
-                  />
+                  <div v-for="(j, k) in a.optionVos" :key="k">
+                    <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">
+                        <a-input style="width: 200px" @change="inputChange(a.id, $event, j.showValue)"></a-input>
+                      </a-form-item>
+                    </div>
+                  </div>
                 </a-col>
               </a-row>
             </a-checkbox-group>
             <div v-else-if="a.type === 10">
-              <a-select default-value="lucy" style="width: 120px" loading>
-                <a-select-option value="1"> 1 </a-select-option>
-                <a-select-option value="2"> 2 </a-select-option>
+              <a-select style="width: 120px" @change="onChange($event, a.type, a.id, a.recordId)">
+                <a-select-option v-for="(b, c) in a.optionVos" :key="c" :value="b.showValue"> {{ b.showValue }} </a-select-option>
               </a-select>
-              <a-input v-if="value === 2"></a-input>
+              <div v-for="(b, c) in a.optionVos" :key="c">
+                <div
+                  v-if="
+                    contentList.find(item => {
+                      return item.testQuestionsId === a.id && item.contents === `${b.showValue}`;
+                    }) && b.afterOperation === 1
+                  "
+                >
+                  <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+                    <a-input style="width: 200px" @change="inputChange(a.id, $event, b.showValue)"></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-checkbox-group @change="onChange($event, a.type, a.id, a.recordId)">
                 <a-row>
                   <a-col :span="24" v-for="(ques, indexNum) in a.optionVos" :key="indexNum">
                     <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
                   </a-col>
                   <a-col :span="100">
-                    <a-input
-                      v-if="
-                        contentList.find(item => {
-                          return (
-                            item.testQuestionsId === a.id &&
-                            item.contents.find(a => {
-                              return a === '其他';
-                            })
-                          );
-                        })
-                      "
-                      :style="{ width: 100, marginLeft: 10 }"
-                    />
+                    <div v-for="(b, c) in a.optionVos" :key="c">
+                      <div
+                        v-if="
+                          contentList.find(item => {
+                            return item.testQuestionsId === a.id && item.contents.find(content => content === `${b.showValue}`);
+                          }) && b.afterOperation > 0
+                        "
+                      >
+                        <a-input style="width: 200px" @change="inputChange(a.id, $event, b.showValue)"></a-input>
+                      </div>
+                    </div>
                   </a-col>
                 </a-row>
-                说明： <a-input :style="{ width: 100, marginLeft: 10 }" />
+                说明： <a-input style="width: 200px" @change="explainChange(a.id, $event)" />
               </a-checkbox-group>
             </div>
             <!-- 当类型为12时，为单选+关联 -->
             <div v-else-if="a.type === 12">
-              <a-radio-group @change="onChange($event, a.type, a.id)">
-                <a-radio :style="radioStyle" :value="1"> 高血压 </a-radio>
-                <a-radio :style="radioStyle" :value="2"> 高血脂 </a-radio>
-                <a-radio :style="radioStyle" :value="3"> 高血糖 </a-radio>
-                <a-radio :style="radioStyle" :value="4">
-                  其它
-                  <a-input v-if="value === 4" :style="{ width: 100, marginLeft: 10 }" />
+              <a-radio-group @change="onChange($event, a.type, a.id, a.recordId)">
+                <a-radio v-for="(f, g) in a.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                  {{ f.showValue }}
                 </a-radio>
               </a-radio-group>
+              <div v-for="(j, k) in a.optionVos" :key="k">
+                <div
+                  v-if="
+                    contentList.find(item => {
+                      return item.testQuestionsId === a.id && item.contents === `${j.showValue}`;
+                    }) && j.afterOperation > 0
+                  "
+                >
+                  <div v-for="(h, i) in j.questionVos" :key="i">
+                    <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" :label="h.question">
+                      <a-input
+                        v-if="j.afterOperation === 1"
+                        style="width: 200px"
+                        @change="inputChange(a.id, $event, j.showValue)"
+                      ></a-input>
+                      <a-textarea v-else-if="j.afterOperation === 2" @change="inputChange(a.id, $event, j.showValue)"></a-textarea>
+                      <div v-else-if="j.afterOperation === 3">
+                        <div v-for="ohter in j.questionVos" :key="ohter.id">
+                          <a-form-item
+                            :label-col="formItemLayout.labelCol"
+                            :wrapper-col="formItemLayout.wrapperCol"
+                            :label="ohter.question"
+                          >
+                            <a-input v-if="ohter.type === 1" @change="onChange($event, ohter.type, ohter.id, ohter.recordId)" />
+                            <a-textarea
+                              v-else-if="ohter.type === 2"
+                              style="height: 100px"
+                              @change="onChange($event, ohter.type, ohter.id)"
+                            />
+                            <a-radio-group
+                              v-else-if="ohter.type === 3"
+                              v-model="value"
+                              @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
+                            >
+                              <a-radio v-for="(b, c) in ohter.optionVos" :key="c" :style="radioStyle" :value="b.showValue">
+                                {{ b.showValue }}
+                              </a-radio>
+                            </a-radio-group>
+                            <a-checkbox-group v-else-if="ohter.type === 4" @change="onChange($event, ohter.type, ohter.id, ohter.recordId)">
+                              <a-row>
+                                <a-col :span="24" v-for="(ques, indexNum) in ohter.optionVos" :key="indexNum">
+                                  <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
+                                </a-col>
+                              </a-row>
+                            </a-checkbox-group>
+                            <a-select
+                              v-else-if="ohter.type === 5"
+                              style="width: 120px"
+                              @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
+                            >
+                              <a-select-option v-for="(b, c) in ohter.optionVos" :key="c" :value="b.showValue">
+                                {{ b.showValue }}
+                              </a-select-option>
+                            </a-select>
+                            <a-date-picker
+                              show-time
+                              placeholder="日期时间选择"
+                              v-else-if="ohter.type === 6"
+                              @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
+                            />
+                            <a-upload
+                              v-else-if="ohter.type === 7"
+                              :action="action"
+                              :headers="headers"
+                              :default-file-list="fileList"
+                              list-type="picture"
+                              @change="fileChange($event, ohter.id)"
+                              name="files"
+                            >
+                              <a-button v-show="fileList.length === 0"> <a-icon type="upload" /> 点击上传 </a-button>
+                            </a-upload>
+                            <a-radio-group
+                              v-else-if="ohter.type === 8"
+                              v-model="value"
+                              @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
+                            >
+                              <a-radio-group @change="onChange($event, ohter.type, ohter.id)">
+                                <a-radio v-for="(f, g) in ohter.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                                  {{ f.showValue }}
+                                </a-radio>
+                              </a-radio-group>
+                              <div v-for="(m, n) in ohter.optionVos" :key="n">
+                                <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 style="width: 200px" @change="inputChange(ohter.id, $event, m.showValue)"></a-input>
+                                  </a-form-item>
+                                </div>
+                              </div>
+                            </a-radio-group>
+                            <a-checkbox-group v-else-if="ohter.type === 9" @change="onChange($event, ohter.type, ohter.id, ohter.recordId)">
+                              <a-row>
+                                <a-col :span="24" v-for="(ques, indexNum) in ohter.optionVos" :key="indexNum">
+                                  <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
+                                </a-col>
+                                <a-col :span="100">
+                                  <div v-for="(m, n) in ohter.optionVos" :key="n">
+                                    <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 style="width: 200px" @change="inputChange(ohter.id, $event, m.showValue)"></a-input>
+                                      </a-form-item>
+                                    </div>
+                                  </div>
+                                </a-col>
+                              </a-row>
+                            </a-checkbox-group>
+                            <div v-else-if="ohter.type === 10">
+                              <a-select style="width: 120px" @change="onChange($event, ohter.type, ohter.id, ohter.recordId)">
+                                <a-select-option v-for="(b, c) in ohter.optionVos" :key="c" :value="b.showValue">
+                                  {{ b.showValue }}
+                                </a-select-option>
+                              </a-select>
+                              <div v-for="(b, c) in ohter.optionVos" :key="c">
+                                <div
+                                  v-if="
+                                    contentList.find(item => {
+                                      return item.testQuestionsId === ohter.id && item.contents === `${b.showValue}`;
+                                    }) && b.afterOperation === 1
+                                  "
+                                >
+                                  <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+                                    <a-input style="width: 200px" @change="inputChange(ohter.id, $event, b.showValue)"></a-input>
+                                  </a-form-item>
+                                </div>
+                              </div>
+                            </div>
+                            <div v-else-if="ohter.type === 11">
+                              <a-checkbox-group @change="onChange($event, ohter.type, ohter.id, ohter.recordId)">
+                                <a-row>
+                                  <a-col :span="24" v-for="(ques, indexNum) in ohter.optionVos" :key="indexNum">
+                                    <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
+                                  </a-col>
+                                  <a-col :span="100">
+                                    <div v-for="(b, c) in ohter.optionVos" :key="c">
+                                      <div
+                                        v-if="
+                                          contentList.find(item => {
+                                            return (
+                                              item.testQuestionsId === ohter.id &&
+                                              item.contents.find(content => content === `${b.showValue}`)
+                                            );
+                                          }) && b.afterOperation > 0
+                                        "
+                                      >
+                                        <a-input style="width: 200px" @change="inputChange(ohter.id, $event, b.showValue)"></a-input>
+                                      </div>
+                                    </div>
+                                  </a-col>
+                                </a-row>
+                                说明： <a-input style="width: 200px" @change="explainChange(ohter.id, $event)" />
+                              </a-checkbox-group>
+                            </div>
+                            <!-- 当类型为12时，为单选+关联 -->
+                            <div v-else-if="ohter.type === 12">
+                              <a-radio-group @change="onChange($event, ohter.type, ohter.id, ohter.recordId)">
+                                <a-radio v-for="(f, g) in ohter.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                                  {{ f.showValue }}
+                                </a-radio>
+                              </a-radio-group>
+                              <div v-for="(m, n) in ohter.optionVos" :key="n">
+                                <div
+                                  v-if="
+                                    contentList.find(item => {
+                                      return item.testQuestionsId === ohter.id && item.contents === `${m.showValue}`;
+                                    }) && m.afterOperation > 0
+                                  "
+                                >
+                                  <div v-for="(p, q) in m.questionVos" :key="q">
+                                    <a-form-item
+                                      :label-col="formItemLayout.labelCol"
+                                      :wrapper-col="formItemLayout.wrapperCol"
+                                      :label="p.question"
+                                    >
+                                      <a-input
+                                        v-if="m.afterOperation === 1"
+                                        style="width: 200px"
+                                        @change="inputChange(ohter.id, $event, m.showValue)"
+                                      ></a-input>
+                                      <a-textarea
+                                        v-else-if="m.afterOperation === 2"
+                                        @change="inputChange(ohter.id, $event, m.showValue)"
+                                      ></a-textarea>
+                                      <div v-else-if="m.afterOperation === 3">qwe</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)" />
+                            </div>
+                            <div v-else-if="ohter.type === 14">图片识别</div>
+                          </a-form-item>
+                        </div>
+                      </div>
+                    </a-form-item>
+                  </div>
+                </div>
+              </div>
             </div>
             <div v-else-if="a.type === 13">
-              <a-input-number @change="onChange($event, a.type, a.id)" />
+              <a-input-number @change="onChange($event, a.type, a.id, a.recordId)" />
             </div>
             <div v-else-if="a.type === 14">图片识别</div>
           </a-form-item>
         </div>
         <!-- 一级标题下的各种二级标题（subReportCodes） -->
-        <div v-for="c in item.subReportCodes" :key="c.name">
+        <div v-for="w in item.subReportCodes" :key="w.name">
           <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
             <!-- 二级大标题 -->
-            <h3>{{ c.name }}：</h3>
+            <h3>{{ w.name }}：</h3>
           </a-form-item>
           <!-- 二级标题下的各种类型 -->
-          <div v-for="e in c.questionVos" :key="e.name">
+          <div v-for="e in w.questionVos" :key="e.name">
             <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" :label="e.question">
-              <a-input v-if="e.type === 1" @change="onChange($event, e.type, e.id)" />
-              <a-textarea v-else-if="e.type === 2" style="height: 100px" @change="onChange($event, e.type, e.id)" />
-              <a-radio-group v-else-if="e.type === 3" v-model="value" @change="onChange($event, e.type, e.id)">
-                <a-radio :style="radioStyle" value="高血压"> 没有单选题 </a-radio>
-                <a-radio :style="radioStyle" value="高血脂"> 没有单选题 </a-radio>
-                <a-radio :style="radioStyle" value="高血糖"> 没有单选题 </a-radio>
+              <a-input v-if="e.type === 1" @change="onChange($event, e.type, e.id, e.recordId)" />
+              <a-textarea v-else-if="e.type === 2" style="height: 100px" @change="onChange($event, e.type, e.id, e.recordId)" />
+              <a-radio-group v-else-if="e.type === 3" v-model="value" @change="onChange($event, e.type, e.id, e.recordId)">
+                <a-radio v-for="(b, c) in e.optionVos" :key="c" :style="radioStyle" :value="b.showValue"> {{ b.showValue }} </a-radio>
               </a-radio-group>
-              <a-checkbox-group v-else-if="e.type === 4" @change="onChange($event, e.type, e.id)">
+              <a-checkbox-group v-else-if="e.type === 4" @change="onChange($event, e.type, e.id, e.recordId)">
                 <a-row>
-                  <a-col :span="8">
-                    <a-checkbox value="A"> A </a-checkbox>
-                  </a-col>
-                  <a-col :span="8">
-                    <a-checkbox value="B"> B </a-checkbox>
-                  </a-col>
-                  <a-col :span="8">
-                    <a-checkbox value="C"> C </a-checkbox>
+                  <a-col :span="24" v-for="(ques, indexNum) in e.optionVos" :key="indexNum">
+                    <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
                   </a-col>
                 </a-row>
               </a-checkbox-group>
-              <a-select v-else-if="e.type === 5" default-value="lucy" style="width: 120px" loading @change="onChange($event, e.type, e.id)">
-                <a-select-option value="1"> Lucy1 </a-select-option>
-                <a-select-option value="2"> Lucy2 </a-select-option>
-                <a-select-option value="3"> Lucy3 </a-select-option>
-                <a-select-option value="4"> Lucy4 </a-select-option>
+              <a-select v-else-if="e.type === 5" style="width: 120px" @change="onChange($event, e.type, e.id, e.recordId)">
+                <a-select-option v-for="(b, c) in e.optionVos" :key="c" :value="b.showValue"> {{ b.showValue }} </a-select-option>
               </a-select>
-              <a-date-picker show-time placeholder="日期时间选择" v-else-if="e.type === 6" @change="onChange($event, e.type, e.id)" />
-              <a-upload v-else-if="e.type === 7">
-                <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
-                <div v-else>
-                  <a-icon :type="loading ? 'loading' : 'plus'" />
-                  <div class="ant-upload-text">Upload</div>
-                </div>
+              <a-date-picker
+                show-time
+                placeholder="日期时间选择"
+                v-else-if="e.type === 6"
+                @change="onChange($event, e.type, e.id, e.recordId)"
+              />
+              <a-upload
+                v-else-if="e.type === 7"
+                :action="action"
+                :default-file-list="fileList"
+                list-type="picture"
+                :headers="headers"
+                @change="fileChange($event, e.id, e.recordId)"
+                name="files"
+              >
+                <a-button v-show="fileList.length === 0"> <a-icon type="upload" /> 点击上传 </a-button>
               </a-upload>
-              <a-radio-group v-else-if="e.type === 8" v-model="value" @change="onChange($event, e.type, e.id)">
-                <a-radio :style="radioStyle" value="高血压"> 高血压 </a-radio>
-                <a-radio :style="radioStyle" value="高血脂"> 高血脂 </a-radio>
-                <a-radio :style="radioStyle" value="高血糖"> 高血糖 </a-radio>
-                <!-- <a-radio :style="radioStyle" :value="4">
-                其它
-                <a-input v-if="value === 4" :style="{ width: 100, marginLeft: 10 }" />
-              </a-radio> -->
+              <a-radio-group v-else-if="e.type === 8" v-model="value" @change="onChange($event, e.type, e.id, e.recordId)">
+                <a-radio-group @change="onChange($event, e.type, e.id)">
+                  <a-radio v-for="(f, g) in e.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                    {{ f.showValue }}
+                  </a-radio>
+                </a-radio-group>
+                <div v-for="(j, k) in e.optionVos" :key="k">
+                  <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">
+                      <a-input style="width: 200px" @change="inputChange(e.id, $event, j.showValue)"></a-input>
+                    </a-form-item>
+                  </div>
+                </div>
               </a-radio-group>
-              <a-checkbox-group v-else-if="e.type === 9" @change="onChange($event, e.type, e.id)">
+              <a-checkbox-group v-else-if="e.type === 9" @change="onChange($event, e.type, e.id, e.recordId)">
                 <a-row>
-                  <a-col :span="12" v-for="(ques, indexNum) in e.optionVos" :key="indexNum">
+                  <a-col :span="24" v-for="(ques, indexNum) in e.optionVos" :key="indexNum">
                     <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
                   </a-col>
-                  {{ e.id }}
                   <a-col :span="100">
-                    <a-input
-                      v-if="
-                        contentList.find(item => {
-                          return (
-                            item.testQuestionsId === e.id &&
-                            item.contents.find(a => {
-                              return a === '其他';
-                            })
-                          );
-                        })
-                      "
-                      :style="{ width: 100, marginLeft: 10 }"
-                    />
+                    <div v-for="(j, k) in e.optionVos" :key="k">
+                      <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">
+                          <a-input style="width: 200px" @change="inputChange(e.id, $event, j.showValue)"></a-input>
+                        </a-form-item>
+                      </div>
+                    </div>
                   </a-col>
                 </a-row>
               </a-checkbox-group>
               <div v-else-if="e.type === 10">
-                <a-select default-value="lucy" style="width: 120px" loading>
-                  <a-select-option value="1"> 1 </a-select-option>
-                  <a-select-option value="2"> 2 </a-select-option>
+                <a-select style="width: 120px" @change="onChange($event, e.type, e.id, e.recordId)">
+                  <a-select-option v-for="(b, c) in e.optionVos" :key="c" :value="b.showValue"> {{ b.showValue }} </a-select-option>
                 </a-select>
-                <a-input v-if="value === 2"></a-input>
+                <div v-for="(b, c) in e.optionVos" :key="c">
+                  <div
+                    v-if="
+                      contentList.find(item => {
+                        return item.testQuestionsId === e.id && item.contents === `${b.showValue}`;
+                      }) && b.afterOperation === 1
+                    "
+                  >
+                    <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+                      <a-input style="width: 200px" @change="inputChange(e.id, $event, b.showValue)"></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)">
+                <a-checkbox-group @change="onChange($event, e.type, e.id, e.recordId)">
                   <a-row>
-                    <a-col :span="12">
-                      <a-checkbox value="A"> A </a-checkbox>
-                    </a-col>
-                    <a-col :span="12">
-                      <a-checkbox value="B"> B </a-checkbox>
+                    <a-col :span="24" v-for="(ques, indexNum) in e.optionVos" :key="indexNum">
+                      <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
                     </a-col>
-                    <a-col :span="12">
-                      <a-checkbox value="C"> 其他 </a-checkbox>
+                    <a-col :span="100">
+                      <div v-for="(b, c) in e.optionVos" :key="c">
+                        <div
+                          v-if="
+                            contentList.find(item => {
+                              return item.testQuestionsId === e.id && item.contents.find(content => content === `${b.showValue}`);
+                            }) && b.afterOperation > 0
+                          "
+                        >
+                          <a-input style="width: 200px" @change="inputChange(e.id, $event, b.showValue)"></a-input>
+                        </div>
+                      </div>
                     </a-col>
                   </a-row>
-                  <a-input v-if="value === 4" :style="{ width: 100, marginLeft: 10 }" />
-                  说明： <a-input :style="{ width: 100, marginLeft: 10 }" />
+                  说明： <a-input style="width: 200px" @change="explainChange(e.id, $event)" />
                 </a-checkbox-group>
               </div>
               <!-- 当类型为12时，为单选+关联 -->
               <div v-else-if="e.type === 12">
-                <a-radio-group @change="onChange($event, e.type, e.id)">
-                  <a-radio :style="radioStyle" :value="1"> 高血压 </a-radio>
-                  <a-radio :style="radioStyle" :value="2"> 高血脂 </a-radio>
-                  <a-radio :style="radioStyle" :value="3"> 高血糖 </a-radio>
-                  <a-radio :style="radioStyle" :value="4">
-                    其它
-                    <a-input v-if="value === 4" :style="{ width: 100, marginLeft: 10 }" />
+                <a-radio-group @change="onChange($event, e.type, e.id, e.recordId)">
+                  <a-radio v-for="(f, g) in e.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                    {{ f.showValue }}
                   </a-radio>
                 </a-radio-group>
+                <div v-for="(j, k) in e.optionVos" :key="k">
+                  <div
+                    v-if="
+                      contentList.find(item => {
+                        return item.testQuestionsId === e.id && item.contents === `${j.showValue}`;
+                      }) && j.afterOperation > 0
+                    "
+                  >
+                    <div v-for="(h, i) in j.questionVos" :key="i">
+                      <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" :label="h.question">
+                        <a-input
+                          v-if="j.afterOperation === 1"
+                          style="width: 200px"
+                          @change="inputChange(e.id, $event, j.showValue)"
+                        ></a-input>
+                        <a-textarea v-else-if="j.afterOperation === 2" @change="inputChange(e.id, $event, j.showValue)"></a-textarea>
+                        <div v-else-if="j.afterOperation === 3">
+                          <a-form-item>
+                            <a-input v-if="h.type === 1" @change="onChange($event, h.type, h.id, h.h.recordId)" />
+                            <a-textarea
+                              v-else-if="h.type === 2"
+                              style="height: 100px"
+                              @change="onChange($event, h.type, h.id, h.recordId)"
+                            />
+                            <a-radio-group v-else-if="h.type === 3" v-model="value" @change="onChange($event, h.type, h.id, h.recordId)">
+                              <a-radio v-for="(b, c) in h.optionVos" :key="c" :style="radioStyle" :value="b.showValue">
+                                {{ b.showValue }}
+                              </a-radio>
+                            </a-radio-group>
+                            <a-checkbox-group v-else-if="h.type === 4" @change="onChange($event, h.type, h.id, h.recordId)">
+                              <a-row>
+                                <a-col :span="24" v-for="(ques, indexNum) in h.optionVos" :key="indexNum">
+                                  <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
+                                </a-col>
+                              </a-row>
+                            </a-checkbox-group>
+                            <a-select v-else-if="h.type === 5" style="width: 120px" @change="onChange($event, h.type, h.id, h.recordId)">
+                              <a-select-option v-for="(b, c) in h.optionVos" :key="c" :value="b.showValue">
+                                {{ b.showValue }}
+                              </a-select-option>
+                            </a-select>
+                            <a-date-picker
+                              show-time
+                              placeholder="日期时间选择"
+                              v-else-if="h.type === 6"
+                              @change="onChange($event, h.type, h.id, h.recordId)"
+                            />
+                            <a-upload
+                              v-else-if="h.type === 7"
+                              :action="action"
+                              :default-file-list="fileList"
+                              list-type="picture"
+                              :headers="headers"
+                              @change="fileChange($event, h.id)"
+                              name="files"
+                            >
+                              <a-button v-show="fileList.length === 0"> <a-icon type="upload" /> 点击上传 </a-button>
+                            </a-upload>
+                            <a-radio-group v-else-if="h.type === 8" v-model="value" @change="onChange($event, h.type, h.id, h.recordId)">
+                              <a-radio-group @change="onChange($event, h.type, h.id, h.recordId)">
+                                <a-radio v-for="(f, g) in h.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                                  {{ f.showValue }}
+                                </a-radio>
+                              </a-radio-group>
+                              <div v-for="(m, n) in h.optionVos" :key="n">
+                                <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">
+                                    <a-input style="width: 200px" @change="inputChange(h.id, $event, m.showValue)"></a-input>
+                                  </a-form-item>
+                                </div>
+                              </div>
+                            </a-radio-group>
+                            <a-checkbox-group v-else-if="h.type === 9" @change="onChange($event, h.type, h.id, h.recordId)">
+                              <a-row>
+                                <a-col :span="24" v-for="(ques, indexNum) in h.optionVos" :key="indexNum">
+                                  <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
+                                </a-col>
+                                <a-col :span="100">
+                                  <div v-for="(m, n) in h.optionVos" :key="n">
+                                    <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">
+                                        <a-input style="width: 200px" @change="inputChange(h.id, $event, m.showValue)"></a-input>
+                                      </a-form-item>
+                                    </div>
+                                  </div>
+                                </a-col>
+                              </a-row>
+                            </a-checkbox-group>
+                            <div v-else-if="h.type === 10">
+                              <a-select style="width: 120px" @change="onChange($event, h.type, h.id, h.recordId)">
+                                <a-select-option v-for="(b, c) in h.optionVos" :key="c" :value="b.showValue">
+                                  {{ b.showValue }}
+                                </a-select-option>
+                              </a-select>
+                              <div v-for="(b, c) in h.optionVos" :key="c">
+                                <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">
+                                    <a-input style="width: 200px" @change="inputChange(h.id, $event, b.showValue)"></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)">
+                                <a-row>
+                                  <a-col :span="24" v-for="(ques, indexNum) in h.optionVos" :key="indexNum">
+                                    <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
+                                  </a-col>
+                                  <a-col :span="100">
+                                    <div v-for="(b, c) in h.optionVos" :key="c">
+                                      <div
+                                        v-if="
+                                          contentList.find(item => {
+                                            return (
+                                              item.testQuestionsId === h.id && item.contents.find(content => content === `${b.showValue}`)
+                                            );
+                                          }) && b.afterOperation > 0
+                                        "
+                                      >
+                                        <a-input style="width: 200px" @change="inputChange(h.id, $event, b.showValue)"></a-input>
+                                      </div>
+                                    </div>
+                                  </a-col>
+                                </a-row>
+                                说明： <a-input style="width: 200px" @change="explainChange(h.id, $event)" />
+                              </a-checkbox-group>
+                            </div>
+                            <!-- 当类型为12时，为单选+关联 -->
+                            <div v-else-if="h.type === 12">
+                              <a-radio-group @change="onChange($event, h.type, h.id, h.recordId)">
+                                <a-radio v-for="(f, g) in h.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                                  {{ f.showValue }}
+                                </a-radio>
+                              </a-radio-group>
+                              <div v-for="(m, n) in h.optionVos" :key="n">
+                                <div
+                                  v-if="
+                                    contentList.find(item => {
+                                      return item.testQuestionsId === h.id && item.contents === `${m.showValue}`;
+                                    }) && m.afterOperation > 0
+                                  "
+                                >
+                                  <div v-for="(p, q) in m.questionVos" :key="q">
+                                    <a-form-item
+                                      :label-col="formItemLayout.labelCol"
+                                      :wrapper-col="formItemLayout.wrapperCol"
+                                      :label="p.question"
+                                    >
+                                      <a-input
+                                        v-if="m.afterOperation === 1"
+                                        style="width: 200px"
+                                        @change="inputChange(h.id, $event, m.showValue)"
+                                      ></a-input>
+                                      <a-textarea
+                                        v-else-if="m.afterOperation === 2"
+                                        @change="inputChange(h.id, $event, m.showValue)"
+                                      ></a-textarea>
+                                      <div v-else-if="m.afterOperation === 3">qwe</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)" />
+                            </div>
+                            <div v-else-if="h.type === 14">图片识别</div>
+                          </a-form-item>
+                        </div>
+                      </a-form-item>
+                    </div>
+                  </div>
+                </div>
               </div>
               <div v-else-if="e.type === 13">
-                <a-input-number @change="onChange($event, e.type, e.id)" />
+                <a-input-number @change="onChange($event, e.type, e.id, e.recordId)" />
               </div>
               <div v-else-if="e.type === 14">图片识别</div>
             </a-form-item>
           </div>
         </div>
       </div>
-      <!-- <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-button class="white--text px-10" type="primary" @click="setData()">提交</a-button>
+    <a-button class="white--text px-10" type="primary" @click="setData()" v-if="list.length > 0">提交</a-button>
+    <case-table :lists="lists" @setData="setData" class="mt-3" />
   </div>
 </template>
 
 <script>
-import { selSearchCriteriaList, saveCaseMes } from 'config/api';
+import { mapState, mapActions } from 'vuex';
+import { getHList, selSearchCriteriaList, queryAll, selPatientMesList, upload } from 'config/api';
+import CaseTable from 'components/CaseTable/CaseTable.vue';
 const formItemLayout = {
   labelCol: { span: 6 },
   wrapperCol: { span: 9 },
@@ -262,11 +722,14 @@ const formItemLayout = {
 const tailItemLayout = { wrapperCol: { span: 18, offset: 4 } };
 export default {
   name: 'CaseSearch',
+  components: { CaseTable },
   data() {
     return {
       formItemLayout,
       tailItemLayout,
       form: this.$form.createForm(this, { name: 'page-add' }),
+      form1: this.$form.createForm(this, { name: 'search' }),
+      hospitals: [],
       value: 1,
       radioStyle: {
         display: 'block',
@@ -276,14 +739,84 @@ export default {
       list: [],
       contentList: [],
       numList: [1, 2, 3, 4, 5],
+      setObj: {
+        hospitalId: '', // 选择的医院Id
+        hospitalization: '', // 输入的住院号
+        inpatientId: '', // 选择的对照组Id
+        inputStatus: '', // 选择的录入状态
+      },
+      action: upload, // 上传附件地址
+      fileList: [], // 附件列表
+      files: '', // 附件Id
+      dateFormat: 'YYYY-MM-DD',
+      dateChoose: new Date(),
+      subDateTime: '',
+      statusList: [
+        {
+          id: 0,
+          name: '新建',
+        },
+        {
+          id: 1,
+          name: '数据搜集中',
+        },
+        {
+          id: 2,
+          name: '数据搜集完成',
+        },
+        {
+          id: 3,
+          name: '数据搜集超时',
+        },
+        {
+          id: 4,
+          name: '废弃',
+        },
+      ],
+      lists: { pageNum: 1, pageSize: 10, total: 1, list: [] },
     };
   },
-
+  computed: {
+    ...mapState('home', ['patientId', 'controlGroups']),
+    // 上传附加请求头
+    headers() {
+      const token = sessionStorage.getItem('anyringToken');
+      return { Authorization: `Bearer ${token}` };
+    },
+  },
   created() {
+    this.getControlGroups();
     this.handleSearchCriteriaList();
+    this.getHos();
+    this.setData();
   },
 
   methods: {
+    ...mapActions('home', ['getControlGroups']),
+    // 选择医院
+    chooseHos(e, type) {
+      if (type === 1) {
+        this.setObj.hospitalId = parseInt(e);
+      } else if (type === 2) {
+        this.setObj.inpatientId = parseInt(e);
+      } else if (type === 3) {
+        this.setObj.inputStatus = parseInt(e);
+      }
+    },
+    // 获取所有医院
+    async getHos() {
+      try {
+        const res = await getHList();
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          this.hospitals = data;
+        } else {
+          this.$message.error('查询医院列表失败');
+        }
+      } catch (error) {
+        this.$message.error('查询医院列表失败');
+      }
+    },
     async handleSearchCriteriaList() {
       try {
         const params = {};
@@ -300,88 +833,131 @@ export default {
         throw new Error(`CaseSearch.vue method selSearchCriteriaList: ${error}`);
       }
     },
-    onChange(e, type, id) {
+    onChange(e, type, id, recordId) {
       // 监听所有得题目类型得填写情况（改变事件）
       if (this.contentList.find(item => item.testQuestionsId === id)) {
         if (type === 1) {
           // 单行文本框
-          this.forFn(id, e.target.value);
+          this.forFn(id, e.target.value, recordId);
         } else if (type === 2) {
           // 多行文本框
-          this.forFn(id, e.target.value);
+          this.forFn(id, e.target.value, recordId);
         } else if (type === 3) {
           // 单选
-          this.forFn(id, e.target.value);
+          this.forFn(id, e.target.value, recordId);
         } else if (type === 4) {
           // 多选
-          alert('多选，没有这类的题，先参考多选+其他类型的题，那个有');
-          // this.forFn(id, e);
+          // 删除上次答题的所有答案
+          this.ergodicList(id);
+          // 遍历本次答案，添加到数组中
+          for (let i = 0; i < e.length; i++) {
+            this.failFn(id, e[i], recordId);
+          }
         } else if (type === 5) {
           // 下拉框
-          this.forFn(id, e);
+          this.forFn(id, e, recordId);
         } else if (type === 6) {
           // 日期时间选择器，给后台返回的值是  2020-01-01 00:00:00 的格式
-          // console.log(this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'));
-          this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'));
+          this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'), recordId);
         } else if (type === 7) {
-          alert('上传文件，先控下');
+          alert('上传文件，先空下');
         } else if (type === 8) {
           // 单选 + 其他
-          console.log(e.target.value);
-          // alert('暂时没有单选 + 其他类型的题，等导入题型之后再改');
+          // 删除上次答题的所有答案
+          this.ergodicList(id);
+          this.failFn(id, e.target.value, recordId);
         } else if (type === 9) {
-          this.forFn(id, e);
           // 多选 + 其他
+          // 如果type === 9 : 删除所有选项，重新添加，文本框继续存在，可以存给后台
+          for (let i = 0; i < this.contentList.length; i++) {
+            if (id === this.contentList[i].testQuestionsId && !this.contentList[i].type) {
+              this.contentList.splice(i, 1);
+              i -= 1;
+            }
+          }
+          // 遍历本次答案，添加到数组中
+          for (let i = 0; i < e.length; i++) {
+            this.failFn(id, e[i], recordId);
+          }
         } else if (type === 10) {
           // 下拉 + 其他
+          // 删除所有本题的答案（包括 选项 和 文本框）
+          this.ergodicList(id);
+          // 添加本次答题的选项
+          this.failFn(id, e, recordId);
         } else if (type === 11) {
           // 多选 + 其他 + 说明
-          this.forFn(id, e);
+          // 如果type === 11 : 删除所有选项，重新添加，文本框继续存在，可以存给后台
+          for (let i = 0; i < this.contentList.length; i++) {
+            if (id === this.contentList[i].testQuestionsId && !this.contentList[i].type) {
+              this.contentList.splice(i, 1);
+              i -= 1;
+            }
+          }
+          // 遍历本次答案，添加到数组中
+          for (let i = 0; i < e.length; i++) {
+            this.failFn(id, e[i], recordId);
+          }
         } else if (type === 12) {
           // 单选 + 关联其他内容
+          // console.log(e.target.value, type, id);
+          this.forFn(id, e.target.value, recordId);
         } else if (type === 13) {
           // 数字类型
+          this.forFn(id, e.target.value, recordId);
         } else if (type === 14) {
-          // 图片识别
+          // 图片识别 暂时不做
         }
       } else {
         if (type === 1) {
           // 单行文本框
-          this.failFn(id, e.target.value);
+          this.failFn(id, e.target.value, recordId);
         } else if (type === 2) {
           // 多行文本框
-          this.failFn(id, e.target.value);
+          this.failFn(id, e.target.value, recordId);
         } else if (type === 3) {
           // 单选
-          this.failFn(id, e.target.value);
+          this.failFn(id, e.target.value, recordId);
         } else if (type === 4) {
           // 多选
-          alert('多选，没有这类的题，先参考多选+其他类型的题，那个有');
+          this.failFn(id, e, recordId);
         } else if (type === 5) {
           // 下拉框
-          this.failFn(id, e);
+          this.failFn(id, e, recordId);
         } else if (type === 6) {
           // 日期时间选择器，给后台返回的值是  2020-01-01 00:00:00 的格式
-          // console.log(this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'));
-          this.failFn(id, this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'));
+          this.failFn(id, this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'), recordId);
         } else if (type === 7) {
-          alert('上传文件，先控下');
+          alert('上传文件，先空下');
         } else if (type === 8) {
           // 单选 + 其他
-          console.log(e.target.value);
-          // alert('暂时没有单选 + 其他类型的题，等导入题型之后再改');
+          this.failFn(id, e.target.value, recordId);
         } else if (type === 9) {
-          this.failFn(id, e);
           // 多选 + 其他
+          for (let i = 0; i < e.length; i++) {
+            this.failFn(id, e[i], recordId);
+          }
         } else if (type === 10) {
           // 下拉 + 其他
+          this.failFn(id, e, recordId);
         } else if (type === 11) {
-          this.failFn(id, e);
+          // 多选 + 其他 + 说明
+          for (let i = 0; i < e.length; i++) {
+            this.failFn(id, e[i], recordId);
+          }
+        } else if (type === 12) {
+          // 单选 + 关联其他内容
+          this.failFn(id, e.target.value, recordId);
+        } else if (type === 13) {
+          // 数字类型
+          this.failFn(id, e.target.value, recordId);
+        } else if (type === 14) {
+          // 图片识别 暂时不做
         }
       }
     },
     // for循环封装函数
-    forFn(id, value) {
+    forFn(id, value, recordId) {
       const { contentList } = this;
       console.log(value);
       for (let i = 0; i < contentList.length; i++) {
@@ -394,31 +970,122 @@ export default {
       console.log(this.contentList);
     },
     // 第一次填写题目答案得时候（在已经填写好的题目答案数组中没有找到当前所填得题）
-    failFn(id, value) {
+    failFn(id, value, recordId) {
       // console.log(id, value);
+      const { contentList } = this;
       let obj = {
         testQuestionsId: id,
+        patientRecordId: recordId ? recordId : '',
         contents: value,
       };
-      this.contentList.push(obj);
+      contentList.push(obj);
+      this.contentList = [...contentList];
+      console.log(this.contentList);
+    },
+    // 遍历数组，删除本题已经答过的所有答案
+    ergodicList(id) {
+      for (let i = 0; i < this.contentList.length; i++) {
+        if (this.contentList[i].testQuestionsId === id) {
+          this.contentList.splice(i, 1);
+          i -= 1;
+        }
+      }
+    },
+    // 其他输入框发生改变时
+    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) {
+          this.contentList.splice(i, 1);
+          i -= 1;
+        }
+      }
+      if (e.target.value !== '') {
+        let obj = {
+          testQuestionsId: id,
+          contents: value + ':' + e.target.value,
+          patientRecordId: recordId ? recordId : '',
+          type: 1,
+        };
+        this.contentList.push(obj);
+      }
+      console.log(this.contentList);
+    },
+    // 说明输入框发生改变时
+    explainChange(id, e, recordId) {
+      for (let i = 0; i < this.contentList.length; i++) {
+        if (this.contentList[i].testQuestionsId === id && this.contentList[i].type === 2) {
+          this.contentList.splice(i, 1);
+        }
+      }
+      if (e.target.value !== '') {
+        let obj = {
+          testQuestionsId: id,
+          contents: e.target.value,
+          type: 2,
+          patientRecordId: recordId ? recordId : '',
+        };
+        this.contentList.push(obj);
+      }
       console.log(this.contentList);
     },
-    // 提交表单
-    async setData() {
+    // 上传图片事件
+    fileChange(info, id, recordId) {
+      console.log(info);
+      if (info.file.status === 'done') {
+        this.fileList = info.fileList;
+        for (let i = 0; i < this.contentList.length; i++) {
+          if (this.contentList[i].testQuestionsId === id) {
+            this.contentList.splice(i, 1);
+          }
+        }
+        if (info.fileList.length > 0) {
+          let obj = {
+            testQuestionsId: id,
+            patientRecordId: recordId ? recordId : '',
+            contents: info.fileList[0].response.data[0].visitUrl,
+          };
+          this.contentList.push(obj);
+        }
+        console.log(this.contentList);
+        console.log(this.fileList);
+      } else if (info.file.status === 'removed') {
+        this.fileList = info.fileList;
+        for (let i = 0; i < this.contentList.length; i++) {
+          if (this.contentList[i].testQuestionsId === id) {
+            this.contentList.splice(i, 1);
+          }
+        }
+      }
+    },
+    // 改变提交时间
+    changeDate(date) {
+      this.subDateTime = this.$moment(date._d).format('YYYY-MM-DD');
+    },
+    // 搜索数据
+    async setData(current) {
+      if (current) {
+        this.pageNum = current;
+      }
       try {
         const params = {
           param: {
-            list: this.contentList,
-            patientId: 1,
-            timeSlot: 123,
+            conditionList: [],
+            conditionListDate: [],
+            hospitalId: this.setObj.hospitalId, // 医院id
+            hospitalization: this.setObj.hospitalization, // 住院号
+            inpatientId: this.setObj.inpatientId, // 对照组id
+            inputStatus: this.setObj.inputStatus, // 录入状态
+            pageNum: this.pageNum,
+            pageSize: this.pageSize,
           },
         };
-        const res = await saveCaseMes(params);
+        const res = await selPatientMesList(params);
         const { code, msg, data } = res.data;
         if (code === 200) {
-          console.log(data);
+          this.lists = data;
+          console.log(this.lists);
         } else {
-          console.log(msg);
+          this.$message.error('搜索失败');
         }
       } catch (error) {
         this.$message.error('error');
diff --git a/src/views/PatientInfo/PatientInfo.vue b/src/views/PatientInfo/PatientInfo.vue
index cbf0ab7..206cce9 100644
--- a/src/views/PatientInfo/PatientInfo.vue
+++ b/src/views/PatientInfo/PatientInfo.vue
@@ -10,250 +10,691 @@
         <!-- 一级标题下的各种问题（questionVos），判断类型1-12，展示不同需要填写的内容 -->
         <div v-for="a in item.questionVos" :key="a.name">
           <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" :label="a.question">
-            <a-input v-if="a.type === 1" @change="onChange($event, a.type, a.id)" />
-            <a-textarea v-else-if="a.type === 2" style="height: 100px" @change="onChange($event, a.type, a.id)" />
-            <a-radio-group v-else-if="a.type === 3" v-model="value" @change="onChange($event, a.type, a.id)">
-              <a-radio :style="radioStyle" value="高血压"> 没有单选题 </a-radio>
-              <a-radio :style="radioStyle" value="高血脂"> 没有单选题 </a-radio>
-              <a-radio :style="radioStyle" value="高血糖"> 没有单选题 </a-radio>
+            <a-input v-if="a.type === 1" @change="onChange($event, a.type, a.id, a.recordId)" />
+            <a-textarea v-else-if="a.type === 2" style="height: 100px" @change="onChange($event, a.type, a.id, a.recordId)" />
+            <a-radio-group v-else-if="a.type === 3" v-model="value" @change="onChange($event, a.type, a.id, a.recordId)">
+              <a-radio v-for="(b, c) in a.optionVos" :key="c" :style="radioStyle" :value="b.showValue"> {{ b.showValue }} </a-radio>
             </a-radio-group>
-            <a-checkbox-group v-else-if="a.type === 4" @change="onChange($event, a.type, a.id)">
+            <a-checkbox-group v-else-if="a.type === 4" @change="onChange($event, a.type, a.id, a.recordId)">
               <a-row>
-                <a-col :span="8">
-                  <a-checkbox value="A"> A </a-checkbox>
-                </a-col>
-                <a-col :span="8">
-                  <a-checkbox value="B"> B </a-checkbox>
-                </a-col>
-                <a-col :span="8">
-                  <a-checkbox value="C"> C </a-checkbox>
+                <a-col :span="24" v-for="(ques, indexNum) in a.optionVos" :key="indexNum">
+                  <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
                 </a-col>
               </a-row>
             </a-checkbox-group>
-            <a-select v-else-if="a.type === 5" default-value="lucy" style="width: 120px" loading @change="onChange($event, a.type, a.id)">
-              <a-select-option value="1"> Lucy1 </a-select-option>
-              <a-select-option value="2"> Lucy2 </a-select-option>
-              <a-select-option value="3"> Lucy3 </a-select-option>
-              <a-select-option value="4"> Lucy4 </a-select-option>
+            <a-select v-else-if="a.type === 5" style="width: 120px" @change="onChange($event, a.type, a.id, a.recordId)">
+              <a-select-option v-for="(b, c) in a.optionVos" :key="c" :value="b.showValue"> {{ b.showValue }} </a-select-option>
             </a-select>
-            <a-date-picker show-time placeholder="日期时间选择" v-else-if="a.type === 6" @change="onChange($event, a.type, a.id)" />
-            <a-upload v-else-if="a.type === 7">
-              <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
-              <div v-else>
-                <a-icon :type="loading ? 'loading' : 'plus'" />
-                <div class="ant-upload-text">Upload</div>
-              </div>
+            <a-date-picker
+              show-time
+              placeholder="日期时间选择"
+              v-else-if="a.type === 6"
+              @change="onChange($event, a.type, a.id, a.recordId)"
+            />
+            <a-upload
+              v-else-if="a.type === 7"
+              :action="action"
+              :default-file-list="fileList"
+              :headers="headers"
+              list-type="picture"
+              @change="fileChange($event, a.id)"
+              name="files"
+            >
+              <a-button v-show="fileList.length === 0"> <a-icon type="upload" /> 点击上传 </a-button>
             </a-upload>
-            <a-radio-group v-else-if="a.type === 8" v-model="value" @change="onChange($event, a.type, a.id)">
-              <a-radio :style="radioStyle" value="高血压"> 高血压 </a-radio>
-              <a-radio :style="radioStyle" value="高血脂"> 高血脂 </a-radio>
-              <a-radio :style="radioStyle" value="高血糖"> 高血糖 </a-radio>
-              <!-- <a-radio :style="radioStyle" :value="4">
-                其它
-                <a-input v-if="value === 4" :style="{ width: 100, marginLeft: 10 }" />
-              </a-radio> -->
+            <a-radio-group v-else-if="a.type === 8" v-model="value" @change="onChange($event, a.type, a.id, a.recordId)">
+              <a-radio-group @change="onChange($event, a.type, a.id, a.recordId)">
+                <a-radio v-for="(f, g) in a.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                  {{ f.showValue }}
+                </a-radio>
+              </a-radio-group>
+              <div v-for="(j, k) in a.optionVos" :key="k">
+                <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">
+                    <a-input style="width: 200px" @change="inputChange(a.id, $event, j.showValue)"></a-input>
+                  </a-form-item>
+                </div>
+              </div>
             </a-radio-group>
-            <a-checkbox-group v-else-if="a.type === 9" @change="onChange($event, a.type, a.id)">
+            <a-checkbox-group v-else-if="a.type === 9" @change="onChange($event, a.type, a.id, a.recordId)">
               <a-row>
                 <a-col :span="24" v-for="(ques, indexNum) in a.optionVos" :key="indexNum">
                   <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
                 </a-col>
                 <a-col :span="100">
-                  <a-input
-                    v-if="
-                      contentList.find(item => {
-                        return (
-                          item.testQuestionsId === a.id &&
-                          item.contents.find(a => {
-                            return a === '其他';
-                          })
-                        );
-                      })
-                    "
-                    :style="{ width: 100, marginLeft: 10 }"
-                  />
+                  <div v-for="(j, k) in a.optionVos" :key="k">
+                    <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">
+                        <a-input style="width: 200px" @change="inputChange(a.id, $event, j.showValue)"></a-input>
+                      </a-form-item>
+                    </div>
+                  </div>
                 </a-col>
               </a-row>
             </a-checkbox-group>
             <div v-else-if="a.type === 10">
-              <a-select default-value="lucy" style="width: 120px" loading>
-                <a-select-option value="1"> 1 </a-select-option>
-                <a-select-option value="2"> 2 </a-select-option>
+              <a-select style="width: 120px" @change="onChange($event, a.type, a.id, a.recordId)">
+                <a-select-option v-for="(b, c) in a.optionVos" :key="c" :value="b.showValue"> {{ b.showValue }} </a-select-option>
               </a-select>
-              <a-input v-if="value === 2"></a-input>
+              <div v-for="(b, c) in a.optionVos" :key="c">
+                <div
+                  v-if="
+                    contentList.find(item => {
+                      return item.testQuestionsId === a.id && item.contents === `${b.showValue}`;
+                    }) && b.afterOperation === 1
+                  "
+                >
+                  <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+                    <a-input style="width: 200px" @change="inputChange(a.id, $event, b.showValue)"></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-checkbox-group @change="onChange($event, a.type, a.id, a.recordId)">
                 <a-row>
                   <a-col :span="24" v-for="(ques, indexNum) in a.optionVos" :key="indexNum">
                     <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
                   </a-col>
                   <a-col :span="100">
-                    <a-input
-                      v-if="
-                        contentList.find(item => {
-                          return (
-                            item.testQuestionsId === a.id &&
-                            item.contents.find(a => {
-                              return a === '其他';
-                            })
-                          );
-                        })
-                      "
-                      :style="{ width: 100, marginLeft: 10 }"
-                    />
+                    <div v-for="(b, c) in a.optionVos" :key="c">
+                      <div
+                        v-if="
+                          contentList.find(item => {
+                            return item.testQuestionsId === a.id && item.contents.find(content => content === `${b.showValue}`);
+                          }) && b.afterOperation > 0
+                        "
+                      >
+                        <a-input style="width: 200px" @change="inputChange(a.id, $event, b.showValue)"></a-input>
+                      </div>
+                    </div>
                   </a-col>
                 </a-row>
-                说明： <a-input :style="{ width: 100, marginLeft: 10 }" />
+                说明： <a-input style="width: 200px" @change="explainChange(a.id, $event)" />
               </a-checkbox-group>
             </div>
             <!-- 当类型为12时，为单选+关联 -->
             <div v-else-if="a.type === 12">
-              <a-radio-group @change="onChange($event, a.type, a.id)">
-                <a-radio :style="radioStyle" :value="1"> 高血压 </a-radio>
-                <a-radio :style="radioStyle" :value="2"> 高血脂 </a-radio>
-                <a-radio :style="radioStyle" :value="3"> 高血糖 </a-radio>
-                <a-radio :style="radioStyle" :value="4">
-                  其它
-                  <a-input v-if="value === 4" :style="{ width: 100, marginLeft: 10 }" />
+              <a-radio-group @change="onChange($event, a.type, a.id, a.recordId)">
+                <a-radio v-for="(f, g) in a.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                  {{ f.showValue }}
                 </a-radio>
               </a-radio-group>
+              <div v-for="(j, k) in a.optionVos" :key="k">
+                <div
+                  v-if="
+                    contentList.find(item => {
+                      return item.testQuestionsId === a.id && item.contents === `${j.showValue}`;
+                    }) && j.afterOperation > 0
+                  "
+                >
+                  <div v-for="(h, i) in j.questionVos" :key="i">
+                    <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" :label="h.question">
+                      <a-input
+                        v-if="j.afterOperation === 1"
+                        style="width: 200px"
+                        @change="inputChange(a.id, $event, j.showValue)"
+                      ></a-input>
+                      <a-textarea v-else-if="j.afterOperation === 2" @change="inputChange(a.id, $event, j.showValue)"></a-textarea>
+                      <div v-else-if="j.afterOperation === 3">
+                        <div v-for="ohter in j.questionVos" :key="ohter.id">
+                          <a-form-item
+                            :label-col="formItemLayout.labelCol"
+                            :wrapper-col="formItemLayout.wrapperCol"
+                            :label="ohter.question"
+                          >
+                            <a-input v-if="ohter.type === 1" @change="onChange($event, ohter.type, ohter.id, ohter.recordId)" />
+                            <a-textarea
+                              v-else-if="ohter.type === 2"
+                              style="height: 100px"
+                              @change="onChange($event, ohter.type, ohter.id)"
+                            />
+                            <a-radio-group
+                              v-else-if="ohter.type === 3"
+                              v-model="value"
+                              @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
+                            >
+                              <a-radio v-for="(b, c) in ohter.optionVos" :key="c" :style="radioStyle" :value="b.showValue">
+                                {{ b.showValue }}
+                              </a-radio>
+                            </a-radio-group>
+                            <a-checkbox-group v-else-if="ohter.type === 4" @change="onChange($event, ohter.type, ohter.id, ohter.recordId)">
+                              <a-row>
+                                <a-col :span="24" v-for="(ques, indexNum) in ohter.optionVos" :key="indexNum">
+                                  <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
+                                </a-col>
+                              </a-row>
+                            </a-checkbox-group>
+                            <a-select
+                              v-else-if="ohter.type === 5"
+                              style="width: 120px"
+                              @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
+                            >
+                              <a-select-option v-for="(b, c) in ohter.optionVos" :key="c" :value="b.showValue">
+                                {{ b.showValue }}
+                              </a-select-option>
+                            </a-select>
+                            <a-date-picker
+                              show-time
+                              placeholder="日期时间选择"
+                              v-else-if="ohter.type === 6"
+                              @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
+                            />
+                            <a-upload
+                              v-else-if="ohter.type === 7"
+                              :action="action"
+                              :headers="headers"
+                              :default-file-list="fileList"
+                              list-type="picture"
+                              @change="fileChange($event, ohter.id)"
+                              name="files"
+                            >
+                              <a-button v-show="fileList.length === 0"> <a-icon type="upload" /> 点击上传 </a-button>
+                            </a-upload>
+                            <a-radio-group
+                              v-else-if="ohter.type === 8"
+                              v-model="value"
+                              @change="onChange($event, ohter.type, ohter.id, ohter.recordId)"
+                            >
+                              <a-radio-group @change="onChange($event, ohter.type, ohter.id)">
+                                <a-radio v-for="(f, g) in ohter.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                                  {{ f.showValue }}
+                                </a-radio>
+                              </a-radio-group>
+                              <div v-for="(m, n) in ohter.optionVos" :key="n">
+                                <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 style="width: 200px" @change="inputChange(ohter.id, $event, m.showValue)"></a-input>
+                                  </a-form-item>
+                                </div>
+                              </div>
+                            </a-radio-group>
+                            <a-checkbox-group v-else-if="ohter.type === 9" @change="onChange($event, ohter.type, ohter.id, ohter.recordId)">
+                              <a-row>
+                                <a-col :span="24" v-for="(ques, indexNum) in ohter.optionVos" :key="indexNum">
+                                  <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
+                                </a-col>
+                                <a-col :span="100">
+                                  <div v-for="(m, n) in ohter.optionVos" :key="n">
+                                    <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 style="width: 200px" @change="inputChange(ohter.id, $event, m.showValue)"></a-input>
+                                      </a-form-item>
+                                    </div>
+                                  </div>
+                                </a-col>
+                              </a-row>
+                            </a-checkbox-group>
+                            <div v-else-if="ohter.type === 10">
+                              <a-select style="width: 120px" @change="onChange($event, ohter.type, ohter.id, ohter.recordId)">
+                                <a-select-option v-for="(b, c) in ohter.optionVos" :key="c" :value="b.showValue">
+                                  {{ b.showValue }}
+                                </a-select-option>
+                              </a-select>
+                              <div v-for="(b, c) in ohter.optionVos" :key="c">
+                                <div
+                                  v-if="
+                                    contentList.find(item => {
+                                      return item.testQuestionsId === ohter.id && item.contents === `${b.showValue}`;
+                                    }) && b.afterOperation === 1
+                                  "
+                                >
+                                  <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+                                    <a-input style="width: 200px" @change="inputChange(ohter.id, $event, b.showValue)"></a-input>
+                                  </a-form-item>
+                                </div>
+                              </div>
+                            </div>
+                            <div v-else-if="ohter.type === 11">
+                              <a-checkbox-group @change="onChange($event, ohter.type, ohter.id, ohter.recordId)">
+                                <a-row>
+                                  <a-col :span="24" v-for="(ques, indexNum) in ohter.optionVos" :key="indexNum">
+                                    <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
+                                  </a-col>
+                                  <a-col :span="100">
+                                    <div v-for="(b, c) in ohter.optionVos" :key="c">
+                                      <div
+                                        v-if="
+                                          contentList.find(item => {
+                                            return (
+                                              item.testQuestionsId === ohter.id &&
+                                              item.contents.find(content => content === `${b.showValue}`)
+                                            );
+                                          }) && b.afterOperation > 0
+                                        "
+                                      >
+                                        <a-input style="width: 200px" @change="inputChange(ohter.id, $event, b.showValue)"></a-input>
+                                      </div>
+                                    </div>
+                                  </a-col>
+                                </a-row>
+                                说明： <a-input style="width: 200px" @change="explainChange(ohter.id, $event)" />
+                              </a-checkbox-group>
+                            </div>
+                            <!-- 当类型为12时，为单选+关联 -->
+                            <div v-else-if="ohter.type === 12">
+                              <a-radio-group @change="onChange($event, ohter.type, ohter.id, ohter.recordId)">
+                                <a-radio v-for="(f, g) in ohter.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                                  {{ f.showValue }}
+                                </a-radio>
+                              </a-radio-group>
+                              <div v-for="(m, n) in ohter.optionVos" :key="n">
+                                <div
+                                  v-if="
+                                    contentList.find(item => {
+                                      return item.testQuestionsId === ohter.id && item.contents === `${m.showValue}`;
+                                    }) && m.afterOperation > 0
+                                  "
+                                >
+                                  <div v-for="(p, q) in m.questionVos" :key="q">
+                                    <a-form-item
+                                      :label-col="formItemLayout.labelCol"
+                                      :wrapper-col="formItemLayout.wrapperCol"
+                                      :label="p.question"
+                                    >
+                                      <a-input
+                                        v-if="m.afterOperation === 1"
+                                        style="width: 200px"
+                                        @change="inputChange(ohter.id, $event, m.showValue)"
+                                      ></a-input>
+                                      <a-textarea
+                                        v-else-if="m.afterOperation === 2"
+                                        @change="inputChange(ohter.id, $event, m.showValue)"
+                                      ></a-textarea>
+                                      <div v-else-if="m.afterOperation === 3">qwe</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)" />
+                            </div>
+                            <div v-else-if="ohter.type === 14">图片识别</div>
+                          </a-form-item>
+                        </div>
+                      </div>
+                    </a-form-item>
+                  </div>
+                </div>
+              </div>
             </div>
             <div v-else-if="a.type === 13">
-              <a-input-number @change="onChange($event, a.type, a.id)" />
+              <a-input-number @change="onChange($event, a.type, a.id, a.recordId)" />
             </div>
             <div v-else-if="a.type === 14">图片识别</div>
           </a-form-item>
         </div>
         <!-- 一级标题下的各种二级标题（subReportCodes） -->
-        <div v-for="c in item.subReportCodes" :key="c.name">
+        <div v-for="w in item.subReportCodes" :key="w.name">
           <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
             <!-- 二级大标题 -->
-            <h3>{{ c.name }}：</h3>
+            <h3>{{ w.name }}：</h3>
           </a-form-item>
           <!-- 二级标题下的各种类型 -->
-          <div v-for="e in c.questionVos" :key="e.name">
+          <div v-for="e in w.questionVos" :key="e.name">
             <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" :label="e.question">
-              <a-input v-if="e.type === 1" @change="onChange($event, e.type, e.id)" />
-              <a-textarea v-else-if="e.type === 2" style="height: 100px" @change="onChange($event, e.type, e.id)" />
-              <a-radio-group v-else-if="e.type === 3" v-model="value" @change="onChange($event, e.type, e.id)">
-                <a-radio :style="radioStyle" value="高血压"> 没有单选题 </a-radio>
-                <a-radio :style="radioStyle" value="高血脂"> 没有单选题 </a-radio>
-                <a-radio :style="radioStyle" value="高血糖"> 没有单选题 </a-radio>
+              <a-input v-if="e.type === 1" @change="onChange($event, e.type, e.id, e.recordId)" />
+              <a-textarea v-else-if="e.type === 2" style="height: 100px" @change="onChange($event, e.type, e.id, e.recordId)" />
+              <a-radio-group v-else-if="e.type === 3" v-model="value" @change="onChange($event, e.type, e.id, e.recordId)">
+                <a-radio v-for="(b, c) in e.optionVos" :key="c" :style="radioStyle" :value="b.showValue"> {{ b.showValue }} </a-radio>
               </a-radio-group>
-              <a-checkbox-group v-else-if="e.type === 4" @change="onChange($event, e.type, e.id)">
+              <a-checkbox-group v-else-if="e.type === 4" @change="onChange($event, e.type, e.id, e.recordId)">
                 <a-row>
-                  <a-col :span="8">
-                    <a-checkbox value="A"> A </a-checkbox>
-                  </a-col>
-                  <a-col :span="8">
-                    <a-checkbox value="B"> B </a-checkbox>
-                  </a-col>
-                  <a-col :span="8">
-                    <a-checkbox value="C"> C </a-checkbox>
+                  <a-col :span="24" v-for="(ques, indexNum) in e.optionVos" :key="indexNum">
+                    <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
                   </a-col>
                 </a-row>
               </a-checkbox-group>
-              <a-select v-else-if="e.type === 5" default-value="lucy" style="width: 120px" loading @change="onChange($event, e.type, e.id)">
-                <a-select-option value="1"> Lucy1 </a-select-option>
-                <a-select-option value="2"> Lucy2 </a-select-option>
-                <a-select-option value="3"> Lucy3 </a-select-option>
-                <a-select-option value="4"> Lucy4 </a-select-option>
+              <a-select v-else-if="e.type === 5" style="width: 120px" @change="onChange($event, e.type, e.id, e.recordId)">
+                <a-select-option v-for="(b, c) in e.optionVos" :key="c" :value="b.showValue"> {{ b.showValue }} </a-select-option>
               </a-select>
-              <a-date-picker show-time placeholder="日期时间选择" v-else-if="e.type === 6" @change="onChange($event, e.type, e.id)" />
-              <a-upload v-else-if="e.type === 7">
-                <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
-                <div v-else>
-                  <a-icon :type="loading ? 'loading' : 'plus'" />
-                  <div class="ant-upload-text">Upload</div>
-                </div>
+              <a-date-picker
+                show-time
+                placeholder="日期时间选择"
+                v-else-if="e.type === 6"
+                @change="onChange($event, e.type, e.id, e.recordId)"
+              />
+              <a-upload
+                v-else-if="e.type === 7"
+                :action="action"
+                :default-file-list="fileList"
+                list-type="picture"
+                :headers="headers"
+                @change="fileChange($event, e.id, e.recordId)"
+                name="files"
+              >
+                <a-button v-show="fileList.length === 0"> <a-icon type="upload" /> 点击上传 </a-button>
               </a-upload>
-              <a-radio-group v-else-if="e.type === 8" v-model="value" @change="onChange($event, e.type, e.id)">
-                <a-radio :style="radioStyle" value="高血压"> 高血压 </a-radio>
-                <a-radio :style="radioStyle" value="高血脂"> 高血脂 </a-radio>
-                <a-radio :style="radioStyle" value="高血糖"> 高血糖 </a-radio>
-                <!-- <a-radio :style="radioStyle" :value="4">
-                其它
-                <a-input v-if="value === 4" :style="{ width: 100, marginLeft: 10 }" />
-              </a-radio> -->
+              <a-radio-group v-else-if="e.type === 8" v-model="value" @change="onChange($event, e.type, e.id, e.recordId)">
+                <a-radio-group @change="onChange($event, e.type, e.id)">
+                  <a-radio v-for="(f, g) in e.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                    {{ f.showValue }}
+                  </a-radio>
+                </a-radio-group>
+                <div v-for="(j, k) in e.optionVos" :key="k">
+                  <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">
+                      <a-input style="width: 200px" @change="inputChange(e.id, $event, j.showValue)"></a-input>
+                    </a-form-item>
+                  </div>
+                </div>
               </a-radio-group>
-              <a-checkbox-group v-else-if="e.type === 9" @change="onChange($event, e.type, e.id)">
+              <a-checkbox-group v-else-if="e.type === 9" @change="onChange($event, e.type, e.id, e.recordId)">
                 <a-row>
-                  <a-col :span="12" v-for="(ques, indexNum) in e.optionVos" :key="indexNum">
+                  <a-col :span="24" v-for="(ques, indexNum) in e.optionVos" :key="indexNum">
                     <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
                   </a-col>
-                  {{ e.id }}
                   <a-col :span="100">
-                    <a-input
-                      v-if="
-                        contentList.find(item => {
-                          return (
-                            item.testQuestionsId === e.id &&
-                            item.contents.find(a => {
-                              return a === '其他';
-                            })
-                          );
-                        })
-                      "
-                      :style="{ width: 100, marginLeft: 10 }"
-                    />
+                    <div v-for="(j, k) in e.optionVos" :key="k">
+                      <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">
+                          <a-input style="width: 200px" @change="inputChange(e.id, $event, j.showValue)"></a-input>
+                        </a-form-item>
+                      </div>
+                    </div>
                   </a-col>
                 </a-row>
               </a-checkbox-group>
               <div v-else-if="e.type === 10">
-                <a-select default-value="lucy" style="width: 120px" loading>
-                  <a-select-option value="1"> 1 </a-select-option>
-                  <a-select-option value="2"> 2 </a-select-option>
+                <a-select style="width: 120px" @change="onChange($event, e.type, e.id, e.recordId)">
+                  <a-select-option v-for="(b, c) in e.optionVos" :key="c" :value="b.showValue"> {{ b.showValue }} </a-select-option>
                 </a-select>
-                <a-input v-if="value === 2"></a-input>
+                <div v-for="(b, c) in e.optionVos" :key="c">
+                  <div
+                    v-if="
+                      contentList.find(item => {
+                        return item.testQuestionsId === e.id && item.contents === `${b.showValue}`;
+                      }) && b.afterOperation === 1
+                    "
+                  >
+                    <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+                      <a-input style="width: 200px" @change="inputChange(e.id, $event, b.showValue)"></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)">
+                <a-checkbox-group @change="onChange($event, e.type, e.id, e.recordId)">
                   <a-row>
-                    <a-col :span="12">
-                      <a-checkbox value="A"> A </a-checkbox>
-                    </a-col>
-                    <a-col :span="12">
-                      <a-checkbox value="B"> B </a-checkbox>
+                    <a-col :span="24" v-for="(ques, indexNum) in e.optionVos" :key="indexNum">
+                      <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
                     </a-col>
-                    <a-col :span="12">
-                      <a-checkbox value="C"> 其他 </a-checkbox>
+                    <a-col :span="100">
+                      <div v-for="(b, c) in e.optionVos" :key="c">
+                        <div
+                          v-if="
+                            contentList.find(item => {
+                              return item.testQuestionsId === e.id && item.contents.find(content => content === `${b.showValue}`);
+                            }) && b.afterOperation > 0
+                          "
+                        >
+                          <a-input style="width: 200px" @change="inputChange(e.id, $event, b.showValue)"></a-input>
+                        </div>
+                      </div>
                     </a-col>
                   </a-row>
-                  <a-input v-if="value === 4" :style="{ width: 100, marginLeft: 10 }" />
-                  说明： <a-input :style="{ width: 100, marginLeft: 10 }" />
+                  说明： <a-input style="width: 200px" @change="explainChange(e.id, $event)" />
                 </a-checkbox-group>
               </div>
               <!-- 当类型为12时，为单选+关联 -->
               <div v-else-if="e.type === 12">
-                <a-radio-group @change="onChange($event, e.type, e.id)">
-                  <a-radio :style="radioStyle" :value="1"> 高血压 </a-radio>
-                  <a-radio :style="radioStyle" :value="2"> 高血脂 </a-radio>
-                  <a-radio :style="radioStyle" :value="3"> 高血糖 </a-radio>
-                  <a-radio :style="radioStyle" :value="4">
-                    其它
-                    <a-input v-if="value === 4" :style="{ width: 100, marginLeft: 10 }" />
+                <a-radio-group @change="onChange($event, e.type, e.id, e.recordId)">
+                  <a-radio v-for="(f, g) in e.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                    {{ f.showValue }}
                   </a-radio>
                 </a-radio-group>
+                <div v-for="(j, k) in e.optionVos" :key="k">
+                  <div
+                    v-if="
+                      contentList.find(item => {
+                        return item.testQuestionsId === e.id && item.contents === `${j.showValue}`;
+                      }) && j.afterOperation > 0
+                    "
+                  >
+                    <div v-for="(h, i) in j.questionVos" :key="i">
+                      <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" :label="h.question">
+                        <a-input
+                          v-if="j.afterOperation === 1"
+                          style="width: 200px"
+                          @change="inputChange(e.id, $event, j.showValue)"
+                        ></a-input>
+                        <a-textarea v-else-if="j.afterOperation === 2" @change="inputChange(e.id, $event, j.showValue)"></a-textarea>
+                        <div v-else-if="j.afterOperation === 3">
+                          <a-form-item>
+                            <a-input v-if="h.type === 1" @change="onChange($event, h.type, h.id, h.h.recordId)" />
+                            <a-textarea
+                              v-else-if="h.type === 2"
+                              style="height: 100px"
+                              @change="onChange($event, h.type, h.id, h.recordId)"
+                            />
+                            <a-radio-group v-else-if="h.type === 3" v-model="value" @change="onChange($event, h.type, h.id, h.recordId)">
+                              <a-radio v-for="(b, c) in h.optionVos" :key="c" :style="radioStyle" :value="b.showValue">
+                                {{ b.showValue }}
+                              </a-radio>
+                            </a-radio-group>
+                            <a-checkbox-group v-else-if="h.type === 4" @change="onChange($event, h.type, h.id, h.recordId)">
+                              <a-row>
+                                <a-col :span="24" v-for="(ques, indexNum) in h.optionVos" :key="indexNum">
+                                  <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
+                                </a-col>
+                              </a-row>
+                            </a-checkbox-group>
+                            <a-select v-else-if="h.type === 5" style="width: 120px" @change="onChange($event, h.type, h.id, h.recordId)">
+                              <a-select-option v-for="(b, c) in h.optionVos" :key="c" :value="b.showValue">
+                                {{ b.showValue }}
+                              </a-select-option>
+                            </a-select>
+                            <a-date-picker
+                              show-time
+                              placeholder="日期时间选择"
+                              v-else-if="h.type === 6"
+                              @change="onChange($event, h.type, h.id, h.recordId)"
+                            />
+                            <a-upload
+                              v-else-if="h.type === 7"
+                              :action="action"
+                              :default-file-list="fileList"
+                              list-type="picture"
+                              :headers="headers"
+                              @change="fileChange($event, h.id)"
+                              name="files"
+                            >
+                              <a-button v-show="fileList.length === 0"> <a-icon type="upload" /> 点击上传 </a-button>
+                            </a-upload>
+                            <a-radio-group v-else-if="h.type === 8" v-model="value" @change="onChange($event, h.type, h.id, h.recordId)">
+                              <a-radio-group @change="onChange($event, h.type, h.id, h.recordId)">
+                                <a-radio v-for="(f, g) in h.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                                  {{ f.showValue }}
+                                </a-radio>
+                              </a-radio-group>
+                              <div v-for="(m, n) in h.optionVos" :key="n">
+                                <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">
+                                    <a-input style="width: 200px" @change="inputChange(h.id, $event, m.showValue)"></a-input>
+                                  </a-form-item>
+                                </div>
+                              </div>
+                            </a-radio-group>
+                            <a-checkbox-group v-else-if="h.type === 9" @change="onChange($event, h.type, h.id, h.recordId)">
+                              <a-row>
+                                <a-col :span="24" v-for="(ques, indexNum) in h.optionVos" :key="indexNum">
+                                  <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
+                                </a-col>
+                                <a-col :span="100">
+                                  <div v-for="(m, n) in h.optionVos" :key="n">
+                                    <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">
+                                        <a-input style="width: 200px" @change="inputChange(h.id, $event, m.showValue)"></a-input>
+                                      </a-form-item>
+                                    </div>
+                                  </div>
+                                </a-col>
+                              </a-row>
+                            </a-checkbox-group>
+                            <div v-else-if="h.type === 10">
+                              <a-select style="width: 120px" @change="onChange($event, h.type, h.id, h.recordId)">
+                                <a-select-option v-for="(b, c) in h.optionVos" :key="c" :value="b.showValue">
+                                  {{ b.showValue }}
+                                </a-select-option>
+                              </a-select>
+                              <div v-for="(b, c) in h.optionVos" :key="c">
+                                <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">
+                                    <a-input style="width: 200px" @change="inputChange(h.id, $event, b.showValue)"></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)">
+                                <a-row>
+                                  <a-col :span="24" v-for="(ques, indexNum) in h.optionVos" :key="indexNum">
+                                    <a-checkbox :value="ques.submitValue"> {{ ques.showValue }} </a-checkbox>
+                                  </a-col>
+                                  <a-col :span="100">
+                                    <div v-for="(b, c) in h.optionVos" :key="c">
+                                      <div
+                                        v-if="
+                                          contentList.find(item => {
+                                            return (
+                                              item.testQuestionsId === h.id && item.contents.find(content => content === `${b.showValue}`)
+                                            );
+                                          }) && b.afterOperation > 0
+                                        "
+                                      >
+                                        <a-input style="width: 200px" @change="inputChange(h.id, $event, b.showValue)"></a-input>
+                                      </div>
+                                    </div>
+                                  </a-col>
+                                </a-row>
+                                说明： <a-input style="width: 200px" @change="explainChange(h.id, $event)" />
+                              </a-checkbox-group>
+                            </div>
+                            <!-- 当类型为12时，为单选+关联 -->
+                            <div v-else-if="h.type === 12">
+                              <a-radio-group @change="onChange($event, h.type, h.id, h.recordId)">
+                                <a-radio v-for="(f, g) in h.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                                  {{ f.showValue }}
+                                </a-radio>
+                              </a-radio-group>
+                              <div v-for="(m, n) in h.optionVos" :key="n">
+                                <div
+                                  v-if="
+                                    contentList.find(item => {
+                                      return item.testQuestionsId === h.id && item.contents === `${m.showValue}`;
+                                    }) && m.afterOperation > 0
+                                  "
+                                >
+                                  <div v-for="(p, q) in m.questionVos" :key="q">
+                                    <a-form-item
+                                      :label-col="formItemLayout.labelCol"
+                                      :wrapper-col="formItemLayout.wrapperCol"
+                                      :label="p.question"
+                                    >
+                                      <a-input
+                                        v-if="m.afterOperation === 1"
+                                        style="width: 200px"
+                                        @change="inputChange(h.id, $event, m.showValue)"
+                                      ></a-input>
+                                      <a-textarea
+                                        v-else-if="m.afterOperation === 2"
+                                        @change="inputChange(h.id, $event, m.showValue)"
+                                      ></a-textarea>
+                                      <div v-else-if="m.afterOperation === 3">qwe</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)" />
+                            </div>
+                            <div v-else-if="h.type === 14">图片识别</div>
+                          </a-form-item>
+                        </div>
+                      </a-form-item>
+                    </div>
+                  </div>
+                </div>
               </div>
               <div v-else-if="e.type === 13">
-                <a-input-number @change="onChange($event, e.type, e.id)" />
+                <a-input-number @change="onChange($event, e.type, e.id, e.recordId)" />
               </div>
               <div v-else-if="e.type === 14">图片识别</div>
             </a-form-item>
           </div>
         </div>
       </div>
-      <!-- <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-button class="white--text px-10" type="primary" @click="setData()">提交</a-button>
+    <a-date-picker
+      v-if="list.length > 0"
+      :default-value="$moment(dateChoose, dateFormat)"
+      :format="dateFormat"
+      class="white--text"
+      @change="changeDate"
+    />
+    <a-button class="white--text px-10" type="primary" @click="setData()" v-if="list.length > 0" style="margin-top: 40px">提交</a-button>
   </div>
 </template>
 
 <script>
-import { queryAll, saveCaseMes } from 'config/api';
+import { mapState } from 'vuex';
+import { queryAll, saveCaseMes, upload } from 'config/api';
 const formItemLayout = {
   labelCol: { span: 6 },
   wrapperCol: { span: 9 },
@@ -275,15 +716,29 @@ export default {
       list: [],
       contentList: [],
       numList: [1, 2, 3, 4, 5],
+      action: upload, // 上传附件地址
+      fileList: [], // 附件列表
+      files: '', // 附件Id
+      dateFormat: 'YYYY-MM-DD',
+      dateChoose: new Date(),
+      subDateTime: '',
     };
   },
+  computed: {
+    ...mapState('home', ['patientId']),
+    // 上传附加请求头
+    headers() {
+      const token = sessionStorage.getItem('anyringToken');
+      return { Authorization: `Bearer ${token}` };
+    },
+  },
   async created() {
     try {
       const params = {
         param: {
           code: '',
-          // id: 0,
-          // nums: 0,
+          id: 1,
+          nums: 0,
         },
       };
       const res = await queryAll(params);
@@ -299,88 +754,131 @@ export default {
     }
   },
   methods: {
-    onChange(e, type, id) {
+    onChange(e, type, id, recordId) {
       // 监听所有得题目类型得填写情况（改变事件）
       if (this.contentList.find(item => item.testQuestionsId === id)) {
         if (type === 1) {
           // 单行文本框
-          this.forFn(id, e.target.value);
+          this.forFn(id, e.target.value, recordId);
         } else if (type === 2) {
           // 多行文本框
-          this.forFn(id, e.target.value);
+          this.forFn(id, e.target.value, recordId);
         } else if (type === 3) {
           // 单选
-          this.forFn(id, e.target.value);
+          this.forFn(id, e.target.value, recordId);
         } else if (type === 4) {
           // 多选
-          alert('多选，没有这类的题，先参考多选+其他类型的题，那个有');
-          // this.forFn(id, e);
+          // 删除上次答题的所有答案
+          this.ergodicList(id);
+          // 遍历本次答案，添加到数组中
+          for (let i = 0; i < e.length; i++) {
+            this.failFn(id, e[i], recordId);
+          }
         } else if (type === 5) {
           // 下拉框
-          this.forFn(id, e);
+          this.forFn(id, e, recordId);
         } else if (type === 6) {
           // 日期时间选择器，给后台返回的值是  2020-01-01 00:00:00 的格式
-          // console.log(this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'));
-          this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'));
+          this.forFn(id, this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'), recordId);
         } else if (type === 7) {
-          alert('上传文件，先控下');
+          alert('上传文件，先空下');
         } else if (type === 8) {
           // 单选 + 其他
-          console.log(e.target.value);
-          // alert('暂时没有单选 + 其他类型的题，等导入题型之后再改');
+          // 删除上次答题的所有答案
+          this.ergodicList(id);
+          this.failFn(id, e.target.value, recordId);
         } else if (type === 9) {
-          this.forFn(id, e);
           // 多选 + 其他
+          // 如果type === 9 : 删除所有选项，重新添加，文本框继续存在，可以存给后台
+          for (let i = 0; i < this.contentList.length; i++) {
+            if (id === this.contentList[i].testQuestionsId && !this.contentList[i].type) {
+              this.contentList.splice(i, 1);
+              i -= 1;
+            }
+          }
+          // 遍历本次答案，添加到数组中
+          for (let i = 0; i < e.length; i++) {
+            this.failFn(id, e[i], recordId);
+          }
         } else if (type === 10) {
           // 下拉 + 其他
+          // 删除所有本题的答案（包括 选项 和 文本框）
+          this.ergodicList(id);
+          // 添加本次答题的选项
+          this.failFn(id, e, recordId);
         } else if (type === 11) {
           // 多选 + 其他 + 说明
-          this.forFn(id, e);
+          // 如果type === 11 : 删除所有选项，重新添加，文本框继续存在，可以存给后台
+          for (let i = 0; i < this.contentList.length; i++) {
+            if (id === this.contentList[i].testQuestionsId && !this.contentList[i].type) {
+              this.contentList.splice(i, 1);
+              i -= 1;
+            }
+          }
+          // 遍历本次答案，添加到数组中
+          for (let i = 0; i < e.length; i++) {
+            this.failFn(id, e[i], recordId);
+          }
         } else if (type === 12) {
           // 单选 + 关联其他内容
+          // console.log(e.target.value, type, id);
+          this.forFn(id, e.target.value, recordId);
         } else if (type === 13) {
           // 数字类型
+          this.forFn(id, e.target.value, recordId);
         } else if (type === 14) {
-          // 图片识别
+          // 图片识别 暂时不做
         }
       } else {
         if (type === 1) {
           // 单行文本框
-          this.failFn(id, e.target.value);
+          this.failFn(id, e.target.value, recordId);
         } else if (type === 2) {
           // 多行文本框
-          this.failFn(id, e.target.value);
+          this.failFn(id, e.target.value, recordId);
         } else if (type === 3) {
           // 单选
-          this.failFn(id, e.target.value);
+          this.failFn(id, e.target.value, recordId);
         } else if (type === 4) {
           // 多选
-          alert('多选，没有这类的题，先参考多选+其他类型的题，那个有');
+          this.failFn(id, e, recordId);
         } else if (type === 5) {
           // 下拉框
-          this.failFn(id, e);
+          this.failFn(id, e, recordId);
         } else if (type === 6) {
           // 日期时间选择器，给后台返回的值是  2020-01-01 00:00:00 的格式
-          // console.log(this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'));
-          this.failFn(id, this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'));
+          this.failFn(id, this.$moment(e._d).format('YYYY-MM-DD HH:mm:ss'), recordId);
         } else if (type === 7) {
-          alert('上传文件，先控下');
+          alert('上传文件，先空下');
         } else if (type === 8) {
           // 单选 + 其他
-          console.log(e.target.value);
-          // alert('暂时没有单选 + 其他类型的题，等导入题型之后再改');
+          this.failFn(id, e.target.value, recordId);
         } else if (type === 9) {
-          this.failFn(id, e);
           // 多选 + 其他
+          for (let i = 0; i < e.length; i++) {
+            this.failFn(id, e[i], recordId);
+          }
         } else if (type === 10) {
           // 下拉 + 其他
+          this.failFn(id, e, recordId);
         } else if (type === 11) {
-          this.failFn(id, e);
+          // 多选 + 其他 + 说明
+          for (let i = 0; i < e.length; i++) {
+            this.failFn(id, e[i], recordId);
+          }
+        } else if (type === 12) {
+          // 单选 + 关联其他内容
+          this.failFn(id, e.target.value, recordId);
+        } else if (type === 13) {
+          // 数字类型
+          this.failFn(id, e.target.value, recordId);
+        } else if (type === 14) {
+          // 图片识别 暂时不做
         }
       }
     },
     // for循环封装函数
-    forFn(id, value) {
+    forFn(id, value, recordId) {
       const { contentList } = this;
       console.log(value);
       for (let i = 0; i < contentList.length; i++) {
@@ -393,31 +891,113 @@ export default {
       console.log(this.contentList);
     },
     // 第一次填写题目答案得时候（在已经填写好的题目答案数组中没有找到当前所填得题）
-    failFn(id, value) {
+    failFn(id, value, recordId) {
       // console.log(id, value);
+      const { contentList } = this;
       let obj = {
         testQuestionsId: id,
+        patientRecordId: recordId ? recordId : '',
         contents: value,
       };
-      this.contentList.push(obj);
+      contentList.push(obj);
+      this.contentList = [...contentList];
+      console.log(this.contentList);
+    },
+    // 遍历数组，删除本题已经答过的所有答案
+    ergodicList(id) {
+      for (let i = 0; i < this.contentList.length; i++) {
+        if (this.contentList[i].testQuestionsId === id) {
+          this.contentList.splice(i, 1);
+          i -= 1;
+        }
+      }
+    },
+    // 其他输入框发生改变时
+    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) {
+          this.contentList.splice(i, 1);
+          i -= 1;
+        }
+      }
+      if (e.target.value !== '') {
+        let obj = {
+          testQuestionsId: id,
+          contents: value + ':' + e.target.value,
+          patientRecordId: recordId ? recordId : '',
+          type: 1,
+        };
+        this.contentList.push(obj);
+      }
       console.log(this.contentList);
     },
+    // 说明输入框发生改变时
+    explainChange(id, e, recordId) {
+      for (let i = 0; i < this.contentList.length; i++) {
+        if (this.contentList[i].testQuestionsId === id && this.contentList[i].type === 2) {
+          this.contentList.splice(i, 1);
+        }
+      }
+      if (e.target.value !== '') {
+        let obj = {
+          testQuestionsId: id,
+          contents: e.target.value,
+          type: 2,
+          patientRecordId: recordId ? recordId : '',
+        };
+        this.contentList.push(obj);
+      }
+      console.log(this.contentList);
+    },
+    // 上传图片事件
+    fileChange(info, id, recordId) {
+      console.log(info);
+      if (info.file.status === 'done') {
+        this.fileList = info.fileList;
+        for (let i = 0; i < this.contentList.length; i++) {
+          if (this.contentList[i].testQuestionsId === id) {
+            this.contentList.splice(i, 1);
+          }
+        }
+        if (info.fileList.length > 0) {
+          let obj = {
+            testQuestionsId: id,
+            patientRecordId: recordId ? recordId : '',
+            contents: info.fileList[0].response.data[0].visitUrl,
+          };
+          this.contentList.push(obj);
+        }
+        console.log(this.contentList);
+        console.log(this.fileList);
+      } else if (info.file.status === 'removed') {
+        this.fileList = info.fileList;
+        for (let i = 0; i < this.contentList.length; i++) {
+          if (this.contentList[i].testQuestionsId === id) {
+            this.contentList.splice(i, 1);
+          }
+        }
+      }
+    },
+    // 改变提交时间
+    changeDate(date) {
+      this.subDateTime = this.$moment(date._d).format('YYYY-MM-DD');
+    },
     // 提交表单
     async setData() {
       try {
         const params = {
           param: {
             list: this.contentList,
-            patientId: 1,
-            timeSlot: 123,
+            patientId: this.patientId,
+            timeSlot: this.subDateTime ? this.subDateTime : this.$moment(this.dateChoose).format('YYYY-MM-DD'),
           },
         };
         const res = await saveCaseMes(params);
         const { code, msg, data } = res.data;
         if (code === 200) {
-          console.log(data);
+          this.$message.success('提交成功');
         } else {
-          console.log(msg);
+          this.$message.error('提交失败');
         }
       } catch (error) {
         this.$message.error('error');