diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 637204a..3ce0df1 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -883,7 +883,7 @@ export default {
     Queue
   },
   // isDoctor: '0:标准人员登记/1:医生诊台登记(可修改单位)' 
-  props: ['isDoctor', 'patientRegisterId', 'editTimes', 'refreshRegister', 'refFuncSetData'],
+  props: ['isDoctor', 'patientRegisterId', 'editTimes', 'refreshRegister', "refQueryCondition"],
   data() {
     return {
       pagePriv: {
@@ -1446,17 +1446,17 @@ export default {
         this.peisid = window.sessionStorage.getItem('peisid');
         let customerOrgId, customerOrgName, customerOrgParentId
 
-        if (this.patientRegister.query.customerOrgId) {
-          customerOrgParentId = this.patientRegister.query.CustomerOrgParentId
-          customerOrgId = this.patientRegister.query.customerOrgId
-          customerOrgName = this.patientRegister.query.customerOrgName
+        if (this.refQueryCondition.customerOrgId) {
+          customerOrgParentId = this.refQueryCondition.CustomerOrgParentId
+          customerOrgId = this.refQueryCondition.customerOrgId
+          customerOrgName = this.refQueryCondition.customerOrgName
         } else {
           customerOrgParentId = this.form.customerOrgParentId
           customerOrgId = this.form.customerOrgId
           customerOrgName = this.form.customerOrgName
         }
 
-        this.preCustomerOrgId = this.patientRegister.query.customerOrgId
+        this.preCustomerOrgId = this.refQueryCondition.customerOrgId
         if (!patientRegisterId) { //添加
           this.form = Object.assign({}, this.form, this.formInit)
           this.form.registerCheckAsbitems = []
@@ -3210,7 +3210,7 @@ export default {
       this.patientRegister.patientRegisterId = this.form.id;
       objCopy(this.form, this.patientRegister.patientRegisterRd);
 
-      //this.patientRegister.query.times++; 不在触发列表查询（换成局部刷新）放在窗口关闭事件中去
+      //this.refQueryCondition.times++; 不在触发列表查询（换成局部刷新）放在窗口关闭事件中去
       // let curRow = deepCopy(this.patientRegister.patientRegisterRd)
       // curRow.index = this.patientRegister.prList.length
       // this.patientRegister.prList.push(curRow)      
@@ -3333,8 +3333,8 @@ export default {
       // 新增 (个人预约只登记个人的)
       this.dataTransOpts.tableS.patient_register.id = ''
       this.preCustomerOrgId = this.dict.personOrgId
-      this.patientRegister.query.customerOrgId = this.dict.personOrgId
-      this.patientRegister.query.CustomerOrgParentId = this.dict.personOrgId
+      this.refQueryCondition.customerOrgId = this.dict.personOrgId
+      this.refQueryCondition.CustomerOrgParentId = this.dict.personOrgId
       this.form.customerOrgId = [this.dict.personOrgId] //单位编号 默认个人       
       this.form.customerOrgParentId = this.dict.personOrgId
       this.form.customerOrgRegisterId = "00000000-0000-0000-0000-000000000001" //默认单位体检次数
@@ -3415,8 +3415,8 @@ export default {
 
       this.dataTransOpts.tableS.patient_register.id = ''
       // this.preCustomerOrgId = this.dict.personOrgId
-      this.patientRegister.query.customerOrgId = appoint_patient_register.customerOrgId
-      this.patientRegister.query.CustomerOrgParentId = appoint_patient_register.customerOrgId
+      this.refQueryCondition.customerOrgId = appoint_patient_register.customerOrgId
+      this.refQueryCondition.CustomerOrgParentId = appoint_patient_register.customerOrgId
       this.form.customerOrgId = [appoint_patient_register.customerOrgId] //单位编号 默认个人  
 
       let customerOrgParentId = ''
@@ -3905,7 +3905,7 @@ export default {
       handler(newVal, oldVal) {
         // console.log('从体检人员登记列表 点登记，触发', newVal, oldVal)
         if (newVal != oldVal) {
-          this.preCustomerOrgId = this.patientRegister.query.customerOrgId
+          this.preCustomerOrgId = this.refQueryCondition.customerOrgId
           // console.log('this.preCustomerOrgId', this.preCustomerOrgId)
         }
       }
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 43b43d8..34cae71 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -295,7 +295,7 @@
         @close="close_dialogWin_PatientRegisterEdit">
         <!-- :formInitData="patientRegister.patientRegisterRd" -->
         <PatientRegisterEdit :isDoctor="'1'" :patientRegisterId="patientRegister.patientRegisterRd.id"
-          :editTimes="editTimes" :refFuncSetData="refFuncSetData" />
+          :editTimes="editTimes" :refFuncSetData="refFuncSetData" :refQueryCondition="refQueryCondition"/>
       </el-dialog>
 
       <!-- 修改信息 -->
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index 4cfb597..9e8c4a0 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -296,6 +296,7 @@ export default {
     //查询
     btnQuery(queryType) {
       this.query.queryType = queryType
+      if(queryType != 'idCardNo') this.query.photo = ''
       this.$emit('triggerQuery', this.query)
     },
 
diff --git a/src/views/customerOrg/patientRegister.vue b/src/views/customerOrg/patientRegister.vue
index e91d42e..fd50ebc 100644
--- a/src/views/customerOrg/patientRegister.vue
+++ b/src/views/customerOrg/patientRegister.vue
@@ -207,7 +207,7 @@ export default {
       this.queryCondition.customerOrgName = org.displayName
       // 获取顶级ID (优化无需获取顶级ID) 
       if (org?.parentNodes.length > 1) {
-        this.queryCondition.customerOrgTopId = this.refParams.parentNodes[1]
+        this.queryCondition.customerOrgTopId = org.parentNodes[1]
       } else {
         this.queryCondition.customerOrgTopId = org.id
       }