diff --git a/public/sysConfig.json b/public/sysConfig.json
index 5964923..0864a2d 100644
--- a/public/sysConfig.json
+++ b/public/sysConfig.json
@@ -1,5 +1,5 @@
 {
-    "apiurl": "http://192.168.0.188:9530",
+    "apiurl": "http://192.168.0.188:9527",
     "softName": "神豚体检管理系统",
     "pacsApi": "http://192.168.0.188:9530",
     "dcmViewers": "https://app.mzaktj.com:4436",
diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue
index 4c6edcb..aab6434 100644
--- a/src/components/doctorCheck/ButtonList.vue
+++ b/src/components/doctorCheck/ButtonList.vue
@@ -107,7 +107,7 @@
 
 
         <div v-show="doctorCheck.doctorCheckDialogVisible"
-            :style="`z-index:2;border-radius: 10px;border: 1px solid #ddd;background-color:#FFF; position: absolute;top:50px;right:120px;width:300px;height: ${window.pageHeight - 42 - 10}px;opacity:1;`">
+            :style="`z-index:2;border-radius: 10px;border: 1px solid #ddd;background-color:#FFF; position: absolute;top:50px;right:120px;width:350px;height: ${window.pageHeight - 42 - 10}px;opacity:1;`">
 
             <PatientRegisterList win="doctorCheck" :winAbsolute="true" />
 
diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue
index afef860..7bfade1 100644
--- a/src/components/doctorCheck/PatientRegisterList.vue
+++ b/src/components/doctorCheck/PatientRegisterList.vue
@@ -10,7 +10,7 @@
         </el-tooltip>
       </div>
       <div class="query" style="display: flex;padding-top: 2px;">
-        <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:238px;" size="small"
+        <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:288px;" size="small"
           disabled>
         </el-input>
         <el-button icon="el-icon-search" @click="report.dialogCusOrgOCX = true"
@@ -19,70 +19,68 @@
 
       <div class="query">
         <span>姓名：</span>
-        <el-input placeholder="姓名" v-model="local.query.patientName" size="small" clearable style="width: 110px" />
+        <el-input placeholder="姓名" v-model="local.query.patientName" size="small" clearable style="width: 130px" />
       </div>
       <div class="query">
         <span>性别：</span>
-        <el-select v-model="local.query.sex" placeholder="请选择" clearable style="width: 80px" size="small">
+        <el-select v-model="local.query.sex" placeholder="请选择" clearable style="width: 120px" size="small">
           <el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id">
           </el-option>
         </el-select>
       </div>
-      <div class="query">
-        <span>体检类别：</span>
-        <el-select v-model="local.query.medicalTypeIds" placeholder="请选择" clearable filterable style="width: 207px"
+      <div class="query">        
+        <el-select v-model="local.query.medicalTypeIds" placeholder="请选择体检类别" clearable filterable style="width: 170px"
           size="small" multiple collapse-tags>
           <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName" :value="item.id" />
         </el-select>
+        <el-select v-model="local.query.personnelTypeIds" placeholder="请选择人员类别" clearable filterable style="width: 170px;margin-left: 2px;"
+          size="small" multiple collapse-tags >
+          <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName" :value="item.id" />
+        </el-select>
       </div>
-      <div v-if="win == 'doctorCheck'" class="query">
-        <span>检查医生：</span>
+      <div v-if="win == 'doctorCheck'" class="query">        
         <el-select v-model="local.query.checkDoctorIds" placeholder="请选择医生" size="small" filterable clearable
-          style="width:207px;text-align: left;" multiple collapse-tags>
+          style="width:140px;text-align: left;" multiple collapse-tags>
           <el-option v-for="item in users" :key="item.id" :value="item.id" :label="item.surname" />
         </el-select>
+        <el-select v-model="local.query.checkAsb" placeholder="请选择组合项目" size="small" filterable
+          :filter-method="filterMethod" clearable @clear="quickAsb = deepCopy(asbItemQuick)" default-first-option
+          ref="quickAsbOCX" style="width:200px;text-align: left;margin-left: 2px;">
+          <el-option v-for="item in quickAsb" :key="item.id" :value="item.id" :label="item.displayName" />
+        </el-select>
       </div>
       <div v-else class="query">
         <span>总检医生：</span>
         <el-select v-model="local.query.summaryDoctorIds" placeholder="请选择医生" size="small" filterable clearable
-          style="width:207px;text-align: left;" multiple collapse-tags>
+          style="width:270px;text-align: left;" multiple collapse-tags>
           <el-option v-for="item in users" :key="item.id" :value="item.id" :label="item.surname" />
         </el-select>
-      </div>
-
-      <div class="query">
-        <span>人员状态：</span>
-        <el-select v-model="local.query.completeFlag" placeholder="请选择" clearable style="width: 80px" size="small">
-          <el-option v-for="item in local.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
+      </div>      
+      <div class="query" v-if="win == 'doctorCheck'">
+        <span>检查状态：</span>
+        <el-select v-model="local.query.checkCompleteFlag" placeholder="请选择" clearable style="width: 110px" size="small">
+          <el-option v-for="item in dict.checkCompleteFlag" :key="item.id" :label="item.displayName" :value="item.id">
           </el-option>
         </el-select>
-        <el-select v-model="local.query.isAudit" placeholder="请选择" clearable style="width: 75px;margin: 0 2px;"
+        <el-select v-model="local.query.isAuditCheck" placeholder="请选择" clearable style="width: 95px;margin: 0 2px;"
           size="small">
           <el-option label="未审核" value="N" />
           <el-option label="已审核" value="Y" />
         </el-select>
-        <el-checkbox v-if="win == 'doctorCheck'" v-model="local.query.haveImage">有图</el-checkbox>
+        <el-checkbox v-model="local.query.haveImage">有图</el-checkbox>
       </div>
-      <div class="query" v-if="win == 'doctorCheck'">
-        <span>组合项目：</span>
-        <el-select v-model="local.query.checkAsb" placeholder="请选择组合项目" size="small" filterable
-          :filter-method="filterMethod" clearable @clear="quickAsb = deepCopy(asbItemQuick)" default-first-option
-          ref="quickAsbOCX" style="width:207px;text-align: left;">
-          <el-option v-for="item in quickAsb" :key="item.id" :value="item.id" :label="item.displayName" />
-        </el-select>
-      </div>
-      <div class="query" v-if="win == 'doctorCheck'">
-        <span>检查状态：</span>
-        <el-select v-model="local.query.checkCompleteFlag" placeholder="请选择" clearable style="width: 80px" size="small">
-          <el-option v-for="item in dict.checkCompleteFlag" :key="item.id" :label="item.displayName" :value="item.id">
+      <div class="query">
+        <span>人员状态：</span>
+        <el-select v-model="local.query.completeFlag" placeholder="请选择" clearable style="width: 110px" size="small">
+          <el-option v-for="item in local.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
           </el-option>
         </el-select>
-        <el-select v-model="local.query.isAuditCheck" placeholder="请选择" clearable style="width: 75px;margin: 0 2px;"
+        <el-select v-model="local.query.isAudit" placeholder="请选择" clearable style="width: 95px;margin: 0 2px;"
           size="small">
           <el-option label="未审核" value="N" />
           <el-option label="已审核" value="Y" />
         </el-select>
-      </div>
+      </div>      
       <div class="query">
         <el-button class="commonbutton" type="primary" @click="btnQuery" size="small"
           style="width:50px;height:26px;margin: 2px 0 2px -3px;">查询</el-button>
@@ -93,7 +91,7 @@
     <u-table :data="dataList" border width="100%" :height="tableHeight" row-key="id" size="small" highlight-current-row
       @row-click="rowClick" @row-dblclick="rowDblclick" ref="info" id="info" style="border-radius:10px;"
       :row-class-name="tableRowClassName" @table-body-scroll="scrollFull" use-virtual :row-height="23" big-data-checkbox :data-changes-scroll-top="false">
-      <u-table-column type="index" label="序号" width="40" align="center" />
+      <u-table-column type="index" label="序号" width="50" align="center" />
       <u-table-column prop="customerOrgParentName" label="单位" width="120" sortable show-overflow-tooltip>
         <template slot-scope="scope">
           <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName :
@@ -233,6 +231,7 @@ export default {
           checkCompleteFlag: '',  //检查项目状态
           isAuditCheck: '',      //检查项目审核
           medicalTypeIds: [],
+          personnelTypeIds: [],
           checkDoctorIds: [],
           summaryDoctorIds: [],
         },
@@ -272,9 +271,9 @@ export default {
     ...mapState(["window", "dataTransOpts", "dict", "customerOrg", "patientRegister", "doctorCheck", "sumDoctorCheck", "report"]),
     divHeight() {
       if (this.win == "doctorCheck") {
-        return 240
+        return 210
       } else {
-        return 170
+        return 175
       }
     },
     tableHeight() {
@@ -331,6 +330,13 @@ export default {
         }
       });
 
+      //人员类别
+      getapi("/api/app/personnel-type/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.personnelType = res.data;
+        }
+      });
+
       // 获取组合项目
       postapi('/api/app/asbitem/GetBasicList', { isFilterActive: 'Y' }).then(res => {
         if (res.code != -1) {
@@ -501,6 +507,10 @@ export default {
       if (Array.isArray(this.local.query.medicalTypeIds) && this.local.query.medicalTypeIds.length > 0) {
         body.medicalTypeIds = this.local.query.medicalTypeIds
       }
+      if (Array.isArray(this.local.query.personnelTypeIds) && this.local.query.personnelTypeIds.length > 0) {
+        body.personnelTypeIds = this.local.query.personnelTypeIds
+      }
+
       if (Array.isArray(this.local.query.checkDoctorIds) && this.local.query.checkDoctorIds.length > 0) {
         body.checkDoctorIds = this.local.query.checkDoctorIds
       }
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index a51d943..637204a 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -45,10 +45,15 @@
                   <el-input v-model="form.patientRegisterNo" disabled size="small"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
-                <el-form-item label="档案号" prop="patientNo">
-                  <el-input v-model="form.patientNo" disabled size="small"></el-input>
-                </el-form-item>
+              <el-col :span="5">                
+                <el-form-item prop="patientNo">
+                  <template slot="label">
+                    <el-tooltip content="双击档案号标签，清除当前档案号，再在姓名或身份证号栏里敲回车可选择档案号（无档案号时则保存后生成新的档案号）" placement="top">
+                      <div @dblclick="dbClearPatientNo">档案号</div>
+                    </el-tooltip>
+                  </template>
+                  <el-input ref="patientNoInput" v-model="form.patientNo" disabled size="small"></el-input>
+                </el-form-item>              
               </el-col>
               <el-col :span="3">
                 <el-form-item label="体检次数" prop="medicalTimes">
@@ -70,14 +75,14 @@
             </el-row>
             <el-row>
               <el-col :span="5">
+                <!--autocomplete="off"-->
                 <el-form-item label="姓名" prop="patientName">
-                  <el-input id="patientName" v-model="form.patientName" @change="changePatientName" size="small"
-                    autocomplete="off"></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" placeholder="身份证号" @change="changeIdNo('N')" size="small"></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">
@@ -156,8 +161,7 @@
               </el-col>
               <el-col :span="3">
                 <el-form-item label="性激素期" prop="sexHormoneTermId">
-                  <el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable size="small"
-                    :disabled="isComplete">
+                  <el-select v-model="form.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>
@@ -237,7 +241,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'" />
+                      :value="item.id" :disabled="item.isComplete == 'Y' ? true:false" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -530,9 +534,6 @@
           <el-button type="danger" class="commonbutton" @click="reMergeAsbitem">手动合并项目</el-button>
         </div>
         -->
-
-
-
         <div v-show="checkPagePriv(pagePriv.privs, '全个人支付')" style="margin-top: 30px;">
           <el-button type="primary" class="commonbutton" @click="btnPayTypeFlag('0')">全个人支付</el-button>
         </div>
@@ -788,7 +789,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'" />
+                  :value="item" :disabled="item.isComplete == 'Y' ? true:false" />
               </el-select>
             </div>
           </div>
@@ -1114,6 +1115,9 @@ export default {
     this.initFormData(this.dataTransOpts.tableS.patient_register.id)
     // 表单中 回车 代替 tab
     this.enterToTab();
+
+    // 档案号元素，添加双击监听
+    this.addDoubleClickListener()
   },
 
   computed: {
@@ -1907,7 +1911,10 @@ export default {
       this.patientChoosed = { id: '' }  // 清空之前的选择
 
       //编辑的时候不查重
-      if (this.form.id || !param) return;
+      // if (this.form.id || !param) return;
+
+      //编辑的时候档案号为空则查重，允许修改档案号
+      if (this.form.patientNo || !param) return;
 
       //// console.log(`/api/app/patient/in-filter?Filter=${param}`)
       let body = {
@@ -1944,6 +1951,27 @@ export default {
       this.choosePatient()
     },
 
+    // 档案号元素，添加双击监听
+    addDoubleClickListener() {
+      // 获取el-input内部的input元素
+      console.log("addDoubleClickListener1")
+      const inputElement = this.$refs.patientNoInput.$el.querySelector('input')
+      if (inputElement) {
+        inputElement.addEventListener('dblclick', (event) => {
+          this.dbClearPatientNo()
+        })
+        console.log("addDoubleClickListener2")
+      }
+    },
+    
+    // 双击档案号，清除档案号（一般用于修改档案号）
+    // 再在姓名或身份证中回车，选择新的档案号
+    dbClearPatientNo() {
+      console.log("dbClearPatientNo")
+      this.form.patientNo = ''
+      this.form.patientId = "00000000-0000-0000-0000-000000000000" //档案号ID 选择了档案就传档案号，未选就传00000-0000...
+    },
+
     //确定选择人员
     choosePatient() {
       if (!this.patientChoosed.id) {
@@ -2032,12 +2060,17 @@ export default {
       } else {
         body.age = Number(body.age)
       }
+      // if(body.medicalTimes){
+      //   body.medicalTimes = Number(body.medicalTimes)||1
+      // }else{
+      //   body.medicalTimes = 1
+      // }
       // // console.log('body',body)
       // Invalid date
 
       delete body.registerManType;
       delete body.patientRegisterNo;
-      delete body.medicalTimes;
+      delete body.medicalTimes; 
       // delete body.completeFlag;
       delete body.isMedicalStart;
       delete body.patientNo;
@@ -3367,7 +3400,7 @@ export default {
           // "displayOrder": 1
           this.dataTransOpts.tableM.register_check_asbitem = deepCopy(this.dataTransOpts.tableM.appoint_register_asbitem)
 
-          this.changeIdNo() //  触发身份证查询档案号
+          this.changeIdNo('N') //  触发身份证查询档案号
         })
 
     },
@@ -3464,7 +3497,7 @@ export default {
           // 触发分组 项目
           if (this.form.customerOrgGroupId) this.changeCustomerOrgGroupId()
 
-          this.changeIdNo() //  触发身份证查询档案号
+          this.changeIdNo('N') //  触发身份证查询档案号
         })
 
     },
@@ -3808,9 +3841,17 @@ export default {
               event.preventDefault();
 
               // 如果是身份证，则计算出生与年龄
-              let placeholder = input.getAttribute('placeholder')
-              if (placeholder == '身份证号') this.changeIdNo()
-
+              let colName = input.getAttribute('data-col')
+              switch (colName) {
+                case "idNo":
+                  this.changeIdNo('N')
+                  break;
+                case "patientName":
+                  this.changePatientName()
+                  break;
+                default:
+                  break;
+              }
               // 跳至下一个输入框
               for (let j = i + 1; j < inputs.length; j++) {
                 if (inputs[j].getAttribute('disabled') != "disabled") {
diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue
index d3744f2..bb00c6c 100644
--- a/src/components/report/BtnReport.vue
+++ b/src/components/report/BtnReport.vue
@@ -2,151 +2,81 @@
   <div>
     <div>
       <div class="listBtn">
-        <el-button type="primary" class="commonbutton" @click="btnQuery"
-          >查询</el-button
-        >
+        <el-button type="primary" class="commonbutton" @click="btnQuery">查询</el-button>
       </div>
       <div class="listBtn">
-        <el-button
-          type="primary"
-          class="commonbutton"
-          @click="btnImportResult('pacs')"
-          >导入检查结果</el-button
-        >
+        <el-button type="primary" class="commonbutton" @click="btnImportResult('pacs')">导入检查结果</el-button>
       </div>
       <div class="listBtn">
-        <el-button
-          type="primary"
-          class="commonbutton"
-          @click="btnImportResult('lis')"
-          >导入检验结果</el-button
-        >
+        <el-button type="primary" class="commonbutton" @click="btnImportResult('lis')">导入检验结果</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="commonbutton" @click="btnReport(true)"
-          >预览报告</el-button
-        >
+        <el-button type="primary" class="commonbutton" @click="btnReport(true)">预览报告</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="commonbutton" @click="btnReport(false)"
-          >打印报告</el-button
-        >
+        <el-button type="primary" class="commonbutton" @click="btnReport(false)">打印报告</el-button>
       </div>
       <div class="listBtn">
-        <el-button
-          type="primary"
-          class="commonbutton"
-          @click="btnReportExport(false)"
-          >导出 pdf 报告</el-button
-        >
+        <el-button type="primary" class="commonbutton" @click="btnReportExport(false)">导出 pdf 报告</el-button>
       </div>
       <div class="listBtn">
-        <el-button
-          type="primary"
-          class="commonbutton"
-          @click="btnGetReport('Y')"
-          >领取报告</el-button
-        >
+        <el-button type="primary" class="commonbutton" @click="btnGetReport('Y')">领取报告</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="commonbutton" @click="btnUpReport"
-          >上传Web</el-button
-        >
+        <el-button type="primary" class="commonbutton" @click="btnUpReport">上传Web</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="commonbutton" @click="btnCheckHistory"
-          >历次结果</el-button
-        >
+        <el-button type="primary" class="commonbutton" @click="btnCheckHistory">历次结果</el-button>
       </div>
       <div class="listBtn">
         <!-- <download-excel :fields="jsonFields" :fetch="btnExport" type="xls" :name="xlsName">
                     <el-button type="" class="commonbutton" style="width:100%">人员信息导出</el-button>
                 </download-excel> -->
-        <el-button type="" class="commonbutton" @click="btnExport"
-          >人员信息导出</el-button
-        >
+        <el-button type="" class="commonbutton" @click="btnExport">人员信息导出</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="commonbutton" @click="exportZip"
-          >导出Zip</el-button
-        >
+        <el-button type="primary" class="commonbutton" @click="exportZip">导出Zip</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="commonbutton" @click="exportJpg"
-          >导出Jpg</el-button
-        >
+        <el-button type="primary" class="commonbutton" @click="exportJpg">导出Jpg</el-button>
       </div>
     </div>
     <div>
       <!-- 通用进度条 -->
-      <el-dialog
-        title="数据处理中……"
-        :visible.sync="elProgress.display"
-        width="640px"
-        :show-close="false"
-        :close-on-click-modal="false"
-        :append-to-body="true"
-      >
+      <el-dialog title="数据处理中……" :visible.sync="elProgress.display" width="640px" :show-close="false"
+        :close-on-click-modal="false" :append-to-body="true">
         <ElProgressOCX />
       </el-dialog>
 
-      <el-dialog
-        title="报告领取"
-        :visible.sync="dialogGetReport"
-        width="350px"
-        :show-close="false"
-        :close-on-click-modal="false"
-        :append-to-body="true"
-      >
+      <el-dialog title="报告领取" :visible.sync="dialogGetReport" width="350px" :show-close="false"
+        :close-on-click-modal="false" :append-to-body="true">
         <div>
           <div class="query" style="display: flex; margin: 0 0 30px 10px">
             <span class="spanClass">领取人</span>
-            <el-input
-              placeholder="领取人"
-              v-model="receiveReport.reportReceiveName"
-              size="small"
-              clearable
-              style="width: 120px"
-            />
+            <el-input placeholder="领取人" v-model="receiveReport.reportReceiveName" size="small" clearable
+              style="width: 120px" />
           </div>
           <div style="display: flex; justify-content: space-between">
             <div></div>
             <div style="display: flex">
               <div>
-                <el-button
-                  type="primary"
-                  class="commonbutton"
-                  @click="btnGetReportOk"
-                  >确定</el-button
-                >
+                <el-button type="primary" class="commonbutton" @click="btnGetReportOk">确定</el-button>
               </div>
               <div style="margin-left: 10px">
-                <el-button
-                  type="primary"
-                  class="commonbutton"
-                  @click="dialogGetReport = false"
-                  >取消</el-button
-                >
+                <el-button type="primary" class="commonbutton" @click="dialogGetReport = false">取消</el-button>
               </div>
             </div>
           </div>
         </div>
       </el-dialog>
 
-      <el-dialog
-        title="历次结果"
-        :visible.sync="dialogVisibleCheckHistory"
-        :close-on-click-modal="false"
-        width="900px"
-      >
+      <el-dialog title="历次结果" :visible.sync="dialogVisibleCheckHistory" :close-on-click-modal="false" width="900px">
         <div>
           <el-tabs v-model="tabChoosed">
             <!---->
             <el-tab-pane label="明细结果" name="2">
-              <CheckDetails
-                :patientRegisterId="dataTransOpts.tableS.patient_register.id"
-                :refParams="{ place: 'doctor' }"
-              />
+              <CheckDetails :patientRegisterId="dataTransOpts.tableS.patient_register.id"
+                :refParams="{ place: 'doctor' }" />
             </el-tab-pane>
             <el-tab-pane label="本次图文报告" name="4">
               <ImageTextReport :refParams="{ place: 'doctor' }" />
@@ -155,16 +85,10 @@
                         <SumItemsType :patientId="doctorCheck.prBase.patientId" />
                     </el-tab-pane> -->
             <el-tab-pane label="横向对比" name="5">
-              <SumItems
-                :patientId="dataTransOpts.tableS.patient_register.id"
-                :refParams="{ place: 'doctor' }"
-              />
+              <SumItems :patientId="dataTransOpts.tableS.patient_register.id" :refParams="{ place: 'doctor' }" />
             </el-tab-pane>
             <el-tab-pane label="历次综述" name="6">
-              <SumHistory
-                :patientId="dataTransOpts.tableS.patient_register.id"
-                :refParams="{ place: 'doctor' }"
-              />
+              <SumHistory :patientId="dataTransOpts.tableS.patient_register.id" :refParams="{ place: 'doctor' }" />
             </el-tab-pane>
           </el-tabs>
         </div>
@@ -200,6 +124,7 @@ export default {
   },
   data() {
     return {
+      medical_report_print_after_summary_check_is_audit: 'N', // Y-审核后才可以打印报告，N-没审核未总检亦可以打印
       dialogGetReport: false,
       dialogVisibleCheckHistory: false,
       tabChoosed: "2",
@@ -380,12 +305,22 @@ export default {
     };
   },
 
-  created() {},
+  created() {
+    // 获取 是否审核才能打印报告
+    postapi("/api/app/SysParmValue/GetSysParmValueBySysParmId",
+      { sysParmId: "medical_report_print_after_summary_check_is_audit" }
+    ).then(res => {
+      if (res.code > -1) {
+        this.medical_report_print_after_summary_check_is_audit = res.data.toUpperCase() || 'N'
+      }
+    });
+  },
 
   //挂载完成
   mounted() {
     this.dataTransOpts.tableS.patient_register.id = "";
     // this.getPatientRegister(this.dataTransOpts.tableS.patient_register.patientRegisterNo)
+
   },
 
   computed: {
@@ -789,6 +724,7 @@ export default {
       let user = window.sessionStorage.getItem("user");
       let toOutShell = {
         ReportCode,
+        TemplateCode: undefined, // 新加打印模版
         token,
         isBuildImage: "N",
         IsUploadPdf: "N",
@@ -817,23 +753,26 @@ export default {
         ],
       };
 
-      // 总检审核后才能打印
-      if (rds[0].completeFlag != "3") toOutShell.preViewCanPrint = "N";
-      if (toOutShell.preViewCanPrint == "Y" && rds[0].isAudit == "N") {
-        let sysParmId = "medical_report_print_after_summary_check_is_audit";
-        let sysParam = await postapi(
-          "/api/app/SysParmValue/GetSysParmValueBySysParmId",
-          { sysParmId }
-        );
-        if (sysParam.data.toUpperCase() == "Y")
-          toOutShell.preViewCanPrint = "N";
-      }
-
-      // let res = await postapi(`/api/app/printreport/getpeisreport?PatientRegisterId=${this.patientRegister.patientRegisterId}`)
-      // toOutShell.ReportTable = res.data
-      let JSONtoOutShell = JSON.stringify(toOutShell);
-      console.log("$peisAPI.printPre", JSONtoOutShell);
+      
+      let JSONtoOutShell = ''
       if (isPreview) {
+        toOutShell.ReportCode =
+          rds[0].isPatientOccupationalDisease == "Y" ? "0006" : "0005";
+
+        toOutShell.BusinessCode = rds[0].patientRegisterId;
+
+        // 选择报告打印模版
+        if (toOutShell.ReportCode == "0005" && rds[0].reportFormatTemplateId) toOutShell.TemplateCode = rds[0].reportFormatTemplateId
+
+
+        // 审核了才可以打印
+        if (this.medical_report_print_after_summary_check_is_audit == 'Y') {
+          //if (rd.completeFlag != "3") toOutShell.preViewCanPrint = "N";
+          if (rds[0].isAudit == "N") toOutShell.preViewCanPrint = "N";
+        }
+
+        JSONtoOutShell = JSON.stringify(toOutShell);
+        console.log("$peisAPI.printPre", toOutShell, JSONtoOutShell);
         this.$peisAPI
           .printPre(JSONtoOutShell)
           .then((res) => {
@@ -856,15 +795,15 @@ export default {
           toOutShell.ReportCode =
             rd.isPatientOccupationalDisease == "Y" ? "0006" : "0005";
           toOutShell.BusinessCode = rd.patientRegisterId;
-          if (rd.completeFlag != "3") toOutShell.preViewCanPrint = "N";
-          if (toOutShell.preViewCanPrint == "Y" && rd.isAudit == "N") {
-            let sysParmId = "medical_report_print_after_summary_check_is_audit";
-            let sysParam = await postapi(
-              "/api/app/SysParmValue/GetSysParmValueBySysParmId",
-              { sysParmId }
-            );
-            if (sysParam.data.toUpperCase() == "Y")
-              toOutShell.preViewCanPrint = "N";
+
+          // 选择报告打印模版
+          if (toOutShell.ReportCode == "0005" && rd.reportFormatTemplateId) toOutShell.TemplateCode = rd.reportFormatTemplateId
+
+
+          // 审核了才可以打印
+          if (this.medical_report_print_after_summary_check_is_audit == 'Y') {
+            //if (rd.completeFlag != "3") toOutShell.preViewCanPrint = "N";
+            if (rd.isAudit == "N") toOutShell.preViewCanPrint = "N";
           }
 
           if (toOutShell.preViewCanPrint == "N") {
@@ -874,8 +813,12 @@ export default {
             });
             continue;
           }
-          JSONtoOutShell = JSON.stringify(toOutShell);
+
           try {
+            JSONtoOutShell = JSON.stringify(toOutShell);
+            // 防止打印太多数据 只输出 第一条
+            if (i == 0) console.log('this.$peisAPI.print', toOutShell, JSONtoOutShell)
+
             let lres = await this.$peisAPI.print(JSONtoOutShell);
             if (JSON.parse(lres).code < 0) {
               this.$message.warning({
@@ -996,17 +939,17 @@ export default {
         try {
           // 石家庄长城 手动导出没有总检也可以导出
           //if (e.completeFlag == "3") {
-            toOutShell.BusinessCode = e.patientRegisterId;
-            toOutShell.ExportDirectory = `${path}\\${e.patientName}_${e.patientRegisterNo}.pdf`;
-            toOutShell.customerOrgName = e.customerOrgName || ""; // 增加单位名称参数
-            toOutShell.departmentName = e.departmentName || "";
-
-            let jsonToOutShell = JSON.stringify(toOutShell);
-            console.log("toOutShell", jsonToOutShell);
-            let res = await this.$peisAPI.exportToPdfPre(jsonToOutShell);
-            if (JSON.parse(res).code < 0) {
-              console.log("this.$peisAPI.exportToPdfPre err", res);
-            }
+          toOutShell.BusinessCode = e.patientRegisterId;
+          toOutShell.ExportDirectory = `${path}\\${e.patientName}_${e.patientRegisterNo}.pdf`;
+          toOutShell.customerOrgName = e.customerOrgName || ""; // 增加单位名称参数
+          toOutShell.departmentName = e.departmentName || "";
+
+          let jsonToOutShell = JSON.stringify(toOutShell);
+          console.log("toOutShell", jsonToOutShell);
+          let res = await this.$peisAPI.exportToPdfPre(jsonToOutShell);
+          if (JSON.parse(res).code < 0) {
+            console.log("this.$peisAPI.exportToPdfPre err", res);
+          }
           //}
         } catch (error) {
           console.log("error", error);
@@ -1078,13 +1021,13 @@ export default {
               newRow.isAudit == "Y"
                 ? "已审核"
                 : dddw(
-                    this.dict.completeFlag,
-                    "id",
-                    newRow.completeFlag,
-                    "displayName"
-                  );
+                  this.dict.completeFlag,
+                  "id",
+                  newRow.completeFlag,
+                  "displayName"
+                );
           newRow.isReportPrint = newRow.isReportPrint == "Y" ? "√" : "";
-          if (newRow.idNo) newRow.idNo = "\u200C"+newRow.idNo;
+          if (newRow.idNo) newRow.idNo = "\u200C" + newRow.idNo;
           if (newRow.patientRegisterNo)
             newRow.patientRegisterNo = "\u200C" + newRow.patientRegisterNo;
           if (newRow.patientNo) newRow.patientNo = "\u200C" + newRow.patientNo;
diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index 441243e..310e085 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -101,7 +101,7 @@
         </div>
 
         <div v-show="sumDoctorCheck.sumDoctorCheckDialogVisible"
-            :style="`z-index:3;border-radius: 10px;border: 1px solid #ddd;background-color:#FFF; position: absolute;top:50px;right:120px;width:300px;height: ${window.pageHeight - 42 - 10}px;opacity:1;`">
+            :style="`z-index:3;border-radius: 10px;border: 1px solid #ddd;background-color:#FFF; position: absolute;top:50px;right:120px;width:350px;height: ${window.pageHeight - 42 - 10}px;opacity:1;`">
 
             <PatientRegisterList win="sumDoctorCheck" :winAbsolute="true" />