diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue
index 7228843..0ad3569 100644
--- a/src/components/doctorCheck/PatientRegisterBase.vue
+++ b/src/components/doctorCheck/PatientRegisterBase.vue
@@ -140,7 +140,7 @@ export default {
         if (res.code != -1) {  
           
           this.doctorCheckPrBaseInit()
-          this.doctorCheck.prBase.patientRegisterNo = val
+          this.doctorCheck.prBase.patientRegisterNo = patientRegisterNo
           objCopy(res.data,this.doctorCheck.prBase)
 
           this.sumPREditInit()
@@ -162,7 +162,7 @@ export default {
         if (res.code != -1) {
           console.log('按条码号查个人数据',res.data)
           this.doctorCheckPrBaseInit()
-          this.doctorCheck.prBase.patientNo = val
+          this.doctorCheck.prBase.patientNo = patientNo
           objCopy(res.data,this.doctorCheck.prBase)
 
           this.sumPREditInit()
diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue
index 125604a..3c1233e 100644
--- a/src/components/doctorCheck/PatientRegisterList.vue
+++ b/src/components/doctorCheck/PatientRegisterList.vue
@@ -38,8 +38,7 @@
     </div>
 
     <!-- 人员列表 -->    
-    <el-table :data="dataList" border width="100%" height="430" row-key="id" size="small"
-      :height="window.pageHeight - 80 - 120"
+    <el-table :data="dataList" border width="100%" height="430" row-key="id" size="small"      
       highlight-current-row @row-click="rowick" ref="dataList">     
       
       <el-table-column prop="customerOrgParentName" label="单位" width="150">
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 2657225..cb1b120 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -739,17 +739,12 @@ export default {
   },
 
   created() {
-    this.initFormData()
-    
     
   },
 
   //挂载完成
   mounted() {
-    // objCopy(this.formInitData, this.form);
-    // this.initBox();
-    // this.getCustomerOrgRegisterList()
-    // this.getPeoplePhoto(this.patientRegister.photo)
+    this.initFormData()
   },
 
   computed: {
@@ -905,28 +900,28 @@ export default {
     },
 
     //获取单位体检次数列表，并默认赋最后一次体检次数
-    async getCustomerOrgRegisterList() {
-      this.customerOrgRegisterList = []
-      if (this.form.customerOrgId == this.dict.personOrgId) {
-        this.form.customerOrgRegisterId = null
-        return
-      }
-      try {
-        let res = await getapi(`/api/app/customer-org/parent/${this.form.customerOrgId}`);
-        let res1 = await getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${res.data}`);
-        this.customerOrgRegisterList = arrayFilter(res1.data, 'isComplete', 'N')
+    // async getCustomerOrgRegisterList() {
+    //   this.customerOrgRegisterList = []
+    //   if (this.form.customerOrgId == this.dict.personOrgId) {
+    //     this.form.customerOrgRegisterId = null
+    //     return
+    //   }
+    //   try {
+    //     let res = await getapi(`/api/app/customer-org/parent/${this.form.customerOrgId}`);
+    //     let res1 = await getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${res.data}`);
+    //     this.customerOrgRegisterList = arrayFilter(res1.data, 'isComplete', 'N')
         
-        //要把已完成体检的次数去掉 (查询时不能触发保存)
-        // if (this.customerOrgRegisterList.length > 0) {
-        //   this.form.customerOrgRegisterId = this.customerOrgRegisterList[this.customerOrgRegisterList.length - 1].id
-        //   //this.changeCustomerOrgGroupId()
-        //   this.changeMedicalTimes()
-        // }
-
-      } catch (error) {
-        console.log(error)
-      }
-    },
+    //     //要把已完成体检的次数去掉 (查询时不能触发保存)
+    //     // if (this.customerOrgRegisterList.length > 0) {
+    //     //   this.form.customerOrgRegisterId = this.customerOrgRegisterList[this.customerOrgRegisterList.length - 1].id
+    //     //   //this.changeCustomerOrgGroupId()
+    //     //   this.changeMedicalTimes()
+    //     // }
+
+    //   } catch (error) {
+    //     console.log(error)
+    //   }
+    // },
 
     //修改单位体检次数
     changeMedicalTimes() {
@@ -1638,12 +1633,12 @@ export default {
   //监听事件
   watch: {
 
-    "form.customerOrgId"(newVal, oldVal) {
-      //console.log('editTimes newVal：',newVal,' oldVal：',oldVal)
-      if (newVal != oldVal) {
-        this.getCustomerOrgRegisterList()
-      }
-    },
+    // "form.customerOrgId"(newVal, oldVal) {
+    //   //console.log('editTimes newVal：',newVal,' oldVal：',oldVal)
+    //   if (newVal != oldVal) {
+    //     this.getCustomerOrgRegisterList()
+    //   }
+    // },
 
     //新增或编辑
     "editTimes"(newVal, oldVal) {
diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue
index e199357..1bac875 100644
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@@ -519,6 +519,7 @@ export default {
           chargePrice: asbItemChoosed[i].price,
           payTypeFlag,
           isCharge: "N",
+          discount:100,
           amount: 1,
           total: asbItemChoosed[i].price,
         }
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index f385e28..76ae74d 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -1426,7 +1426,7 @@ export default {
         postapi(
           `/api/app/printreport/getlisrequestreport?PatientRegisterId=${prId}`
         )
-          .then((res) => {
+          .then((res) => {        
             if (res.code != -1) {
               toOutShell.ReportTable = { lisRequest: res.data };
               console.log(
diff --git a/src/components/sumDoctorCheck/SumAsbItemStatus.vue b/src/components/sumDoctorCheck/SumAsbItemStatus.vue
index 641b45f..7ee5449 100644
--- a/src/components/sumDoctorCheck/SumAsbItemStatus.vue
+++ b/src/components/sumDoctorCheck/SumAsbItemStatus.vue
@@ -1,27 +1,27 @@
 <template>
   <div style="display: flex;height:90px;">
     <div class="asbitemListClass">
-      <div style="margin-top:2px;font-size:7px;color: #F56C6C;">未检组合项目：</div>
+      <div style="margin-top:2px;font-size:9px;color: #F56C6C;">未检组合项目：</div>
       <div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">
         <el-tag type="danger" style="margin-left: 5px;" v-for="item in data.unCheckedAsbitem" :key="item" size="mini">{{ item }}</el-tag>
       </div>
     </div>
     <div class="asbitemListClass">
-      <div style="margin-top:2px;font-size:7px;color: #909399;">弃检组合项目：</div>
+      <div style="margin-top:2px;font-size:9px;color: #909399;">弃检组合项目：</div>
       <div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">
         <el-tag type="info" style="margin-left: 5px;" v-for="item in data.giveUpAsbitem" :key="item"
           size="mini">{{ item }}</el-tag>
       </div>
     </div>
     <div class="asbitemListClass">
-      <div style="margin-top:2px;font-size:7px;color: #409EFF;">组合项目已检但无值的明细项目：</div>
+      <div style="margin-top:2px;font-size:9px;color: #409EFF;">组合项目已检但无值的明细项目：</div>
       <div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">
         <el-tag style="margin-left: 5px;" v-for="item in data.checkedNullValueItem" :key="item"
           size="mini">{{ item }}</el-tag>
       </div>
     </div>
     <div class="asbitemListClass">
-      <div style="margin-top:2px;font-size:7px;color: #E6A23C;">组合项目已检但弃检的明细项目：</div>
+      <div style="margin-top:2px;font-size:9px;color: #E6A23C;">组合项目已检但弃检的明细项目：</div>
       <div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">
         <el-tag type="warning" style="margin-left: 5px;" v-for="item in data.checkedGiveUpItem" :key="item"
           size="mini">{{ item }}</el-tag>
diff --git a/src/components/sumDoctorCheck/SumPREdit.vue b/src/components/sumDoctorCheck/SumPREdit.vue
index 369c41e..5591353 100644
--- a/src/components/sumDoctorCheck/SumPREdit.vue
+++ b/src/components/sumDoctorCheck/SumPREdit.vue
@@ -10,7 +10,7 @@
         <el-date-picker v-model="sumDoctorCheck.sumPREdit.summaryDate" value-format="yyyy-MM-dd"
           type="date" style="width: 90px" size="small" />
       </div>
-      <div class="query" style="margin-top: 10px;">
+      <div class="query" style="margin-top: 5px;">
         <span>总检</span>
         <el-checkbox :value="sumDoctorCheck.sumPREdit.completeFlag == '3'" disabled></el-checkbox>        
       </div> 
@@ -22,7 +22,7 @@
         <span>审核日期</span> 
         <el-input :value="sumDoctorCheck.sumPREdit.auditDate ? lmoment(sumDoctorCheck.sumPREdit.auditDate, 'yyyy-MM-DD') :''" style="width: 90px" size="small" disabled></el-input>
       </div>
-      <div class="query" style="margin-top: 10px;">
+      <div class="query" style="margin-top: 5px;">
         <span>审核</span>
         <el-checkbox :value="sumDoctorCheck.sumPREdit.isAudit == 'Y'" disabled></el-checkbox>        
       </div>