diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index 82496a0..212982d 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -21,17 +21,14 @@
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '取消审核')" class="listBtn">
             <el-button type="primary" class="commonbutton" @click="unAudit" :disabled="sumBtnDisabled('unAudit')">取消审核</el-button>
-        </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '新增建议')" class="listBtn">
-            <el-button type="primary" class="commonbutton" @click="addSuggtion" :disabled="sumBtnDisabled('addSuggtion')">新增建议</el-button>
-        </div>
+        </div>        
         <!-- 直接放在 建议旁边
         <div class="listBtn">
             <el-button type="primary" class="btnClass" @click="addDiagnosis">疾病诊断</el-button>
         </div>
         -->
         <div v-show="checkPagePriv(pagePriv.privs, '体检报告')" class="listBtn">
-            <el-button type="primary" class="commonbutton" @click="report" :disabled="sumBtnDisabled('report')">体检报告</el-button>
+            <el-button type="primary" class="commonbutton" @click="btnReport" :disabled="sumBtnDisabled('report')">体检报告</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '复查')" class="listBtn">
             <el-button type="primary" class="commonbutton" @click="reCheck" :disabled="sumBtnDisabled('reCheck')">复查</el-button>
@@ -75,7 +72,6 @@ export default {
         PatientRegisterList,
         SumDiagnosis,
     },
-    props: ["fnSetSuggestionFocus"],
     data() {
         return {
             pagePriv: {
@@ -288,7 +284,7 @@ export default {
         },
 
         //体检报告
-        report() {
+        btnReport() {
 
             if (!this.$peisAPI) {
                 this.$message.info("此功能，需要在壳客户端才可运行！")
@@ -326,39 +322,7 @@ export default {
 
         },
 
-        //增加建议
-        addSuggtion() {
-            let id = String(new Date().getTime())
-            let pojo = {
-                id,
-                patientRegisterId: this.dataTransOpts.tableS.patient_register.id,
-                diagnosisIds: [],
-                medicalInterpretations: [
-                    {
-                        sumSuggestionHeaderId: id, // 拖拽用到
-                        diagnosisId: '',  // 关联诊断用到
-                        suggestionContent: '',
-                    }
-                ],
-                commonReasons: [
-                    {
-                        sumSuggestionHeaderId: id, // 拖拽用到
-                        diagnosisId: '',
-                        suggestionContent: '',
-                    }
-                ],
-                healthGuidances: [
-                    {
-                        sumSuggestionHeaderId: id, // 拖拽用到
-                        diagnosisId: '',
-                        suggestionContent: '',
-                    }
-                ],
-            }
-
-            this.sumDoctorCheck.suggestionList.push(pojo);
-            this.fnSetSuggestionFocus(id)
-        },
+        
 
         //复查
         reCheck() {
diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue
index 53ea788..24d154f 100644
--- a/src/components/sumDoctorCheck/SumSug.vue
+++ b/src/components/sumDoctorCheck/SumSug.vue
@@ -30,12 +30,28 @@
         </el-table-column>
       </el-table>
     </div>
+    <div style="position: absolute; top: 0px; right: 2px; display: flex;z-index: 3;">
+      <div style="margin-right: 5px;">
+        <el-button style="height: 28px;" class="commonbutton"  @click="btnCollapseAll" :disabled="sumBtnDisabled()">{{ collapse ?
+          '展开' : '折叠' }}全部建议</el-button>
+      </div>
+      <div v-show="checkPagePriv(pagePriv.privs, '新增建议')">
+        <el-button style="height: 28px;" class="commonbutton" @click="addSuggtion" :disabled="sumBtnDisabled()">新增建议</el-button>
+      </div>
+    </div>
+
     <div style="width:50%;">
       <el-table id="tableSuggestion" row-key="id" :data="sumDoctorCheck.suggestionList" width="100%" :height="sumHeight"
         border size="small" ref="tableSuggestion">
         <el-table-column type="index" width="20" align="center">
         </el-table-column>
         <el-table-column prop="suggestionTitle" label="建议">
+          <template slot="header">
+            <div style="display: flex;justify-content:space-between;">
+              <div>建议</div>
+              <div></div>
+            </div>
+          </template>
           <template slot-scope="scope">
             <div>
               <div style="display: flex;">
@@ -179,6 +195,7 @@ export default {
       sumDetails: [],
       suggestionCurRow: 0, //当前操作建议的行
       diagnosises: [], // 诊断
+      collapse: true,  // 折叠/展开全部建议
     };
   },
 
@@ -236,6 +253,49 @@ export default {
       })
     },
 
+    //增加建议
+    addSuggtion() {
+      let id = String(new Date().getTime())
+      let pojo = {
+        id,
+        patientRegisterId: this.dataTransOpts.tableS.patient_register.id,
+        diagnosisIds: [],
+        medicalInterpretations: [
+          {
+            sumSuggestionHeaderId: id, // 拖拽用到
+            diagnosisId: '',  // 关联诊断用到
+            suggestionContent: '',
+          }
+        ],
+        commonReasons: [
+          {
+            sumSuggestionHeaderId: id, // 拖拽用到
+            diagnosisId: '',
+            suggestionContent: '',
+          }
+        ],
+        healthGuidances: [
+          {
+            sumSuggestionHeaderId: id, // 拖拽用到
+            diagnosisId: '',
+            suggestionContent: '',
+          }
+        ],
+      }
+
+      this.sumDoctorCheck.suggestionList.push(pojo);
+      this.$refs[id].focus();
+    },
+
+    // 单个折叠展开建议
+    btnCollapseAll() {
+      this.collapse = !this.collapse
+      this.sumDoctorCheck.suggestionList.forEach(e => {
+        e.collapse = this.collapse
+      });
+    },
+
+    // 单个折叠展开建议
     btnCollapse(index) {
       this.sumDoctorCheck.suggestionList[index]['collapse'] = !this.sumDoctorCheck.suggestionList[index]['collapse']
       this.$nextTick(() => {
@@ -682,19 +742,6 @@ export default {
         this.getHaveSumData(this.dataTransOpts.tableS.patient_register.id)
       }
     },
-
-    // 新增时，光标定位
-    "curGetFocusSuggestionId": {
-      immediate: true,
-      handler(newVal, oldVal) {
-        console.log(`watch curGetFocusSuggestionId newVal: ${newVal},  oldVal: ${oldVal}`);
-        if (newVal) {
-          this.$nextTick(() => {
-            this.$refs[newVal].focus();
-          });
-        }
-      }
-    },
   },
 };
 </script>
diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue
index dc16a70..9a027e1 100644
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@@ -15,8 +15,7 @@
                 <div style="display: flex;">
                   <!-- 综述建议 -->
                   <div :style="'width:' + (window.pageWidth - 110 - 15) + 'px;'">
-                    <SumSug :patientRegisterId="dataTransOpts.tableS.patient_register.id"
-                      :curGetFocusSuggestionId="curGetFocusSuggestionId" />
+                    <SumSug :patientRegisterId="dataTransOpts.tableS.patient_register.id"/>
                   </div>
                   <!-- 诊断 width:200px; -->
                   <div v-show="false" style="width:200px;">
@@ -49,7 +48,7 @@
           </div>
         </div>
         <div style="width: 110px">
-          <ButtonList :fnSetSuggestionFocus="fnSetSuggestionFocus" />
+          <ButtonList/>
         </div>
       </div>
     </div>
@@ -86,7 +85,6 @@ export default {
   data() {
     return {
       tabChoosed: "1",
-      curGetFocusSuggestionId: "",
     };
   },
 
@@ -214,11 +212,7 @@ export default {
 
       console.log("dict", this.dict);
     },
-
-    fnSetSuggestionFocus(id) {
-      console.log('in fnSetSuggestionFocus')
-      this.curGetFocusSuggestionId = id
-    },
+   
   },
 
   //监听事件()