diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 810a537..282fc9e 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -45,7 +45,7 @@
                   <el-input v-model="form.patientRegisterNo" disabled size="small"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="5">                
+              <el-col :span="5">
                 <el-form-item prop="patientNo">
                   <template slot="label">
                     <el-tooltip content="双击档案号标签，清除当前档案号，再在姓名或身份证号栏里敲回车可选择档案号（无档案号时则保存后生成新的档案号）" placement="top">
@@ -53,7 +53,7 @@
                     </el-tooltip>
                   </template>
                   <el-input ref="patientNoInput" v-model="form.patientNo" disabled size="small"></el-input>
-                </el-form-item>              
+                </el-form-item>
               </el-col>
               <el-col :span="3">
                 <el-form-item label="体检次数" prop="medicalTimes">
@@ -77,12 +77,13 @@
               <el-col :span="5">
                 <!--autocomplete="off"-->
                 <el-form-item label="姓名" prop="patientName">
-                  <el-input id="patientName" v-model="form.patientName" @change="changePatientName" data-col="patientName" size="small"></el-input>
+                  <el-input id="patientName" v-model="form.patientName" @change="changePatientName"
+                    data-col="patientName" size="small"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="5">
                 <el-form-item label="身份证号" prop="idNo">
-                  <el-input v-model="form.idNo" @change="changeIdNo('N')" size="small" data-col="idNo" ></el-input>
+                  <el-input v-model="form.idNo" @change="changeIdNo('N')" size="small" data-col="idNo"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="3">
@@ -241,7 +242,7 @@
                     :style="'width:' + Math.floor((window.pageWidth - 654) / 6) + 'px;'" @change="changeMedicalTimes"
                     value-key="id">
                     <el-option v-for="item in customerOrgRegisterList" :key="item.id" :label="item.medicalTimes"
-                      :value="item.id" :disabled="item.isComplete == 'Y' ? true:false" />
+                      :value="item.id" :disabled="item.isComplete == 'Y' ? true : false" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -789,7 +790,7 @@
               <el-select v-model="customerOrgRegister" placeholder="次数" style="width: 60px; margin-left: 10px"
                 size="small" @change="changeTimes" value-key="id">
                 <el-option v-for="item in customerOrgRegisterListCopy" :key="item.id" :label="item.medicalTimes"
-                  :value="item" :disabled="item.isComplete == 'Y' ? true:false" />
+                  :value="item" :disabled="item.isComplete == 'Y' ? true : false" />
               </el-select>
             </div>
           </div>
@@ -1446,17 +1447,23 @@ export default {
         this.peisid = window.sessionStorage.getItem('peisid');
         let customerOrgId, customerOrgName, customerOrgParentId
 
-        if (this.refQueryCondition.customerOrgId) {
+        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
+          if (Array.isArray(this.form.customerOrgId) && this.form.customerOrgId.length > 0) {
+            customerOrgParentId = this.form.customerOrgId[0]
+            customerOrgId = this.form.customerOrgId[this.form.customerOrgId.length - 1]
+            customerOrgName = this.form.customerOrgName
+          } else {
+            customerOrgParentId = this.form.customerOrgParentId
+            customerOrgId = this.form.customerOrgId
+            customerOrgName = this.form.customerOrgName
+          }
         }
 
-        this.preCustomerOrgId = this.refQueryCondition.customerOrgId
+        this.preCustomerOrgId = this?.refQueryCondition?.customerOrgId
         if (!patientRegisterId) { //添加
           this.form = Object.assign({}, this.form, this.formInit)
           this.form.registerCheckAsbitems = []
@@ -1492,14 +1499,22 @@ export default {
     // 根据体检单位ID，获取体检类别、人员类别，介绍人
     getMedicalTypeByOrg(customerOrgId) {
       return new Promise((resolve, reject) => {
-        postapi('/api/app/Customerorg/GetMedicalTypeIdByCustomerOrgId', { customerOrgId })
-          .then(res => {
-            if (res.code > -1) {
-              this.form.medicalTypeId = res.data.medicalTypeId
-              this.form.personnelTypeId = res.data.personnelTypeId
-              this.form.salesman = res.data.salesPerson
-            }
-          })
+        console.log('getMedicalTypeByOrg', customerOrgId)
+        if (customerOrgId) {
+          postapi('/api/app/Customerorg/GetMedicalTypeIdByCustomerOrgId', { customerOrgId })
+            .then(res => {
+              if (res.code > -1) {
+                this.form.medicalTypeId = res.data.medicalTypeId
+                this.form.personnelTypeId = res.data.personnelTypeId
+                this.form.salesman = res.data.salesPerson
+              }
+            })
+            .finally(() => {
+              resolve()
+            })
+        } else {
+          resolve()
+        }
       })
     },
 
@@ -1740,19 +1755,19 @@ export default {
 
           // 如果是编辑状态，则加身份证与之前登记的人员信息相等提示 
           this.readCardAfter(idNos)
-          .then(() => {
-            this.form.patientName = idNos.Name
-            this.form.birthDate = idNos.birthDate
-            this.form.sexId = idNos.sexId
-            this.form.age = idNos.age
-            this.form.nationId = idNos.nationId
-            this.form.idNo = idNos.IDCode
-            this.form.address = idNos.Address
-            this.peoplePhoto = 'data:image/bmp;base64,' + idNos.Photo
-            // this.patientRegister.photo = 'data:image/bmp;base64,' + idNos.Photo
-            // isNameContinue 身份证号查重后是否姓名查重
-            this.changeIdNo('N') //  触发身份证查询档案号（Y:身份证没查到，再按名字查，N：仅按身份证号查）
-          })
+            .then(() => {
+              this.form.patientName = idNos.Name
+              this.form.birthDate = idNos.birthDate
+              this.form.sexId = idNos.sexId
+              this.form.age = idNos.age
+              this.form.nationId = idNos.nationId
+              this.form.idNo = idNos.IDCode
+              this.form.address = idNos.Address
+              this.peoplePhoto = 'data:image/bmp;base64,' + idNos.Photo
+              // this.patientRegister.photo = 'data:image/bmp;base64,' + idNos.Photo
+              // isNameContinue 身份证号查重后是否姓名查重
+              this.changeIdNo('N') //  触发身份证查询档案号（Y:身份证没查到，再按名字查，N：仅按身份证号查）
+            })
 
         } else {
           this.$message.error({ showClose: true, message: `${lres.message}` })
@@ -1963,7 +1978,7 @@ export default {
         console.log("addDoubleClickListener2")
       }
     },
-    
+
     // 双击档案号，清除档案号（一般用于修改档案号）
     // 再在姓名或身份证中回车，选择新的档案号
     dbClearPatientNo() {
@@ -2070,7 +2085,7 @@ export default {
 
       delete body.registerManType;
       delete body.patientRegisterNo;
-      delete body.medicalTimes; 
+      delete body.medicalTimes;
       // delete body.completeFlag;
       delete body.isMedicalStart;
       delete body.patientNo;
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index 1b82c73..a976065 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -512,7 +512,7 @@ export default {
   // },
 
   computed: {
-    ...mapState(["window", "dialogWin", "doctorCheck"]),
+    ...mapState(["window", "dialogWin", "doctorCheck","dataTransOpts"]),
 
     frameHeight() {
       return this.window.pageHeight - 42 - 10
@@ -1174,12 +1174,13 @@ export default {
       // debugger
       if (this.medicalStartDate) {
         //this.formData = Object.assign({},this.formInitData,{medicalStartDate:moment(this.medicalStartDate).format('yyyy-MM-DD')}) 
-        this.patient_register.id = ''
+        // this.patient_register.id = ''
+        this.dataTransOpts.tableS.patient_register.id = ''
         this.dialogWin.PatientRegisterEdit = true
         setTimeout(() => {
           this.dataTransOpts.refresh.patient_register.S++
         }, 20);
-        this.patientRegister.photo = ''
+        // this.patientRegister.photo = ''
       } else {
         this.nextTodialogVisible = true
         this.dialogVisibleSetStartDate = true
@@ -1226,7 +1227,8 @@ export default {
         this.$message.warning({ showClose: true, message: "未选中要编辑的人员记录" })
         return
       }
-
+      
+      this.dataTransOpts.tableS.patient_register.id = this.patient_register.id
       // this.patientRegister.patientRegisterRd = Object.assign({},this.doctorCheck.prBase)
       // this.formData = Object.assign({},this.doctorCheck.prBase)