diff --git a/src/App.vue b/src/App.vue
index 99edf30..7adf3a7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,6 +27,7 @@ export default {
       if (val.userId) {
         const params = { userId: val.userId };
         this.getUserId(params);
+        console.log('val.userId:' + val.userId);
       }
     },
   },
@@ -35,9 +36,10 @@ export default {
     const userId = '1218763410024566784';
     const params = { userId };
     this.getUserId(params);
+    // this.getToken();
     this.getHospitalId();
-    if (sessionStorage.getItem('patientId')) {
-      this.setPatientId(sessionStorage.getItem('patientId'));
+    if (localStorage.getItem('patientId')) {
+      this.setPatientId(localStorage.getItem('patientId'));
     }
     const that = this;
     window.plugin = window.TallPlugin.init();
@@ -45,14 +47,14 @@ export default {
     // created接受一个回调函数 created成功后调用 可选参数
     // 接受PT传过来的 插件id，项目id，角色id，任务id，userId
     window.plugin.created(function(props) {
-      that.setPtProps(props);
       console.log('props: ', props);
+      that.setPtProps(props);
     });
   },
 
   methods: {
     ...mapActions('home', ['getUserId']),
-    ...mapMutations('home', ['setPtProps', 'setHospitalId', 'setPatientId']),
+    ...mapMutations('home', ['setPtProps', 'setHospitalId', 'setPatientId', 'getToken']),
 
     async getHospitalId() {
       try {
diff --git a/src/components/Echarts/Analysis.vue b/src/components/Echarts/Analysis.vue
new file mode 100644
index 0000000..6c840ce
--- /dev/null
+++ b/src/components/Echarts/Analysis.vue
@@ -0,0 +1,130 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-01-29 14:45:02
+ * @LastEditors: wally
+ * @LastEditTime: 2021-02-19 15:50:23
+-->
+<template>
+  <!-- <div>数据统计组件</div> -->
+  <div style="width: 100%; height: 500px" class="chart-box">
+    <div id="Analysis" style="height: 500px"></div>
+  </div>
+</template>
+<script>
+import { HospitalComplete } from 'config/api';
+export default {
+  name: 'Analysis',
+  props: {
+    lists: {
+      type: Object,
+      default: function() {
+        return {};
+      },
+    },
+  },
+  data() {
+    return {
+      // msg: 'Welcome to Your Vue.js App',
+      width: '',
+      height: '',
+      nameList: [], // 对照组名称数组
+      dataList: [],
+      series: [],
+      colorList: ['#5470C6', '#91CC75', '#FAC858', '#EE6666', '#73C0DE'],
+    };
+  },
+  watch: {
+    lists() {
+      this.nameList = [];
+      this.dataList = [];
+      this.series = [];
+      // 遍历 对照组 数组
+      for (let i = 0; i < this.lists.selGroupNums.length; i++) {
+        // 把所有搜索出来的对照组，组成一个数组作为Y轴
+        this.nameList.push(this.lists.selGroupNums[i].name);
+        let arr = [];
+        // 遍历 横坐标 数组
+        for (let j = 0; j < this.lists.stringList.length; j++) {
+          // 遍历 每个对照组 下的list数组
+          for (let k = 0; k < this.lists.selGroupNums[i].list.length; k++) {
+            // 当 某个横坐标 等于 某个对照组下的list数组的content时，添加 content 和 value
+            if (this.lists.selGroupNums[i].list[k].content === this.lists.stringList[j]) {
+              let obj = {
+                name: this.lists.selGroupNums[i].list[k].content,
+                value: this.lists.selGroupNums[i].list[k].nums,
+              };
+              arr.push(obj);
+              break;
+              // 当 不等于 且 当前处于 list数组最后一位时
+            } else if (k === this.lists.selGroupNums[i].list.length - 1) {
+              let obj = {
+                name: this.lists.stringList[i],
+                value: 0,
+              };
+              arr.push(obj);
+              break;
+            }
+          }
+        }
+        this.dataList.push(arr);
+      }
+      // 遍历 存储的数组 ，动态生成统计图的数据
+      for (let i = 0; i < this.dataList[0].length; i++) {
+        let arr1 = [];
+        for (let k = 0; k < this.dataList.length; k++) {
+          arr1.push(this.dataList[k][i].value);
+        }
+        let obj = {
+          name: this.dataList[0][i].name,
+          type: 'bar',
+          stack: 'total',
+          label: { show: true },
+          itemStyle: { color: this.colorList[`${i % 5}`] },
+          emphasis: { focus: 'series' },
+          data: arr1,
+        };
+        this.series.push(obj);
+      }
+      this.drawLine();
+      console.log(this.dataList);
+      console.log(this.series);
+    },
+  },
+  mounted() {
+    this.drawLine();
+  },
+  methods: {
+    drawLine() {
+      // 基于准备好的dom，初始化echarts实例
+      let myChart = this.$echarts.init(document.getElementById('Analysis'));
+      // 绘制图表
+      var option = {
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow', // 默认为直线，可选为：'line' | 'shadow'
+          },
+        },
+        legend: { data: this.lists.stringList },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true,
+        },
+        xAxis: { type: 'value' },
+        yAxis: {
+          type: 'category',
+          data: this.nameList,
+        },
+        series: this.series,
+      };
+      myChart.setOption(option);
+    },
+  },
+};
+</script>
+
+<style lang="stylus" scoped ></style>
diff --git a/src/components/PatientInfo/PatientTable.vue b/src/components/PatientInfo/PatientTable.vue
index d296bc1..40a30b0 100644
--- a/src/components/PatientInfo/PatientTable.vue
+++ b/src/components/PatientInfo/PatientTable.vue
@@ -110,7 +110,7 @@ export default {
     // 选择病患
     chooseItem(id) {
       this.setPatientId(id);
-      sessionStorage.setItem('patientId', id);
+      localStorage.setItem('patientId', id);
     },
 
     handleTableChange(pagination) {
diff --git a/src/config/api.js b/src/config/api.js
index 453ae5e..3e39b51 100644
--- a/src/config/api.js
+++ b/src/config/api.js
@@ -23,8 +23,10 @@ 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);
 
@@ -43,6 +45,9 @@ export const selSearchCriteriaList = params => axios.post(`${patient}/selSearchC
 // 试题相关接口：按code查看题目信息，code为空则查询全部
 export const queryAll = params => axios.post(`${tcm}/question/query`, params);
 
+// 查询所有得题目的类型和题目相关信息
+export const queryQuestion = params => axios.get(`${tcm}/question/queryQuestion`);
+
 // 查询所有对照组的信息
 export const getQuery = params => axios.post(`${inpatient}/query`, params);
 
diff --git a/src/main.js b/src/main.js
index a554e46..b7fa45b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -19,6 +19,8 @@ import 'echarts-gl';
 import 'echarts/map/js/province/shanxi.js'; //对应的省份
 import './plugins/vue-quill-editor.js';
 import VueDOMPurifyHTML from 'vue-dompurify-html';
+// import { getUserId } from 'config/api-user';
+
 // Vue.use(echarts);
 Vue.use(VueDOMPurifyHTML);
 Vue.prototype.$echarts = echarts;
@@ -28,6 +30,17 @@ import moment from 'moment'; //导入文件
 Vue.prototype.$moment = moment; //赋值使用
 Vue.config.productionTip = false;
 
+// router.beforeEach((to, from, next) => {
+//   const token = sessionStorage.getItem('anyringToken');
+//   if (token) {
+//     next();
+//   } else {
+//     const userId = '1218763410024566784';
+//     const params = { userId };
+//     getUserId(params).then(next());
+//   }
+// });
+
 window.vm = new Vue({
   router,
   store,
diff --git a/src/plugins/ant-design-vue.js b/src/plugins/ant-design-vue.js
index bd45be3..eccff69 100644
--- a/src/plugins/ant-design-vue.js
+++ b/src/plugins/ant-design-vue.js
@@ -39,6 +39,7 @@ import {
   Card,
   List,
   Collapse,
+  Cascader,
 } from 'ant-design-vue';
 import { ConfigProvider } from 'ant-design-vue';
 Vue.component(ConfigProvider.name, ConfigProvider);
@@ -72,6 +73,7 @@ Vue.use(Spin);
 Vue.use(Card);
 Vue.use(List);
 Vue.use(Collapse);
+Vue.use(Cascader);
 
 Vue.prototype.$message = message;
 Vue.prototype.$notification = notification;
diff --git a/src/store/modules/home/actions.js b/src/store/modules/home/actions.js
index 1ad22a3..642b427 100644
--- a/src/store/modules/home/actions.js
+++ b/src/store/modules/home/actions.js
@@ -16,6 +16,7 @@ const actions = {
       if (code === 200) {
         commit('sign', data.token);
         commit('setUser', data);
+        console.log(data.token);
         return data;
       } else {
         throw msg;
diff --git a/src/store/modules/home/mutations.js b/src/store/modules/home/mutations.js
index bd5bb3b..86ad67d 100644
--- a/src/store/modules/home/mutations.js
+++ b/src/store/modules/home/mutations.js
@@ -8,7 +8,15 @@ const mutations = {
     state.anyringToken = token;
     sessionStorage.setItem('anyringToken', token);
   },
-
+  /**
+   * 设置token
+   * @param { object } state
+   * @param { string } token
+   */
+  getToken(state, token) {
+    state.anyringToken = sessionStorage.getItem('anyringToken');
+    console.log('anyringToken' + sessionStorage.getItem('anyringToken'));
+  },
   /**
    * 设置user用户信息
    * @param {object} state
diff --git a/src/views/CaseAnalysis/CaseAnalysis.vue b/src/views/CaseAnalysis/CaseAnalysis.vue
index 6862308..ddf86e4 100644
--- a/src/views/CaseAnalysis/CaseAnalysis.vue
+++ b/src/views/CaseAnalysis/CaseAnalysis.vue
@@ -1,159 +1,507 @@
 <template>
   <div class="flex-column">
-    <a-collapse v-model="activeKey">
-      <a-collapse-panel key="1" header="搜索条件">
-        <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: 150px" @change="chooseHos($event, 3)">
-                  <a-select-option :key="item.id" :value="item.id" v-for="item in statusList">{{ item.name }}</a-select-option>
+    <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: 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">
+      <a-collapse v-model="activeKey">
+        <!-- 首先遍历整个data大数组 -->
+        <!-- <div v-for="(item, index) in list" :key="index"> -->
+        <a-collapse-panel v-for="(item, index) in list" :key="index.toString()" :header="item.name">
+          <!-- <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+              一级大标题
+              <h2>{{ item.name }}：</h2>
+            </a-form-item> -->
+          <!-- 一级标题下的各种问题（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.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.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-row>
+              </a-checkbox-group>
+              <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-range-picker show-time 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.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.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">
+                    <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 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-form-item>
-            </a-form>
-            <div class="flex-1"></div>
+                <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.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">
+                      <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: 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.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-range-picker
+                                show-time
+                                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.recordId)" />
+              </div>
+              <div v-else-if="a.type === 14">图片识别</div>
+            </a-form-item>
           </div>
-        </div>
-        <a-form :form="form">
-          <!-- 首先遍历整个data大数组 -->
-          <div v-for="(item, index) in list" :key="index">
+          <!-- 一级标题下的各种二级标题（subReportCodes） -->
+          <div v-for="w in item.subReportCodes" :key="w.name">
             <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <!-- 一级大标题 -->
-              <h2>{{ item.name }}：</h2>
+              <!-- 二级大标题 -->
+              <h3>{{ w.name }}：</h3>
             </a-form-item>
-            <!-- 一级标题下的各种问题（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.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>
+            <!-- 二级标题下的各种类型 -->
+            <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, 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="a.type === 4" @change="onChange($event, a.type, a.id, a.recordId)">
+                <a-checkbox-group v-else-if="e.type === 4" @change="onChange($event, e.type, e.id, e.recordId)">
                   <a-row>
-                    <a-col :span="24" v-for="(ques, indexNum) in a.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>
                   </a-row>
                 </a-checkbox-group>
-                <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 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-range-picker show-time v-else-if="a.type === 6" @change="onChange($event, a.type, a.id, a.recordId)" />
+                <a-range-picker show-time v-else-if="e.type === 6" @change="onChange($event, e.type, e.id, e.recordId)" />
                 <a-upload
-                  v-else-if="a.type === 7"
+                  v-else-if="e.type === 7"
                   :action="action"
                   :default-file-list="fileList"
-                  :headers="headers"
                   list-type="picture"
-                  @change="fileChange($event, a.id)"
+                  :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="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">
+                <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 a.optionVos" :key="k">
+                  <div v-for="(j, k) in e.optionVos" :key="k">
                     <div
                       v-if="
                         contentList.find(item => {
-                          return item.testQuestionsId === a.id && item.contents === `${j.showValue}`;
+                          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(a.id, $event, j.showValue)"></a-input>
+                        <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="a.type === 9" @change="onChange($event, a.type, a.id, a.recordId)">
+                <a-checkbox-group v-else-if="e.type === 9" @change="onChange($event, e.type, e.id, e.recordId)">
                   <a-row>
-                    <a-col :span="24" v-for="(ques, indexNum) in a.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>
                     <a-col :span="100">
-                      <div v-for="(j, k) in a.optionVos" :key="k">
+                      <div v-for="(j, k) in e.optionVos" :key="k">
                         <div
                           v-if="
                             contentList.find(item => {
-                              return item.testQuestionsId === a.id && item.contents === `${j.showValue}`;
+                              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(a.id, $event, j.showValue)"></a-input>
+                            <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="a.type === 10">
-                  <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>
+                <div v-else-if="e.type === 10">
+                  <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>
-                  <div v-for="(b, c) in a.optionVos" :key="c">
+                  <div v-for="(b, c) in e.optionVos" :key="c">
                     <div
                       v-if="
                         contentList.find(item => {
-                          return item.testQuestionsId === a.id && item.contents === `${b.showValue}`;
+                          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(a.id, $event, b.showValue)"></a-input>
+                        <a-input style="width: 200px" @change="inputChange(e.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.recordId)">
+                <div v-else-if="e.type === 11">
+                  <a-checkbox-group @change="onChange($event, e.type, e.id, e.recordId)">
                     <a-row>
-                      <a-col :span="24" v-for="(ques, indexNum) in a.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>
                       <a-col :span="100">
-                        <div v-for="(b, c) in a.optionVos" :key="c">
+                        <div v-for="(b, c) in e.optionVos" :key="c">
                           <div
                             v-if="
                               contentList.find(item => {
-                                return item.testQuestionsId === a.id && item.contents.find(content => content === `${b.showValue}`);
+                                return item.testQuestionsId === e.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>
+                            <a-input style="width: 200px" @change="inputChange(e.id, $event, b.showValue)"></a-input>
                           </div>
                         </div>
                       </a-col>
                     </a-row>
-                    说明： <a-input style="width: 200px" @change="explainChange(a.id, $event)" />
+                    说明： <a-input style="width: 200px" @change="explainChange(e.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.recordId)">
-                    <a-radio v-for="(f, g) in a.optionVos" :key="g" :style="radioStyle" :value="f.showValue">
+                <div v-else-if="e.type === 12">
+                  <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 a.optionVos" :key="k">
+                  <div v-for="(j, k) in e.optionVos" :key="k">
                     <div
                       v-if="
                         contentList.find(item => {
-                          return item.testQuestionsId === a.id && item.contents === `${j.showValue}`;
+                          return item.testQuestionsId === e.id && item.contents === `${j.showValue}`;
                         }) && j.afterOperation > 0
                       "
                     >
@@ -162,559 +510,218 @@
                           <a-input
                             v-if="j.afterOperation === 1"
                             style="width: 200px"
-                            @change="inputChange(a.id, $event, j.showValue)"
+                            @change="inputChange(e.id, $event, j.showValue)"
                           ></a-input>
-                          <a-textarea v-else-if="j.afterOperation === 2" @change="inputChange(a.id, $event, j.showValue)"></a-textarea>
+                          <a-textarea v-else-if="j.afterOperation === 2" @change="inputChange(e.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-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-range-picker show-time 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-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-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>
-                                <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-range-picker
-                                  show-time
-                                  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 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>
-                                </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-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>
-                                  </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.recordId)" />
-                </div>
-                <div v-else-if="a.type === 14">图片识别</div>
-              </a-form-item>
-            </div>
-            <!-- 一级标题下的各种二级标题（subReportCodes） -->
-            <div v-for="w in item.subReportCodes" :key="w.name">
-              <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-                <!-- 二级大标题 -->
-                <h3>{{ w.name }}：</h3>
-              </a-form-item>
-              <!-- 二级标题下的各种类型 -->
-              <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, 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, e.recordId)">
-                    <a-row>
-                      <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" 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-range-picker show-time 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, 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, e.recordId)">
-                    <a-row>
-                      <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="100">
-                        <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 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>
-                    <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, e.recordId)">
-                      <a-row>
-                        <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="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 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, 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-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>
-                                <a-range-picker show-time 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 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>
-                                </a-radio-group>
-                                <a-checkbox-group v-else-if="h.type === 9" @change="onChange($event, h.type, h.id, h.recordId)">
+                                </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="(m, n) in h.optionVos" :key="n">
+                                      <div v-for="(b, c) in h.optionVos" :key="c">
                                         <div
                                           v-if="
                                             contentList.find(item => {
-                                              return item.testQuestionsId === h.id && item.contents === `${m.showValue}`;
-                                            }) && m.afterOperation === 1
+                                              return (
+                                                item.testQuestionsId === h.id && item.contents.find(content => content === `${b.showValue}`)
+                                              );
+                                            }) && b.afterOperation > 0
                                           "
                                         >
-                                          <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>
+                                          <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 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>
+                              </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 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 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 v-else-if="e.type === 13">
-                    <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 v-else-if="e.type === 13">
+                  <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>
-        </a-form>
-        <a-button class="white--text px-10" type="primary" @click="setData()" v-if="list.length > 0">提交</a-button>
-      </a-collapse-panel>
-    </a-collapse>
+        </a-collapse-panel>
+        <!-- </div> -->
+      </a-collapse>
+    </a-form>
+    <div style="padding: 4px 0 40px 0">
+      <a-cascader
+        style="width: 200px"
+        :field-names="{ label: 'name', value: 'id', children: 'optionVos' }"
+        :options="options"
+        :display-render="displayRender"
+        expand-trigger="hover"
+        placeholder="请选择类型"
+        @change="changeQues"
+      />
+      <a-select mode="multiple" size="default" placeholder="请选择对照组" style="width: 450px; margin-left: 40px" @change="handleChange">
+        <a-select-option v-for="i in controlGroups" :key="i.id">
+          {{ i.name }}
+        </a-select-option>
+      </a-select>
+    </div>
+    <a-button class="white--text px-10" type="primary" @click="setData()" v-if="list.length > 0">提交</a-button>
+    <a-card style="width: 100%; height: 600px; margin-top: 10px" title="病例分析统计">
+      <analysis :lists="lists" />
+    </a-card>
   </div>
 </template>
 
 <script>
 import { mapState, mapActions } from 'vuex';
-import { getHList, selSearchCriteriaList, queryAll, countAnalysis, upload } from 'config/api';
+import { getHList, selSearchCriteriaList, queryAll, countAnalysis, upload, queryQuestion } from 'config/api';
+import Analysis from 'components/Echarts/Analysis';
 const formItemLayout = {
   labelCol: { span: 6 },
   wrapperCol: { span: 9 },
@@ -722,6 +729,7 @@ const formItemLayout = {
 const tailItemLayout = { wrapperCol: { span: 18, offset: 4 } };
 export default {
   name: 'CaseAnalysis',
+  components: { Analysis },
   data() {
     return {
       formItemLayout,
@@ -773,8 +781,11 @@ export default {
           name: '废弃',
         },
       ],
-      lists: { pageNum: 1, pageSize: 10, total: 1, list: [] },
-      activeKey: ['1'], // 折叠面板
+      lists: {},
+      activeKey: ['0'], // 折叠面板
+      options: [], // 分析属性内的问题数组
+      testQuestionsId: '', // 分析属性内的问题Id
+      inpatientList: [], // 分析属性内的对照组Id数组
     };
   },
   computed: {
@@ -786,6 +797,7 @@ export default {
     },
   },
   created() {
+    this.getQues();
     this.getControlGroups();
     this.handleSearchCriteriaList();
     this.getHos();
@@ -1077,6 +1089,35 @@ export default {
         }
       }
     },
+    // 查询所有试题及ID，用于分析
+    async getQues() {
+      try {
+        const params = {};
+        const res = await queryQuestion(params);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          this.options = data;
+        } else {
+          this.$message.error('查询失败');
+        }
+      } catch (error) {
+        this.$message.error(error);
+      }
+    },
+    // 改变属性分析内的问题属性
+    changeQues(value) {
+      this.testQuestionsId = parseInt(value);
+    },
+    displayRender({ labels }) {
+      return labels[labels.length - 1];
+    },
+    handleChange(value) {
+      console.log(`Selected: ${value}`);
+      this.inpatientList = [];
+      for (let i = 0; i < value.length; i++) {
+        this.inpatientList.push(parseInt(value[i]));
+      }
+    },
     // 搜索数据
     async setData() {
       try {
@@ -1086,16 +1127,16 @@ export default {
             conditionListDate: this.conditionListDate,
             hospitalId: this.setObj.hospitalId, // 医院id
             hospitalization: this.setObj.hospitalization, // 住院号
-            inpatientId: [], // 对照组id
+            inpatientId: this.inpatientList, // 对照组id
             inputStatus: this.setObj.inputStatus, // 录入状态
-            testQuestionsId: '',
+            testQuestionsId: this.testQuestionsId,
           },
         };
         const res = await countAnalysis(params);
         const { code, msg, data } = res.data;
         if (code === 200) {
           this.lists = data;
-          console.log(this.lists);
+          // console.log(this.lists);
         } else {
           this.$message.error('搜索失败');
         }
diff --git a/src/views/CaseSearch/CaseSearch.vue b/src/views/CaseSearch/CaseSearch.vue
index 6dd4e3c..bef8b64 100644
--- a/src/views/CaseSearch/CaseSearch.vue
+++ b/src/views/CaseSearch/CaseSearch.vue
@@ -797,6 +797,7 @@ export default {
     this.getControlGroups();
     this.handleSearchCriteriaList();
     this.getHos();
+
     this.setData();
   },
 
diff --git a/src/views/PatientInfo/PatientInfo.vue b/src/views/PatientInfo/PatientInfo.vue
index 206cce9..2faf8b1 100644
--- a/src/views/PatientInfo/PatientInfo.vue
+++ b/src/views/PatientInfo/PatientInfo.vue
@@ -719,7 +719,7 @@ export default {
       action: upload, // 上传附件地址
       fileList: [], // 附件列表
       files: '', // 附件Id
-      dateFormat: 'YYYY-MM-DD',
+      dateFormat: 'YYYY-MM-DD HH:mm:ss',
       dateChoose: new Date(),
       subDateTime: '',
     };
@@ -980,7 +980,7 @@ export default {
     },
     // 改变提交时间
     changeDate(date) {
-      this.subDateTime = this.$moment(date._d).format('YYYY-MM-DD');
+      this.subDateTime = this.$moment(date._d).format('YYYY-MM-DD HH:mm:ss');
     },
     // 提交表单
     async setData() {
@@ -989,7 +989,7 @@ export default {
           param: {
             list: this.contentList,
             patientId: this.patientId,
-            timeSlot: this.subDateTime ? this.subDateTime : this.$moment(this.dateChoose).format('YYYY-MM-DD'),
+            timeSlot: this.subDateTime ? this.subDateTime : this.$moment(this.dateChoose).format('YYYY-MM-DD HH:mm:ss'),
           },
         };
         const res = await saveCaseMes(params);
diff --git a/src/views/SelectPatient/SelectPatient.vue b/src/views/SelectPatient/SelectPatient.vue
index bb61425..ef4eda9 100644
--- a/src/views/SelectPatient/SelectPatient.vue
+++ b/src/views/SelectPatient/SelectPatient.vue
@@ -51,6 +51,7 @@ export default {
         };
         const res = await selPatientMes(params);
         const { code, msg, data } = res.data;
+        console.log('获取列表');
         if (code === 200) {
           this.lists = data;
         } else {
@@ -58,7 +59,7 @@ export default {
           throw msg;
         }
       } catch (error) {
-        throw new Error(`CaseSearch.vue method selSearchCriteriaList: ${error}`);
+        throw new Error(error);
       }
     },
   },