diff --git a/src/components/customerOrg/customerOrgGroupAsbitem.vue b/src/components/customerOrg/customerOrgGroupAsbitem.vue
index 277a4fa..3d0b269 100644
--- a/src/components/customerOrg/customerOrgGroupAsbitem.vue
+++ b/src/components/customerOrg/customerOrgGroupAsbitem.vue
@@ -105,7 +105,7 @@
       </div>
       <div style="margin-top: 10px;">
         <el-button class="commonbutton" @click="btnPastGroupAsbitem"
-          :disabled="dataTransOpts.copyGroupAsbitem.length == 0 ? true : false">粘贴</el-button>
+          :disabled="dataTransOpts?.copyGroupAsbitem?.length > 0 ? false : true">粘贴</el-button>
       </div>
       <div v-show="checkPagePriv(pagePriv.privs, '保存')" style="margin-top: 10px;">
         <el-button class="commonbutton" @click="btnSave">保存</el-button>
diff --git a/src/components/patientRegister/PatientRegisterRecoverList.vue b/src/components/patientRegister/PatientRegisterRecoverList.vue
index 65a35f6..01296d1 100644
--- a/src/components/patientRegister/PatientRegisterRecoverList.vue
+++ b/src/components/patientRegister/PatientRegisterRecoverList.vue
@@ -117,15 +117,18 @@
           </download-excel>
       </div> -->
     </div>
-    <el-dialog title="扫/输入条码回收体检表（指引单）" :visible.sync="dialogVisible" width="400px" :append-to-body="true"
+    <el-dialog title="扫/输入条码回收体检表（指引单）" :visible.sync="recover.dialog" width="400px" :append-to-body="true"
       :close-on-click-modal="false">
-      <div class="query">
-        <span class="spanClass">条码号</span> <!-- @change="signByPatientRegisterNo" -->
-        <el-input ref="tmh" v-model="patientRegisterNo" @keyup.native.enter="signByPatientRegisterNo"></el-input>
+      <div style="margin-left: 10px;">
+          <template>
+            <el-radio v-model="recover.recoverType" label="0">条码号</el-radio>
+            <el-radio v-model="recover.recoverType" label="1">档案号</el-radio>
+          </template>
+          <el-input style="margin: 10px 0;" ref="tmh" v-model="recover.barcode" @keyup.native.enter="signByPatientRegisterNo"></el-input>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="signByPatientRegisterNo" class="commonbutton">确定</el-button>
-        <el-button @click="dialogVisible = false" class="commonbutton">关闭</el-button>        
+        <el-button @click="recover.dialog = false" class="commonbutton">关闭</el-button>        
       </div>
     </el-dialog>
   </div>
@@ -149,7 +152,16 @@ export default {
       tableData: [], //列表数据
       multipleSelection: [], //选中的数据列表
       tableDataCurrentRow:{},  // 单行选中的行 
-      dialogVisible: false,
+     
+      // 体检表回收
+      recover: {
+        dialog: false,
+        recoverType: '0', //回收类型 0-条码号 1-档案号
+        barcode: '', // 条码号或档案号
+        barcodes: [], // 条码号或档案号集合
+        isRecoverGuide: 'Y',  //状态 Y-回收，N-取消回收
+      },
+
 
       patientRegisterNo: '',
 
@@ -242,29 +254,41 @@ export default {
       this.tableDataCurrentRow = row
     },
 
-    // 回收表提交
+    // 回收表提交 Y-回收，N-取消
     recoverCore(body) {
-      postapi(`/api/app/patientregister/updaterecoverguidemany`, body)
+      // postapi(`/api/app/patientregister/updaterecoverguidemany`, body)
+      //   .then((res) => {
+      //     if (res.code > -1) {
+      //       this.$message.success({ showClose: true, message: "操作成功！"}); 
+      //       // 刷新页面回收状态
+      //       if(this.multipleSelection.length > 0){
+      //         this.multipleSelection.forEach(e => {
+      //           e.isRecoverGuide = 'Y'
+      //         });
+      //       }else{
+      //         let lfind = arrayExistObj(this.tableData,'id',body[0].id)
+      //         if(lfind > -1){
+      //           this.tableData[lfind].isRecoverGuide = 'Y'
+      //         }
+      //       }          
+      //     }
+      //   })
+      postapi('/api/app/PatientRegister/BatchRecoverGuide', body)
         .then((res) => {
           if (res.code > -1) {
-            this.$message.success({ showClose: true, message: "操作成功！"}); 
-            // 刷新页面回收状态
-            if(this.multipleSelection.length > 0){
-              this.multipleSelection.forEach(e => {
-                e.isRecoverGuide = 'Y'
-              });
-            }else{
-              let lfind = arrayExistObj(this.tableData,'id',body[0].id)
-              if(lfind > -1){
-                this.tableData[lfind].isRecoverGuide = 'Y'
-              }
-            }          
+            this.$message.success({ showClose: true, message: '操作成功！' })
+            let key = body.recoverType == '0' ? 'patientRegisterNo':'patientNo'
+            let lfind = -1
+            body.barcodes.forEach(e => {
+              lfind = arrayExistObj(this.tableData,key,e)
+              if(lfind > -1) this.tableData[lfind].isRecoverGuide = body.isRecoverGuide
+            });
           }
-        })
+        });
     },
 
     //选中人员记录回收
-    btnRecover() {
+    btnRecover(isRecoverGuide) {
       // 有勾选，则操作勾选的，无勾选则按选中的记录
       let  selectedRds = []
       selectedRds = selectedRds.concat(this.multipleSelection)
@@ -276,9 +300,13 @@ export default {
         return;
       }
 
-      let body = []
+      let body = {
+        recoverType:'0',
+        isRecoverGuide,
+        barcodes:[]
+      }
       selectedRds.forEach(e => {
-        body.push(e.id)
+        body.barcodes.push(e.patientRegisterNo)
       });
 
       this.recoverCore(body)
@@ -287,8 +315,8 @@ export default {
 
     // 点击扫码回收体检表按钮
     btnScanRecover() {
-      this.patientRegisterNo = ''
-      this.dialogVisible = true
+      this.recover.barcode = ''
+      this.recover.dialog = true
       this.$nextTick(() => {
         this.$refs['tmh'].focus(); //打开光标定位到条码栏里 
       });
@@ -296,18 +324,31 @@ export default {
 
     //按条码号查个人数据
     signByPatientRegisterNo() {
-      let patientRegisterNos = [this.patientRegisterNo]
-      let body = {
-        patientRegisterNos
-      }
-      //console.log(`/api/app/patientregister/getpatientregisterorpatient`, body)
-      postapi('/api/app/PatientRegister/BatchRecoverGuideByPatientRegisterNo', body)
+      // let patientRegisterNos = [this.patientRegisterNo]
+      // let body = {
+      //   patientRegisterNos
+      // }
+      // //console.log(`/api/app/patientregister/getpatientregisterorpatient`, body)
+      // postapi('/api/app/PatientRegister/BatchRecoverGuideByPatientRegisterNo', body)
+      //   .then((res) => {
+      //     if (res.code > -1) {
+      //       this.$message.success({ showClose: true, message: '操作成功！' })
+      //       //let lfind = arrayExistObj()
+      //       this.recover.barcode = ''            
+      //     }
+      //   });
+      this.recover.barcodes = [this.recover.barcode]
+      postapi('/api/app/PatientRegister/BatchRecoverGuide', this.recover)
         .then((res) => {
           if (res.code > -1) {
-            this.patientRegisterNo = ''
             this.$message.success({ showClose: true, message: '操作成功！' })
+            let key = this.recover.recoverType == '0' ? 'patientRegisterNo':'patientNo'
+            let lfind = arrayExistObj(this.tableData,key,this.recover.barcode)
+            if(lfind > -1) this.tableData[lfind].isRecoverGuide = this.recover.isRecoverGuide
+            this.recover.barcode = ''            
           }
         });
+
     },
 
     ldddw(arrayData, key, value, display) {
diff --git a/src/views/customerReport/personnelPositive.vue b/src/views/customerReport/personnelPositive.vue
index 8c477aa..0f3a3df 100644
--- a/src/views/customerReport/personnelPositive.vue
+++ b/src/views/customerReport/personnelPositive.vue
@@ -118,18 +118,19 @@
                   width="60"
                   align="center"
                 />
-                <el-table-column prop="customerOrgParentName" label="单位" />
-                <el-table-column prop="customerOrgName" label="部门" />
-                <el-table-column prop="patientNo" label="档案号" width="120" />
-                <el-table-column prop="patientName" label="姓名" width="120" />
-                <el-table-column prop="sexName" label="性别" width="50" />
-                <el-table-column prop="age" label="年龄" width="80" />
-                <el-table-column prop="medicalTimes" label="次数" width="50" />
+                <el-table-column prop="customerOrgParentName" label="单位" align="center"/>
+                <el-table-column prop="customerOrgName" label="部门" align="center"/>
+                <el-table-column prop="patientNo" label="档案号" width="90" align="center"/>
+                <el-table-column prop="patientName" label="姓名" width="90" align="center"/>
+                <el-table-column prop="sexName" label="性别" width="50" align="center"/>
+                <el-table-column prop="age" label="年龄" width="80" align="center"/>
+                <el-table-column prop="medicalTimes" label="次数" width="50" align="center"/>
                 <el-table-column
                   prop="mobileTelephone"
                   label="手机号码"
                   width="120"
                 />
+                <el-table-column prop="summary" label="检查综述" />
                 <el-table-column prop="diagnosisNames" label="检查结果" />
               </el-table-column>
             </el-table-column>