diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue
index 555d174..754b4e4 100644
--- a/src/components/doctorCheck/RegisterCheckList.vue
+++ b/src/components/doctorCheck/RegisterCheckList.vue
@@ -3,7 +3,7 @@
     <div :style="`overflow-y: scroll;height: ${tableHeight}px;`">
       <el-collapse v-model="activeNames">
         <el-collapse-item v-if="registerCheckList0.length > 0" title="普通检查" name="0">
-          <el-table :data="registerCheckList0" style="width: 100%;" border highlight-current-row @row-click="rowClick"
+          <el-table ref="registerCheckList0" :data="registerCheckList0" style="width: 100%;" border highlight-current-row @row-click="rowClick0"
             :show-header="false" :row-style="{ height: '28px' }">
             <el-table-column prop="asbitemName" label="组合项目" width="184">
               <template slot-scope="scope">
@@ -15,7 +15,7 @@
           </el-table>
         </el-collapse-item>
         <el-collapse-item v-if="registerCheckList1.length > 0" title="检验" name="1">
-          <el-table :data="registerCheckList1" style="width: 100%;" border highlight-current-row @row-click="rowClick"
+          <el-table ref="registerCheckList1" :data="registerCheckList1" style="width: 100%;" border highlight-current-row @row-click="rowClick1"
             :show-header="false" :row-style="{ height: '28px' }">
             <el-table-column prop="asbitemName" label="组合项目" width="184">
               <template slot-scope="scope">
@@ -27,7 +27,7 @@
           </el-table>
         </el-collapse-item>
         <el-collapse-item v-if="registerCheckList2.length > 0" title="特检" name="2">
-          <el-table :data="registerCheckList2" style="width: 100%;" border highlight-current-row @row-click="rowClick"
+          <el-table ref="registerCheckList2" :data="registerCheckList2" style="width: 100%;" border highlight-current-row @row-click="rowClick2"
             :show-header="false" :row-style="{ height: '28px' }">
             <el-table-column prop="asbitemName" label="组合项目"
               :width="LocalConfig.doctorCheck.isPacsWorklist == 'Y' ? 153 : 184">
@@ -48,7 +48,7 @@
           </el-table>
         </el-collapse-item>
         <el-collapse-item v-if="registerCheckList3.length > 0" title="放射" name="3">
-          <el-table :data="registerCheckList3" style="width: 100%;" border highlight-current-row @row-click="rowClick"
+          <el-table ref="registerCheckList3" :data="registerCheckList3" style="width: 100%;" border highlight-current-row @row-click="rowClick3"
             :show-header="false" :row-style="{ height: '28px' }">
             <el-table-column prop="asbitemName" label="组合项目"
               :width="LocalConfig.doctorCheck.isPacsWorklist == 'Y' ? 153 : 184">
@@ -75,7 +75,7 @@
 <script>
 import { mapState } from 'vuex';
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { listOrderBy, setCheckStatusColor } from "../../utlis/proFunc"
+import { arrayExistObj, listOrderBy, setCheckStatusColor } from "../../utlis/proFunc"
 
 export default {
   components: {},
@@ -176,9 +176,47 @@ export default {
 
     },
 
+    // 普通检查点击
+    rowClick0(row){
+      // 跨检查类别选择时，先清除其他区的高亮选中状态
+      //if(this.registerCheckList0.length>0) this.$refs['registerCheckList0'].setCurrentRow();
+      if(this.registerCheckList1.length>0) this.$refs['registerCheckList1'].setCurrentRow();
+      if(this.registerCheckList2.length>0) this.$refs['registerCheckList2'].setCurrentRow();
+      if(this.registerCheckList3.length>0) this.$refs['registerCheckList3'].setCurrentRow();
+      this.rowClick(row)
+    },
+
+    // 检验检查点击
+    rowClick1(row){
+      // 跨检查类别选择时，先清除其他区的高亮选中状态
+      if(this.registerCheckList0.length>0) this.$refs['registerCheckList0'].setCurrentRow();
+      //if(this.registerCheckList1.length>0) this.$refs['registerCheckList1'].setCurrentRow();
+      if(this.registerCheckList2.length>0) this.$refs['registerCheckList2'].setCurrentRow();
+      if(this.registerCheckList3.length>0) this.$refs['registerCheckList3'].setCurrentRow();
+      this.rowClick(row)
+    },
+    // 检验检查点击
+    rowClick2(row){
+      // 跨检查类别选择时，先清除其他区的高亮选中状态
+      if(this.registerCheckList0.length>0) this.$refs['registerCheckList0'].setCurrentRow();
+      if(this.registerCheckList1.length>0) this.$refs['registerCheckList1'].setCurrentRow();
+      //if(this.registerCheckList2.length>0) this.$refs['registerCheckList2'].setCurrentRow();
+      if(this.registerCheckList3.length>0) this.$refs['registerCheckList3'].setCurrentRow();
+      this.rowClick(row)
+    },
+    // 检验检查点击
+    rowClick3(row){
+      // 跨检查类别选择时，先清除其他区的高亮选中状态
+      if(this.registerCheckList0.length>0) this.$refs['registerCheckList0'].setCurrentRow();
+      if(this.registerCheckList1.length>0) this.$refs['registerCheckList1'].setCurrentRow();
+      if(this.registerCheckList2.length>0) this.$refs['registerCheckList2'].setCurrentRow();
+      //if(this.registerCheckList3.length>0) this.$refs['registerCheckList3'].setCurrentRow();
+      this.rowClick(row)
+    },
     //选择组合项目
     rowClick(row) {
       // console.log('rowClick')
+      
       this.doctorCheck.RegisterCheckId = row.id
       this.doctorCheck.asbitemName = row.asbitemName
       this.doctorCheck.checkRequestNo = row.checkRequestNo
@@ -200,6 +238,116 @@ export default {
 
     },
 
+    // 保存完后，自动下一个项目
+    doctorAutoNext(){
+      let lfind = -1
+      let nextRow = -1
+
+      
+      if(this.registerCheckList0.length > 0){
+        lfind = arrayExistObj(this.registerCheckList0,'id',this.doctorCheck.RegisterCheckId)
+        if(lfind > -1){
+          // 不是最后一个
+          if(lfind < this.registerCheckList0.length - 1){
+            nextRow = Number(lfind) + 1            
+            this.rowClick0(this.registerCheckList0[nextRow])
+            this.$refs['registerCheckList0'].setCurrentRow();
+            this.$refs['registerCheckList0'].setCurrentRow(this.registerCheckList0[nextRow]);
+            return
+          }else{            
+            if(this.registerCheckList1.length > 0){
+              nextRow = 0
+              this.rowClick1(this.registerCheckList1[nextRow])
+              this.$refs['registerCheckList1'].setCurrentRow(this.registerCheckList1[nextRow]);
+              return
+            }
+            if(this.registerCheckList2.length > 0){
+              nextRow = 0
+              this.rowClick2(this.registerCheckList2[nextRow])
+              this.$refs['registerCheckList2'].setCurrentRow(this.registerCheckList2[nextRow]);
+              return
+            }
+            if(this.registerCheckList3.length > 0){
+              nextRow = 0
+              this.rowClick3(this.registerCheckList3[nextRow])
+              this.$refs['registerCheckList3'].setCurrentRow(this.registerCheckList3[nextRow]);
+              return
+            }
+            return
+          }
+        }
+      }
+
+      if(nextRow > -1) return
+      if(this.registerCheckList1.length > 0){
+        lfind = arrayExistObj(this.registerCheckList1,'id',this.doctorCheck.RegisterCheckId)
+        if(lfind > -1){
+          // 不是最后一个
+          if(lfind < this.registerCheckList1.length - 1){
+            nextRow = Number(lfind) + 1            
+            this.rowClick1(this.registerCheckList1[nextRow])
+            this.$refs['registerCheckList1'].setCurrentRow();
+            this.$refs['registerCheckList1'].setCurrentRow(this.registerCheckList1[nextRow]);
+            return
+          }else{ 
+            if(this.registerCheckList2.length > 0){
+              nextRow = 0
+              this.rowClick2(this.registerCheckList2[nextRow])
+              this.$refs['registerCheckList2'].setCurrentRow(this.registerCheckList2[nextRow]);
+              return
+            }
+            if(this.registerCheckList3.length > 0){
+              nextRow = 0
+              this.rowClick3(this.registerCheckList3[nextRow])
+              this.$refs['registerCheckList3'].setCurrentRow(this.registerCheckList3[nextRow]);
+              return
+            }
+            return
+          }
+        }
+      }
+
+      if(nextRow > -1) return
+      if(this.registerCheckList2.length > 0){
+        lfind = arrayExistObj(this.registerCheckList2,'id',this.doctorCheck.RegisterCheckId)
+        if(lfind > -1){
+          // 不是最后一个
+          if(lfind < this.registerCheckList2.length - 1){
+            nextRow = Number(lfind) + 1            
+            this.rowClick2(this.registerCheckList2[nextRow])
+            this.$refs['registerCheckList2'].setCurrentRow();
+            this.$refs['registerCheckList2'].setCurrentRow(this.registerCheckList2[nextRow]);
+            return
+          }else{             
+            if(this.registerCheckList3.length > 0){
+              nextRow = 0
+              this.rowClick3(this.registerCheckList3[nextRow])
+              this.$refs['registerCheckList3'].setCurrentRow(this.registerCheckList3[nextRow]);
+              return
+            }
+            return
+          }
+        }
+      }
+      
+      if(nextRow > -1) return
+      if(this.registerCheckList3.length > 0){
+        lfind = arrayExistObj(this.registerCheckList3,'id',this.doctorCheck.RegisterCheckId)
+        if(lfind > -1){
+          // 不是最后一个
+          if(lfind < this.registerCheckList3.length - 1){
+            nextRow = Number(lfind) + 1            
+            this.rowClick3(this.registerCheckList3[nextRow])
+            this.$refs['registerCheckList3'].setCurrentRow();
+            this.$refs['registerCheckList3'].setCurrentRow(this.registerCheckList3[nextRow]);
+            return
+          }
+        }
+      }
+
+    },
+    
+
     // 分屏方式 浏览Dcm文件 ；如果不是 分屏方式，则点击 dcm 标签页时，再触发嵌入Dcm显示页
     browseDcm(row) {
       
@@ -265,25 +413,42 @@ export default {
 
               this.doctorCheck.asbitemName = this.registerCheckList0[0].asbitemName
               this.doctorCheck.checkRequestNo = this.registerCheckList0[0].checkRequestNo  
+              // 默认选中第一个组合项目              
+              setTimeout(() => {                  
+                this.$refs['registerCheckList0'].setCurrentRow(this.registerCheckList0[0])                  
+              }, 20);                            
+              
+
             } else if(this.registerCheckList1.length > 0){
               this.doctorCheck.RegisterCheckId = this.registerCheckList1[0].id
               this.dataTransOpts.tableS.register_check.id = this.registerCheckList1[0].id
 
               this.doctorCheck.asbitemName = this.registerCheckList1[0].asbitemName
               this.doctorCheck.checkRequestNo = this.registerCheckList1[0].checkRequestNo
+              // 默认选中第一个组合项目              
+              setTimeout(() => {                  
+                this.$refs['registerCheckList1'].setCurrentRow(this.registerCheckList1[0])                  
+              }, 20);
             } else if(this.registerCheckList2.length > 0){
               this.doctorCheck.RegisterCheckId = this.registerCheckList2[0].id
               this.dataTransOpts.tableS.register_check.id = this.registerCheckList2[0].id
 
               this.doctorCheck.asbitemName = this.registerCheckList2[0].asbitemName
               this.doctorCheck.checkRequestNo = this.registerCheckList2[0].checkRequestNo
+              // 默认选中第一个组合项目              
+              setTimeout(() => {                  
+                this.$refs['registerCheckList2'].setCurrentRow(this.registerCheckList2[0])                  
+              }, 20);
             } else if(this.registerCheckList3.length > 0){
               this.doctorCheck.RegisterCheckId = this.registerCheckList3[0].id
               this.dataTransOpts.tableS.register_check.id = this.registerCheckList3[0].id
 
               this.doctorCheck.asbitemName = this.registerCheckList3[0].asbitemName
               this.doctorCheck.checkRequestNo = this.registerCheckList3[0].checkRequestNo
-
+              // 默认选中第一个组合项目              
+              setTimeout(() => {                  
+                this.$refs['registerCheckList3'].setCurrentRow(this.registerCheckList3[0])                  
+              }, 20);
             // if (res.data.length > 0) {
 
 
@@ -339,6 +504,16 @@ export default {
         this.registerCheckList(this.dataTransOpts.tableS.patient_register.id)
       }
     },
+    // 
+    "dataTransOpts.plus.doctorAutoNext": {
+      // immediate:true,
+      handler(newVal, oldVal) {
+        console.log(`watch 自动下一个项目 newVal: ${newVal} oldVal: ${oldVal} patient_register.id: ${this.dataTransOpts.tableS.patient_register.id}`);
+        if(newVal != oldVal && newVal > 0){
+          this.doctorAutoNext()
+        }        
+      }
+    },
   }
 };
 </script>
diff --git a/src/store/index.js b/src/store/index.js
index 436d8d5..17ea07c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -536,6 +536,7 @@ export default new Vuex.Store({
                 WebBookingMzak: 0, // 人寿预约
                 ImportOrgData: 0, // 导入企业（青藏公司）数据
                 queue: 0, // 排队信息 
+                doctorAutoNext:0,  //触发医生诊台保存结果后自动下一个功能
             },
 
             // 登记时复制分组与套餐用 
diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue
index 09bba5e..f89e5c4 100644
--- a/src/views/charge/charge.vue
+++ b/src/views/charge/charge.vue
@@ -533,12 +533,12 @@ export default {
           break;
       }
 
-      const loading = this.$loading({
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      });
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: 'Loading',
+      //   spinner: 'el-icon-loading',
+      //   background: 'rgba(0, 0, 0, 0.7)'
+      // });
       postapi(url, body).then(res => {
         console.log(url, body, res)
         if (res.code != - 1) {
@@ -559,10 +559,11 @@ export default {
             this.form = Object.assign({}, this.formInit)
           }
         }
-        loading.close();
+        // loading.close();
       })
         .catch((err) => {
-          loading.close();
+          console.error(err)
+          // loading.close();
         });
 
     },
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index 20edb0b..662d42c 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -679,6 +679,8 @@ export default {
 
               // 保存成功后，是否自动下一个项目
               if (this.LocalConfig.doctorCheck.isAutoNext == 'Y') {
+
+                /*  检查类别分区后，自动下一个项目不起作用 
                 // this.doctorCheck.RegisterCheckList   registerCheckId
                 lfind = Number(lfind) + 1
                 if (this.doctorCheck.RegisterCheckList.length >= lfind) {
@@ -691,6 +693,8 @@ export default {
                   this.dataTransOpts.refresh.register_check.S++
                   this.dataTransOpts.refresh.register_check_item.M++
                 }
+                */
+                this.dataTransOpts.plus.doctorAutoNext++
               }
             }
             //console.log('操作成功')