diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index cade6b0..772cc7e 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div style="display: flex;">
-      <div :style="`width:${sumWidth}px;`" @dblclick.prevent="blClick">
+    <div style="display: flex;" @contextmenu="onContextmenu">
+      <div :style="`width:${sumWidth}px;`" @dblclick="blClick">
         <el-table id="tableSummary" row-key="id" :data="doctorCheck.checkSummaryList" size="samll" :height="sumHeight"
           width="100%" border>
           <el-table-column width="30" align="center">
@@ -193,6 +193,14 @@ export default {
 
   //挂载完成
   mounted() {
+    
+    // 监听来自 Electron 的调用 右击事件    
+    if (this.$peisAPI) {
+      this.$peisAPI.onContextMenuAction((data) => {
+        this.onContextMenuDIY(data)
+      });
+    }
+
     this.rowDrop();
 
     if(this.doctor_check_disp_suggestion == 'Y') this.rowDropSuggestion()
@@ -409,6 +417,42 @@ export default {
       }
       this.btnMakeDiagnosis()
     },
+
+    // 右击菜单
+    onContextmenu(event) {
+      if (!this.$peisAPI) {
+        return
+      }
+
+      
+      let menus = [
+        // { type: 'separator' },
+        // { label: '测试菜单', itemId: '测试菜单', enabled: true },
+        // {
+        //   label: '更多操作',
+        //   submenu: [
+        //     { label: '子菜单', itemId: '子菜单', enabled: true }
+        //   ]
+        // }
+      ]
+
+      this.$peisAPI.showContextMenu(menus)
+        .then(res => {
+          console.log('res', res)
+        })
+        .catch(err => {
+          console.log('err', err)
+        })
+        .finally(() => {
+          console.log('finally')
+        })
+      
+    },
+
+    // 自定义右击事件
+    onContextMenuDIY(data){
+      this.$message({showClose:true,message:data})
+    }
   },
 
   //监听事件
diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue
index 7471cbe..63fc615 100644
--- a/src/components/doctorCheck/PatientRegisterBase.vue
+++ b/src/components/doctorCheck/PatientRegisterBase.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div @contextmenu="onContextmenu">
     <div style="display: flex; flex-wrap: wrap;height:70px; width: 100%;overflow-y: auto;">
       <div>
         <span class="query">条码号</span>
@@ -156,6 +156,13 @@ export default {
 
   //挂载完成
   mounted() {
+    // 监听来自 Electron 的调用 右击事件    
+    if (this.$peisAPI) {
+      this.$peisAPI.onContextMenuAction((data) => {
+        this.onContextMenuDIY(data)
+      });
+    }
+
     // 回车替代查询
     this.enterToQuery()
 
@@ -476,6 +483,42 @@ export default {
       });
     },
 
+    // 右击菜单
+    onContextmenu(event) {
+      if (!this.$peisAPI) {
+        return
+      }
+
+      
+      let menus = [
+        // { type: 'separator' },
+        // { label: '测试菜单', itemId: '测试菜单', enabled: true },
+        // {
+        //   label: '更多操作',
+        //   submenu: [
+        //     { label: '子菜单', itemId: '子菜单', enabled: true }
+        //   ]
+        // }
+      ]
+
+      this.$peisAPI.showContextMenu(menus)
+        .then(res => {
+          console.log('res', res)
+        })
+        .catch(err => {
+          console.log('err', err)
+        })
+        .finally(() => {
+          console.log('finally')
+        })
+      
+    },
+
+    // 自定义右击事件
+    onContextMenuDIY(data){
+      this.$message({showClose:true,message:data})
+    }
+
   },
 
   watch: {
diff --git a/src/components/sumDoctorCheck/CheckDetails.vue b/src/components/sumDoctorCheck/CheckDetails.vue
index e5fc1c8..03fc161 100644
--- a/src/components/sumDoctorCheck/CheckDetails.vue
+++ b/src/components/sumDoctorCheck/CheckDetails.vue
@@ -10,14 +10,15 @@
         </el-table-column>
       </el-table>
     </div>
-    <div :style="`overflow: scroll;padding-left:10px;width:${(window.pageWidth - 180 - 110 - 25)}px;height:${divHeight}px;`">      
+    <div
+      :style="`overflow: scroll;padding-left:10px;width:${(window.pageWidth - 180 - 110 - 25)}px;height:${divHeight}px;`">
       <table width="100%" border="1" cellspacing="0" bordercolor="#909399"
         style="font-size:14px;border-collapse:collapse;">
         <tr height="24">
           <td width="200" class="tdCellClass">{{ details.asbitemNames }}</td>
-          <td width="604" class="tdCellClass" colspan="7">{{ '检查日期：' + details.checkDate.substring(0, 10) + ' 检查医生：' +
+          <td width="604" class="tdCellClass" colspan="7">{{ '检查日期：' + details.checkDate + ' 检查医生：' +
             details.checkDoctorName
-            }}</td>
+          }}</td>
         </tr>
 
         <tr style="text-align: center;" height="24">
@@ -126,16 +127,18 @@ export default {
 
     mergeSummarys(array, itemKey) {
       let ret = ''
-      array.forEach((e, i) => {
-        //let splitStr = "<br>"
-        if (i == 0) {
-          ret = e[itemKey]
-        } else if (i == 1) {
-          ret = `1.${ret} ${Number(i) + 1}.${e[itemKey]}`
-        } else {
-          ret += ` ${Number(i) + 1}.${e[itemKey]}`
-        }
-      })
+      if (Array.isArray(array) && array.length > 0) {
+        array.forEach((e, i) => {
+          //let splitStr = "<br>"
+          if (i == 0) {
+            ret = e[itemKey]
+          } else if (i == 1) {
+            ret = `1.${ret} ${Number(i) + 1}.${e[itemKey]}`
+          } else {
+            ret += ` ${Number(i) + 1}.${e[itemKey]}`
+          }
+        })
+      }
       return ret
     },
 
diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue
index 8bb2c88..da47bca 100644
--- a/src/components/sumDoctorCheck/SumSug.vue
+++ b/src/components/sumDoctorCheck/SumSug.vue
@@ -6,7 +6,7 @@
         :style="`position: absolute; top: 0px; left: ${Math.floor((window.pageWidth - 120) / 2) - 110}px; display: flex;z-index: 3;`">
         <div v-show="checkPagePriv(pagePriv.privs, '新增综述')">
           <el-button style="height: 28px;" class="commonbutton" @click="addSummary"
-            :disabled="sumBtnDisabled('addSummary')">新增综述</el-button>
+            :disabled="sumBtnDisabledAddSummary">新增综述</el-button>
         </div>
       </div>
       <div style="width:50%;background-color: #B9CEE9;">
@@ -24,13 +24,13 @@
               <div>
                 <div style="display: flex;">
                   <el-input v-model="scope.row.summaryTitle" placeholder="请输入综述" :ref="scope.row.id" :id="scope.row.id"
-                    :disabled="sumBtnDisabled('addSummary')"></el-input>
+                    :disabled="sumBtnDisabledAddSummary"></el-input>
                   <el-button v-show="checkPagePriv(pagePriv.privs, '新增综述明细')" icon="el-icon-plus"
                     style="min-width:21px;height:21px;padding:2px;" @click="addSum(scope.$index)"
-                    :disabled="sumBtnDisabled('addSummary')"></el-button>
+                    :disabled="sumBtnDisabledAddSummary"></el-button>
                   <el-button v-show="checkPagePriv(pagePriv.privs, '删除综述')" type="danger" icon="el-icon-delete"
-                    style="margin-left: 2px;min-width:21px;height:21px;padding:2px;" @click="delSumHead(scope.$index)"
-                    :disabled="sumBtnDisabled('addSummary')"></el-button>
+                    style="margin-left: 2px;min-width:21px;height:21px;padding:2px;background-color: red;" @click="delSumHead(scope.$index)"
+                    :disabled="sumBtnDisabledAddSummary"></el-button>
                 </div>
                 <el-table :id="scope.row.id" :row-key="scope.$index + scope.row.id" style="margin-left: 10px;"
                   :data="scope.row.details" border @row-click="rowClick" :show-header="false">
@@ -43,13 +43,13 @@
                     <template slot-scope="scope2">
                       <div style="display: flex;">
                         <el-input type="textarea" v-model="scope2.row.summaryContent" placeholder="请输入综述"
-                          :disabled="sumBtnDisabled('addSummary')" :id="scope2.row.id" :ref="scope2.row.id"
+                          :disabled="sumBtnDisabledAddSummary" :id="scope2.row.id" :ref="scope2.row.id"
                           :autosize="{ minRows: 1, maxRows: 20 }">
                         </el-input>
                         <el-button v-show="checkPagePriv(pagePriv.privs, '删除综述明细')" type="danger" icon="el-icon-delete"
-                          style="margin-left: 2px;min-width:21px;height:21px;padding:2px;"
+                          style="margin-left: 2px;min-width:21px;height:21px;padding:2px;background-color: red;"
                           @click="delSug(scope.row.details, scope2.$index)"
-                          :disabled="sumBtnDisabled('addSummary')"></el-button>
+                          :disabled="sumBtnDisabledAddSummary"></el-button>
                       </div>
                     </template>
                   </el-table-column>
@@ -63,13 +63,13 @@
       <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')">{{
+            :disabled="sumBtnDisabledCollapse">{{
               collapse ?
                 '展开' : '折叠' }}全部建议</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '新增建议')">
           <el-button style="height: 28px;" class="commonbutton" @click="addSuggtion"
-            :disabled="sumBtnDisabled()">新增建议</el-button>
+            :disabled="sumBtnDisabled">新增建议</el-button>
         </div>
       </div>
       <div style="width:50%;background-color: #B9CEE9;">
@@ -93,32 +93,32 @@
               <div>
                 <div style="display: flex;" @dblclick="openSymbols(scope.$index, 'suggestionTitle', -1)">
                   <el-input v-model="scope.row.suggestionTitle" placeholder="请输入建议标题" :ref="scope.row.id"
-                    :id="scope.row.id" :disabled="sumBtnDisabled()">
+                    :id="scope.row.id" :disabled="sumBtnDisabled">
                   </el-input>
-                  <el-button type="danger" :icon="scope.row.collapse ? 'el-icon-arrow-down' : 'el-icon-arrow-up'"
-                    style="min-width:21px;height:21px;padding:2px;"
+
+                  <!-- <el-tooltip content="选择诊断" placement="top"></el-tooltip> -->
+                  <el-button icon="el-icon-search" style="min-width:21px;height:21px;padding:2px;"
+                      @click="btnChooseDiagnosis(scope.$index)" :disabled="sumBtnDisabled"></el-button>
+                    <!-- <el-tooltip content="根据诊断搜索医学解释、常见原因及健康指导" placement="top"></el-tooltip>-->
+                    <el-button icon="el-icon-cpu" style="margin-left: 2px;min-width:21px;height:21px;padding:2px;"
+                      @click="btnAIdiagnosis(scope.row.diagnosisNames)" :disabled="sumBtnDisabled"></el-button>
+
+                  <el-button :icon="scope.row.collapse ? 'el-icon-arrow-down' : 'el-icon-arrow-up'"
+                    style="margin-left: 2px;min-width:21px;height:21px;padding:2px;"
                     @click="btnCollapse(sumDoctorCheck.suggestionList, scope.$index, scope.row)"
-                    :disabled="sumBtnDisabled('collapse')"></el-button>
+                    :disabled="sumBtnDisabledCollapse"></el-button>
                   <el-button v-show="checkPagePriv(pagePriv.privs, '删除建议')" type="danger" icon="el-icon-delete"
-                    style="margin-left: 2px;min-width:21px;height:21px;padding:2px;" @click="delSugHead(scope.$index)"
-                    :disabled="sumBtnDisabled()"></el-button>
+                    style="margin-left: 2px;min-width:21px;height:21px;padding:2px;background-color:red;" @click="delSugHead(scope.$index)"
+                    :disabled="sumBtnDisabled"></el-button>
                 </div>
                 <div v-show="!scope.row.collapse">
-                  <div style="display: flex;margin-top: 2px;">
+                  <div style="display: flex;margin-top: 2px;" v-show="dispDiagnsis == 'Y' ? true:false">
                     <div style="width:60px;">诊断</div>
                     <el-input placeholder="请选择诊断" :value="`${scope.row.diagnosisNames}`" size="small" disabled>
-                    </el-input>
-                    <el-tooltip content="选择诊断" placement="top">
-                      <el-button icon="el-icon-search" style="min-width:21px;height:21px;padding:2px;"
-                        @click="btnChooseDiagnosis(scope.$index)" :disabled="sumBtnDisabled()"></el-button>
-                    </el-tooltip>
-                    <el-tooltip content="根据诊断搜索医学解释、常见原因及健康指导" placement="top">
-                      <el-button icon="el-icon-cpu" style="margin-left: 2px;min-width:21px;height:21px;padding:2px;"
-                        @click="btnAIdiagnosis(scope.row.diagnosisNames)" :disabled="sumBtnDisabled()"></el-button>
-                    </el-tooltip>
+                    </el-input> 
                     <!--
                     <el-select v-model="scope.row.diagnosisIds" multiple placeholder="请选择" style="width: 100%;"
-                      :disabled="sumBtnDisabled()" @change="changeDiagnosis" filterable class="no-animation">                      
+                      :disabled="sumBtnDisabled" @change="changeDiagnosis" filterable class="no-animation">                      
                       <el-option v-for="item in diagnosises" :key="item.id" :value="item.id" :label="item.displayName"
                         :disabled="disabledDiagnosis(item.id, scope.$index)" />
                     </el-select>
@@ -127,12 +127,11 @@
                   <!--医学解释-->
                   <div v-if="dispTermReason == 'Y'" style="display: flex;margin-top: 2px;">
                     <div style="width:60px;">医学解释</div>
-                    <el-tooltip content="新增医学解释" placement="top">
-                      <el-button v-show="checkPagePriv(pagePriv.privs, '新增医学解释')" type="success" icon="el-icon-plus"
-                        style="min-width:21px;height:21px;padding:2px;" @click="addSug(scope.$index, 0)"
-                        :disabled="sumBtnDisabled()">
-                      </el-button>
-                    </el-tooltip>
+                    <!-- <el-tooltip content="新增医学解释" placement="top"></el-tooltip> -->
+                    <el-button v-show="checkPagePriv(pagePriv.privs, '新增医学解释')" type="success" icon="el-icon-plus"
+                      style="min-width:21px;height:21px;padding:2px;" @click="addSug(scope.$index, 0)"
+                      :disabled="sumBtnDisabled">
+                    </el-button>                    
                     <el-table :id="'0_sug' + scope.row.id" row-key="displayOrder" style="margin-left: 5px;"
                       :data="scope.row.medicalInterpretations" border @row-click="rowClickSug0" :show-header="false">
                       <el-table-column width="30">
@@ -146,7 +145,7 @@
                         <template slot-scope="scope2">
                           <div @dblclick="openSymbols(scope.$index, 'medicalInterpretations', scope2.$index)">
                             <el-input type="textarea" v-model="scope2.row.suggestionContent" placeholder="请输入建议内容"
-                              :disabled="sumBtnDisabled()" :autosize="{ minRows: 1, maxRows: 10 }">
+                              :disabled="sumBtnDisabled" :autosize="{ minRows: 1, maxRows: 10 }">
                             </el-input>
                           </div>
                         </template>
@@ -154,9 +153,9 @@
                       <el-table-column label="操作" width="25">
                         <template slot-scope="scope2">
                           <el-button v-show="checkPagePriv(pagePriv.privs, '删除医学解释')" type="danger"
-                            style="min-width:21px;height:21px;padding:2px;" icon="el-icon-delete"
+                            style="min-width:21px;height:21px;padding:2px; background-color:red;" icon="el-icon-delete"                            
                             @click="delSug(scope.row.medicalInterpretations, scope2.$index)"
-                            :disabled="sumBtnDisabled()" size="small"></el-button>
+                            :disabled="sumBtnDisabled" size="small"></el-button>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -167,7 +166,7 @@
                     <el-tooltip content="新增常见原因" placement="top">
                       <el-button v-show="checkPagePriv(pagePriv.privs, '新增常见原因')" type="danger" icon="el-icon-plus"
                         style="min-width:21px;height:21px;padding:2px;" @click="addSug(scope.$index, 1)"
-                        :disabled="sumBtnDisabled()">
+                        :disabled="sumBtnDisabled">
                       </el-button>
                     </el-tooltip>
                     <el-table :id="'1_sug' + scope.row.id" row-key="displayOrder" style="margin-left: 5px;"
@@ -183,7 +182,7 @@
                         <template slot-scope="scope2">
                           <div @dblclick="openSymbols(scope.$index, 'commonReasons', scope2.$index)">
                             <el-input type="textarea" v-model="scope2.row.suggestionContent" placeholder="请输入建议内容"
-                              :disabled="sumBtnDisabled()" :autosize="{ minRows: 1, maxRows: 10 }">
+                              :disabled="sumBtnDisabled" :autosize="{ minRows: 1, maxRows: 10 }">
                             </el-input>
                           </div>
                         </template>
@@ -191,8 +190,8 @@
                       <el-table-column label="操作" width="25">
                         <template slot-scope="scope2">
                           <el-button v-show="checkPagePriv(pagePriv.privs, '删除常见原因')" type="danger"
-                            style="min-width:21px;height:21px;padding:2px;" icon="el-icon-delete"
-                            @click="delSug(scope.row.commonReasons, scope2.$index)" :disabled="sumBtnDisabled()"
+                            style="min-width:21px;height:21px;padding:2px;background-color:red;" icon="el-icon-delete"
+                            @click="delSug(scope.row.commonReasons, scope2.$index)" :disabled="sumBtnDisabled"
                             size="small"></el-button>
                         </template>
                       </el-table-column>
@@ -204,7 +203,7 @@
                     <el-tooltip content="新增健康指导" placement="top">
                       <el-button v-show="checkPagePriv(pagePriv.privs, '新增健康指导')" type="danger" icon="el-icon-plus"
                         style="min-width:21px;height:21px;padding:2px;" @click="addSug(scope.$index, 2)"
-                        :disabled="sumBtnDisabled()">
+                        :disabled="sumBtnDisabled">
                       </el-button>
                     </el-tooltip>
                     <el-table :id="'2_sug' + scope.row.id" row-key="displayOrder" style="margin-left: 5px;"
@@ -220,7 +219,7 @@
                         <template slot-scope="scope2">
                           <div @dblclick="openSymbols(scope.$index, 'healthGuidances', scope2.$index)">
                             <el-input type="textarea" v-model="scope2.row.suggestionContent" placeholder="请输入健康指导"
-                              :disabled="sumBtnDisabled()" :autosize="{ minRows: 1, maxRows: 10 }">
+                              :disabled="sumBtnDisabled" :autosize="{ minRows: 1, maxRows: 10 }">
                             </el-input>
                           </div>
                         </template>
@@ -228,8 +227,8 @@
                       <el-table-column label="操作" width="25">
                         <template slot-scope="scope2">
                           <el-button v-show="checkPagePriv(pagePriv.privs, '删除健康指导')" type="danger"
-                            style="min-width:21px;height:21px;padding:2px;" icon="el-icon-delete"
-                            @click="delSug(scope.row.healthGuidances, scope2.$index)" :disabled="sumBtnDisabled()"
+                            style="min-width:21px;height:21px;padding:2px;background-color:red;" icon="el-icon-delete"
+                            @click="delSug(scope.row.healthGuidances, scope2.$index)" :disabled="sumBtnDisabled"
                             size="small"></el-button>
                         </template>
                       </el-table-column>
@@ -309,6 +308,7 @@ import { mapState } from 'vuex';
 import Sortable from "sortablejs";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { getPagePriv, checkPagePriv, deepCopy, arrayExistObj } from '../../utlis/proFunc';
+
 export default {
   components: {},
   props: ["patientRegisterId", "tabChoosed"],
@@ -329,7 +329,8 @@ export default {
 
       collapse: false,  // 折叠/展开全部建议
 
-      dispTermReason: 'N',  // 显示医学解释与常见原因
+      dispTermReason: 'Y',  // 显示医学解释与常见原因
+      dispDiagnsis:'Y',  // 显示诊断
 
       dialogWinSymbols: false,
       selection: { // 光标位置
@@ -361,19 +362,35 @@ export default {
     if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
 
     // 获取是否显示医学解释与常见原因
-    // 获取系统参数(医生诊台侧边项目归类模式 0-检检类别，1-指引类别，2-报告类别)
+    // 获取系统参数(获取是否显示医学解释与常见原因)
     postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId: 'summary_check_disp_reas' })
       .then(res => {
         if (res.code > -1) {
           this.dispTermReason = res.data || "Y"
         }
       })
+    
+    // 获取系统参数(获取是否显示诊断)
+    postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId: 'summary_check_disp_diagnsis' })
+      .then(res => {
+        if (res.code > -1) {
+          this.dispDiagnsis = res.data || "Y"
+        }
+      })
+    
 
     this.AI.height = this.frameHeight
   },
 
   //挂载完成
   async mounted() {
+    // 监听来自 Electron 的调用    
+    if (this.$peisAPI) {
+      this.$peisAPI.onContextMenuAction((data) => {
+        this.onContextMenuDIY(data)
+      });
+    }
+
     // this.rowDrop();  （综述取消拖拽）
     this.rowDropSuggestion();
 
@@ -405,7 +422,52 @@ export default {
     // AIdiagnosisHeight
     AIDH() {
       return Math.floor((this.AI.height - 24 - 42 - 4) / 21.5)
-    }
+    },
+
+    sumBtnDisabled(){
+      let patientRegister = this.dataTransOpts.tableS.patient_register
+      let ret = true
+
+      //' 请选择体检人员'
+      if (!patientRegister.id) return ret
+      // '人员已锁定，不可执行此操作'
+      if (patientRegister?.isLock == 'Y') return ret
+
+      // console.log('btnType', btnType, this.summary_check_default_summay_modifiable)      
+      if (patientRegister.completeFlag && patientRegister.completeFlag != '3') ret = false
+
+      return ret
+    },
+
+    sumBtnDisabledAddSummary(){
+      let patientRegister = this.dataTransOpts.tableS.patient_register
+      let ret = true
+
+      //' 请选择体检人员'
+      if (!patientRegister.id) return ret
+      // '人员已锁定，不可执行此操作'
+      if (patientRegister?.isLock == 'Y') return ret
+
+      if (patientRegister.completeFlag && patientRegister.completeFlag != '3' && this.summary_check_default_summay_modifiable == 'Y') {
+        return false;
+      } else {
+        return true;
+      }      
+
+    },
+
+    sumBtnDisabledCollapse(){
+      let patientRegister = this.dataTransOpts.tableS.patient_register
+      let ret = true
+
+      //' 请选择体检人员'
+      if (!patientRegister.id) return ret
+      // '人员已锁定，不可执行此操作'
+      if (patientRegister?.isLock == 'Y') return ret
+
+      return false
+
+    },
   },
 
   methods: {
@@ -417,6 +479,12 @@ export default {
     //     e.style.height = 'auto'; // 重置高度        
     //   });      
     // },
+
+    // 自定义右击事件
+    onContextMenuDIY(data){
+      this.$message({showClose:true,message:data})
+    },
+
     // 获取诊断数据
     async dictInit() {
 
@@ -470,6 +538,7 @@ export default {
       let pojo = {
         id,
         patientRegisterId: this.dataTransOpts.tableS.patient_register.id,
+        suggestionTitle: '', 
         diagnosisIds: [],
         medicalInterpretations: [
           {
@@ -744,37 +813,7 @@ export default {
           }
         });
     },
-
-    // 按钮可用
-    sumBtnDisabled(btnType) {
-      let patientRegister = this.dataTransOpts.tableS.patient_register
-      let ret = true
-
-      //' 请选择体检人员'
-      if (!patientRegister.id) return ret
-      // '人员已锁定，不可执行此操作'
-      if (patientRegister.isLock && patientRegister.isLock == 'Y') return ret
-
-      // console.log('btnType', btnType, this.summary_check_default_summay_modifiable)
-
-      switch (btnType) {
-        case 'collapse':
-          return false;
-        case 'addSummary':
-          if (patientRegister.completeFlag && patientRegister.completeFlag != '3' && this.summary_check_default_summay_modifiable == 'Y') {
-            return false;
-          } else {
-            return true;
-          }
-        default:
-          break;
-      }
-
-      if (patientRegister.completeFlag && patientRegister.completeFlag != '3') ret = false
-
-      return ret
-    },
-
+    
     // 诊断选择
     changeDiagnosis(v) {
       // console.log('changeDiagnosis', v)
@@ -1197,7 +1236,24 @@ export default {
         return
       }
 
-      console.log('this.$peisAPI.contextMenuForPeis()')
+      /*
+      let menus = [
+        { label: '测试菜单', itemId: '测试菜单', enabled: true }
+      ]
+
+      this.$peisAPI.showContextMenu(menus)
+        .then(res => {
+          console.log('res', res)
+        })
+        .catch(err => {
+          console.log('err', err)
+        })
+        .finally(() => {
+          console.log('finally')
+        })
+      */
+
+      // console.log('this.$peisAPI.contextMenuForPeis()')
       this.$peisAPI.contextMenuForPeis()
         .then(res => {
           console.log('res', res)
@@ -1361,5 +1417,6 @@ export default {
 ::v-deep .diagnosisSelect .el-select-dropdown__wrap {
   background-color: #FFF;
   max-height: 288px;
+  max-width: 780px;
 }
 </style>
diff --git a/src/views/diagnosis/diagnosis.vue b/src/views/diagnosis/diagnosis.vue
index 18ca2c3..e6455d0 100644
--- a/src/views/diagnosis/diagnosis.vue
+++ b/src/views/diagnosis/diagnosis.vue
@@ -2,65 +2,59 @@
   <div class="box">
     <div>
       <div class="middlebox">
-          <div class="contenttitle">
-            基础资料 /
-            <span class="contenttitleBold"
-              >诊断建议设置</span
-            >
-          </div>
-          <div class="seachinput">
-            <el-select v-model="diagnosis" placeholder="快速查找" size="small" 
-                    filterable   :filter-method="filterMethod" value-key="id"
-                    clearable @clear="quickTableData = deepCopy(tableData)" 
-                    @change="quickDiagnosis" default-first-option ref="elSelectKeyWords">
-                    <!-- 
+        <div class="contenttitle">
+          基础资料 /
+          <span class="contenttitleBold">诊断建议设置</span>
+        </div>
+        <div class="seachinput">
+          <el-select v-model="diagnosis" placeholder="快速查找" size="small" filterable :filter-method="filterMethod"
+            value-key="id" clearable @clear="quickTableData = deepCopy(tableData)" @change="quickDiagnosis"
+            default-first-option ref="elSelectKeyWords" popper-class="dddwSelect" :popper-append-to-body="false">
+            <!-- 
                     <el-option key='1' value="" label="1" />
                     <el-option key='2' value="{id:'2',displayName:'n2'}" label="2" />
                      -->
-                    <!--  -->
-                    <el-option v-for="item in quickTableData" :key="item.id" :value="item" :label="item.displayName" />
-                    
-                  </el-select>
-          </div>
-      </div>     
+            <!--  -->
+            <el-option v-for="item in quickTableData" :key="item.id" :value="item" :label="item.displayName" />
+
+          </el-select>
+        </div>
+      </div>
       <div style="display: flex;margin-top: 7px;">
         <!-- 类别树组件 -->
-        <div :style="'width: 208px; height:' +(window.pageHeight < 600 ? 505 : window.pageHeight - 100) +'px;background-color: #fff; border-radius: 8px'">
-          <ItemTypeTree :refreshItemTypeId="refreshItemTypeId" :itemTypeId="query.itemTypeId"/>
+        <div
+          :style="'width: 208px; height:' + (window.pageHeight < 600 ? 505 : window.pageHeight - 100) + 'px;background-color: #fff; border-radius: 8px'">
+          <ItemTypeTree :refreshItemTypeId="refreshItemTypeId" :itemTypeId="query.itemTypeId" />
         </div>
         <!-- 诊断与建议 -->
-        <div style="display: block;">          
+        <div style="display: block;">
           <!-- 诊断列表 -->
           <div style="margin-left:15px;display: flex;">
-            <div :style="'width:' + (window.pageWidth - 200 - 110 - 50-14) + 'px;padding: 15px;background-color: #fff;border-radius: 8px;'">
+            <div
+              :style="'width:' + (window.pageWidth - 200 - 110 - 50 - 14) + 'px;padding: 15px;background-color: #fff;border-radius: 8px;'">
               <div style="margin-left: 5px;display: flex; flex-wrap: wrap;">
                 <div>
                   <!--
                   <el-checkbox v-model="query.itemTypeFlag">项目类别作为查询条件</el-checkbox>                  
                   <el-input placeholder="查询关键字" v-model="query.keyWords" size="small" clearable style="width: 200px" />
                   -->
-                  
+
                 </div>
               </div>
               <div>
                 <el-table :data="tableData" id="elTableDiagnosis" row-key="id"
                   :height="window.pageHeight < 600 ? 190 : Math.floor((window.pageHeight - 240) / 2)"
-                  highlight-current-row @row-click="rowClick" size="small"  ref="elTable">
-                  <el-table-column type="index" label="序号" width="40" align="center"/>
-                  <el-table-column
-                    v-for="(item, index) in headerCols" 
-                    :key="`col_${index}`"          
-                    :min-width="dropCol[index].minWidth"
-                    :align="dropCol[index].align"
-                    :label="item.label"
-                  >        
-                    <template slot-scope="scope">            
-                      <div v-if="dropCol[index].prop == 'sn'" >
+                  highlight-current-row @row-click="rowClick" size="small" ref="elTable">
+                  <el-table-column type="index" label="序号" width="40" align="center" />
+                  <el-table-column v-for="(item, index) in headerCols" :key="`col_${index}`"
+                    :min-width="dropCol[index].minWidth" :align="dropCol[index].align" :label="item.label">
+                    <template slot-scope="scope">
+                      <div v-if="dropCol[index].prop == 'sn'">
                         {{ scope.$index + 1 }}
                       </div>
-                      <div v-else-if ="dropCol[index].prop == 'isIll' 
-                                    || dropCol[index].prop == 'isSummaryTemplate'" >
-                        {{ scope.row[dropCol[index].prop] == 'Y' ? '是':'否' }}
+                      <div v-else-if="dropCol[index].prop == 'isIll'
+                        || dropCol[index].prop == 'isSummaryTemplate'">
+                        {{ scope.row[dropCol[index].prop] == 'Y' ? '是' : '否' }}
                       </div>
                       <!--
                       <div v-else-if="dropCol[index].prop == 'itemTypeId'" >
@@ -70,14 +64,14 @@
                         </el-cascader>                        
                       </div>
                       -->
-                      <div v-else-if="dropCol[index].prop == 'diagnosisLevelId'" >
+                      <div v-else-if="dropCol[index].prop == 'diagnosisLevelId'">
                         {{ dddw(dict.diagnosisLevel, "id", scope.row[dropCol[index].prop], "displayName") }}
                       </div>
-                      <div v-else-if="dropCol[index].prop == 'forSexId'" >
+                      <div v-else-if="dropCol[index].prop == 'forSexId'">
                         {{ dddw(dict.forSex, "id", scope.row[dropCol[index].prop], "displayName") }}
                       </div>
-                      <div v-else-if ="dropCol[index].prop == 'lastModificationTime' 
-                                    || dropCol[index].prop == 'creationTime'" >
+                      <div v-else-if="dropCol[index].prop == 'lastModificationTime'
+                        || dropCol[index].prop == 'creationTime'">
                         {{ scope.row[dropCol[index].prop] ? moment(scope.row[dropCol[index].prop]).format('yyyy-MM-DD HH:mm:ss'):'' }}
                       </div>
                       <div v-else>
@@ -87,23 +81,16 @@
                   </el-table-column>
                   <el-table-column label="排序" width="40" align="center">
                     <template>
-                      <el-tag
-                        class="move"
-                        style="
+                      <el-tag class="move" style="
                           cursor: move;
                           background-color: rgb(245, 245, 245);
                           border: none;
-                        "
-                        draggable="true"
-                      >
-                        <i
-                          class="el-icon-d-caret"
-                          style="
+                        " draggable="true">
+                        <i class="el-icon-d-caret" style="
                             width: 1rem;
                             height: 1rem;
                             color: rgb(113, 113, 113);
-                          "
-                        ></i>
+                          "></i>
                       </el-tag>
                     </template>
                   </el-table-column>
@@ -133,19 +120,16 @@
 
           <!-- 诊断对应的建议列表 -->
           <div style="margin-top:15px;">
-            <DiagnosisSug :formDiagnosis="form" :refreshSugs="refreshSugs" :refreshSuges="refreshSuges" :refreshSugess="refreshSugess"/>
+            <DiagnosisSug :formDiagnosis="form" :refreshSugs="refreshSugs" :refreshSuges="refreshSuges"
+              :refreshSugess="refreshSugess" />
           </div>
         </div>
       </div>
     </div>
 
     <!--新增/编辑-->
-    <el-dialog
-      :title="form.id ? '编辑' : '新增'"
-      :visible.sync="dialogVisible"
-      width="800px" @close="closeDialog"
-      :close-on-click-modal="false"
-    >
+    <el-dialog :title="form.id ? '编辑' : '新增'" :visible.sync="dialogVisible" width="800px" @close="closeDialog"
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" label-width="100px" :rules="rules">
         <el-row>
           <el-col :span="8">
@@ -155,11 +139,9 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="项目类别" prop="itemTypeId">
-              <el-cascader :options="dict.itemTypeTree" v-model="form.itemTypeId" 
-                :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }" popper-class="example"
-                ref="itemTypeIds"
-                @change="ischangsItemTypeId"
-                size="small">
+              <el-cascader :options="dict.itemTypeTree" v-model="form.itemTypeId"
+                :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }"
+                popper-class="example" ref="itemTypeIds" @change="ischangsItemTypeId" size="small">
               </el-cascader>
             </el-form-item>
           </el-col>
@@ -173,7 +155,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="建议名称" prop="suggestionName">
-              <el-input v-model="form.suggestionName" size="small"/>
+              <el-input v-model="form.suggestionName" size="small" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -185,29 +167,18 @@
           <el-col :span="8">
             <el-form-item label="适用性别" prop="forSexId">
               <el-select v-model="form.forSexId" placeholder="请选择" size="small">
-                <el-option
-                  v-for="item in dict.forSex"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
+                <el-option v-for="item in dict.forSex" :key="item.id" :label="item.displayName" :value="item.id">
                 </el-option>
-              </el-select> </el-form-item
-          ></el-col>
+              </el-select> </el-form-item></el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="诊断级别" prop="diagnosisLevelId">
               <el-select v-model="form.diagnosisLevelId" placeholder="请选择" size="small">
-                <el-option
-                  v-for="item in dict.diagnosisLevel"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
+                <el-option v-for="item in dict.diagnosisLevel" :key="item.id" :label="item.displayName"
+                  :value="item.id">
                 </el-option>
-              </el-select> </el-form-item
-          ></el-col>
+              </el-select> </el-form-item></el-col>
           <el-col :span="8">
             <el-form-item label="启用" prop="isActive">
               <el-radio v-model="form.isActive" label="Y">是</el-radio>
@@ -224,464 +195,463 @@
   </div>
 </template>
 <script>
+  import moment from "moment";
+  import { mapState } from "vuex";
+  import { getapi, postapi, putapi, deletapi } from "@/api/api";
+  import Sortable from "sortablejs";
 
-import moment from "moment";
-import { mapState } from "vuex";
-import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import Sortable from "sortablejs";
-
-import ItemTypeTree from "../../components/common/ItemTypeTree.vue";
-import DiagnosisSug from "./diagnosisSug.vue";
-import { deepCopy,dddw, arrayExistObj, objCopy } from '@/utlis/proFunc';
-
-
-
-export default {
-  components: {
-    ItemTypeTree,
-    DiagnosisSug,
-  },
-  data() {
-    return {
-      query:{
-        triggerScroll:0,    //触发按类别定
-        itemTypeFlag:true, //项目类别是否 作为查询条件 
-        itemTypeId:'',
-        keyWords:'',        
-      },
-      diagnosis: {}, //null, //{id:'',displayName:''}
-      tableData:[], //诊断列表(显示)
-      diagnosisAll:[], // 所有诊断列表
-      quickTableData:[], //快速查找诊断
-      formInit:{},
-      form:{
-        id:'',
-        itemTypeId:'',
-        isIll:'Y',
-        displayName:'',
-        suggestionName:'',
-        forSexId:'A',
-        isSummaryTemplate:'N',
-        isActive:'Y',
-        diagnosisLevelId:1,  //
-        medicalInterpretations:[],
-        healthGuidances:[],
-        commonReasons:[]
-      },
-      dialogVisible:false,
-      rules: {
-        displayName: [{ required: true, message: "请输入诊断名称", trigger: "blur" }],
-        itemTypeId: [{ required: true, message: "请输入项目类别", trigger: "blur" }],        
-      },
-
-      //动态列（预留）
-      headerCols: [],
-
-      //拖动列（预留）
-      dropCol: [
-        //{ label: "序号",prop: "sn",minWidth: 40,align:"center"},
-        // { label: "项目类别",prop: "itemTypeId",minWidth: 120,align:"center"},
-        { label: "诊断级别",prop: "diagnosisLevelId",minWidth: 60,align:"center"},
-        { label: "诊断名称",prop: "displayName",minWidth: 100,align:"center"},
-        { label: "建议名称",prop: "suggestionName",minWidth: 100,align:"center"},
-        { label: "疾病",prop: "isIll",minWidth: 40,align:"center"},
-        { label: "适用性别",prop: "forSexId",minWidth: 60,align:"center"},
-        { label: "总检模板",prop: "isSummaryTemplate",minWidth: 60,align:"center"},
-        { label: "创建者",prop: "creatorName",minWidth: 60,align:"center"},
-        { label: "创建时间",prop: "creationTime",minWidth: 130,align:"center"},
-        { label: "修改者",prop: "lastModifierName",minWidth: 60,align:"center"},
-        { label: "修改时间",prop: "lastModificationTime",minWidth: 130,align:"center"},
-      ],
-    };
-  },
-
-  created() {
-    this.init()
-  },
-
-  //挂载完成
-  mounted() { 
-    this.rowDrop('elTableDiagnosis') 
-    // this.btnQuery()
-  },
-
-  computed: {
-    ...mapState(["customerOrg", "window","dict"]),
-  },
-
-  methods: {
-    moment,dddw,deepCopy,
-
-    init(){
-      this.formInit = Object.assign({},this.form)
-      this.headerCols = deepCopy(this.dropCol)
-
-      //适用性别（查询）
-      getapi("/api/app/for-sex").then((res) => {
-        if (res.code != -1) {
-          this.dict.forSex = res.data;
-        }
-      });
+  import ItemTypeTree from "../../components/common/ItemTypeTree.vue";
+  import DiagnosisSug from "./diagnosisSug.vue";
+  import { deepCopy, dddw, arrayExistObj, objCopy } from '@/utlis/proFunc';
 
-      //诊断级别
-      getapi("/api/app/diagnosis-level/in-filter").then((res) => {
-        if (res.code != -1) {
-          this.dict.diagnosisLevel = res.data;
-        }
-      });
 
-      this.allDiagnosis()
 
+  export default {
+    components: {
+      ItemTypeTree,
+      DiagnosisSug,
     },
-
-    //查询所有 诊断记录 
-    allDiagnosis(){
-      postapi('/api/app/diagnosis/getlistinsuggestion',{}).then(res =>{
-        if(res.code != -1){
-          this.diagnosisAll = res.data
-          this.quickTableData = res.data
-        }
-      })
+    data() {
+      return {
+        query: {
+          triggerScroll: 0,    //触发按类别定
+          itemTypeFlag: true, //项目类别是否 作为查询条件 
+          itemTypeId: '',
+          keyWords: '',
+        },
+        diagnosis: {}, //null, //{id:'',displayName:''}
+        tableData: [], //诊断列表(显示)
+        diagnosisAll: [], // 所有诊断列表
+        quickTableData: [], //快速查找诊断
+        formInit: {},
+        form: {
+          id: '',
+          itemTypeId: '',
+          isIll: 'Y',
+          displayName: '',
+          suggestionName: '',
+          forSexId: 'A',
+          isSummaryTemplate: 'N',
+          isActive: 'Y',
+          diagnosisLevelId: 1,  //
+          medicalInterpretations: [],
+          healthGuidances: [],
+          commonReasons: []
+        },
+        dialogVisible: false,
+        rules: {
+          displayName: [{ required: true, message: "请输入诊断名称", trigger: "blur" }],
+          itemTypeId: [{ required: true, message: "请输入项目类别", trigger: "blur" }],
+        },
+
+        //动态列（预留）
+        headerCols: [],
+
+        //拖动列（预留）
+        dropCol: [
+          //{ label: "序号",prop: "sn",minWidth: 40,align:"center"},
+          // { label: "项目类别",prop: "itemTypeId",minWidth: 120,align:"center"},
+          { label: "诊断级别", prop: "diagnosisLevelId", minWidth: 60, align: "center" },
+          { label: "诊断名称", prop: "displayName", minWidth: 100, align: "center" },
+          { label: "建议名称", prop: "suggestionName", minWidth: 100, align: "center" },
+          { label: "疾病", prop: "isIll", minWidth: 40, align: "center" },
+          { label: "适用性别", prop: "forSexId", minWidth: 60, align: "center" },
+          { label: "总检模板", prop: "isSummaryTemplate", minWidth: 60, align: "center" },
+          { label: "创建者", prop: "creatorName", minWidth: 60, align: "center" },
+          { label: "创建时间", prop: "creationTime", minWidth: 130, align: "center" },
+          { label: "修改者", prop: "lastModifierName", minWidth: 60, align: "center" },
+          { label: "修改时间", prop: "lastModificationTime", minWidth: 130, align: "center" },
+        ],
+      };
     },
 
-    // 供树节点组件调用，更新当前所选的项目类别
-    refreshItemTypeId(itemTypeId){
-      this.query.itemTypeId = itemTypeId
-      this.query.triggerScroll++
+    created() {
+      this.init()
     },
 
-    // 供明建议组件调用，更新所选建议
-    refreshSugs(sugs){
-      if(!this.form.id) return
-      this.form.medicalInterpretations = deepCopy(sugs)
-      let lfind = arrayExistObj(this.tableData,'id',this.form.id)
-      if(lfind > -1) this.tableData[lfind] = Object.assign(this.tableData[lfind],this.form)
-    },
-    refreshSuges(sugs){
-      if(!this.form.id) return
-      this.form.healthGuidances = deepCopy(sugs)
-      let lfind = arrayExistObj(this.tableData,'id',this.form.id)
-      if(lfind > -1) this.tableData[lfind] = Object.assign(this.tableData[lfind],this.form)
-    },
-    refreshSugess(sugs){
-      if(!this.form.id) return
-      this.form.commonReasons = deepCopy(sugs)
-      let lfind = arrayExistObj(this.tableData,'id',this.form.id)
-      if(lfind > -1) this.tableData[lfind] = Object.assign(this.tableData[lfind],this.form)
+    //挂载完成
+    mounted() {
+      this.rowDrop('elTableDiagnosis')
+      // this.btnQuery()
     },
 
-    async btnQuery(){
-      let body = {}
-      if(this.query.itemTypeFlag && this.query.itemTypeId){
-        body.itemTypeId = this.query.itemTypeId
-      }else{
-        return
-      }
-      // if(this.query.keyWords) body.keyWords = this.query.keyWords  
-
-      postapi('/api/app/diagnosis/getlistinsuggestion',body).then(res =>{
-        if(res.code != -1){
-          this.tableData = res.data
-          this.form = Object.assign({},this.formInit)
-        }
-      })      
+    computed: {
+      ...mapState(["customerOrg", "window", "dict"]),
     },
 
-    //快速查找诊断时，调整可按拼间简码及简称查找
-    filterMethod(keyWords) {
-      //console.log('filterMethod',this.dict.asbItemQuick)  
-      if (keyWords) {
-        this.quickTableData = [];
-        this.diagnosisAll.forEach(item => {
-          if (item.displayName.indexOf(keyWords) > - 1
-            || item.simpleCode.indexOf(keyWords.toUpperCase()) > - 1
-            || item.suggestionName.indexOf(keyWords) > - 1) {
-            this.quickTableData.push(item);
+    methods: {
+      moment, dddw, deepCopy,
+
+      init() {
+        this.formInit = Object.assign({}, this.form)
+        this.headerCols = deepCopy(this.dropCol)
+
+        //适用性别（查询）
+        getapi("/api/app/for-sex").then((res) => {
+          if (res.code != -1) {
+            this.dict.forSex = res.data;
+          }
+        });
+
+        //诊断级别
+        getapi("/api/app/diagnosis-level/in-filter").then((res) => {
+          if (res.code != -1) {
+            this.dict.diagnosisLevel = res.data;
           }
         });
-      } else {
-        this.quickTableData = deepCopy(this.diagnosisAll);
-      }
-    },
 
-    //快速查找诊断
-    quickDiagnosis(v) {
-      //远程查询时，设置了 value-key 也不管用，只能取到value console.log('quickDiagnosis',v)
-      let lfind = -1
-      if(!v.itemTypeId) return
-
-      this.query.itemTypeId = v.itemTypeId
-      let body = {
-        itemTypeId:v.itemTypeId
-      }  
-
-      postapi('/api/app/diagnosis/getlistinsuggestion',body).then(res =>{
-        if(res.code != -1){
-          this.tableData = res.data
-          this.form = Object.assign({},this.formInit)
-
-          // lfind = arrayExistObj(this.tableData, 'id', v.id)
-          // if (lfind > -1) {
-          //   this.$refs['elTable'].setCurrentRow(this.tableData[lfind])
-          //   this.rowClick(this.tableData[lfind])
-          //   this.scrollToRow(lfind)          
-          // }
-          this.tableData.forEach((item, index) => {
+        this.allDiagnosis()
+
+      },
+
+      //查询所有 诊断记录 
+      allDiagnosis() {
+        postapi('/api/app/diagnosis/getlistinsuggestion', {}).then(res => {
+          if (res.code != -1) {
+            this.diagnosisAll = res.data
+            this.quickTableData = res.data
+          }
+        })
+      },
+
+      // 供树节点组件调用，更新当前所选的项目类别
+      refreshItemTypeId(itemTypeId) {
+        this.query.itemTypeId = itemTypeId
+        this.query.triggerScroll++
+      },
+
+      // 供明建议组件调用，更新所选建议
+      refreshSugs(sugs) {
+        if (!this.form.id) return
+        this.form.medicalInterpretations = deepCopy(sugs)
+        let lfind = arrayExistObj(this.tableData, 'id', this.form.id)
+        if (lfind > -1) this.tableData[lfind] = Object.assign(this.tableData[lfind], this.form)
+      },
+      refreshSuges(sugs) {
+        if (!this.form.id) return
+        this.form.healthGuidances = deepCopy(sugs)
+        let lfind = arrayExistObj(this.tableData, 'id', this.form.id)
+        if (lfind > -1) this.tableData[lfind] = Object.assign(this.tableData[lfind], this.form)
+      },
+      refreshSugess(sugs) {
+        if (!this.form.id) return
+        this.form.commonReasons = deepCopy(sugs)
+        let lfind = arrayExistObj(this.tableData, 'id', this.form.id)
+        if (lfind > -1) this.tableData[lfind] = Object.assign(this.tableData[lfind], this.form)
+      },
+
+      async btnQuery() {
+        let body = {}
+        if (this.query.itemTypeFlag && this.query.itemTypeId) {
+          body.itemTypeId = this.query.itemTypeId
+        } else {
+          return
+        }
+        // if(this.query.keyWords) body.keyWords = this.query.keyWords  
+
+        postapi('/api/app/diagnosis/getlistinsuggestion', body).then(res => {
+          if (res.code != -1) {
+            this.tableData = res.data
+            this.form = Object.assign({}, this.formInit)
+          }
+        })
+      },
+
+      //快速查找诊断时，调整可按拼间简码及简称查找
+      filterMethod(keyWords) {
+        //console.log('filterMethod',this.dict.asbItemQuick)  
+        if (keyWords) {
+          this.quickTableData = [];
+          this.diagnosisAll.forEach(item => {
+            if (item.displayName.indexOf(keyWords) > - 1
+              || item.simpleCode.indexOf(keyWords.toUpperCase()) > - 1
+              || item.suggestionName.indexOf(keyWords) > - 1) {
+              this.quickTableData.push(item);
+            }
+          });
+        } else {
+          this.quickTableData = deepCopy(this.diagnosisAll);
+        }
+      },
+
+      //快速查找诊断
+      quickDiagnosis(v) {
+        //远程查询时，设置了 value-key 也不管用，只能取到value console.log('quickDiagnosis',v)
+        let lfind = -1
+        if (!v.itemTypeId) return
+
+        this.query.itemTypeId = v.itemTypeId
+        let body = {
+          itemTypeId: v.itemTypeId
+        }
+
+        postapi('/api/app/diagnosis/getlistinsuggestion', body).then(res => {
+          if (res.code != -1) {
+            this.tableData = res.data
+            this.form = Object.assign({}, this.formInit)
+
+            // lfind = arrayExistObj(this.tableData, 'id', v.id)
+            // if (lfind > -1) {
+            //   this.$refs['elTable'].setCurrentRow(this.tableData[lfind])
+            //   this.rowClick(this.tableData[lfind])
+            //   this.scrollToRow(lfind)          
+            // }
+            this.tableData.forEach((item, index) => {
               if (v.id == item.id) {
                 this.$refs["elTable"].setCurrentRow(item);
                 this.rowClick(item);
-                this.scrollToRow(item)   
+                this.scrollToRow(item)
                 this.searchup(item, index)
               }
             });
+          }
+        })
+
+        //console.log('v,query.diagnosis',v,this.query.diagnosis)
+        this.$refs['elSelectKeyWords'].focus(); //asbItemId
+        this.$nextTick(() => {
+          this.$refs['elSelectKeyWords'].blur(); //total  asbItemId
+          // this.query.keyWords = ''
+          this.quickTableData = deepCopy(this.diagnosisAll)
+          this.$refs['elSelectKeyWords'].focus(); //total  asbItemId       
+        });
+      },
+      searchup(data, index) {
+        this.$nextTick(() => {
+          if (index == 0) {
+            index = 1
+          }
+          const targetTop = this.$refs["elTable"].$el.querySelectorAll('.el-table__body tr')[index - 1].getBoundingClientRect().top
+          const containerTop = this.$refs["elTable"].$el.querySelector('.el-table__body').getBoundingClientRect().top
+          const scrollParent = this.$refs["elTable"].$el.querySelector('.el-table__body-wrapper')
+          scrollParent.scrollTop = targetTop - containerTop
+        })
+      },
+      // 选体检类别时，定位到相应类别的第1行
+      triggerScroll() {
+        if (!this.query.itemTypeId) return
+        let lfind = arrayExistObj(this.tableData, 'itemTypeId', this.query.itemTypeId)
+        if (lfind > -1) {
+          this.scrollToRow(lfind)
         }
-      })
-      
-      //console.log('v,query.diagnosis',v,this.query.diagnosis)
-      this.$refs['elSelectKeyWords'].focus(); //asbItemId
-      this.$nextTick(() => {        
-        this.$refs['elSelectKeyWords'].blur(); //total  asbItemId
-        // this.query.keyWords = ''
-        this.quickTableData = deepCopy(this.diagnosisAll)        
-        this.$refs['elSelectKeyWords'].focus(); //total  asbItemId       
-      });      
-    },
-    searchup(data,index) {
-      this.$nextTick(()=>{
-        if(index==0){
-          index=1
-         }
-          const targetTop = this.$refs["elTable"].$el.querySelectorAll('.el-table__body tr')[index-1].getBoundingClientRect().top
-      const containerTop = this.$refs["elTable"].$el.querySelector('.el-table__body').getBoundingClientRect().top
-      const scrollParent = this.$refs["elTable"].$el.querySelector('.el-table__body-wrapper')
-      scrollParent.scrollTop = targetTop - containerTop
-      })
-    },
-    // 选体检类别时，定位到相应类别的第1行
-    triggerScroll(){
-      if(!this.query.itemTypeId) return
-      let lfind = arrayExistObj(this.tableData,'itemTypeId',this.query.itemTypeId)
-      if(lfind > -1){
-        this.scrollToRow(lfind)
-      }
-    },
-    scrollToRow(rowNum){
-      let dom = this.$refs['elTable'].bodyWrapper
-      this.$nextTick(() =>{
-        let tableHeight = this.window.pageHeight < 600 ? 200 : Math.floor((this.window.pageHeight - 200) / 2)
-        let rowHeight = 36.96
-        dom.scrollTo(0, rowHeight * rowNum - tableHeight*rowNum/(2*this.tableData.length) ) 
-      })
-    },
- 
-
-    //拖拽
-    rowDrop(elId) {
-      this.$nextTick(() => {
-        let el = document.querySelector(`#${elId} tbody`);
-        //console.log('tbody', el)
-        let that = this;
-        Sortable.create(el, {
-          handle: ".move",  // 选中class='move'的元素按住，方可拖动
-          animation: 150, // ms, number 单位：ms，定义排序动画的时间
-          //拖拽结束
-          onChoose({ oldIndex }) {
-            that.$refs["elTable"].setCurrentRow(that.tableData[oldIndex]);
-            that.rowClick(that.tableData[oldIndex]);
-          },
-          onEnd({ newIndex, oldIndex }) {
-            let currRow = that.tableData.splice(oldIndex, 1)[0];
-            that.tableData.splice(newIndex, 0, currRow);
-          },
+      },
+      scrollToRow(rowNum) {
+        let dom = this.$refs['elTable'].bodyWrapper
+        this.$nextTick(() => {
+          let tableHeight = this.window.pageHeight < 600 ? 200 : Math.floor((this.window.pageHeight - 200) / 2)
+          let rowHeight = 36.96
+          dom.scrollTo(0, rowHeight * rowNum - tableHeight * rowNum / (2 * this.tableData.length))
+        })
+      },
+
+
+      //拖拽
+      rowDrop(elId) {
+        this.$nextTick(() => {
+          let el = document.querySelector(`#${elId} tbody`);
+          //console.log('tbody', el)
+          let that = this;
+          Sortable.create(el, {
+            handle: ".move",  // 选中class='move'的元素按住，方可拖动
+            animation: 150, // ms, number 单位：ms，定义排序动画的时间
+            //拖拽结束
+            onChoose({ oldIndex }) {
+              that.$refs["elTable"].setCurrentRow(that.tableData[oldIndex]);
+              that.rowClick(that.tableData[oldIndex]);
+            },
+            onEnd({ newIndex, oldIndex }) {
+              let currRow = that.tableData.splice(oldIndex, 1)[0];
+              that.tableData.splice(newIndex, 0, currRow);
+            },
+          });
         });
-      });
-    },
+      },
 
-    rowClick(row){
-      this.form = deepCopy(row)
+      rowClick(row) {
+        this.form = deepCopy(row)
 
-      //用于选择树节点
-      // if(typeof row.itemTypeId == 'string'){
-      //   this.query.itemTypeId = row.itemTypeId  
-      // }else{
-      //   this.query.itemTypeId = row.itemTypeId[row.itemTypeId.length - 1]
-      // }
-      
-    },
+        //用于选择树节点
+        // if(typeof row.itemTypeId == 'string'){
+        //   this.query.itemTypeId = row.itemTypeId  
+        // }else{
+        //   this.query.itemTypeId = row.itemTypeId[row.itemTypeId.length - 1]
+        // }
 
-    btnAdd(){
-      if(!this.query.itemTypeId){
-        this.$message.warning("请先选择项目类别！")
-        return
-      }
-      this.form = deepCopy(this.formInit)
-      this.form.itemTypeId = this.query.itemTypeId
-      this.dialogVisible = true
-    },
+      },
 
-    btnEdit(){
-      if(!this.form.id){
-        this.$message.warning("请先选择要编辑的诊断记录！")
-        return
-      }
-      this.dialogVisible = true
-    },
-    ischangsItemTypeId(v){
-      if(v.length>1){
-        this.form.itemTypeId=this.form.itemTypeId.slice(-1)[0]
-      }else{
-        this.form.itemTypeId=this.form.itemTypeId[0]
-      }
-      this.$refs.itemTypeIds.toggleDropDownVisible();
-    },
-    inputDisplayName(v){
-      //console.log(v)
-      this.form.suggestionName = v
-    },
+      btnAdd() {
+        if (!this.query.itemTypeId) {
+          this.$message.warning("请先选择项目类别！")
+          return
+        }
+        this.form = deepCopy(this.formInit)
+        this.form.itemTypeId = this.query.itemTypeId
+        this.dialogVisible = true
+      },
 
-    onSubmit(formName){
-      let msg='',body = {},itemTypeId=''
-      
-      this.$refs[formName].validate((valid, fields) => {
-        if (!valid) {
-          msg = fields[Object.keys(fields)[0]][0].message;
-          return false;
-        }        
-      })
-
-      if(msg){
-        this.$message.warning(msg);
-        return
-      }
-
-      if(typeof this.form.itemTypeId == 'object'){
-        itemTypeId = this.form.itemTypeId[this.form.itemTypeId.length - 1]
-      }else{
-        itemTypeId = this.form.itemTypeId
-      }
-      
-      body = {
-        displayName: this.form.displayName,
-        itemTypeId,
-        suggestionName: this.form.suggestionName,
-        isIll: this.form.isIll,
-        isSummaryTemplate: this.form.isSummaryTemplate,
-        forSexId: this.form.forSexId,
-        diagnosisLevelId: this.form.diagnosisLevelId,
-        isActive:this.form.isActive,
-      }
-      // console.log('this.form',this.form)
-      if(this.form.id){
-        postapi(`/api/app/diagnosis/updatediagnosis?id=${this.form.id}`,body).then(res =>{
-          if(res.code != -1){
-            this.dialogVisible = false
-            //this.$message.success('操作成功！')
-          }
-        })
-      }else{
-        postapi(`/api/app/diagnosis/creatediagnosis`,body).then(res =>{
-          if(res.code != -1){
-            this.form = Object.assign(this.form,res.data)    
-            this.dialogVisible = false       
-            //this.$message.success('操作成功！') 
+      btnEdit() {
+        if (!this.form.id) {
+          this.$message.warning("请先选择要编辑的诊断记录！")
+          return
+        }
+        this.dialogVisible = true
+      },
+      ischangsItemTypeId(v) {
+        if (v.length > 1) {
+          this.form.itemTypeId = this.form.itemTypeId.slice(-1)[0]
+        } else {
+          this.form.itemTypeId = this.form.itemTypeId[0]
+        }
+        this.$refs.itemTypeIds.toggleDropDownVisible();
+      },
+      inputDisplayName(v) {
+        //console.log(v)
+        this.form.suggestionName = v
+      },
+
+      onSubmit(formName) {
+        let msg = '', body = {}, itemTypeId = ''
+
+        this.$refs[formName].validate((valid, fields) => {
+          if (!valid) {
+            msg = fields[Object.keys(fields)[0]][0].message;
+            return false;
           }
         })
-      }
-    },
 
-    btnSort(){
-      if(this.tableData.length<2) return
-      let itemList = []
-      this.tableData.forEach((e,index) =>{
-        itemList.push({
-          id:e.id,
-          displayOrder:index+1
-        })
-      })
+        if (msg) {
+          this.$message.warning(msg);
+          return
+        }
 
-      putapi('/api/app/diagnosis/updatesortmany',{itemList}).then(res =>{
-        if(res.code != -1){
-          //this.$message.success('操作成功！')
+        if (typeof this.form.itemTypeId == 'object') {
+          itemTypeId = this.form.itemTypeId[this.form.itemTypeId.length - 1]
+        } else {
+          itemTypeId = this.form.itemTypeId
         }
-      })
-    },
 
-    closeDialog(){
-      if(!this.form.id) return
-      let curRow = {}
-      let lfind = arrayExistObj(this.tableData,'id',this.form.id)
-      if(lfind > -1){
-        curRow = Object.assign(this.tableData[lfind],this.form)
-        this.tableData[lfind] = curRow
-      }else{
-        lfind = this.tableData.length
-        curRow = Object.assign({},this.form)
-        this.tableData.push(curRow)
-      }
-      if(lfind > -1){
-        this.$refs['elTable'].setCurrentRow(curRow)
-        this.$nextTick(() =>{
-          this.rowClick(curRow)
+        body = {
+          displayName: this.form.displayName,
+          itemTypeId,
+          suggestionName: this.form.suggestionName,
+          isIll: this.form.isIll,
+          isSummaryTemplate: this.form.isSummaryTemplate,
+          forSexId: this.form.forSexId,
+          diagnosisLevelId: this.form.diagnosisLevelId,
+          isActive: this.form.isActive,
+        }
+        // console.log('this.form',this.form)
+        if (this.form.id) {
+          postapi(`/api/app/diagnosis/updatediagnosis?id=${this.form.id}`, body).then(res => {
+            if (res.code != -1) {
+              this.dialogVisible = false
+              //this.$message.success('操作成功！')
+            }
+          })
+        } else {
+          postapi(`/api/app/diagnosis/creatediagnosis`, body).then(res => {
+            if (res.code != -1) {
+              this.form = Object.assign(this.form, res.data)
+              this.dialogVisible = false
+              //this.$message.success('操作成功！') 
+            }
+          })
+        }
+      },
+
+      btnSort() {
+        if (this.tableData.length < 2) return
+        let itemList = []
+        this.tableData.forEach((e, index) => {
+          itemList.push({
+            id: e.id,
+            displayOrder: index + 1
+          })
         })
-      }
-      this.allDiagnosis()
-    },
 
-    btnDel(){
-      if(!this.form.id){
-        this.$message.warning("请先选中要删除的诊断记录！")
-        return
-      }
-
-      this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
-        confirmButtonText: "是",
-        cancelButtonText: "否", 
-        type: "warning",
-        cancelButtonClass:"difference",
-        confirmButtonClass:"commonbutton"
-      }).then(() => {
-        //console.log('{patientRegisterIds}',{patientRegisterIds})
-        return postapi(`/api/app/diagnosis/deletediagnosis?id=${this.form.id}`);
-      }).then((res) => {
-        if(res.code != -1){
-          let lfind = arrayExistObj(this.tableData,'id',this.form.id)
-          if(lfind > -1) this.tableData.splice(lfind,1)
-          this.form = deepCopy(this.formInit)   
-          this.allDiagnosis()
-          //this.$message.success('操作成功！')
-        }          
-      }).catch((err) => {
-        if (err == "cancel") {
-          this.$message.info("已取消操作");
+        putapi('/api/app/diagnosis/updatesortmany', { itemList }).then(res => {
+          if (res.code != -1) {
+            //this.$message.success('操作成功！')
+          }
+        })
+      },
+
+      closeDialog() {
+        if (!this.form.id) return
+        let curRow = {}
+        let lfind = arrayExistObj(this.tableData, 'id', this.form.id)
+        if (lfind > -1) {
+          curRow = Object.assign(this.tableData[lfind], this.form)
+          this.tableData[lfind] = curRow
+        } else {
+          lfind = this.tableData.length
+          curRow = Object.assign({}, this.form)
+          this.tableData.push(curRow)
+        }
+        if (lfind > -1) {
+          this.$refs['elTable'].setCurrentRow(curRow)
+          this.$nextTick(() => {
+            this.rowClick(curRow)
+          })
+        }
+        this.allDiagnosis()
+      },
+
+      btnDel() {
+        if (!this.form.id) {
+          this.$message.warning("请先选中要删除的诊断记录！")
+          return
         }
-      });     
+
+        this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
+          confirmButtonText: "是",
+          cancelButtonText: "否",
+          type: "warning",
+          cancelButtonClass: "difference",
+          confirmButtonClass: "commonbutton"
+        }).then(() => {
+          //console.log('{patientRegisterIds}',{patientRegisterIds})
+          return postapi(`/api/app/diagnosis/deletediagnosis?id=${this.form.id}`);
+        }).then((res) => {
+          if (res.code != -1) {
+            let lfind = arrayExistObj(this.tableData, 'id', this.form.id)
+            if (lfind > -1) this.tableData.splice(lfind, 1)
+            this.form = deepCopy(this.formInit)
+            this.allDiagnosis()
+            //this.$message.success('操作成功！')
+          }
+        }).catch((err) => {
+          if (err == "cancel") {
+            this.$message.info("已取消操作");
+          }
+        });
+      },
+
     },
 
-  },
-
-  watch: {    
-    // "query.itemTypeId":{
-    //   immediate: true, // 立即执行
-    //   // deep: true, // 深度监听复杂类型内变化
-    //   handler(newVal,oldVal){
-    //     // console.log('watch:patientRegisterNo:',newVal,oldVal)
-    //     if(newVal != oldVal){
-    //       this.btnQuery();                 
-    //     }
-    //   }
-    // },
-    "query.triggerScroll":{
-      immediate: true, // 立即执行
-      // deep: true, // 深度监听复杂类型内变化
-      handler(newVal,oldVal){
-        // console.log('watch:patientRegisterNo:',newVal,oldVal)
-        if(newVal != oldVal){
-          this.btnQuery();                 
+    watch: {
+      // "query.itemTypeId":{
+      //   immediate: true, // 立即执行
+      //   // deep: true, // 深度监听复杂类型内变化
+      //   handler(newVal,oldVal){
+      //     // console.log('watch:patientRegisterNo:',newVal,oldVal)
+      //     if(newVal != oldVal){
+      //       this.btnQuery();                 
+      //     }
+      //   }
+      // },
+      "query.triggerScroll": {
+        immediate: true, // 立即执行
+        // deep: true, // 深度监听复杂类型内变化
+        handler(newVal, oldVal) {
+          // console.log('watch:patientRegisterNo:',newVal,oldVal)
+          if (newVal != oldVal) {
+            this.btnQuery();
+          }
         }
-      }
+      },
     },
-  },
-};
+  };
 </script>
 <style scoped>
 @import '../../assets/css/global_button.css';
@@ -696,35 +666,52 @@ export default {
   display: flex;
   flex-direction: column;
 }
+
+::v-deep .dddwSelect .el-select-dropdown__wrap {
+  background-color: #FFF;
+  max-height: 600px;
+  max-width: 350px;
+}
+
 /* form表单每一项的下边距 */
 :deep .el-form-item {
   margin-bottom: 14px;
 }
+
 /* 去掉input textarea的手动扩张样式 */
-:deep(.el-textarea__inner) {
+:deep .el-textarea__inner {
   resize: none;
 }
+
 /* el-dialog的头部样式 */
 :deep .el-dialog__header {
   padding: 11px 20px 11px;
 }
+
 /* el-dialog的主体样式 */
 :deep .el-dialog__body {
   padding: 0px 20px 0px;
 }
+
 /* el-divider样式 */
 :deep .el-divider--horizontal {
   margin: 0px 0 12px;
 }
+
 /* el-dialog的底部样式 */
 :deep .el-dialog__footer {
   padding: 0px 20px 14px;
 }
+
 .seachinput {
-  width: 250px;
+  width: 350px;
   margin-right: 110px;
 }
+
 :deep .seachinput .el-select {
   width: 100%;
 }
+
+
+
 </style>
diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue
index 7ab2bb9..8b08dee 100644
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@@ -544,6 +544,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
           <el-col :span="5">
             <el-form-item label="疾病筛查类别" prop="" label-width="100px">
               <el-select v-model="form.diseaseScreeningTypeId" placeholder="请选择" size="small" @change="quckRusetform">
@@ -2174,7 +2175,7 @@ export default {
 }
 
 .seachinput {
-  width: 250px;
+  width: 350px;
   margin-right: 110px;
 }
 
diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index 92d9f8e..bf257ac 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -692,7 +692,7 @@
           <el-col :span="8">
             <el-form-item label="诊断编号">
               <el-select v-model="rusetform.diagnosisId" placeholder="请选择" filterable :filter-method="remoteMethod"
-                clearable @change="quckRusetforms" default-first-option size="small">
+                clearable @change="quckRusetforms" default-first-option size="small" popper-class="dddwSelect" :popper-append-to-body="false">
                 <el-option v-for="item in quickAsb" :key="item.id" :label="item.displayName" :value="item.id">
                 </el-option>
               </el-select>
@@ -2732,10 +2732,16 @@ export default {
 }
 
 .seachinput {
-  width: 250px;
+  width: 350px;
   margin-right: 110px;
 }
 
+::v-deep .dddwSelect .el-select-dropdown__wrap {
+  background-color: #FFF;
+  max-height: 600px;
+  max-width: 350px;
+}
+
 :deep .seachinput .el-select {
   width: 100%;
 }