diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 262d2ef..2e16c37 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -742,6 +742,9 @@ export default {
     if (!this.form.id) {
       this.form.organizationUnitId = this.peisid;
     }
+    objCopy(this.formInitData, this.form);
+    this.initBox();
+    this.getPeoplePhoto(this.patientRegister.photo)
   },
 
   //挂载完成
@@ -1055,6 +1058,7 @@ export default {
     //提交
     btnSubmit(formName, msgTip) {
       this.$refs[formName].validate((valid,fields) => {
+        console.log('fields',fields)
         if(!valid){
           this.$message.warning(fields[Object.keys(fields)[0]][0].message);
           return false
@@ -1455,7 +1459,7 @@ export default {
     "editTimes"(newVal, oldVal) {
       //console.log('editTimes newVal：',newVal,' oldVal：',oldVal)
       if (newVal != oldVal) {
-        console.log('this.editTimes', this.editTimes)
+        console.log('this.editTimes', this.editTimes,this.formInitData)
         objCopy(this.formInitData, this.form);
         this.initBox();
         this.getPeoplePhoto(this.patientRegister.photo)
diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue
index 13e9292..a3e9080 100644
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@@ -75,8 +75,10 @@
             @focus="totalFoucs = true" @blur="totalFoucs = false" />
         </div>
         <div class="disTotal">
-          <el-select v-model="asbItemId" placeholder="快速选择组合项目" size="small" filterable clearable remote automatic-dropdown
-            :remote-method="remoteMethod" @change="quickChoosedAsb" default-first-option ref="asbItemId"
+          <el-select v-model="asbItemId" placeholder="快速选择组合项目" size="small" 
+            filterable :filter-method="filterMethod"
+            clearable @clear="quickAsb = deepCopy(dict.asbItemQuick)"
+            @change="quickChoosedAsb" default-first-option ref="asbItemId"
             style="width:150px;text-align: left;padding-right: 15px;">
             <el-option v-for="item in quickAsb" :key="item.id" :value="item.id" :label="item.displayName" />
           </el-select>
@@ -823,8 +825,8 @@ export default {
     // },   
 
     //快速选择组合项目时，调整可按拼间简码及简称查找
-    remoteMethod(keyWords) {
-      //console.log('remoteMethod',this.dict.asbItemQuick)  
+    filterMethod(keyWords) {
+      //console.log('filterMethod',this.dict.asbItemQuick)  
       if (keyWords) {
         this.quickAsb = [];
         this.dict.asbItemQuick.forEach(item => {
@@ -835,7 +837,7 @@ export default {
           }
         });
       } else {
-        this.quickAsb = [...this.dict.asbItemQuick];
+        this.quickAsb = deepCopy(this.dict.asbItemQuick);
       }
     },
 
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index b8242d2..1848a8a 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -2,7 +2,7 @@
   <div style="display: flex">
     <div
       :style="
-        'margin-left:5px;width:' + (window.pageWidth - 200 - 120 - 55) + 'px;'
+        'margin-left:5px;width:' + (window.pageWidth - 200 - 110 - 50) + 'px;'
       "
       @contextmenu.prevent="onContextmenu"
     >
@@ -122,26 +122,25 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <div style="margin-left: 10px; width: 110px">
+    <div style="margin-left: 10px;">
       <div class="listBtn">
-        <el-button type="" class="btnClass commonbutton" @click="add"
-          >人员登记</el-button
+        <el-button type="success" class="btnClass" @click="btnAdd">人员登记</el-button
         >
       </div>
       <div class="listBtn">
-        <el-button type="" class="btnClass commonbutton" @click="btnEdit"
+        <el-button type="primary" class="btnClass" @click="btnEdit"
           >编辑</el-button
         >
       </div>
       <div class="listBtn">
-        <el-button type="" class="btnClass commonbutton" @click="del"
+        <el-button type="danger" class="btnClass" @click="del"
           >删除</el-button
         >
       </div>
       <div class="listBtn">
         <el-button
           type=""
-          class="btnClass commonbutton"
+          class="btnClass"
           @click="openCamera"
           icon="el-icon-camera"
           >拍照</el-button
@@ -153,19 +152,19 @@
       </div>
       -->
       <div class="listBtn">
-        <el-button type="" class="btnClass commonbutton" @click="btnGroupBatch"
-          >调整分组</el-button
+        <el-button type="" class="btnClass" @click="btnGroupBatch"
+          >批量调整分组</el-button
         >
       </div>
       <div class="listBtn">
-        <el-button type="" class="btnClass commonbutton" @click="asbBatch"
-          >调整项目</el-button
+        <el-button type="" class="btnClass" @click="asbBatch"
+          >批量调整项目</el-button
         >
       </div>
       <div class="listBtn">
         <el-button
           type=""
-          class="btnClass commonbutton"
+          class="btnClass"
           @click="guidePrint('0001', false)"
           >指引单打印</el-button
         >
@@ -173,7 +172,7 @@
       <div class="listBtn">
         <el-button
           type=""
-          class="btnClass commonbutton"
+          class="btnClass"
           @click="guidePrint('0001', true)"
           >指引单预览</el-button
         >
@@ -188,14 +187,14 @@
     <!-- 体检人员登记 -->
     <el-dialog
       :title="
-        patientRegister.patientRegisterId ? '体检人员--编辑' : '体检人员--新增'
+        patientRegister.patientRegisterRd.id ? '体检人员--编辑' : '体检人员--新增'
       "
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
       fullscreen
     >
       <PatientRegisterEdit
-        :formInitData="formInitData"
+        :formInitData="patientRegister.patientRegisterRd"
         :editTimes="editTimes"
       />
     </el-dialog>
@@ -767,10 +766,12 @@ export default {
           break
         }
       }
-      if(lfind > -1 && this.patientRegister.patientRegisterId != this.patientRegister.prList[lfind].id){
-        this.patientRegister.patientRegisterId = this.patientRegister.prList[lfind].id
-        this.patientRegister.photo = this.patientRegister.prList[lfind].photo || "/pic/Photo.jpg";
+
+      if(lfind > -1 && this.patientRegister.patientRegisterRd.id != this.patientRegister.prList[lfind].id){
         this.patientRegister.patientRegisterRd = this.patientRegister.prList[lfind];
+        this.patientRegister.photo = this.patientRegister.prList[lfind].photo || "/pic/Photo.jpg";
+        this.patientRegister.patientRegisterRd.customerOrgId = this.patientRegister.query.customerOrgId;
+
         this.patientRegister.query.customerOrgParentId = this.patientRegister.prList[lfind].customerOrgParentId;
         this.patientRegister.customerOrgGroupChange = 0; //控制体检列表记录切换时，0 无需触发更换分组操作
         this.patientRegister.medicalPackageChange = 0; //控制体检列表记录切换时，0 无需触发更换套餐操作
@@ -782,7 +783,7 @@ export default {
     },
 
     //体检次数 相关操作
-    add() {  
+    btnAdd() {  
       if(!this.peisid || this.peisid == 'null'){
         this.$message.warning("该用户未选归属体检中心，不能执行此操作！");
         return
@@ -793,16 +794,11 @@ export default {
         this.$message.warning("请选择单位或个人");
         return;
       }
-      //console.log('customerOrgId',customerOrgId)
-      this.patientRegister.patientRegisterId = "";
-      this.patientRegister.photo = "/pic/Photo.jpg";
-      // this.patientRegister.patientRegisterRdInit.id = "";
-      // this.patientRegister.patientRegisterRdInit.customerOrgId = this.patientRegister.query.customerOrgId;
-      // this.patientRegister.addTimes++;
-      // this.patientRegister.patientRegisterTimes++;
-      this.patientRegister.patientRegisterRdInit.customerOrgId =
-        this.patientRegister.query.customerOrgId;
-      this.formInitData = deepCopy(this.patientRegister.patientRegisterRdInit);
+
+      this.patientRegister.patientRegisterRd = deepCopy(this.patientRegister.patientRegisterRdInit)
+      this.patientRegister.patientRegisterRd.customerOrgId = this.patientRegister.query.customerOrgId;    
+      this.patientRegister.photo = "/pic/Photo.jpg";      
+      
       this.patientRegister.patientRegisterAbs = [];
       this.dialogVisible = true;
       this.editTimes++; //触发表单窗口，数据更新
@@ -814,9 +810,6 @@ export default {
         this.$message.warning("请选择要操作的记录");
         return;
       }
-      //this.patientRegister.patientRegisterTimes++;
-      //this.getPatientRegisterAbs(this.patientRegister.patientRegisterRd.id); 
-      this.formInitData = deepCopy(this.patientRegister.patientRegisterRd);
       this.dialogVisible = true;
       this.editTimes++; //触发表单窗口，数据更新
     },
@@ -893,13 +886,6 @@ export default {
         });
     },
 
-    ldddw(arrayData, key, value, display) {
-      return dddw(arrayData, key, value, display);
-    },
-
-    lmoment(date, forMat) {
-      return moment(new Date(date)).format(forMat);
-    },
 
     //查询
     async Query() {
@@ -1030,6 +1016,9 @@ export default {
               this.pacsPrint(row.id, "0004", false);
             },
           },
+          {
+            label: "----------------",
+          },
         ],
         event,
         //x: event.clientX,
@@ -1580,8 +1569,11 @@ export default {
 };
 </script>
 <style scoped>
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global_table.css";
 @import "../../assets/css/global.css";
 
+
 .box {
   display: flex;
 }
@@ -1592,47 +1584,7 @@ export default {
 }
 
 .btnClass {
-  width: 110px;
-}
-
-::v-deep .el-input__inner {
-  /*text-align: center;*/
-  padding-left: 5px;
-  padding-right: 1px;
-}
-
-/* 表格 表头 列间距控制 */
-::v-deep .el-table th.el-table__cell>.cell{
-  text-align: center;  /* 表格 表头 对齐方式，默认 left */
-  padding-right: 2px;  /* 表格 表头 列间距控制，默认 10px */
-  padding-left: 2px;  /* 表格 表头 列间距控制，默认 10px */
-}
-
-/* 表格 表体 首列左间距控制 */
-::v-deep .el-table--border .el-table__cell:first-child .cell {
-  padding-left: 2px; /* 表格 表体 首列左间距控制，默认 10px */
-}
-
-/* 表格 行列间距控制 ，默认 10 px*/
-::v-deep .el-table__cell {
-  padding: 2px 2px 2px 2px;   /* 上，右，下，左 */
-}
-
-/* 表格单元格 .el-table .cell ，默认 10 px*/
-::v-deep .cell {
-  padding-left: 2px;
-  padding-right: 2px;
+  width: 100px;
 }
 
-::v-deep input[type="number"]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
-  -webkit-appearance: none !important;
-  margin: 0 !important;
-}
-
-/* 表格选中行 颜色  
-::v-deep .el-table__body tr.current-row>td {
-  background-color: #CCF9CB !important;
-}
-*/
 </style>
diff --git a/src/components/patientRegister/customerOrgTreeAll.vue b/src/components/patientRegister/customerOrgTreeAll.vue
index e14e47d..2202ced 100644
--- a/src/components/patientRegister/customerOrgTreeAll.vue
+++ b/src/components/patientRegister/customerOrgTreeAll.vue
@@ -37,10 +37,9 @@ export default {
   methods: {
     //获取体检单位列表树信息
     getCustomerOrgTree() {
-      getapi("/api/app/customerorg/getbycodeall").then((res) => {
-        //customerOrgTree = res.data;
-        console.log("res.data", res.data);
-        this.patientRegister.customerOrgTreeAll = res.data;
+      getapi("/api/app/customerorg/getbycodeall").then((res) => { 
+        // console.log("res.data", res.data);
+        if(res.code != -1) this.patientRegister.customerOrgTreeAll = res.data;
         //tcdate(this.patientRegister.customerOrgTreeAll)
       });
     },
@@ -52,7 +51,7 @@ export default {
         return;
       }
       getapi(`/api/app/customer-org/parent/${customerOrgld}`).then((res) => {
-        console.log("res.data", res.data);
+        // console.log("res.data", res.data);
         if (res.code == 1) {
           this.patientRegister.query.CustomerOrgParentId = res.data;
         }
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index a7925d5..d31b5f9 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -1,8 +1,8 @@
 <template>
 
-  <div style="display: flex; ">
+  <div style="display: flex;">
 
-    <div :style="'margin-left: 5px;display: flex; flex-wrap: wrap; height:100px;width:' + (window.pageWidth - (orgEnable=='Y' ? 0:200) - 120 - 50) + 'px;'">
+    <div :style="'margin-left: 5px;display: flex; flex-wrap: wrap; height:100px;width:' + (window.pageWidth - (orgEnable=='Y' ? 0:200) - 110 - 50) + 'px;'">
       <div class="query">
         <span>登记日期：</span>
         <el-date-picker v-model="patientRegister.query.startDate" type="date" placeholder="起始日期" size="small" style="width:90px;"/>
@@ -59,7 +59,7 @@
     </div>
 
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px; width: 110px">
+    <div style="margin-left: 10px;">
       <div class="listBtn">
         <el-button class="btnClass" @click="btnQuery">查询</el-button>
       </div>
@@ -109,19 +109,7 @@ export default {
 };
 </script>
 <style scoped>
-
-::v-deep .el-input__inner {
-  /*text-align: center;*/
-  padding-left: 2px;  /* 控件默认 15 */
-  padding-right: 15px; /* 控件默认 25 */
-}
-::v-deep .el-icon-date:before {
-  content: ""; /* 去掉日期控件前面的图标 */
-}
-
-::v-deep .el-input__icon{
-  width: 15px; /* 输入框下拉箭头或清除图标 默认 25 */
-}
+@import "../../assets/css/global_input.css";
 
 .query {
   margin-right: 10px;
@@ -137,6 +125,6 @@ export default {
   /* position: absolute; */
   /* left: 0;
   top: 0; */
-  width: 110px;
+  width: 100px;
 }
 </style>
diff --git a/src/store/index.js b/src/store/index.js
index 5e4f5b9..2883ac3 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -61,8 +61,7 @@ export default new Vuex.Store({
     //体检人员登记 add by pengjun
     patientRegister: {
       customerOrgTreeAll: [], //体检单位列表（含个人）
-      patientRegisterId: "", //当前单位ID（可根据此值是否为空，判断是新增还是编辑）
-      patientRegisterRd: { id: "" }, //体检人员记录
+      patientRegisterId: "",  //当前人员ID（可根据此值是否为空，判断是新增还是编辑）      
       patientRegisterTimes: 0, //体检人员登记窗口显示次数(弃用)
       addTimes: 0, //用于触发新增时初始化赋值
       saveTimes: 0,  //用于体检登记时，触发分组调整保存
@@ -70,6 +69,7 @@ export default new Vuex.Store({
       cameraVisble: false, //拍照控件显示
       lisRequestVisble: false, //检验条码补打
       mergeAsbitemVisble: false, //合并项目
+      patientRegisterRd: { id: "" }, //体检人员记录
       patientRegisterRdInit: {
         id: "", //id
         patientId: "00000000-0000-0000-0000-000000000000", //档案号ID 选择了档案就传档案号，未选就传00000-0000...
diff --git a/src/views/customerOrg/customerOrgGroup.vue b/src/views/customerOrg/customerOrgGroup.vue
index 31854f9..4d6734b 100644
--- a/src/views/customerOrg/customerOrgGroup.vue
+++ b/src/views/customerOrg/customerOrgGroup.vue
@@ -159,6 +159,7 @@
     <!-- 新增或者编辑弹框 -->
     <el-dialog
       :title="form.id ? '编辑' : '新增'"
+      :close-on-click-modal="false"
       :visible.sync="dialogVisible"
       width="800px"
     >
diff --git a/src/views/customerOrg/patientRegister.vue b/src/views/customerOrg/patientRegister.vue
index 710274a..a95a57d 100644
--- a/src/views/customerOrg/patientRegister.vue
+++ b/src/views/customerOrg/patientRegister.vue
@@ -18,7 +18,7 @@
         <div
           :style="
             'display:block;width:' +
-            (window.pageWidth - 200 - 50) +
+            (window.pageWidth - 200 - 45) +
             'px;height:' +
             (window.pageHeight < 600 ? 450 : window.pageHeight - 150) +
             'px;' +