diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue
index 495eccd..0c8e5f5 100644
--- a/src/components/doctorCheck/PatientRegisterList.vue
+++ b/src/components/doctorCheck/PatientRegisterList.vue
@@ -603,7 +603,7 @@ export default {
 
 /* 部份已检 */
 ::v-deep .el-table .complete2 {
-  background: #b9cee9 !important;
+  background: #ec7504 !important;
 }
 /* 总检 */
 ::v-deep .el-table .complete3 {
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 765326b..fe8742d 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -1438,6 +1438,7 @@ 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
@@ -1447,6 +1448,7 @@ export default {
           customerOrgId = this.form.customerOrgId
           customerOrgName = this.form.customerOrgName
         }
+
         this.preCustomerOrgId = this.patientRegister.query.customerOrgId
         if (!patientRegisterId) { //添加
           this.form = Object.assign({}, this.form, this.formInit)
@@ -2371,8 +2373,10 @@ export default {
     btnAdd() {
       // 当前面点新增时，清部份信息
       this.clearPerson()
-      this.dataTransOpts.tableS.patient_register.id = ''
-      this.dataTransOpts.refresh.patient_register.S++
+      // this.dataTransOpts.tableS.patient_register.id = ''
+      // this.dataTransOpts.refresh.patient_register.S++
+      this.dataTransOpts.tableM.register_check_asbitem = []
+      //this.changeItemType(deepCopy(this.dataTransOpts.copyGroup.itemTypeIds))
     },
 
     //将现有的数据，复制并展现，但未保存
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index bc08e83..47995ba 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -2,75 +2,40 @@
   <div>
     <!--组件主体-->
     <div style="display: flex">
-      <div
-        :style="'width:' + (window.pageWidth - 200 - 145) + 'px;'"
-        @contextmenu.prevent="onContextmenu"
-      >
+      <div :style="'width:' + (window.pageWidth - 200 - 145) + 'px;'" @contextmenu.prevent="onContextmenu">
         <div>
-          <u-table
-            :data="tableData"
-            border
-            :height="
-              window.pageHeight < 600
-                ? 248
-                : Math.floor(((window.pageHeight - 250) * 2) / 3)
-            "
-            highlight-current-row
-            @row-click="rowClick"
-            @row-dblclick="dblClick"
-            size="small"
-            row-key="id"
-            @selection-change="handleSelectionChange"
-            @row-contextmenu="onCellRightClick"
-            ref="info"
-            id="info"
-            :row-class-name="handleRowClassName"
-            use-virtual
-            :row-height="25"
-            @table-body-scroll="scrollFull"
-            big-data-checkbox
-            :data-changes-scroll-top="false"
-          >
-            <u-table-column
-              type="selection"
-              width="40"
-              align="center"
-            ></u-table-column>
-            <u-table-column
-              v-for="(item, index) in dragCol"
-              :key="index"
-              :type="dragCol[index].type"
-              :min-width="dragCol[index].minWidth"
-              :align="dragCol[index].align"
-              :label="item.label"
-              :prop="dragCol[index].prop"
-              :sortable="
-                dragCol[index].type || dragCol[index].prop == 'sn'
+          <u-table :data="tableData" border :height="window.pageHeight < 600
+              ? 248
+              : Math.floor(((window.pageHeight - 250) * 2) / 3)
+            " highlight-current-row @row-click="rowClick" @row-dblclick="dblClick" size="small" row-key="id"
+            @selection-change="handleSelectionChange" @row-contextmenu="onCellRightClick" ref="info" id="info"
+            :row-class-name="handleRowClassName" use-virtual :row-height="25" @table-body-scroll="scrollFull"
+            big-data-checkbox :data-changes-scroll-top="false">
+            <u-table-column type="selection" width="40" align="center"></u-table-column>
+            <u-table-column v-for="(item, index) in dragCol" :key="index" :type="dragCol[index].type"
+              :min-width="dragCol[index].minWidth" :align="dragCol[index].align" :label="item.label"
+              :prop="dragCol[index].prop" :sortable="dragCol[index].type || dragCol[index].prop == 'sn'
                   ? false
                   : true
-              "
-            >
+                ">
               <template slot-scope="scope" v-if="!dragCol[index].type">
                 <div v-if="!dragCol[index].type">
                   <div v-if="dragCol[index].prop == 'sn'">
                     {{ scope.$index + 1 }}
                   </div>
-                  <div
-                    v-else-if="dragCol[index].prop == 'completeFlag'"
-                    :style="`color: ${setPrStatusColor(
-                      scope.row.isAudit,
-                      scope.row.completeFlag
-                    )}`"
-                  >
+                  <div v-else-if="dragCol[index].prop == 'completeFlag'" :style="`color: ${setPrStatusColor(
+                    scope.row.isAudit,
+                    scope.row.completeFlag
+                  )}`">
                     {{
                       scope.row.isAudit == "Y"
                         ? "已审核"
                         : dddw(
-                            dict.completeFlag,
-                            "id",
-                            scope.row.completeFlag,
-                            "displayName"
-                          )
+                          dict.completeFlag,
+                          "id",
+                          scope.row.completeFlag,
+                          "displayName"
+                        )
                     }}
                   </div>
                   <div v-else-if="dragCol[index].prop == 'qztlType'">
@@ -84,42 +49,29 @@
                     }}
                   </div>
                   <div v-else-if="dragCol[index].prop == 'guidePrintTimes'">
-                    <i
-                      class="el-icon-printer"
-                      v-if="scope.row.guidePrintTimes > 0"
-                      style="font-size: 20px; color: green"
-                    />
+                    <i class="el-icon-printer" v-if="scope.row.guidePrintTimes > 0"
+                      style="font-size: 20px; color: green" />
                   </div>
                   <div v-else-if="dragCol[index].prop == 'isLock'">
-                    <i
-                      class="el-icon-lock"
-                      v-if="scope.row.isLock == 'Y'"
-                      style="font-size: 20px; color: red"
-                    />
+                    <i class="el-icon-lock" v-if="scope.row.isLock == 'Y'" style="font-size: 20px; color: red" />
                   </div>
-                  <div
-                    v-else-if="
-                      dragCol[index].prop == 'isVip' ||
-                      dragCol[index].prop == 'isUpload' ||
-                      dragCol[index].prop == 'qztlIsMain' ||
-                      dragCol[index].prop == 'qztlIsCy' ||
-                      dragCol[index].prop == 'qztlIsCw' ||
-                      dragCol[index].prop == 'qztlIsGt' ||
-                      dragCol[index].prop == 'qztlIsWh' ||
-                      dragCol[index].prop == 'qztlIsFj'
-                    "
-                  >
-                    <el-checkbox
-                      :value="scope.row[dragCol[index].prop] == 'Y'"
-                    />
+                  <div v-else-if="
+                    dragCol[index].prop == 'isVip' ||
+                    dragCol[index].prop == 'isUpload' ||
+                    dragCol[index].prop == 'qztlIsMain' ||
+                    dragCol[index].prop == 'qztlIsCy' ||
+                    dragCol[index].prop == 'qztlIsCw' ||
+                    dragCol[index].prop == 'qztlIsGt' ||
+                    dragCol[index].prop == 'qztlIsWh' ||
+                    dragCol[index].prop == 'qztlIsFj'
+                  ">
+                    <el-checkbox :value="scope.row[dragCol[index].prop] == 'Y'" />
                     <!--
                     {{ scope.row[dragCol[index].prop] == "Y" ? "是" : "否" }}
                       -->
                   </div>
 
-                  <div
-                    v-else-if="dragCol[index].prop == 'customerOrgParentName'"
-                  >
+                  <div v-else-if="dragCol[index].prop == 'customerOrgParentName'">
                     {{
                       scope.row.customerOrgParentName
                         ? scope.row.customerOrgParentName
@@ -137,12 +89,10 @@
                     }}
                   </div>
                   <div v-else-if="dragCol[index].prop == 'groupPack'">
-                    <div
-                      v-if="
-                        scope.row.medicalPackageId !== dict.personOrgId &&
-                        scope.row.customerOrgId === dict.personOrgId
-                      "
-                    >
+                    <div v-if="
+                      scope.row.medicalPackageId !== dict.personOrgId &&
+                      scope.row.customerOrgId === dict.personOrgId
+                    ">
                       {{ scope.row.medicalPackageName }}
                     </div>
                     <div v-else>
@@ -165,8 +115,8 @@
                     {{
                       scope.row[dragCol[index].prop]
                         ? moment(scope.row[dragCol[index].prop]).format(
-                            "yyyy-MM-DD"
-                          )
+                          "yyyy-MM-DD"
+                        )
                         : ""
                     }}
                   </div>
@@ -210,7 +160,7 @@
                   <div v-else-if="dragCol[index].prop == 'customerOrgName'">
                     {{
                       scope.row[dragCol[index].prop] ==
-                      scope.row["customerOrgParentName"]
+                        scope.row["customerOrgParentName"]
                         ? ""
                         : scope.row[dragCol[index].prop]
                     }}
@@ -252,12 +202,10 @@
           <div style="display: flex; justify-content: space-between">
             <div></div>
             <div>
-              <span style="font-size: 12px"
-                >共：{{ loadOpts.totalCount }} 条记录，当前显示：{{
-                  tableData.length
-                }}
-                条。</span
-              >
+              <span style="font-size: 12px">共：{{ loadOpts.totalCount }} 条记录，当前显示：{{
+                tableData.length
+              }}
+                条。</span>
             </div>
           </div>
         </div>
@@ -270,53 +218,23 @@
         </el-tabs>
       </div>
       <div style="margin-left: 10px">
-        <div
-          v-show="checkPagePriv(pagePriv.privs, '导入青藏数据')"
-          class="listBtn"
-        >
-          <el-button
-            type="success"
-            class="commonbutton"
-            @click="btnImportOrgData"
-            >导入青藏数据</el-button
-          >
+        <div v-show="checkPagePriv(pagePriv.privs, '导入青藏数据')" class="listBtn">
+          <el-button type="success" class="commonbutton" @click="btnImportOrgData">导入青藏数据</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '人员登记')" class="listBtn">
-          <el-button type="success" class="commonbutton" @click="btnAdd"
-            >人员登记</el-button
-          >
+          <el-button type="success" class="commonbutton" @click="btnAdd">人员登记</el-button>
         </div>
-        <div
-          v-show="checkPagePriv(pagePriv.privs, '批量正式登记')"
-          class="listBtn"
-        >
-          <el-button
-            type="success"
-            class="commonbutton"
-            @click="btnAddBatch('1')"
-            >批量正式登记</el-button
-          >
+        <div v-show="checkPagePriv(pagePriv.privs, '批量正式登记')" class="listBtn">
+          <el-button type="success" class="commonbutton" @click="btnAddBatch('1')">批量正式登记</el-button>
         </div>
-        <div
-          v-show="checkPagePriv(pagePriv.privs, '批量转预登记')"
-          class="listBtn"
-        >
-          <el-button
-            type="success"
-            class="commonbutton"
-            @click="btnAddBatch('0')"
-            >批量转预登记</el-button
-          >
+        <div v-show="checkPagePriv(pagePriv.privs, '批量转预登记')" class="listBtn">
+          <el-button type="success" class="commonbutton" @click="btnAddBatch('0')">批量转预登记</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '编辑')" class="listBtn">
-          <el-button type="primary" class="commonbutton" @click="btnEdit"
-            >编辑</el-button
-          >
+          <el-button type="primary" class="commonbutton" @click="btnEdit">编辑</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '删除')" class="listBtn">
-          <el-button type="danger" class="deleteButton" @click="btnDel"
-            >删除</el-button
-          >
+          <el-button type="danger" class="deleteButton" @click="btnDel">删除</el-button>
         </div>
         <!--
       <div class="listBtn">
@@ -332,91 +250,37 @@
         <el-button type="" class="btnClass commonbutton">健康档案</el-button>
       </div>
       -->
-        <div
-          v-show="checkPagePriv(pagePriv.privs, '批量调整分组')"
-          class="listBtn"
-        >
-          <el-button type="" class="commonbutton" @click="btnGroupBatch"
-            >批量调整分组</el-button
-          >
+        <div v-show="checkPagePriv(pagePriv.privs, '批量调整分组')" class="listBtn">
+          <el-button type="" class="commonbutton" @click="btnGroupBatch">批量调整分组</el-button>
         </div>
-        <div
-          v-show="checkPagePriv(pagePriv.privs, '批量调整项目')"
-          class="listBtn"
-        >
-          <el-button type="" class="commonbutton" @click="btnAsbBatch"
-            >批量调整项目</el-button
-          >
+        <div v-show="checkPagePriv(pagePriv.privs, '批量调整项目')" class="listBtn">
+          <el-button type="" class="commonbutton" @click="btnAsbBatch">批量调整项目</el-button>
         </div>
-        <div
-          v-show="checkPagePriv(pagePriv.privs, '指引单打印')"
-          class="listBtn"
-        >
-          <el-button
-            type=""
-            class="commonbutton"
-            @click="guidePrint('0001', false)"
-            >指引单打印</el-button
-          >
+        <div v-show="checkPagePriv(pagePriv.privs, '指引单打印')" class="listBtn">
+          <el-button type="" class="commonbutton" @click="guidePrint('0001', false)">指引单打印</el-button>
         </div>
-        <div
-          v-show="checkPagePriv(pagePriv.privs, '指引单预览')"
-          class="listBtn"
-        >
-          <el-button
-            type=""
-            class="commonbutton"
-            @click="guidePrint('0001', true)"
-            >指引单预览</el-button
-          >
+        <div v-show="checkPagePriv(pagePriv.privs, '指引单预览')" class="listBtn">
+          <el-button type="" class="commonbutton" @click="guidePrint('0001', true)">指引单预览</el-button>
         </div>
-        <div
-          v-show="checkPagePriv(pagePriv.privs, '人员检验检查条码')"
-          class="listBtn"
-        >
-          <el-button
-            type=""
-            class="commonbutton"
-            @click="printPromise()"
-            style="font-size: 12px"
-            >人员检验检查条码</el-button
-          >
+        <div v-show="checkPagePriv(pagePriv.privs, '人员检验检查条码')" class="listBtn">
+          <el-button type="" class="commonbutton" @click="printPromise()" style="font-size: 12px">人员检验检查条码</el-button>
         </div>
-        <div
-          v-show="checkPagePriv(pagePriv.privs, '人员信息导出')"
-          class="listBtn"
-        >
+        <div v-show="checkPagePriv(pagePriv.privs, '人员信息导出')" class="listBtn">
           <!-- <download-excel :fields="jsonFields" :fetch="btnExport" type="xls" :name="tableName">
             <el-button type="" style="width:100%">人员信息导出</el-button>
           </download-excel> -->
-          <el-button type="" class="commonbutton" @click="btnExport('info')"
-            >人员信息导出</el-button
-          >
+          <el-button type="" class="commonbutton" @click="btnExport('info')">人员信息导出</el-button>
         </div>
         <!-- 弃用
         <div class="listBtn">
           <el-button type="" class="commonbutton" @click="btnDragColDesign">设计列排序</el-button>
         </div>
         -->
-        <div
-          v-show="checkPagePriv(pagePriv.privs, '人员检验检查条码')"
-          class="listBtn"
-        >
-          <el-button
-            type=""
-            class="commonbutton"
-            @click="printPromise2()"
-            style="font-size: 12px"
-            >人员+检查条码</el-button
-          >
+        <div v-show="checkPagePriv(pagePriv.privs, '人员检验检查条码')" class="listBtn">
+          <el-button type="" class="commonbutton" @click="printPromise2()" style="font-size: 12px">人员+检查条码</el-button>
         </div>
-        <div
-          v-show="checkPagePriv(pagePriv.privs, '体检表回收')"
-          class="listBtn"
-        >
-          <el-button type="" class="commonbutton" @click="btnScanRecover"
-            >体检表回收</el-button
-          >
+        <div v-show="checkPagePriv(pagePriv.privs, '体检表回收')" class="listBtn">
+          <el-button type="" class="commonbutton" @click="btnScanRecover">体检表回收</el-button>
         </div>
 
         <!-- elProgress.display  dialogWin.LocalConfig
@@ -428,126 +292,68 @@
       <div class="listBtn">
         <el-button type="" class="btnClass commonbutton" @click="rowSelected(tableData)">选中</el-button>
       </div>
-      --></div>
+      -->
+      </div>
     </div>
     <!--组件弹窗-->
     <div>
       <!-- 体检人员登记 :title="patientRegister.patientRegisterRd.id ? '体检人员--编辑' : '体检人员--新增'" -->
-      <el-dialog
-        :title="
-          dataTransOpts.tableS.patient_register.id
-            ? '体检人员--编辑'
-            : '体检人员--新增'
-        "
-        :visible.sync="dialogWin.PatientRegisterEdit"
-        :close-on-click-modal="false"
-        fullscreen
-        @close="close_dialogWin_PatientRegisterEdit"
-      >
+      <el-dialog :title="dataTransOpts.tableS.patient_register.id
+          ? '体检人员--编辑'
+          : '体检人员--新增'
+        " :visible.sync="dialogWin.PatientRegisterEdit" :close-on-click-modal="false" fullscreen
+        @close="close_dialogWin_PatientRegisterEdit">
         <!-- :formInitData="patientRegister.patientRegisterRd" -->
-        <PatientRegisterEdit
-          :isDoctor="'1'"
-          :patientRegisterId="patientRegister.patientRegisterRd.id"
-          :editTimes="editTimes"
-          :refFuncSetData="refFuncSetData"
-        />
+        <PatientRegisterEdit :isDoctor="'1'" :patientRegisterId="patientRegister.patientRegisterRd.id"
+          :editTimes="editTimes" :refFuncSetData="refFuncSetData" />
       </el-dialog>
 
       <!-- 修改信息 -->
-      <el-dialog
-        title="修改人员信息"
-        :visible.sync="upBaseInfo.visble"
-        width="800px"
-        :show-close="false"
-        :append-to-body="true"
-        :close-on-click-modal="false"
-      >
+      <el-dialog title="修改人员信息" :visible.sync="upBaseInfo.visble" width="800px" :show-close="false"
+        :append-to-body="true" :close-on-click-modal="false">
         <div>
           <div style="display: flex; margin-bottom: 20px">
-            <el-form
-              ref="form"
-              :model="upBaseInfo"
-              label-width="80px"
-              size="medium"
-            >
+            <el-form ref="form" :model="upBaseInfo" label-width="80px" size="medium">
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="姓名" prop="patientName">
-                    <el-input
-                      id="patientName"
-                      v-model="upBaseInfo.patientName"
-                      size="small"
-                      autocomplete="off"
-                    ></el-input>
+                    <el-input id="patientName" v-model="upBaseInfo.patientName" size="small"
+                      autocomplete="off"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="身份证号" prop="idNo">
-                    <el-input
-                      v-model="upBaseInfo.idNo"
-                      placeholder="身份证号"
-                      @change="changeIdNo('N')"
-                      size="small"
-                    ></el-input>
+                    <el-input v-model="upBaseInfo.idNo" placeholder="身份证号" @change="changeIdNo('N')"
+                      size="small"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="出生日期" prop="birthDate">
-                    <el-date-picker
-                      v-model="upBaseInfo.birthDate"
-                      type="date"
-                      format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd"
-                      placeholder="出生日期"
-                      style="width: 180px"
-                      @change="changeBirthDate"
-                      size="small"
-                    />
+                    <el-date-picker v-model="upBaseInfo.birthDate" type="date" format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd" placeholder="出生日期" style="width: 180px" @change="changeBirthDate"
+                      size="small" />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="性别" prop="sexId">
-                    <el-select
-                      v-model="upBaseInfo.sexId"
-                      placeholder="请选择"
-                      size="small"
-                      filterable
-                    >
-                      <el-option
-                        v-for="item in dict.sex"
-                        :key="item.id"
-                        :label="item.displayName"
-                        :value="item.id"
-                      >
+                    <el-select v-model="upBaseInfo.sexId" placeholder="请选择" size="small" filterable>
+                      <el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id">
                       </el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="年龄" prop="age">
-                    <el-input
-                      v-model="upBaseInfo.age"
-                      size="small"
-                      @change="changeAge"
-                    ></el-input>
+                    <el-input v-model="upBaseInfo.age" size="small" @change="changeAge"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="婚姻" prop="maritalStatusId">
-                    <el-select
-                      v-model="upBaseInfo.maritalStatusId"
-                      placeholder="请选择"
-                      size="small"
-                      filterable
-                    >
-                      <el-option
-                        v-for="item in dict.maritalStatus"
-                        :key="item.id"
-                        :label="item.displayName"
-                        :value="item.id"
-                      >
+                    <el-select v-model="upBaseInfo.maritalStatusId" placeholder="请选择" size="small" filterable>
+                      <el-option v-for="item in dict.maritalStatus" :key="item.id" :label="item.displayName"
+                        :value="item.id">
                       </el-option>
                     </el-select>
                   </el-form-item>
@@ -556,35 +362,19 @@
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="手机号" prop="mobileTelephone">
-                    <el-input
-                      v-model="upBaseInfo.mobileTelephone"
-                      size="small"
-                    ></el-input>
+                    <el-input v-model="upBaseInfo.mobileTelephone" size="small"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="电话" prop="telephone">
-                    <el-input
-                      v-model="upBaseInfo.telephone"
-                      size="small"
-                    ></el-input>
+                    <el-input v-model="upBaseInfo.telephone" size="small"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="籍贯" prop="birthPlaceId">
-                    <el-select
-                      v-model="upBaseInfo.birthPlaceId"
-                      placeholder="请选择"
-                      filterable
-                      clearable
-                      size="small"
-                    >
-                      <el-option
-                        v-for="item in dict.birthPlace"
-                        :key="item.id"
-                        :label="item.displayName"
-                        :value="item.id"
-                      />
+                    <el-select v-model="upBaseInfo.birthPlaceId" placeholder="请选择" filterable clearable size="small">
+                      <el-option v-for="item in dict.birthPlace" :key="item.id" :label="item.displayName"
+                        :value="item.id" />
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -592,76 +382,43 @@
               <el-row>
                 <el-col :span="24">
                   <el-form-item label="地址" prop="address">
-                    <el-input
-                      v-model="upBaseInfo.address"
-                      size="small"
-                    ></el-input>
+                    <el-input v-model="upBaseInfo.address" size="small"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="邮编" prop="postalCode">
-                    <el-input
-                      v-model="upBaseInfo.postalCode"
-                      size="small"
-                    ></el-input>
+                    <el-input v-model="upBaseInfo.postalCode" size="small"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="邮箱" prop="email">
-                    <el-input
-                      v-model="upBaseInfo.email"
-                      size="small"
-                    ></el-input>
+                    <el-input v-model="upBaseInfo.email" size="small"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="体检卡号" prop="medicalCardNo">
-                    <el-input
-                      v-model="upBaseInfo.medicalCardNo"
-                      size="small"
-                    ></el-input>
+                    <el-input v-model="upBaseInfo.medicalCardNo" size="small"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="性激素期" prop="sexHormoneTermId">
-                    <el-select
-                      v-model="upBaseInfo.sexHormoneTermId"
-                      placeholder="请选择"
-                      filterable
-                      clearable
-                      size="small"
-                    >
-                      <el-option
-                        v-for="item in dict.sexHormoneTerm"
-                        :key="item.id"
-                        :label="item.displayName"
-                        :value="item.id"
-                      >
+                    <el-select v-model="upBaseInfo.sexHormoneTermId" placeholder="请选择" filterable clearable
+                      size="small">
+                      <el-option v-for="item in dict.sexHormoneTerm" :key="item.id" :label="item.displayName"
+                        :value="item.id">
                       </el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="民族" prop="nationId">
-                    <el-select
-                      v-model="upBaseInfo.nationId"
-                      placeholder="请选择"
-                      filterable
-                      clearable
-                      default-first-option
-                      :filter-method="filterMethod"
-                      size="small"
-                    >
-                      <el-option
-                        v-for="item in nation"
-                        :key="item.id"
-                        :label="item.displayName"
-                        :value="item.id"
-                      />
+                    <el-select v-model="upBaseInfo.nationId" placeholder="请选择" filterable clearable default-first-option
+                      :filter-method="filterMethod" size="small">
+                      <el-option v-for="item in nation" :key="item.id" :label="item.displayName" :value="item.id" />
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -669,64 +426,35 @@
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="体检类别" prop="medicalTypeId">
-                    <el-select
-                      v-model="upBaseInfo.medicalTypeId"
-                      placeholder="请选择"
-                      filterable
-                      clearable
-                      size="small"
-                    >
-                      <el-option
-                        v-for="item in dict.medicalType"
-                        :key="item.id"
-                        :label="item.displayName"
-                        :value="item.id"
-                      />
+                    <el-select v-model="upBaseInfo.medicalTypeId" placeholder="请选择" filterable clearable size="small">
+                      <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName"
+                        :value="item.id" />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="人员类别" prop="personnelTypeId">
-                    <el-select
-                      v-model="upBaseInfo.personnelTypeId"
-                      placeholder="请选择"
-                      filterable
-                      clearable
-                      size="small"
-                    >
-                      <el-option
-                        v-for="item in dict.personnelType"
-                        :key="item.id"
-                        :label="item.displayName"
-                        :value="item.id"
-                      />
+                    <el-select v-model="upBaseInfo.personnelTypeId" placeholder="请选择" filterable clearable size="small">
+                      <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName"
+                        :value="item.id" />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="介绍人" prop="salesman">
-                    <el-input
-                      v-model="upBaseInfo.salesman"
-                      size="small"
-                    ></el-input>
+                    <el-input v-model="upBaseInfo.salesman" size="small"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="工卡号" prop="jobCardNo">
-                    <el-input
-                      v-model="upBaseInfo.jobCardNo"
-                      size="small"
-                    ></el-input>
+                    <el-input v-model="upBaseInfo.jobCardNo" size="small"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="职务" prop="jobPost">
-                    <el-input
-                      v-model="upBaseInfo.jobPost"
-                      size="small"
-                    ></el-input>
+                    <el-input v-model="upBaseInfo.jobPost" size="small"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -743,62 +471,37 @@
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="电话随访" prop="isPhoneFollow">
-                    <el-checkbox
-                      v-model="upBaseInfo.isPhoneFollow"
-                      true-label="Y"
-                      false-label="N"
-                    />
+                    <el-checkbox v-model="upBaseInfo.isPhoneFollow" true-label="Y" false-label="N" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="VIP" prop="isVip">
-                    <el-checkbox
-                      v-model="upBaseInfo.isVip"
-                      true-label="Y"
-                      false-label="N"
-                    />
+                    <el-checkbox v-model="upBaseInfo.isVip" true-label="Y" false-label="N" />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="隐藏姓名" prop="isNameHide">
-                    <el-checkbox
-                      v-model="upBaseInfo.isNameHide"
-                      true-label="Y"
-                      false-label="N"
-                    />
+                    <el-checkbox v-model="upBaseInfo.isNameHide" true-label="Y" false-label="N" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="锁住" prop="isLock">
-                    <el-checkbox
-                      v-model="upBaseInfo.isLock"
-                      true-label="Y"
-                      false-label="N"
-                    />
+                    <el-checkbox v-model="upBaseInfo.isLock" true-label="Y" false-label="N" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="体检开始" prop="isMedicalStart">
-                    <el-checkbox
-                      v-model="upBaseInfo.isMedicalStart"
-                      true-label="Y"
-                      false-label="N"
-                    />
+                    <el-checkbox v-model="upBaseInfo.isMedicalStart" true-label="Y" false-label="N" />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="24">
                   <el-form-item label="备注" prop="remark">
-                    <el-input
-                      v-model="upBaseInfo.remark"
-                      type="textarea"
-                      :rows="1"
-                      placeholder="请输入备注"
-                      size="small"
-                    ></el-input>
+                    <el-input v-model="upBaseInfo.remark" type="textarea" :rows="1" placeholder="请输入备注"
+                      size="small"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -808,233 +511,113 @@
           <div style="display: flex; justify-content: space-between">
             <div></div>
             <div>
-              <el-button class="commonbutton" @click="btnUpBaseInfo"
-                >提交</el-button
-              >
-              <el-button
-                class="commonbutton"
-                @click="close_dialogWin_upBaseInfo"
-                >关闭</el-button
-              >
+              <el-button class="commonbutton" @click="btnUpBaseInfo">提交</el-button>
+              <el-button class="commonbutton" @click="close_dialogWin_upBaseInfo">关闭</el-button>
             </div>
           </div>
         </div>
       </el-dialog>
 
-      <el-dialog
-        title="修改信息--体检日期"
-        :visible.sync="dialogEditMedicalStartDate"
-        width="400"
-        :show-close="false"
-        :append-to-body="true"
-        :close-on-click-modal="false"
-      >
+      <el-dialog title="修改信息--体检日期" :visible.sync="dialogEditMedicalStartDate" width="400" :show-close="false"
+        :append-to-body="true" :close-on-click-modal="false">
         <div>
           <div style="display: flex; margin-bottom: 20px">
             <span style="padding: 5px 0 0 10px; width: 100px">体检日期</span>
-            <el-date-picker
-              v-model="upBaseInfo.medicalStartDate"
-              type="date"
-              placeholder="体检日期"
-              size="small"
-              value-format="yyyy-MM-dd"
-              :picker-options="pickerOptions"
-            />
+            <el-date-picker v-model="upBaseInfo.medicalStartDate" type="date" placeholder="体检日期" size="small"
+              value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
           </div>
           <div style="display: flex; justify-content: space-between">
             <div></div>
             <div>
-              <el-button class="commonbutton" @click="btnEditMedicalStartDate"
-                >提交</el-button
-              >
-              <el-button
-                class="commonbutton"
-                @click="dialogEditMedicalStartDate = false"
-                >关闭</el-button
-              >
+              <el-button class="commonbutton" @click="btnEditMedicalStartDate">提交</el-button>
+              <el-button class="commonbutton" @click="dialogEditMedicalStartDate = false">关闭</el-button>
             </div>
           </div>
         </div>
       </el-dialog>
 
       <!-- 分诊排队 -->
-      <el-dialog
-        title="分诊排队"
-        :visible.sync="dialogWin.queue"
-        width="800px"
-        :append-to-body="true"
-        :close-on-click-modal="false"
-      >
+      <el-dialog title="分诊排队" :visible.sync="dialogWin.queue" width="800px" :append-to-body="true"
+        :close-on-click-modal="false">
         <Queue :refParams="queueParams" />
       </el-dialog>
 
       <!-- 拍照 -->
-      <el-dialog
-        title="拍照"
-        :visible.sync="patientRegister.cameraVisble"
-        width="400"
-        height="800"
-        :show-close="false"
-        :append-to-body="true"
-        :close-on-click-modal="false"
-      >
+      <el-dialog title="拍照" :visible.sync="patientRegister.cameraVisble" width="400" height="800" :show-close="false"
+        :append-to-body="true" :close-on-click-modal="false">
         <Camera :id="patientRegister.patientRegisterId" />
       </el-dialog>
 
       <!-- 导入企业数据 -->
-      <el-dialog
-        title="导入企业数据"
-        :visible.sync="dialogWin.ImportOrgData"
-        width="800px"
-        :append-to-body="true"
-        :close-on-click-modal="false"
-      >
+      <el-dialog title="导入企业数据" :visible.sync="dialogWin.ImportOrgData" width="800px" :append-to-body="true"
+        :close-on-click-modal="false">
         <ImportOrgData />
       </el-dialog>
 
       <!-- 列排序 -->
-      <el-dialog
-        title="列排序"
-        :visible.sync="dialogColSort"
-        width="300px"
-        :append-to-body="true"
-        :close-on-click-modal="false"
-      >
-        <el-table
-          id="elTable_dragCol"
-          :data="dragColDesign"
-          row-key="prop"
-          border
-          height="600"
-        >
+      <el-dialog title="列排序" :visible.sync="dialogColSort" width="300px" :append-to-body="true"
+        :close-on-click-modal="false">
+        <el-table id="elTable_dragCol" :data="dragColDesign" row-key="prop" border height="600">
           <el-table-column type="index" label="序号" width="40" align="center">
           </el-table-column>
-          <el-table-column
-            label="列名"
-            prop="label"
-            min-width="120"
-            align="center"
-          ></el-table-column>
+          <el-table-column label="列名" prop="label" min-width="120" align="center"></el-table-column>
         </el-table>
         <span slot="footer" class="dialog-footer">
-          <el-button class="commonbutton" @click="dialogColSort = false"
-            >取消</el-button
-          >
-          <el-button class="commonbutton" @click="btnDragColDesignOk"
-            >确定</el-button
-          >
+          <el-button class="commonbutton" @click="dialogColSort = false">取消</el-button>
+          <el-button class="commonbutton" @click="btnDragColDesignOk">确定</el-button>
         </span>
       </el-dialog>
 
       <!-- 批量调整分组 -->
-      <el-dialog
-        title="批量调整分组"
-        :visible.sync="dialogWin.PatientRegisterEditGroupBatch"
-        width="600px"
-        height="800px"
-        :append-to-body="true"
-        :close-on-click-modal="false"
-      >
+      <el-dialog title="批量调整分组" :visible.sync="dialogWin.PatientRegisterEditGroupBatch" width="600px" height="800px"
+        :append-to-body="true" :close-on-click-modal="false">
         <PatientRegisterEditGroupBatch :multipleSelection="multipleSelection" />
       </el-dialog>
 
       <!-- 批量调整项目 -->
-      <el-dialog
-        title="批量调整项目"
-        :visible.sync="dialogWin.PatientRegisterEditItemBatch"
-        width="610px"
-        height="800px"
-        :append-to-body="true"
-        :close-on-click-modal="false"
-      >
+      <el-dialog title="批量调整项目" :visible.sync="dialogWin.PatientRegisterEditItemBatch" width="610px" height="800px"
+        :append-to-body="true" :close-on-click-modal="false">
         <PatientRegisterEditItemBatch :multipleSelection="multipleSelection" />
       </el-dialog>
 
       <!-- 批量调整检查项目医生 -->
-      <el-dialog
-        title="批量调整检查项目医生"
-        :visible.sync="dialogWin.PatientRegisterEditDoctorBatch"
-        width="610px"
-        :append-to-body="true"
-        :close-on-click-modal="false"
-      >
-        <PatientRegisterEditDoctorBatch
-          :multipleSelection="multipleSelection"
-          :doctorType="doctorType"
-        />
+      <el-dialog title="批量调整检查项目医生" :visible.sync="dialogWin.PatientRegisterEditDoctorBatch" width="610px"
+        :append-to-body="true" :close-on-click-modal="false">
+        <PatientRegisterEditDoctorBatch :multipleSelection="multipleSelection" :doctorType="doctorType" />
       </el-dialog>
 
       <!-- 批量调整体检类别 -->
-      <el-dialog
-        title="批量调整体检类别"
-        :visible.sync="dialogWin.PatientRegisterEditMedicalTypeBatch"
-        width="610px"
-        :append-to-body="true"
-        :close-on-click-modal="false"
-      >
-        <PatientRegisterEditMedicalTypeBatch
-          :multipleSelection="multipleSelection"
-        />
+      <el-dialog title="批量调整体检类别" :visible.sync="dialogWin.PatientRegisterEditMedicalTypeBatch" width="610px"
+        :append-to-body="true" :close-on-click-modal="false">
+        <PatientRegisterEditMedicalTypeBatch :multipleSelection="multipleSelection" />
       </el-dialog>
 
       <!-- 批量调整人员类别 -->
-      <el-dialog
-        title="批量调整人员类别"
-        :visible.sync="dialogWin.PatientRegisterEditPersonnelTypeBatch"
-        width="610px"
-        :append-to-body="true"
-        :close-on-click-modal="false"
-      >
-        <PatientRegisterEditPersonnelTypeBatch
-          :multipleSelection="multipleSelection"
-        />
+      <el-dialog title="批量调整人员类别" :visible.sync="dialogWin.PatientRegisterEditPersonnelTypeBatch" width="610px"
+        :append-to-body="true" :close-on-click-modal="false">
+        <PatientRegisterEditPersonnelTypeBatch :multipleSelection="multipleSelection" />
       </el-dialog>
 
       <!-- 批量调整备注 -->
-      <el-dialog
-        title="批量调整备注"
-        :visible.sync="dialogWin.PatientRegisterEditRemarkBatch"
-        width="610px"
-        :append-to-body="true"
-        :close-on-click-modal="false"
-      >
-        <PatientRegisterEditRemarkBatch
-          :multipleSelection="multipleSelection"
-        />
+      <el-dialog title="批量调整备注" :visible.sync="dialogWin.PatientRegisterEditRemarkBatch" width="610px"
+        :append-to-body="true" :close-on-click-modal="false">
+        <PatientRegisterEditRemarkBatch :multipleSelection="multipleSelection" />
       </el-dialog>
 
       <!-- 通用进度条 -->
-      <el-dialog
-        title="数据处理中……"
-        :visible.sync="elProgress.display"
-        width="600px"
-        height="400"
-        :show-close="false"
-        :close-on-click-modal="false"
-        :append-to-body="true"
-      >
+      <el-dialog title="数据处理中……" :visible.sync="elProgress.display" width="600px" height="400" :show-close="false"
+        :close-on-click-modal="false" :append-to-body="true">
         <ElProgressOCX />
       </el-dialog>
 
       <!--通用本地参数设置-->
-      <el-dialog
-        title="本地参数设置"
-        :visible.sync="dialogWin.LocalConfig"
-        :close-on-click-modal="false"
-        :append-to-body="true"
-        width="800px"
-        height="600px"
-      >
+      <el-dialog title="本地参数设置" :visible.sync="dialogWin.LocalConfig" :close-on-click-modal="false"
+        :append-to-body="true" width="800px" height="600px">
         <LocalConfig />
       </el-dialog>
 
       <!--云胶片二维码-->
-      <el-dialog
-        :visible.sync="qrCode.winDisplay"
-        title="云胶片二维码"
-        width="400px"
-        style="text-align: center"
-      >
+      <el-dialog :visible.sync="qrCode.winDisplay" title="云胶片二维码" width="400px" style="text-align: center">
         <!--<canvas ref="canvas"></canvas>-->
         <img width="100%" :src="qrCode.personUrl" />
         <div style="font-size: 16px">
@@ -1042,35 +625,19 @@
         </div>
       </el-dialog>
       <!---->
-      <el-dialog
-        title="扫/输入条码回收体检表（指引单）"
-        :visible.sync="recover.dialog"
-        width="400px"
-        :append-to-body="true"
-        :close-on-click-modal="false"
-      >
+      <el-dialog title="扫/输入条码回收体检表（指引单）" :visible.sync="recover.dialog" width="400px" :append-to-body="true"
+        :close-on-click-modal="false">
         <div style="margin-left: 10px">
           <template>
             <el-radio v-model="recover.recoverType" label="0">条码号</el-radio>
             <el-radio v-model="recover.recoverType" label="1">档案号</el-radio>
           </template>
-          <el-input
-            style="margin: 10px 0"
-            ref="tmh"
-            v-model="recover.barcode"
-            @keyup.native.enter="signByPatientRegisterNo"
-          ></el-input>
+          <el-input style="margin: 10px 0" ref="tmh" v-model="recover.barcode"
+            @keyup.native.enter="signByPatientRegisterNo"></el-input>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button
-            type="primary"
-            @click="signByPatientRegisterNo"
-            class="commonbutton"
-            >确定</el-button
-          >
-          <el-button @click="recover.dialog = false" class="commonbutton"
-            >关闭</el-button
-          >
+          <el-button type="primary" @click="signByPatientRegisterNo" class="commonbutton">确定</el-button>
+          <el-button @click="recover.dialog = false" class="commonbutton">关闭</el-button>
         </div>
       </el-dialog>
     </div>
@@ -2198,7 +1765,7 @@ export default {
       if (
         this.loadOpts.skipCount != 0 &&
         this.loadOpts.skipCount * this.loadOpts.maxResultCount >=
-          this.loadOpts.totalCount
+        this.loadOpts.totalCount
       )
         return;
       // console.log('getPrList', this.loadOpts)
@@ -2403,7 +1970,7 @@ export default {
       if (scroll.judgeFlse) {
         if (
           (Number(this.loadOpts.skipCount) + 1) *
-            Number(this.loadOpts.maxResultCount) >=
+          Number(this.loadOpts.maxResultCount) >=
           Number(this.loadOpts.totalCount)
         ) {
           return;
@@ -2494,7 +2061,7 @@ export default {
         this.dict.nation.forEach((item) => {
           if (
             item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) >
-              -1 ||
+            -1 ||
             item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
           ) {
             this.nation.push(item);
@@ -3236,11 +2803,11 @@ export default {
               newRow.isAudit == "Y"
                 ? "已审核"
                 : this.dddw(
-                    this.dict.completeFlag,
-                    "id",
-                    newRow.completeFlag,
-                    "displayName"
-                  );
+                  this.dict.completeFlag,
+                  "id",
+                  newRow.completeFlag,
+                  "displayName"
+                );
           if (newRow.guidePrintTimes?.toString())
             newRow.guidePrintTimes = newRow.guidePrintTimes > 0 ? "打印" : "";
           if (newRow.isLock) newRow.isLock = newRow.isLock == "Y" ? "锁住" : "";
@@ -3300,7 +2867,7 @@ export default {
 
           return newRow;
         });
-        const data =list.map((v) => filterVal.map((j) => v[j]));
+        const data = list.map((v) => filterVal.map((j) => v[j]));
         exportJsonToExcel(tHeader, data, '人员登记列表' + moment(new Date()).format('yyyyMMDDHHmmss')); //"列表excel"  是下载后的表名 可修改
       });
 
diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue
index e714498..d3744f2 100644
--- a/src/components/report/BtnReport.vue
+++ b/src/components/report/BtnReport.vue
@@ -994,7 +994,8 @@ export default {
 
         // 导出pdf
         try {
-          if (e.completeFlag == "3") {
+          // 石家庄长城 手动导出没有总检也可以导出
+          //if (e.completeFlag == "3") {
             toOutShell.BusinessCode = e.patientRegisterId;
             toOutShell.ExportDirectory = `${path}\\${e.patientName}_${e.patientRegisterNo}.pdf`;
             toOutShell.customerOrgName = e.customerOrgName || ""; // 增加单位名称参数
@@ -1006,7 +1007,7 @@ export default {
             if (JSON.parse(res).code < 0) {
               console.log("this.$peisAPI.exportToPdfPre err", res);
             }
-          }
+          //}
         } catch (error) {
           console.log("error", error);
           this.$message.warning({ showClose: true, message: error });
diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue
index bbe5bdd..cd67e8f 100644
--- a/src/components/report/PatientRegisterListNobtn.vue
+++ b/src/components/report/PatientRegisterListNobtn.vue
@@ -159,6 +159,19 @@ export default {
     this.loadOptsInit = Object.assign({}, this.loadOpts)
     this.patientRegister.prList = []
 
+    try {
+      let LocalConfig = JSON.parse(
+        window.localStorage.getItem("LocalConfig") || null
+      );
+      if (LocalConfig?.normal?.maxResultCount) {
+        this.loadOpts.maxResultCount =
+          LocalConfig.normal.maxResultCount;
+      }
+    } catch (error) {
+      console.log('window.localStorage.getItem("LocalConfig")', error);
+    }
+
+
     // 系统参数，获取 总检别名
     postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId: "summary_check_doctor_alias" })
       .then(res => {
diff --git a/src/components/sumDoctorCheck/SumAsbItemStatus.vue b/src/components/sumDoctorCheck/SumAsbItemStatus.vue
index c686829..563b807 100644
--- a/src/components/sumDoctorCheck/SumAsbItemStatus.vue
+++ b/src/components/sumDoctorCheck/SumAsbItemStatus.vue
@@ -3,7 +3,7 @@
     <div class="asbitemListClass">
       <div class="asbTitle">未检组合项目：</div>
       <div style="overflow-y:auto; height:68px;width:100%; margin-top:2px;border: 1px solid;">
-        <el-tag style="color:#303133;background-color: white;margin-left: 5px;" v-for="item in data.unCheckedAsbitem" :key="item" size="mini">{{
+        <el-tag style="color:red;background-color: white;margin-left: 5px;" v-for="item in data.unCheckedAsbitem" :key="item" size="mini">{{
           item }}</el-tag>
       </div>
     </div>