diff --git a/src/App.vue b/src/App.vue
index 38d3c99..562ae05 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,9 +7,9 @@
 -->
 <template>
   <a-config-provider :locale="zh_CN">
-    <div v-if="isRouter" class="d-flex flex-row flex-nowrap" id="app">
-      <!-- <div class="d-flex flex-row flex-nowrap" id="app"> -->
-      <!-- <btn-con /> -->
+    <!-- <div v-if="isRouter" class="d-flex flex-row flex-nowrap" id="app"> -->
+    <div class="d-flex flex-row flex-nowrap" id="app">
+      <btn-con />
       <router-view class="flex-1 bg" style="padding: 6px"></router-view>
     </div>
   </a-config-provider>
@@ -18,12 +18,12 @@
 <script>
 import { mapState, mapActions, mapMutations } from 'vuex';
 import zh_CN from 'ant-design-vue/lib/locale-provider/zh_CN';
-// import BtnCon from 'components/BtnCom/BtnCon.vue';
+import BtnCon from 'components/BtnCom/BtnCon.vue';
 import { getHId } from 'config/api';
 
 export default {
   name: 'App',
-  // components: { BtnCon },
+  components: { BtnCon },
   data() {
     return { zh_CN, isRouter: false };
   },
@@ -36,10 +36,10 @@ export default {
     },
   },
   async created() {
-    // const userId = '1387952026067013632';
-    // const params = { userId };
-    // await this.getUserId(params);
-    // await this.getToken();
+    const userId = '1387952026067013632';
+    const params = { userId };
+    await this.getUserId(params);
+    await this.getToken();
     if (localStorage.getItem('patientId')) {
       this.setPatientId(localStorage.getItem('patientId'));
     }
diff --git a/src/components/CaseTable/CaseTable.vue b/src/components/CaseTable/CaseTable.vue
index edec896..cf7c76f 100644
--- a/src/components/CaseTable/CaseTable.vue
+++ b/src/components/CaseTable/CaseTable.vue
@@ -19,7 +19,7 @@
           <span v-if="record.inputStatus === 0">新建</span>
           <span v-else-if="record.inputStatus === 1">数据收集中</span>
           <span v-else-if="record.inputStatus === 2">数据收集按时完成</span>
-          <span v-else-if="record.inputStatus === 3">数据收集超时中</span>
+          <!-- <span v-else-if="record.inputStatus === 3">数据收集超时中</span> -->
           <span v-else-if="record.inputStatus === 4">废弃</span>
           <span v-else-if="record.inputStatus === 5">审核通过</span>
           <span v-else-if="record.inputStatus === 6">已结算</span>
@@ -33,7 +33,7 @@
     <a-empty v-else />
     <a-modal title="修改状态" :visible="visible" :confirm-loading="confirmLoading" @ok="handleOk" @cancel="handleCancel">
       <a-select :default-value="defaultValue" :key="defaultValue" style="width: 200px" @change="handleChange">
-        <a-select-option v-for="(item, index) in statusList" :value="index" :key="index"> {{ item }} </a-select-option>
+        <a-select-option v-for="item in statusList" :value="item.id" :key="item.id"> {{ item.name }} </a-select-option>
       </a-select>
     </a-modal>
   </div>
@@ -106,7 +106,25 @@ export default {
       recordId: '',
       recordType: '',
       defaultValue: '',
-      statusList: ['新建', '数据收集中', '数据收集按时完成', '数据收集超时中', '废弃'],
+      // statusList: ['新建', '数据收集中', '数据收集按时完成', '数据收集超时中', '废弃'],
+      statusList: [
+        {
+          name: '新建',
+          id: 0,
+        },
+        {
+          name: '数据收集中',
+          id: 1,
+        },
+        {
+          name: '数据收集按时完成',
+          id: 2,
+        },
+        {
+          name: '废弃',
+          id: 4,
+        },
+      ],
     };
   },
 
@@ -148,7 +166,7 @@ export default {
     showEditModal(id, inputStatus) {
       this.recordId = id;
       this.recordType = inputStatus;
-      this.defaultValue = this.statusList[inputStatus];
+      this.defaultValue = this.statusList[inputStatus].id;
       this.visible = true;
     },
     async handleOk() {
diff --git a/src/components/Echarts/Categorymap.vue b/src/components/Echarts/Categorymap.vue
index ed45100..aedfa98 100644
--- a/src/components/Echarts/Categorymap.vue
+++ b/src/components/Echarts/Categorymap.vue
@@ -57,7 +57,8 @@ export default {
       // 绘制图表
       await this.getData();
       var option = {
-        legend: { data: ['新建', '数据收集按时完成', '数据收集中', '废弃', '数据收集超时'] },
+        // legend: { data: ['新建', '数据收集按时完成', '数据收集中', '废弃', '数据收集超时'] },
+        legend: { data: ['新建', '数据收集按时完成', '数据收集中'] },
         xAxis: [
           {
             axisLabel: {
@@ -202,68 +203,68 @@ export default {
               },
             },
           },
-          {
-            name: '废弃',
-            type: 'bar',
-            // label: labelOption,
-            emphasis: { focus: 'series' },
-            data: this.dList,
-            barWidth: this.widthNum > 550 ? 20 : 10,
-            itemStyle: {
-              normal: {
-                label: {
-                  formatter: '{c}',
-                  show: true,
-                  position: 'top',
-                  textStyle: {
-                    fontSize: '12',
-                    color: '#000',
-                  },
-                },
-                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  { offset: 0, color: '#f00' }, //柱图渐变色
-                  { offset: 1, color: '#F00' }, //柱图渐变色
-                ]),
-              },
-              emphasis: {
-                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  { offset: 0, color: '#F00' }, //柱图高亮渐变色
-                  { offset: 1, color: '#F00' }, //柱图高亮渐变色
-                ]),
-              },
-            },
-          },
-          {
-            name: '数据收集超时',
-            type: 'bar',
-            // label: labelOption,
-            emphasis: { focus: 'series' },
-            data: this.eList,
-            barWidth: this.widthNum > 550 ? 20 : 10,
-            itemStyle: {
-              normal: {
-                label: {
-                  formatter: '{c}',
-                  show: true,
-                  position: 'top',
-                  textStyle: {
-                    fontSize: '12',
-                    color: '#000',
-                  },
-                },
-                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  { offset: 0, color: '#F5D041' }, //柱图渐变色
-                  { offset: 1, color: '#FF9000' }, //柱图渐变色
-                ]),
-              },
-              emphasis: {
-                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  { offset: 0, color: '#F5D041' }, //柱图高亮渐变色
-                  { offset: 1, color: '#FF9000' }, //柱图高亮渐变色
-                ]),
-              },
-            },
-          },
+          // {
+          //   name: '废弃',
+          //   type: 'bar',
+          //   // label: labelOption,
+          //   emphasis: { focus: 'series' },
+          //   data: this.dList,
+          //   barWidth: this.widthNum > 550 ? 20 : 10,
+          //   itemStyle: {
+          //     normal: {
+          //       label: {
+          //         formatter: '{c}',
+          //         show: true,
+          //         position: 'top',
+          //         textStyle: {
+          //           fontSize: '12',
+          //           color: '#000',
+          //         },
+          //       },
+          //       color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          //         { offset: 0, color: '#f00' }, //柱图渐变色
+          //         { offset: 1, color: '#F00' }, //柱图渐变色
+          //       ]),
+          //     },
+          //     emphasis: {
+          //       color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          //         { offset: 0, color: '#F00' }, //柱图高亮渐变色
+          //         { offset: 1, color: '#F00' }, //柱图高亮渐变色
+          //       ]),
+          //     },
+          //   },
+          // },
+          // {
+          //   name: '数据收集超时',
+          //   type: 'bar',
+          //   // label: labelOption,
+          //   emphasis: { focus: 'series' },
+          //   data: this.eList,
+          //   barWidth: this.widthNum > 550 ? 20 : 10,
+          //   itemStyle: {
+          //     normal: {
+          //       label: {
+          //         formatter: '{c}',
+          //         show: true,
+          //         position: 'top',
+          //         textStyle: {
+          //           fontSize: '12',
+          //           color: '#000',
+          //         },
+          //       },
+          //       color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          //         { offset: 0, color: '#F5D041' }, //柱图渐变色
+          //         { offset: 1, color: '#FF9000' }, //柱图渐变色
+          //       ]),
+          //     },
+          //     emphasis: {
+          //       color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          //         { offset: 0, color: '#F5D041' }, //柱图高亮渐变色
+          //         { offset: 1, color: '#FF9000' }, //柱图高亮渐变色
+          //       ]),
+          //     },
+          //   },
+          // },
         ],
       };
       myChart.setOption(option);
diff --git a/src/components/Echarts/CategorymapHos.vue b/src/components/Echarts/CategorymapHos.vue
index e7c473e..77c0275 100644
--- a/src/components/Echarts/CategorymapHos.vue
+++ b/src/components/Echarts/CategorymapHos.vue
@@ -44,7 +44,8 @@ export default {
       await this.getData(this.hospitalId);
       // 绘制图表
       var option = {
-        legend: { data: ['新建', '数据收集按时完成', '数据收集中', '废弃', '数据收集超时'] },
+        // legend: { data: ['新建', '数据收集按时完成', '数据收集中', '废弃', '数据收集超时'] },
+        legend: { data: ['新建', '数据收集按时完成', '数据收集中'] },
         xAxis: [
           {
             axisLabel: {
@@ -189,68 +190,68 @@ export default {
               },
             },
           },
-          {
-            name: '废弃',
-            type: 'bar',
-            // label: labelOption,
-            emphasis: { focus: 'series' },
-            data: this.dList,
-            barWidth: this.widthNum > 550 ? 20 : 10,
-            itemStyle: {
-              normal: {
-                label: {
-                  formatter: '{c}',
-                  show: true,
-                  position: 'top',
-                  textStyle: {
-                    fontSize: '12',
-                    color: '#000',
-                  },
-                },
-                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  { offset: 0, color: '#f00' }, //柱图渐变色
-                  { offset: 1, color: '#F00' }, //柱图渐变色
-                ]),
-              },
-              emphasis: {
-                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  { offset: 0, color: '#F00' }, //柱图高亮渐变色
-                  { offset: 1, color: '#F00' }, //柱图高亮渐变色
-                ]),
-              },
-            },
-          },
-          {
-            name: '数据收集超时',
-            type: 'bar',
-            // label: labelOption,
-            emphasis: { focus: 'series' },
-            data: this.eList,
-            barWidth: this.widthNum > 550 ? 20 : 10,
-            itemStyle: {
-              normal: {
-                label: {
-                  formatter: '{c}',
-                  show: true,
-                  position: 'top',
-                  textStyle: {
-                    fontSize: '12',
-                    color: '#000',
-                  },
-                },
-                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  { offset: 0, color: '#F5D041' }, //柱图渐变色
-                  { offset: 1, color: '#FF9000' }, //柱图渐变色
-                ]),
-              },
-              emphasis: {
-                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  { offset: 0, color: '#F5D041' }, //柱图高亮渐变色
-                  { offset: 1, color: '#FF9000' }, //柱图高亮渐变色
-                ]),
-              },
-            },
-          },
+          // {
+          //   name: '废弃',
+          //   type: 'bar',
+          //   // label: labelOption,
+          //   emphasis: { focus: 'series' },
+          //   data: this.dList,
+          //   barWidth: this.widthNum > 550 ? 20 : 10,
+          //   itemStyle: {
+          //     normal: {
+          //       label: {
+          //         formatter: '{c}',
+          //         show: true,
+          //         position: 'top',
+          //         textStyle: {
+          //           fontSize: '12',
+          //           color: '#000',
+          //         },
+          //       },
+          //       color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          //         { offset: 0, color: '#f00' }, //柱图渐变色
+          //         { offset: 1, color: '#F00' }, //柱图渐变色
+          //       ]),
+          //     },
+          //     emphasis: {
+          //       color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          //         { offset: 0, color: '#F00' }, //柱图高亮渐变色
+          //         { offset: 1, color: '#F00' }, //柱图高亮渐变色
+          //       ]),
+          //     },
+          //   },
+          // },
+          // {
+          //   name: '数据收集超时',
+          //   type: 'bar',
+          //   // label: labelOption,
+          //   emphasis: { focus: 'series' },
+          //   data: this.eList,
+          //   barWidth: this.widthNum > 550 ? 20 : 10,
+          //   itemStyle: {
+          //     normal: {
+          //       label: {
+          //         formatter: '{c}',
+          //         show: true,
+          //         position: 'top',
+          //         textStyle: {
+          //           fontSize: '12',
+          //           color: '#000',
+          //         },
+          //       },
+          //       color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          //         { offset: 0, color: '#F5D041' }, //柱图渐变色
+          //         { offset: 1, color: '#FF9000' }, //柱图渐变色
+          //       ]),
+          //     },
+          //     emphasis: {
+          //       color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          //         { offset: 0, color: '#F5D041' }, //柱图高亮渐变色
+          //         { offset: 1, color: '#FF9000' }, //柱图高亮渐变色
+          //       ]),
+          //     },
+          //   },
+          // },
         ],
       };
       myChart.setOption(option);
diff --git a/src/components/PatientInfo/PatientAdd.vue b/src/components/PatientInfo/PatientAdd.vue
index c7e2ef1..1162462 100644
--- a/src/components/PatientInfo/PatientAdd.vue
+++ b/src/components/PatientInfo/PatientAdd.vue
@@ -41,7 +41,7 @@
         <!-- 组别 -->
         <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="组别">
           <a-select placeholder="请选择组别" v-decorator="['inpatientId', { rules: [{ required: true, message: '组别不能为空' }] }]">
-            <a-select-option :key="index" :value="group.id" v-for="(group, index) in controlGroups">{{ group.name }}</a-select-option>
+            <a-select-option :key="index" :value="group.id" v-for="(group, index) in controlList">{{ group.name }}</a-select-option>
           </a-select>
         </a-form-item>
 
@@ -56,7 +56,7 @@
 
 <script>
 import { mapState } from 'vuex';
-import { savePatientMes } from 'config/api';
+import { savePatientMes, queryEnable } from 'config/api';
 
 const formItemLayout = {
   labelCol: { span: 6 },
@@ -71,12 +71,26 @@ export default {
       formItemLayout,
       tailItemLayout,
       form: this.$form.createForm(this, { name: 'r-d-add' }),
+      controlList: [],
     };
   },
-
-  computed: mapState('home', ['controlGroups']),
-
+  created() {
+    this.getList();
+  },
   methods: {
+    async getList() {
+      try {
+        const res = await queryEnable({});
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          this.controlList = data;
+        } else {
+          console.log(msg);
+        }
+      } catch (error) {
+        console.error(error);
+      }
+    },
     // 提交表单
     handleSubmit(e) {
       e.preventDefault();
diff --git a/src/components/PatientInfo/PatientTable.vue b/src/components/PatientInfo/PatientTable.vue
index 9c63eec..35f45a2 100644
--- a/src/components/PatientInfo/PatientTable.vue
+++ b/src/components/PatientInfo/PatientTable.vue
@@ -25,8 +25,6 @@
                 ? '数据收集中'
                 : record.inputStatus === 2
                 ? '数据收集按时完成'
-                : record.inputStatus === 3
-                ? '数据收集超时'
                 : record.inputStatus === 4
                 ? '废弃'
                 : record.inputStatus === 5
@@ -88,8 +86,6 @@
                   ? '数据收集中'
                   : record.inputStatus === 2
                   ? '数据收集按时完成'
-                  : record.inputStatus === 3
-                  ? '数据收集超时'
                   : record.inputStatus === 4
                   ? '废弃'
                   : record.inputStatus === 5
diff --git a/src/components/PatientInfo/Search.vue b/src/components/PatientInfo/Search.vue
index 4acc672..c9fb5c6 100644
--- a/src/components/PatientInfo/Search.vue
+++ b/src/components/PatientInfo/Search.vue
@@ -43,6 +43,7 @@ export default {
     return {
       form: this.$form.createForm(this, { name: 'search' }),
       visible: false,
+      controlList: [],
     };
   },
 
diff --git a/src/config/api.js b/src/config/api.js
index 506ba16..af8ab5d 100644
--- a/src/config/api.js
+++ b/src/config/api.js
@@ -55,6 +55,9 @@ export const queryQuestion = params => axios.get(`${tcm}/question/queryQuestion`
 // 查询所有组别的信息
 export const getQuery = params => axios.post(`${inpatient}/query`, params);
 
+// 查询组别信息（含有不可选择的）
+export const queryEnable = params => axios.post(`${inpatient}/queryEnable`, params);
+
 // 查询统计病例数据
 export const complete = params => axios.post(`${statistics}/complete`, params);
 
diff --git a/src/store/modules/home/mutations.js b/src/store/modules/home/mutations.js
index 978ce90..1c4b025 100644
--- a/src/store/modules/home/mutations.js
+++ b/src/store/modules/home/mutations.js
@@ -29,7 +29,7 @@ const mutations = {
   },
 
   /**
-   * 设置user用户信息
+   * 设置组别信息
    * @param {object} state
    * @param {Array} data
    */
diff --git a/src/views/CaseAnalysis/CaseAnalysis.vue b/src/views/CaseAnalysis/CaseAnalysis.vue
index 1b63e4f..d4739b4 100644
--- a/src/views/CaseAnalysis/CaseAnalysis.vue
+++ b/src/views/CaseAnalysis/CaseAnalysis.vue
@@ -1444,10 +1444,10 @@ export default {
           id: 2,
           name: '数据收集按时完成',
         },
-        {
-          id: 3,
-          name: '数据收集超时中',
-        },
+        // {
+        //   id: 3,
+        //   name: '数据收集超时中',
+        // },
         {
           id: 4,
           name: '废弃',
diff --git a/src/views/CaseSearch/CaseSearch.vue b/src/views/CaseSearch/CaseSearch.vue
index 84362d8..0c910ad 100644
--- a/src/views/CaseSearch/CaseSearch.vue
+++ b/src/views/CaseSearch/CaseSearch.vue
@@ -1409,10 +1409,10 @@ export default {
           id: 2,
           name: '数据收集按时完成',
         },
-        {
-          id: 3,
-          name: '数据收集超时中',
-        },
+        // {
+        //   id: 3,
+        //   name: '数据收集超时中',
+        // },
         {
           id: 4,
           name: '废弃',
diff --git a/src/views/ProjectAssistant/Examine.vue b/src/views/ProjectAssistant/Examine.vue
index 4745839..aa955cd 100644
--- a/src/views/ProjectAssistant/Examine.vue
+++ b/src/views/ProjectAssistant/Examine.vue
@@ -58,8 +58,6 @@
                 ? '数据收集中'
                 : record.inputStatus === 2
                 ? '数据收集按时完成'
-                : record.inputStatus === 3
-                ? '数据收集超时中'
                 : record.inputStatus === 4
                 ? '废弃'
                 : record.inputStatus === 5
diff --git a/src/views/ProjectAssistant/General.vue b/src/views/ProjectAssistant/General.vue
index 83b4fea..5789b90 100644
--- a/src/views/ProjectAssistant/General.vue
+++ b/src/views/ProjectAssistant/General.vue
@@ -60,8 +60,6 @@
                 ? '数据收集中'
                 : record.inputStatus === 2
                 ? '数据收集按时完成'
-                : record.inputStatus === 3
-                ? '数据收集超时中'
                 : record.inputStatus === 4
                 ? '废弃'
                 : record.inputStatus === 5