diff --git a/src/components/itemSet/ReferenceRange.vue b/src/components/itemSet/ReferenceRange.vue
index d0c171a..4002e16 100644
--- a/src/components/itemSet/ReferenceRange.vue
+++ b/src/components/itemSet/ReferenceRange.vue
@@ -289,8 +289,8 @@ export default {
 
     // 新增或者编辑需要的类别
     addtoedit() {
-      //性别
-      getapi("/api/app/sex").then((res) => {
+      //适用性别
+      getapi("/api/app/for-sex").then((res) => {
         this.forSexId = res.data;
       });
       //诊断
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 39d0832..590ed76 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -1476,7 +1476,7 @@ export default {
                 this.refreshRegister(Object.assign({},res.data))
 
                 //一般读身份证照片时，会出现这种情况
-                if (this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(res.data.id, this.patientRegister.photo);
+                if (this.patientRegister.photo && this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(res.data.id, this.patientRegister.photo);
               }
             }
           );
@@ -1823,7 +1823,7 @@ export default {
         if (res.code != -1) {
           console.log("操作成功");
           //一般读身份证照片时，会出现这种情况
-          if (this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(this.form.id, this.patientRegister.photo);
+          if (this.patientRegister.photo && this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(this.form.id, this.patientRegister.photo);
           objCopy(this.form, this.patientRegister.patientRegisterRd);
 
           this.refreshRegister(Object.assign({},this.form))
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index dd1697f..3539ba4 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -6,7 +6,7 @@
       "
       @contextmenu.prevent="onContextmenu"
     >
-      <div>
+      <div id="info">
         <el-table @body-scrolling="load"
           :data="patientRegister.prList"
           border  :height="window.pageHeight < 600 ? 202 : Math.floor(((window.pageHeight - 302) * 2) / 3)"
@@ -15,7 +15,7 @@
           size="small" row-key="id"
           @selection-change="handleSelectionChange"
           @cell-contextmenu="onCellRightClick"
-          ref="info" id="elTable_prList"
+          ref="info"
           :row-class-name="handleRowClassName"
         >
           <!-- 取消勾选，改为选中
@@ -133,6 +133,10 @@
         <el-button type="success" class="btnClass" @click="btnAdd">人员登记</el-button
         >
       </div>
+      <div class="listBtn">
+        <el-button type="success" class="btnClass" @click="btnAddBatch">批量正式登记</el-button
+        >
+      </div>
       <div class="listBtn">
         <el-button type="primary" class="btnClass" @click="btnEdit"
           >编辑</el-button
@@ -187,7 +191,7 @@
         <el-button
           type=""
           class="btnClass"
-          @click="btnExport('elTable_prList')"
+          @click="btnExport('info')"
           >人员信息导出</el-button
         >
       </div>
@@ -463,6 +467,7 @@ import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import Sortable from "sortablejs";
 import FileSaver from 'file-saver';
+import html2canvas from 'html2canvas';
 
 import {
   dddw,
@@ -470,7 +475,7 @@ import {
   arrayReduce,
   arrayExistObj,
   deepCopy,
-} from "@/utlis/proFunc";
+} from "../../utlis/proFunc";
 
 import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
 import Camera from "../../components/patientRegister/Camera.vue";
@@ -847,6 +852,42 @@ export default {
       console.log('编辑/新增的 form :',patientRegister)
     },
 
+    //批量正式登记
+    btnAddBatch(){
+      let patientRegisterIds = []
+      //取消勾选，换成选择的方式  start
+      this.multipleSelection = [];
+      this.patientRegister.prList.forEach((e) => {
+        if (e.choosed && e.completeFlag == '0'){
+          this.multipleSelection.push(e);
+          patientRegisterIds.push(e.id)
+        }
+      });
+      //取消勾选，换成选择的方式  end
+
+      if (patientRegisterIds.length < 1) {
+        this.$message.info("请选择状态为预登记的记录！");
+        return;
+      }
+      let completeFlag = '1'
+      let body = { completeFlag, patientRegisterIds }
+      postapi('/api/app/patientregister/updatepatientregistercompleteflagormedicalstartdate',body)
+      .then(res =>{
+        if(res.code != -1){
+          console.log('操作成功！')
+          patientRegisterIds.forEach(e => {
+            let lfind = arrayExistObj(this.patientRegister.prList,'id',e)
+            if(lfind > -1) this.patientRegister.prList[lfind].completeFlag = completeFlag
+          });
+        }
+      })
+      .catch(err =>{
+        this.$message.error(`操作失败 ${err}`);
+      });
+
+    },
+
+    // 单个编辑
     btnEdit() {
       if (!this.patientRegister.patientRegisterRd.id) {
         this.$message.warning("请选择要操作的记录");
@@ -1674,13 +1715,41 @@ export default {
 
     //通用导出
     btnExport(elId){
-      let table = document.getElementById(elId);
-      let tableData = table.innerHTML
-      let fileName = moment(new Date()).format('yyyyMMDDHHmmss') + '.xls'
-      let blob = new Blob([tableData],{type:"text/plain;charset=utf-8"});
-
-      FileSaver.saveAs(blob, fileName);
+      // 获取HTML元素（表格）
+      // let table = document.getElementById(elId); //.cloneNode(true)
+      this.$nextTick(() => {
+        let table = document.getElementById(elId)
+        console.log('table',table)
+        // let table = this.$refs[elId]  //.cloneNode(true) true
+        let tableData = table.innerHTML
+        let fileName = moment(new Date()).format('yyyyMMDDHHmmss')
+        let blob = new Blob([tableData],{type:"text/plain;charset=utf-8"});
+
+        FileSaver.saveAs(blob, fileName + '.xls');
+
+
+
+        // 导出图片       
+        // 使用html2canvas将HTML元素转换为画布
+        html2canvas(table).then(canvas => {
+          
+          // 创建一个a元素用于下载
+          const link = document.createElement('a');
+          link.href = canvas.toDataURL('image/png');        
+          link.download = fileName + '.png';
+          document.body.appendChild(link);
+          link.click();
+          document.body.removeChild(link);
+
+          // // 创建一个PDF对象
+          // var pdf = new jsPDF();    
+          // // 设置PDF的尺寸
+          // pdf.addImage(canvas.toDataURL('image/png'), 'PNG', 0, 0, canvas.width, canvas.height);    
+          // // 导出PDF
+          // pdf.save('员工信息表.pdf');
 
+        });
+      })
     },
 
   },