diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue
index 6dbde08..08a49d3 100644
--- a/src/components/doctorCheck/PatientRegisterBase.vue
+++ b/src/components/doctorCheck/PatientRegisterBase.vue
@@ -3,7 +3,7 @@
     <div style="display: flex; flex-wrap: wrap;height:70px; width: 100%;">
       <div>
         <span class="query">条码号</span>
-        <el-input placeholder="条码号" v-model="prBase.patientRegisterNo" size="small" style="width: 140px;" clearable />
+        <el-input placeholder="条码号" v-model="prBase.patientRegisterNo" size="small" style="width: 120px;" clearable />
       </div>
       <div>
         <span class="query">档案号</span>
@@ -13,6 +13,14 @@
         <span class="query">姓名</span>
         <el-input placeholder="姓名" v-model="prBase.patientName" size="small" style="width: 100px;" clearable />
       </div>
+      <div>
+        <span class="query">检查条码</span>
+        <el-input placeholder="检查条码" v-model="prBase.pacsNo" size="small" style="width: 120px;" clearable />
+      </div>
+      <div>
+        <span class="query">检验条码</span>
+        <el-input placeholder="检验条码" v-model="prBase.lisNo" size="small" style="width: 120px;" clearable />
+      </div>
       <div>
         <span class="query">性别</span>
         <!--
@@ -110,11 +118,13 @@ export default {
       prBase: {
         id: '', //体检登记ID
         patientRegisterNo: '', //条码号
+        pacsNo: '', //
+        lisNo: '',
         patientNo: '', //档案号
         patientName: '', //姓名
         sexId: '', //性别
         sexName: '', //性别
-        age:'',   // 年龄
+        age: '',   // 年龄
         medicalTimes: '', //体检次数
         maritalStatusId: '', //婚姻
         maritalStatusName: '', //婚姻
@@ -160,7 +170,7 @@ export default {
       this.prBase = deepCopy(this.prBaseInit)
       objCopy(rd, this.prBase)
       this.doctorCheck.prBase = Object.assign({}, this.doctorCheck.prBase, rd)  //待优化
-      
+
       //触发检查医生诊台相关刷新
       this.dataTransOpts.refresh.register_check.M++
 
@@ -174,6 +184,30 @@ export default {
     },
 
 
+    // 根据pacs条码查询
+    onQueryByPacsNo(checkRequestNo) {
+      postapi('/api/app/PatientRegister/GetPatientRegisterNoByCheckRequestNo', {checkRequestNo}).then(res => {
+        if (res.code > 0) {
+          this.prBase.patientRegisterNo = res.data.patientRegisterNo
+          this.onQueryByPatientRegisterNo()
+        } else {
+          this.$message.warning({ showClose: true, message: '没有查询到人员信息！' })
+        }
+      })
+    },
+
+    // 根据lis条码查询
+    onQueryByLisNo(lisRequestNo) {
+      postapi('/api/app/PatientRegister/GetPatientRegisterNoByLisRequestNo', {lisRequestNo}).then(res => {
+        if (res.code > 0) {
+          this.prBase.patientRegisterNo = res.data.patientRegisterNo
+          this.onQueryByPatientRegisterNo()
+        } else {
+          this.$message.warning({ showClose: true, message: '没有查询到人员信息！' })
+        }
+      })
+    },
+
     //按条码号查个人数据
     onQueryByPatientRegisterNo() {
       let patientRegisterNo = this.prBase.patientRegisterNo
@@ -212,7 +246,7 @@ export default {
             this.dataTransOpts.tableS.patient_register = res.data
           }
         })
-        .finally(() =>{
+        .finally(() => {
           this.afterFind(this.dataTransOpts.tableS.patient_register)
         });
     },
@@ -233,7 +267,7 @@ export default {
               this.dataTransOpts.tableS.patient_register = res.data.items[0]
               // this.dataTransOpts.tableS.patient_register.id = res.data.items[0].id
               // this.dataTransOpts.tableS.patient_register.patientRegisterNo = res.data.items[0].patientRegisterNo
-              this.dataTransOpts.refresh.patient_register.S++              
+              this.dataTransOpts.refresh.patient_register.S++
               // this.getPatientRegister(res.data.items[0].id)
 
             } else if (res.data.items.length > 1) {
@@ -245,7 +279,7 @@ export default {
             }
           }
         })
-        
+
       // setTimeout(() => {
       //   //触发检查医生诊台相关刷新
       //   this.dataTransOpts.refresh.register_check.M++
@@ -264,10 +298,10 @@ export default {
       postapi('/api/app/patientregister/GetAlreadyRegisterPatientRegisterByNo', body)
         .then((res) => {
           if (res.code > -1) {
-            this.dataTransOpts.tableS.patient_register = res.data            
+            this.dataTransOpts.tableS.patient_register = res.data
           }
         })
-        .finally(() =>{
+        .finally(() => {
           this.afterFind(this.dataTransOpts.tableS.patient_register)
         });
 
@@ -289,7 +323,7 @@ export default {
         // 为每个输入框添加键盘事件监听器
         inputs.forEach((input, i) => {
           // console.log('input',input);
-          input.addEventListener('keydown', (event) => {            
+          input.addEventListener('keydown', (event) => {
             if (event.keyCode === 13) {
               // 阻止回车键的默认行为（换行）            
               event.preventDefault();
@@ -301,6 +335,14 @@ export default {
                   if (input.value) this.onQueryByPatientRegisterNo()
                   input.select()
                   break;
+                case '检查条码':
+                  if (input.value) this.onQueryByPacsNo(input.value)
+                  input.select()
+                  break;
+                case '检验条码':
+                  if (input.value) this.onQueryByLisNo(input.value)
+                  input.select()
+                  break;
                 case '档案号':
                   if (input.value) this.onQueryByPatientNo()
                   input.select()
@@ -312,16 +354,18 @@ export default {
               }
             }
           });
-          
-          input.addEventListener('click', (event) => {  
+
+          input.addEventListener('click', (event) => {
             let placeholder = input.getAttribute('placeholder')
-              switch (placeholder) {
-                case '条码号':                  
-                case '档案号':                  
-                case '姓名':                  
-                  input.select()
-                  break;
-              }            
+            switch (placeholder) {
+              case '条码号':
+              case '档案号':
+              case '姓名':
+              case '检查条码':
+              case '检验条码':
+                input.select()
+                break;
+            }
           });
 
         });
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index 655bf4e..987a9e6 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -4,42 +4,50 @@
     <div
       :style="'display: flex;flex-wrap: wrap;height: 80px;width: 1216px;background-color: #fff;border-radius: 8px;margin-bottom: 15px;align-items: center;padding: 10px;width:' + (window.pageWidth - (orgEnable == 'Y' ? 0 : 200) - 110 - 10) + 'px;'">
       <div class="query">
-        <span class="spanClass">登记日期：</span>
+        <span class="spanClass">登记日期</span>
         <el-date-picker v-model="patientRegister.query.startDate" type="date" placeholder="起始日期" size="small"
-          style="width:90px;" value-format="yyyy-MM-dd" />
+          style="width:90px;" value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
         <span class="spanClass">至</span>
         <el-date-picker v-model="patientRegister.query.endDate" type="date" placeholder="截止日期" size="small"
-          style="width:90px;" value-format="yyyy-MM-dd" />
+          style="width:90px;" value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
       </div>
       <div class="query">
-        <span class="spanClass">条码号：</span>
+        <span class="spanClass">条码号</span>
         <el-input placeholder="条码号" v-model="patientRegister.query.patientRegisterNo" size="small" clearable
-          style="width: 130px" />
+          style="width: 120px" />
       </div>
       <div class="query">
-        <span class="spanClass">档案号：</span>
+        <span class="spanClass">档案号</span>
         <el-input placeholder="档案号" v-model="patientRegister.query.patientNo" size="small" clearable
           style="width: 110px" />
       </div>
       <div class="query">
-        <span class="spanClass">姓名：</span>
+        <span class="spanClass">姓名</span>
         <el-input placeholder="姓名" v-model="patientRegister.query.patientName" size="small" clearable
           style="width: 80px" />
       </div>
       <div class="query">
-        <span class="spanClass">性别：</span>
+        <span class="spanClass">检查条码</span>
+        <el-input placeholder="检查条码" v-model="patientRegister.query.pacsNo" size="small" clearable style="width: 120px" />
+      </div>
+      <div class="query">
+        <span class="spanClass">检验条码</span>
+        <el-input placeholder="检验条码" v-model="patientRegister.query.lisNo" size="small" clearable style="width: 120px" />
+      </div>
+      <div class="query">
+        <span class="spanClass">性别</span>
         <el-select v-model="patientRegister.query.sex" placeholder="请选择" style="width: 80px" size="small">
           <el-option v-for="item in dict.forSex" :key="item.id" :label="item.displayName" :value="item.id">
           </el-option>
         </el-select>
       </div>
       <div class="query">
-        <span class="spanClass">手机号：</span>
+        <span class="spanClass">手机号</span>
         <el-input placeholder="手机号/电话" v-model="patientRegister.query.phone" size="small" clearable
           style="width: 100px" />
       </div>
       <div class="query">
-        <span class="spanClass">身份证号：</span>
+        <span class="spanClass">身份证号</span>
         <el-input placeholder="身份证号" v-model="patientRegister.query.idCardNo" size="small" clearable
           style="width: 150px" />
       </div>
@@ -52,14 +60,15 @@
         </el-cascader>
       </div>
       <div class="query">
-        <span class="spanClass">次数：</span>
+        <span class="spanClass">次数</span>
         <el-select v-model="patientRegister.query.customerOrgRegister" placeholder="次数"
           @change="changeCustomerOrgRegister" style="width: 60px;" size="small" value-key="id">
-          <el-option v-for="item in customerOrgRegisterList" :key="item.id" :label="item.medicalTimes" :value="item" >{{ item.medicalTimes + '次' }}</el-option>
+          <el-option v-for="item in customerOrgRegisterList" :key="item.id" :label="item.medicalTimes" :value="item">{{
+            item.medicalTimes + '次' }}</el-option>
         </el-select>
       </div>
       <div class="query">
-        <span class="spanClass">状态：</span>
+        <span class="spanClass">状态</span>
         <el-select v-model="patientRegister.query.completeFlag" placeholder="请选择" clearable style="width: 80px"
           size="small">
           <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
@@ -93,6 +102,31 @@ export default {
         routeUrlorPageName: 'patientRegister', //当前页面归属路由或归属页面权限名称
         privs: [] // 页面权限
       },
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+        shortcuts: [{
+          text: '今天',
+          onClick(picker) {
+            picker.$emit('pick', new Date());
+          }
+        }, {
+          text: '昨天',
+          onClick(picker) {
+            const date = new Date();
+            date.setTime(date.getTime() - 3600 * 1000 * 24);
+            picker.$emit('pick', date);
+          }
+        }, {
+          text: '一周前',
+          onClick(picker) {
+            const date = new Date();
+            date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', date);
+          }
+        }]
+      },
       dialogVisible: false,
       customerOrgRegisterList: [],
     };
@@ -196,8 +230,32 @@ export default {
           this.$message.error({ showClose: true, message: lres.message })
         }
       })
-      .catch(err => {
-        this.$message.error({ showClose: true, message: `读取身份证失败，原因：${err}` })
+        .catch(err => {
+          this.$message.error({ showClose: true, message: `读取身份证失败，原因：${err}` })
+        })
+    },
+
+    // 根据pacs条码查询
+    onQueryByPacsNo(checkRequestNo) {
+      postapi('/api/app/PatientRegister/GetPatientRegisterNoByCheckRequestNo', {checkRequestNo}).then(res => {
+        if (res.code > 0) {
+          this.patientRegister.query.patientRegisterNo = res.data.patientRegisterNo
+          this.patientRegister.query.times++;
+        } else {
+          this.$message.warning({ showClose: true, message: '没有查询到人员信息！' })
+        }
+      })
+    },
+
+    // 根据lis条码查询
+    onQueryByLisNo(lisRequestNo) {
+      postapi('/api/app/PatientRegister/GetPatientRegisterNoByLisRequestNo', {lisRequestNo}).then(res => {
+        if (res.code > 0) {
+          this.patientRegister.query.patientRegisterNo = res.data.patientRegisterNo
+          this.patientRegister.query.times++;
+        } else {
+          this.$message.warning({ showClose: true, message: '没有查询到人员信息！' })
+        }
       })
     },
 
@@ -206,12 +264,12 @@ export default {
       // console.log('enterToTab');
       this.$nextTick(() => {
         let inputs = document.querySelectorAll(["input"]); //用数组可以读取多个标签的元素  //.inline-input
-        
+
         // 为每个输入框添加键盘事件监听器
-        inputs.forEach((input,i) => {
+        inputs.forEach((input, i) => {
           // console.log('input',input);
           input.addEventListener('keydown', (event) => {
-            if (event.keyCode === 13){
+            if (event.keyCode === 13) {
               // 阻止回车键的默认行为（换行）            
               event.preventDefault();
 
@@ -221,28 +279,37 @@ export default {
               switch (placeholder) {
                 case '条码号':
                 case '档案号':
-                case '姓名':                  
+                case '姓名':
                 case '预约手机号':
                 case '身份证号':
-                  if(input.value) this.patientRegister.query.times++;
+                  if (input.value) this.patientRegister.query.times++;
+                  input.select()
+                  break;
+                case '检查条码':
+                  if (input.value) this.onQueryByPacsNo(input.value)
                   input.select()
-                  break;                 
-              }              
-            }          
+                  break;
+                case '检验条码':
+                  if (input.value) this.onQueryByLisNo(input.value)
+                  input.select()
+                  break;
+              }
+            }
           });
 
           input.addEventListener('click', (event) => {
             let placeholder = input.getAttribute('placeholder')
-              switch (placeholder) {
-                case '条码号':
-                case '档案号':
-                case '姓名':                  
-                case '预约手机号':
-                case '身份证号':
-                  if(input.value) this.patientRegister.query.times++;
-                  input.select()
-                  break;                 
-              }
+            switch (placeholder) {
+              case '条码号':
+              case '档案号':
+              case '姓名':
+              case '预约手机号':
+              case '身份证号':
+              case '检查条码':
+              case '检验条码':
+                input.select()
+                break;
+            }
           });
         });
       });
@@ -289,5 +356,6 @@ export default {
 
 .spanClass {
   font-size: 14px;
+  padding: 0 2px 0 0;
 }
 </style>
diff --git a/src/components/report/PatientRegisterQueryNobtn.vue b/src/components/report/PatientRegisterQueryNobtn.vue
index b6b341a..f7ba650 100644
--- a/src/components/report/PatientRegisterQueryNobtn.vue
+++ b/src/components/report/PatientRegisterQueryNobtn.vue
@@ -3,7 +3,7 @@
     <div style="display:block;">
       <div style="display: flex;flex-wrap: wrap;height: 80px;align-items: center;">
         <div class="query">
-          <span>体检单位：</span>
+          <span class="spanClass">体检单位</span>
           <el-input placeholder="请选择单位" v-model="patientRegister.query.cusOrgOCX" style="width:240px;" size="small"
             disabled>
             <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"
@@ -11,23 +11,48 @@
           </el-input>
         </div>
         <div class="query">
-          <span>性别：</span>
+          <span class="spanClass">条码号</span>
+          <el-input placeholder="条码号" v-model="patientRegister.query.patientRegisterNo" size="small" clearable
+            style="width: 120px" />
+        </div>
+        <div class="query">
+          <span class="spanClass">档案号</span>
+          <el-input placeholder="档案号" v-model="patientRegister.query.patientNo" size="small" clearable
+            style="width: 100px" />
+        </div>
+        <div class="query">
+          <span class="spanClass">姓名</span>
+          <el-input placeholder="姓名" v-model="patientRegister.query.patientName" size="small" clearable
+            style="width: 80px" />
+        </div>
+        <div class="query">
+          <span class="spanClass">检查条码</span>
+          <el-input placeholder="检查条码" v-model="patientRegister.query.pacsNo" size="small" clearable
+            style="width: 120px" />
+        </div>
+        <div class="query">
+          <span class="spanClass">检验条码</span>
+          <el-input placeholder="检验条码" v-model="patientRegister.query.lisNo" size="small" clearable
+            style="width: 120px" />
+        </div>
+        <div class="query">
+          <span class="spanClass">性别</span>
           <el-select v-model="patientRegister.query.sex" placeholder="请选择" style="width: 60px" size="small">
             <el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id" />
           </el-select>
         </div>
         <div class="query">
-          <span>身份证号：</span>
+          <span class="spanClass">身份证号</span>
           <el-input placeholder="身份证号" v-model="patientRegister.query.idCardNo" size="small" clearable
             style="width: 150px" />
         </div>
         <div class="query">
-          <span>电话：</span>
+          <span class="spanClass">电话</span>
           <el-input placeholder="手机号及电话" v-model="patientRegister.query.phone" size="small" clearable
             style="width: 110px" />
         </div>
         <div class="query">
-          <span>检查状态：</span>
+          <span class="spanClass">检查状态</span>
           <el-select v-model="patientRegister.query.completeFlag" placeholder="请选择" clearable style="width: 80px"
             size="small">
             <el-option v-for="item in dict.completeFlag.filter(e => { return e.id != '0' })" :key="item.id"
@@ -36,29 +61,14 @@
           </el-select>
         </div>
         <div class="query">
-          <span>条码号：</span>
-          <el-input placeholder="条码号" v-model="patientRegister.query.patientRegisterNo" size="small" clearable
-            style="width: 130px" />
-        </div>
-        <div class="query">
-          <span>档案号：</span>
-          <el-input placeholder="档案号" v-model="patientRegister.query.patientNo" size="small" clearable
-            style="width: 120px" />
-        </div>
-        <div class="query">
-          <span>姓名：</span>
-          <el-input placeholder="姓名" v-model="patientRegister.query.patientName" size="small" clearable
-            style="width: 100px" />
-        </div>
-        <div class="query">
-          <span>审核：</span>
+          <span class="spanClass">审核</span>
           <el-select v-model="patientRegister.query.isAudit" placeholder="请选择" clearable style="width: 75px" size="small">
             <el-option label="未审核" value="N" />
             <el-option label="已审核" value="Y" />
           </el-select>
         </div>
         <div class="query">
-          <span>上传：</span>
+          <span class="spanClass">上传</span>
           <el-select v-model="patientRegister.query.isUpload" placeholder="请选择" clearable style="width: 75px"
             size="small">
             <el-option label="未上传" value="N" />
@@ -66,7 +76,7 @@
           </el-select>
         </div>
         <div class="query">
-          <span>打印：</span>
+          <span class="spanClass">打印</span>
           <el-select v-model="patientRegister.query.reportPrintTimes" placeholder="请选择" clearable style="width: 75px"
             size="small">
             <el-option label="未打印" value=0 />
@@ -99,12 +109,14 @@ export default {
     };
   },
 
-  created() { 
-    
+  created() {
+
   },
 
   //挂载完成
-  mounted() { },
+  mounted() {
+    this.enterToQuery()
+  },
 
   computed: {
     ...mapState(["window", "dict", "patientRegister", "customerOrg", "report"]),
@@ -150,6 +162,85 @@ export default {
       ];
     }
   },
+  // 根据pacs条码查询
+  onQueryByPacsNo(checkRequestNo) {
+    postapi('/api/app/PatientRegister/GetPatientRegisterNoByCheckRequestNo', {checkRequestNo}).then(res => {
+      if (res.code > 0) {
+        this.patientRegister.query.patientRegisterNo = res.data.patientRegisterNo
+        this.patientRegister.query.times++;
+      } else {
+        this.$message.warning({ showClose: true, message: '没有查询到人员信息！' })
+      }
+    })
+  },
+
+  // 根据lis条码查询
+  onQueryByLisNo(lisRequestNo) {
+    postapi('/api/app/PatientRegister/GetPatientRegisterNoByLisRequestNo', {lisRequestNo}).then(res => {
+      if (res.code > 0) {
+        this.patientRegister.query.patientRegisterNo = res.data.patientRegisterNo
+        this.patientRegister.query.times++;
+      } else {
+        this.$message.warning({ showClose: true, message: '没有查询到人员信息！' })
+      }
+    })
+  },
+
+  //回车替代查询
+  enterToQuery() {
+    // console.log('enterToTab');
+    this.$nextTick(() => {
+      let inputs = document.querySelectorAll(["input"]); //用数组可以读取多个标签的元素  //.inline-input
+
+      // 为每个输入框添加键盘事件监听器
+      inputs.forEach((input, i) => {
+        // console.log('input',input);
+        input.addEventListener('keydown', (event) => {
+          if (event.keyCode === 13) {
+            // 阻止回车键的默认行为（换行）            
+            event.preventDefault();
+
+            // 如果按下的是回车查询
+            // console.log(input.getAttribute('placeholder'),input.value)
+            let placeholder = input.getAttribute('placeholder')
+            switch (placeholder) {
+              case '条码号':
+              case '档案号':
+              case '姓名':
+              case '预约手机号':
+              case '身份证号':
+                if (input.value) this.patientRegister.query.times++;
+                input.select()
+                break;
+              case '检查条码':
+                if (input.value) this.onQueryByPacsNo(input.value)
+                input.select()
+                break;
+              case '检验条码':
+                if (input.value) this.onQueryByLisNo(input.value)
+                input.select()
+                break;
+            }
+          }
+        });
+
+        input.addEventListener('click', (event) => {
+          let placeholder = input.getAttribute('placeholder')
+          switch (placeholder) {
+            case '条码号':
+            case '档案号':
+            case '姓名':
+            case '预约手机号':
+            case '身份证号':              
+            case '检查条码':              
+            case '检验条码':
+              input.select()
+              break;
+          }
+        });
+      });
+    });
+  },
 };
 </script>
 <style scoped>
@@ -182,4 +273,9 @@ export default {
   color: #232748;
   font-weight: 400;
   font-family: "NotoSansSC-Regular";
-}</style>
+}
+
+.spanClass {
+  padding: 0 2px 0 0;
+}
+</style>