diff --git a/public/pic/occGrant.jpg b/public/pic/occGrant.jpg
new file mode 100644
index 0000000..8ddc186
Binary files /dev/null and b/public/pic/occGrant.jpg differ
diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue
index bdfed99..6522028 100644
--- a/src/components/doctorCheck/ButtonList.vue
+++ b/src/components/doctorCheck/ButtonList.vue
@@ -62,11 +62,11 @@
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '总检')" class="divBtnClass">
             <el-button type="primary" class="commonbutton" @click="toSumDoctorCheck"
-            :disabled="doctorBtnDisabled('toSumDoctorCheck')">总检</el-button>
+                :disabled="doctorBtnDisabled('toSumDoctorCheck')">总检</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '职业病')" class="divBtnClass">
             <el-button type="primary" class="commonbutton" @click="btnOcc"
-            :disabled="doctorBtnDisabled('btnOcc')">职业病</el-button>
+                :disabled="doctorBtnDisabled('btnOcc')">职业病</el-button>
         </div>
 
         <!--
@@ -101,8 +101,9 @@
 
 
         <!-- 体检人员登记 -->
-        <el-dialog :title="doctorCheck.prBase.id ? '体检人员--编辑' : '体检人员--新增'" :visible.sync="dialogWin.PatientRegisterEdit"
-            :close-on-click-modal="false" fullscreen @close="closeDialogWinPatientRegisterEdit">
+        <el-dialog :title="doctorCheck.prBase.id ? '体检人员--编辑' : '体检人员--新增'"
+            :visible.sync="dialogWin.PatientRegisterEdit" :close-on-click-modal="false" fullscreen
+            @close="closeDialogWinPatientRegisterEdit">
             <!-- :formInitData="formData" -->
             <PatientRegisterEdit style="z-index:30001;" :isDoctor="'1'" :patientRegisterId="doctorCheck.prBase.id"
                 :editTimes="editTimes" :refreshRegister="refreshRegister" />
@@ -121,14 +122,17 @@
         </el-dialog>
 
         <el-dialog title="历次结果" :visible.sync="dialogVisibleCheckHistory" :close-on-click-modal="false" width="800px">
-            <div style="padding: 0 20px;">
+            <div>
                 <el-tabs v-model="tabChoosed">
                     <el-tab-pane label="明细结果" name="2">
                         <CheckDetails :patientRegisterId="doctorCheck.prBase.id" />
                     </el-tab-pane>
-                    <el-tab-pane label="项目对比" name="4">
-                        <SumItemsType :patientId="doctorCheck.prBase.patientId" />
+                    <el-tab-pane label="本次图文报告" name="4">
+                        <ImageTextReport :refParams="{ place: 'doctor' }" />
                     </el-tab-pane>
+                    <!-- <el-tab-pane label="项目对比" name="4">
+                        <SumItemsType :patientId="doctorCheck.prBase.patientId" />
+                    </el-tab-pane> -->
                     <el-tab-pane label="横向对比" name="5">
                         <SumItems :patientId="doctorCheck.prBase.patientId" />
                     </el-tab-pane>
@@ -158,6 +162,7 @@ import SumItemsType from "../../components/sumDoctorCheck/SumItemsType.vue";
 import SumItems from "../../components/sumDoctorCheck/SumItems.vue";
 import SumHistory from "../../components/sumDoctorCheck/SumHistory.vue";
 import OccDisease from "../../components/occDisease/OccDisease.vue"
+import ImageTextReport from "../../components/occDisease/ImageTextReport.vue";
 import moment from 'moment';
 
 export default {
@@ -168,7 +173,8 @@ export default {
         SumItemsType,
         SumItems,
         SumHistory,
-        OccDisease
+        OccDisease,
+        ImageTextReport
     },
     props: ["optGrant", "addSummary", "btnMakeDiagnosis", "save", "audit", "unAudit", "doctorBtnDisabled"],
 
@@ -561,7 +567,7 @@ export default {
             }
             ///3a0c990e-5756-2dc0-19d5-69a617fe4048
             let ReportCode = '0005';
-            if(this.dataTransOpts.tableS.patient_register.isPatientOccupationalDisease == 'Y') ReportCode = '0006'
+            if (this.dataTransOpts.tableS.patient_register.isPatientOccupationalDisease == 'Y') ReportCode = '0006'
             let token = window.sessionStorage.getItem('token');
             let user = window.sessionStorage.getItem('user');
             let toOutShell = {
diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index 9ba1d81..872510b 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -26,7 +26,7 @@
       </el-table-column>
       <el-table-column prop="criticalFlag" label="危急" width="40" align="center">
         <template slot-scope="scope">
-          <el-checkbox v-model="scope.row.criticalFlag" size="small" true-label="Y" false-label="N" />
+          <el-checkbox v-model="scope.row.criticalFlag" size="small" true-label="Y" false-label="N" @change="dialogWin.FollowCriticalCheck = true"/>
         </template>
       </el-table-column>
     </el-table>
@@ -144,7 +144,7 @@ export default {
   },
 
   computed: {
-    ...mapState(["window", "dataTransOpts", "dict", "doctorCheck"]),
+    ...mapState(["window", "dataTransOpts", "dict","dialogWin", "doctorCheck"]),
 
     tableHeight() {
       let temp = this.window.pageHeight < 600 ? 600 : this.window.pageHeight
diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index 6506518..4c1beb6 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -262,8 +262,9 @@ export default {
       this.dialogWin.queue = true
     },
 
+    // 危急值
     btnCritical(){
-      console.log('危急值')
+      this.dialogWin.FollowCriticalCheck = true
     },
 
     //删除小结
diff --git a/src/components/follow/FollowCriticalCheck.vue b/src/components/follow/FollowCriticalCheck.vue
new file mode 100644
index 0000000..ef7db76
--- /dev/null
+++ b/src/components/follow/FollowCriticalCheck.vue
@@ -0,0 +1,1524 @@
+<template>
+  <div>
+    <!--组件主体-->
+    <div>
+      <div @contextmenu.prevent="onContextmenu">
+        <el-table :data="tableData" border height="465" width="100%" highlight-current-row @row-click="rowClick"
+          size="small" row-key="id" @selection-change="handleSelectionChange" @cell-contextmenu="onCellRightClick"
+          ref="info" id="info" :row-class-name="handleRowClassName">
+          <el-table-column prop="criticalRangeValue" label="危急值范围" min-width="100">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.criticalValueContent" size="small"/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="isCriticalValue" label="危急值标志" min-width="100" align="center">
+            <template slot-scope="scope">
+              <el-checkbox v-model="scope.row.isCriticalValue" size="small" true-label="Y" false-label="N" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="criticalValueContent" label="危急值" min-width="80">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.criticalValueContent" size="small"/>
+            </template>
+          </el-table-column>          
+          <el-table-column prop="isCriticalValueAudit" label="审核" min-width="60" align="center">
+            <template slot-scope="scope">
+              <el-checkbox v-model="scope.row.isCriticalValueAudit" size="small" true-label="Y" false-label="N" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="isReview" label="复查" min-width="60" align="center">
+            <template slot-scope="scope">
+              <el-checkbox v-model="scope.row.isReview" size="small" true-label="Y" false-label="N" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="isCriticalValueSmsComplete" label="短信" min-width="60" align="center">
+            <template slot-scope="scope">
+              <el-checkbox v-model="scope.row.isCriticalValueSmsComplete" size="small" true-label="Y" false-label="N" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="isCriticalValuePhoneComplete" label="电话随访" min-width="100" align="center">
+            <template slot-scope="scope">
+              <el-checkbox v-model="scope.row.isCriticalValuePhoneComplete" size="small" true-label="Y" false-label="N" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="criticalValueCreatorId" label="登记人" min-width="80" />
+          <el-table-column prop="criticalValueCreationTime" label="登记时间" min-width="100" />
+        </el-table>
+      </div>
+      <div style="margin-top: 10px; display: flex;justify-content: space-between;">
+        <div></div>
+        <div>
+          <el-button type="success" class="commonbutton" @click="btnImportOrgData">确定</el-button>
+
+          <el-button type="success" class="commonbutton" @click="dialogWin.FollowCriticalCheck = false">关闭</el-button>
+        </div>
+
+      </div>
+    </div>
+    <!--组件弹窗-->
+    <div>
+    </div>
+  </div>
+</template>
+<script>
+import moment from "moment";
+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 {
+  getPagePriv, checkPagePriv,
+  dddw,
+  objCopy,
+  arrayReduce,
+  arrayExistObj,
+  deepCopy, setPrStatusColor
+} from "../../utlis/proFunc";
+
+
+import FollowPlan from "../../components/follow/FollowPlan.vue";
+
+
+export default {
+  components: {
+    FollowPlan,
+  },
+  data() {
+    return {
+      pagePriv: {
+        routeUrlorPageName: 'patientRegister', //当前页面归属路由或归属页面权限名称
+        privs: [] // 页面权限
+      },
+      peisid: null,
+      startPoint: -1, // 多选起点 -1 表示选择
+      endPoint: -1, // 多选终点 -1 表示未选择
+
+      tableData: [
+        {
+          criticalRangeValue: "", //危急值范围
+          isCriticalValue: "Y", //危急值标志
+          criticalValueContent: "", // 危急值
+          criticalValueCreatorId: "", // 登记人
+          criticalValueCreationTime: "", // 登记时间
+          isCriticalValueAudit: "N",  // 审核
+          isReview: 'N', // 复查
+          isCriticalValueSmsComplete: "N", // 短信
+          isCriticalValuePhoneComplete: "N",  // 电话随访
+        }
+      ], //表格数据
+      tableDataCurrentRow: {}, // 当前被选中的行
+
+      multipleSelection: [], //选中的数据列表
+
+      dialogCamera: false,
+      tabChoosed: "1",
+      formInitData: {}, //体检登记初始表单数据
+      editTimes: 0,
+
+      rClickRow: null, //右击的行
+      rClickColumn: null, //右击的列（预留）
+
+      dragColDesign: [],  // 待调整的排序的序
+      //拖动列
+      dragCol: [
+        { label: "序号", prop: "sn", minWidth: 40, align: "center" },
+        { label: "锁住", prop: "isLock", minWidth: 55, align: "center" },
+        { label: "单位", prop: "customerOrgParentName", minWidth: 180, align: "center" },
+        { label: "部门", prop: "customerOrgName", minWidth: 120, align: "center" },
+        { label: "姓名", prop: "patientName", minWidth: 80, align: "center" },
+        { label: "性别", prop: "sexId", minWidth: 55, align: "center" },
+        { label: "年龄", prop: "age", minWidth: 55, align: "center" },
+        { label: "条码号", prop: "patientRegisterNo", minWidth: 150, align: "center" },
+        { label: "档案号", prop: "patientNo", minWidth: 100, align: "center" },
+        { label: "体检次数", prop: "medicalTimes", minWidth: 80, align: "center" },
+        { label: "分组/套餐", prop: "groupPack", minWidth: 150, align: "center" },
+        { label: "民族", prop: "nationId", minWidth: 55, align: "center" },
+        { label: "身份证", prop: "idNo", minWidth: 160, align: "center" },
+        { label: "出生日期", prop: "birthDate", minWidth: 80, align: "center" },
+        { label: "邮箱", prop: "email", minWidth: 150, align: "center" },
+        { label: "手机", prop: "mobileTelephone", minWidth: 130, align: "center" },
+        { label: "电话", prop: "telephone", minWidth: 130, align: "center" },
+        { label: "地址", prop: "address", minWidth: 400, align: "" },
+        { label: "体检卡号", prop: "medicalCardNo", minWidth: 80, align: "center" },
+        { label: "工卡号", prop: "jobCardNo", minWidth: 80, align: "center" },
+        { label: "婚姻状况", prop: "maritalStatusId", minWidth: 80, align: "center" },
+        { label: "体检类别", prop: "medicalTypeId", minWidth: 80, align: "center" },
+        { label: "人员类别", prop: "personnelTypeId", minWidth: 80, align: "center" },
+        { label: "职务", prop: "jobPost", minWidth: 200, align: "center" },
+        { label: "职称", prop: "jobTitle", minWidth: 80, align: "center" },
+        { label: "介绍人", prop: "salesman", minWidth: 80, align: "center" },
+        { label: "是否VIP", prop: "isVip", minWidth: 80, align: "center" },
+        { label: "体检进度", prop: "completeFlag", minWidth: 80, align: "center" },
+        { label: "打印", prop: "guidePrintTimes", minWidth: 55, align: "center" },
+        { label: "登记人", prop: "creatorName", minWidth: 80, align: "center" },
+        { label: "登记日期", prop: "creationTime", minWidth: 140, align: "center" },
+        { label: "体检日期", prop: "medicalStartDate", minWidth: 140, align: "center" },
+        { label: "是否上传", prop: "isUpload", minWidth: 80, align: "center" },
+        { label: "高原/健康", prop: "qztlType", minWidth: 90, align: "center" },
+        { label: "行车", prop: "qztlIsMain", minWidth: 50, align: "center" },
+        { label: "从业", prop: "qztlIsCy", minWidth: 50, align: "center" },
+        { label: "普速", prop: "qztlIsCw", minWidth: 50, align: "center" },
+        { label: "高铁", prop: "qztlIsGt", minWidth: 50, align: "center" },
+        { label: "职害", prop: "qztlIsWh", minWidth: 50, align: "center" },
+        { label: "复检", prop: "qztlIsFj", minWidth: 50, align: "center" },
+      ],
+      dialogColSort: false,
+
+      dom: null,   //用于滚动加载数据
+      lazyLoading: false,  //是否懒加载中
+      loadOpts: {
+        totalCount: 0,
+        skipCount: 0,
+        maxResultCount: 100,
+      },
+      loadOptsInit: {},
+
+      upBaseInfo: {
+        visble: false,
+        label: "姓名",
+        value: "",
+        colName: "patientName",
+        patientRegisterId: ""
+      },
+
+      queueParams: {}, // 分诊排队参数
+      LocalConfig: {
+        normal: {
+          maxResultCount: 100, //分页时单页记录数          
+        },
+      },
+      LocalConfigInit: {},
+    };
+  },
+
+  created() {
+    //获取用户当前页面的权限
+    let userPriv = window.sessionStorage.getItem('userPriv')
+    if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+
+    this.LocalConfigInit = deepCopy(this.LocalConfig)
+    let LocalConfig = window.localStorage.getItem("LocalConfig") || null
+    // console.log('LocalConfig',LocalConfig)
+    try {
+      this.LocalConfig = Object.assign({}, deepCopy(this.LocalConfigInit), JSON.parse(LocalConfig) || {})
+    } catch (error) {
+      console.log('window.localStorage.getItem("LocalConfig")', error)
+    }
+    // console.log('this.LocalConfig',this.LocalConfig)
+    this.loadOpts.maxResultCount = Number(this.LocalConfig.normal.maxResultCount || 100)
+
+    this.loadOptsInit = Object.assign({}, this.loadOpts)
+
+  },
+
+  //挂载完成
+  mounted() {
+    this.quickAsb = this.dict.asbItemAll;
+
+    this.peisid = window.sessionStorage.getItem('peisid');
+
+
+    this.$nextTick(() => {
+      this.scrollFull()
+    })
+
+
+  },
+  computed: {
+    ...mapState([
+      "window",
+      "dataTransOpts",
+      "dialogWin",
+      "dict",
+      "elProgress",
+      "patientRegister",
+      "customerOrg",
+    ]),
+  },
+  methods: {
+    ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
+    moment, dddw, deepCopy, checkPagePriv, setPrStatusColor,
+
+    // 扩展定义表格行样式
+    handleRowClassName({ row, rowIndex }) {
+      // highLightBg 为 'selected'的高亮
+      //// console.log(rowIndex, row)
+      //return row.highLightBg == 'selected' ? 'high-light-bg' : '';
+      if (row.choosed) {
+        return "current-row";
+      } else {
+        return "";
+      }
+    },
+
+    // 行选择
+    rowSelected(rows) {
+      rows.forEach((e) => {
+        this.$refs["info"].toggleRowSelection(e, true);
+      });
+    },
+
+
+
+
+    refFuncSetData(item, v) {
+      setData(this, item, v)
+    },
+
+    // 打印指引单(isPreview)
+    async guidePrint(ReportCode, isPreview) {
+
+      if (!this.$peisAPI) {
+        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" });
+        return;
+      }
+      let token = window.sessionStorage.getItem("token");
+      let user = window.sessionStorage.getItem("user");
+      let toOutShell = {
+        ReportCode,
+        token,
+        isBuildImage: 'N',
+        IsUploadPdf: 'N',
+        preViewCanPrint: "N",
+        Parameters: [
+          { Name: "printer", Value: user },
+          { Name: "hisLog", Value: "pic/hisLog.jpg" },
+          { Name: 'pageFooter', Value: 'pic/peisQrCode.jpg' },
+        ],
+      };
+      let lfind = -1;
+
+      //选中（取消勾选）start -------------------------
+      // this.multipleSelection = []
+      // this.tableData.forEach(e => {
+      //   if (e.choosed) {
+      //     this.multipleSelection.push(deepCopy(e))
+      //   }
+      // })
+      //选中（取消勾选） end  -------------------------
+
+      if (this.multipleSelection.length < 1) {
+        this.$message.info({ showClose: true, message: "请勾选要打印指引单的人员记录！" });
+        return;
+      }
+
+      if (isPreview) {
+        /*
+        //this.multipleSelection.forEach((item,index) =>{
+        postapi(
+          `/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.multipleSelection[0].id}`
+        )
+          .then((res) => {
+            if (res.code != -1) {
+              toOutShell.ReportTable = res.data;
+              // console.log(
+                "JSON.stringify(toOutShell)",
+                JSON.stringify(toOutShell)
+              );
+              return this.$peisAPI.printPre(JSON.stringify(toOutShell));
+            }
+          })
+          .then(res => {
+            // console.log('this.$peisAPI.printPre', res)
+            if (JSON.parse(res).code < 0) {
+              this.$message.warning(JSON.parse(res).message);
+            }
+          })
+          .catch((err) => {
+            // console.log('打印指引单', err)
+            this.$message.warning({ showClose: true, message: err });
+          });
+        */
+        toOutShell.BusinessCode = this.multipleSelection[0].id
+        if (this.multipleSelection[0].completeFlag == '0') {
+          this.$message.warning({ showClose: true, message: '预登记人员，不可执行此操作！' })
+          return
+        }
+
+        this.$peisAPI.printPre(JSON.stringify(toOutShell))
+          .then(res => {
+            if (JSON.parse(res).code < 0) {
+              this.$message.warning({ showClose: true, message: JSON.parse(res).message });
+            }
+          })
+          .catch((err) => {
+            // console.log('打印指引单', err)
+            this.$message.warning({ showClose: true, message: `${err}` });
+          });
+
+      } else {
+
+        this.elProgress.display = true;
+        this.elProgress.percentage = 0;
+
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          try {
+
+            let patientregisterId = this.multipleSelection[i].id
+            if (this.multipleSelection[i].completeFlag == '0') {
+              this.$message.warning({ showClose: true, message: `${this.multipleSelection[i].patientName} 为预登记人员，不可打印指引单` });
+              continue
+            }
+            toOutShell.BusinessCode = patientregisterId
+            let resPeisAPI = await this.$peisAPI.print(JSON.stringify(toOutShell));
+            if (JSON.parse(resPeisAPI).code < 0) continue
+            let resPrintTimes = await postapi("/api/app/patientregister/updatepatientregisterguideprinttimesmany", [patientregisterId]);
+            if (resPrintTimes.code == -1) continue
+            lfind = arrayExistObj(this.tableData, "id", patientregisterId);
+            if (lfind > -1) {
+              if (this.tableData[lfind].guidePrintTimes) {
+                this.tableData[lfind].guidePrintTimes = Number(this.tableData[lfind].guidePrintTimes) + 1;
+              } else {
+                this.tableData[lfind].guidePrintTimes = 1;
+              }
+            }
+
+          } catch (error) {
+            // console.log('打印指引单', error)
+            this.$message.warning({ showClose: true, message: `${error}` });
+          }
+
+          this.elProgress.percentage = Math.floor(
+            ((i + 1) * 100) / this.multipleSelection.length
+          );
+        }
+        this.elProgress.display = false;
+      }
+    },
+
+    // 指引单新打印方式，promise 
+    guidePrintPromise(ReportCode, isPreview, row) {
+      return new Promise((resolve, reject) => {
+        if (!this.$peisAPI) reject("此功能，需要在壳客户端才可运行！")
+
+
+        let token = window.sessionStorage.getItem("token");
+        let user = window.sessionStorage.getItem("user");
+        let toOutShell = {
+          ReportCode,
+          token,
+          isBuildImage: 'N',
+          IsUploadPdf: 'N',
+          preViewCanPrint: "N",
+          Parameters: [
+            { Name: "printer", Value: user },
+            { Name: "hisLog", Value: "pic/hisLog.jpg" },
+            { Name: 'pageFooter', Value: 'pic/peisQrCode.jpg' },
+          ],
+        };
+
+        if (!row.completeFlag || row.completeFlag == '0') reject('预登记人员，不可执行此操作！')
+        toOutShell.BusinessCode = row.id
+        console.log(JSON.stringify(toOutShell))
+        if (isPreview) {
+          this.$peisAPI.printPre(JSON.stringify(toOutShell))
+            .then(res => {
+              let lres = JSON.parse(res)
+              if (lres.code > -1) {
+                resolve(lres)
+              } else {
+                reject(lres.message)
+              }
+            })
+            .catch((err) => {
+              reject(err)
+            });
+        } else {
+          this.$peisAPI.print(JSON.stringify(toOutShell))
+            .then(res => {
+              let lres = JSON.parse(res)
+              if (lres.code > -1) {
+                return postapi("/api/app/patientregister/updatepatientregisterguideprinttimesmany", [row.id]);
+              } else {
+                reject(lres.message)
+              }
+            })
+            .then(res => {
+              if (res && res.code > -1) {
+                let lfind = arrayExistObj(this.tableData, "id", row.id);
+                if (lfind > -1) {
+                  if (this.tableData[lfind].guidePrintTimes) {
+                    this.tableData[lfind].guidePrintTimes = Number(this.tableData[lfind].guidePrintTimes) + 1;
+                  } else {
+                    this.tableData[lfind].guidePrintTimes = 1;
+                  }
+                }
+              }
+              resolve(res)
+            })
+            .catch((err) => {
+              reject(err)
+            });
+        }
+      })
+    },
+
+
+
+    printGuideLisPacs(row) {
+      return new Promise((resolve, reject) => {
+        this.guidePrintPromise("0008", false, row)
+          .then(res => {
+            return this.lisPrint(row, "0002", false)
+          })
+          .then(res => {
+            return this.pacsPrint(row, "0004", false)
+          })
+          .then(res => {
+            resolve(res)
+          })
+          .catch(err => {
+            reject(err)
+          })
+      })
+    },
+
+
+    async printPromise() {
+
+      if (this.multipleSelection.length < 1) {
+        this.$message.info({ showClose: true, message: "请勾选要打印人员检验检查条码的记录！" });
+        return;
+      }
+
+      this.elProgress.display = true;
+      this.elProgress.percentage = 0;
+
+      for (let i = 0; i < this.multipleSelection.length; i++) {
+        let row = this.multipleSelection[i]
+        try {
+          await this.printGuideLisPacs(row)
+        } catch (error) {
+          console.log('printPromise', error)
+        }
+
+        this.elProgress.percentage = Math.floor(
+          ((i + 1) * 100) / this.multipleSelection.length
+        );
+      }
+      this.elProgress.display = false;
+    },
+
+
+
+    handleSelectionChange(rows) {
+      //this.multipleSelection = rows;
+      //// console.log('this.multipleSelection',this.multipleSelection)
+      // rows.forEach((item) => {
+      //   item.highLightBg = "selected";
+      // });
+      // // 取消全选
+      // if (!rows.length) {
+      //   this.tableData.forEach((item) => {
+      //     item.highLightBg = "";
+      //   });
+      // }
+      this.multipleSelection = rows;
+    },
+
+    //设置新增/编辑的form数据
+    setForm(formData) {
+      this.patientRegister.patientRegisterRd = deepCopy(formData)
+      if (!this.patientRegister.patientRegisterRd.id) {
+        this.patientRegister.patientRegisterRd.customerOrgId = this.patientRegister.query.customerOrgId
+      }
+    },
+
+    //点击体检次数行
+    rowClick(row) {
+      // 按住了shift键
+      // if (this.window.shift) {
+      //   //清除所有选择
+      //   this.tableData.forEach((e, index) => {
+      //     e.choosed = false;
+      //     e.index = index;
+      //   });
+
+      //   if (this.startPoint == -1) {
+      //     this.tableData[row.index].choosed = true;
+      //     this.startPoint = row.index;
+      //   } else {
+      //     if (this.startPoint > row.index) {
+      //       for (let i = row.index; i <= this.startPoint; i++) {
+      //         this.tableData[i].choosed = true;
+      //       }
+      //     } else if (this.startPoint <= row.index) {
+      //       for (let i = this.startPoint; i <= row.index; i++) {
+      //         this.tableData[i].choosed = true;
+      //       }
+      //     }
+      //   }
+      // } else if (this.window.ctrl) {  // 按住了ctrl 键
+      //   this.tableData[row.index].choosed = true;
+      //   if (this.startPoint == -1) {
+      //     this.startPoint = row.index;
+      //   }
+      // } else {
+      //   // 未按住了ctrl 、shift 键
+      //   //清除所有选择
+      //   // console.log("清除所有选择");
+      //   this.tableData.forEach((e, index) => {
+      //     e.choosed = false;
+      //     e.index = index;
+      //   });
+      //   // console.log(this.tableData, row.index);
+      //   // console.log(this.tableData[row.index].choosed);
+
+      //   this.tableData[row.index].choosed = true;
+      //   this.startPoint = row.index;
+      // }
+
+      //选中了多个点编辑时，排序最前的作为当前选中的
+      // console.log('row.index <= this.startPoint', row.index, this.startPoint)
+      // let lfind = -1
+      // for (let i = 0; i < this.tableData.length; i++) {
+      //   if (this.tableData[i].choosed) {
+      //     lfind = i
+      //     break
+      //   }
+      // }
+
+      // if (lfind > -1) {
+      // 弹出编辑框，只有在编辑框显示时，才去触发获取数据
+      this.dataTransOpts.tableS.patient_register = deepCopy(row)
+      this.tableDataCurrentRow = deepCopy(row)
+      this.dataTransOpts.refresh.register_check_asbitem.M++ //触发所选组合项目刷新       
+      // }
+    },
+
+    // 导入企业(青藏公司)数据
+    btnImportOrgData() {
+
+      //
+      this.dataTransOpts.plus.ImportOrgData++
+      this.dialogWin.ImportOrgData = true
+
+    },
+
+    //体检次数 相关操作
+    btnAdd() {
+      if (!this.peisid || this.peisid == 'null') {
+        this.$message.warning({ showClose: true, message: "该用户未选归属体检中心，不能执行此操作！" });
+        return
+      }
+
+      let customerOrgId = this.patientRegister.query.customerOrgId;
+      if (!customerOrgId) {
+        this.$message.warning({ showClose: true, message: "请选择单位或个人" });
+        return;
+      }
+
+      // this.patientRegister.patientRegisterRdInit.customerOrgId = customerOrgId
+      // this.setForm(this.patientRegister.patientRegisterRdInit)      
+      // this.patientRegister.patientRegisterAbs = [];
+      // this.patientRegister.patientRegisterRd.id = ''
+      // this.dialogWin.PatientRegisterEdit = true;
+      // this.editTimes++; //触发表单窗口，数据更新
+      // this.getPatientRegisterAbs();
+
+      this.dataTransOpts.tableS.patient_register.id = ''
+      this.dialogWin.PatientRegisterEdit = true;
+      this.dataTransOpts.plus.clearPatientRegisterQuery++ //触发清空人员登记界面的查询条件
+      setTimeout(() => {
+        this.dataTransOpts.refresh.patient_register.S++  //触发人员信息刷新
+      }, 10);
+
+    },
+
+    //批量正式登记
+    btnAddBatch(completeFlag) {
+      let patientRegisterIds = []
+      //取消勾选，换成选择的方式  start
+      // this.multipleSelection = [];
+      // this.tableData.forEach((e) => {
+      //   if (e.choosed && e.completeFlag == '0') {
+      //     this.multipleSelection.push(e);
+      //     patientRegisterIds.push(e.id)
+      //   }
+      // });
+      //取消勾选，换成选择的方式  end
+
+
+      if (this.multipleSelection.length < 1) {
+        this.$message.info({ showClose: true, message: "请勾选要操作的记录！" });
+        return;
+      }
+
+      this.multipleSelection.forEach(e => {
+        switch (completeFlag) {
+          case '0':
+            if (e.completeFlag == '1') patientRegisterIds.push(e.id)
+            break;
+          case '1':
+            if (e.completeFlag == '0') patientRegisterIds.push(e.id)
+            break;
+        }
+      });
+
+      if (patientRegisterIds.length == 0) {
+        this.$message.info({ showClose: true, message: "没有可操作的数据！" });
+        return;
+      }
+      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.tableData, 'id', e)
+              if (lfind > -1) this.tableData[lfind].completeFlag = completeFlag
+            });
+          }
+        })
+        .catch(err => {
+          this.$message.error({ showClose: true, message: `操作失败 ${err}` });
+        });
+    },
+
+    // 单个编辑
+    btnEdit() {
+      // if (!this.patientRegister.patientRegisterRd.id) {
+      if (!this.dataTransOpts.tableS.patient_register.id) {
+        this.$message.warning({ showClose: true, message: "请选择要操作的记录" });
+        return;
+      }
+      //// console.log(this.patientRegister.patientRegisterRd,this.tableData)
+
+      // 触发数据刷新
+      this.dataTransOpts.refresh.patient_register.S++  //触发人员信息刷新(会同时刷新组合项目)
+      this.dataTransOpts.plus.clearPatientRegisterQuery++ //触发清空人员登记界面的查询条件
+
+      this.dialogWin.PatientRegisterEdit = true;
+
+    },
+
+    //新增或编辑后选中记录
+    async close_dialogWin_PatientRegisterEdit() {
+      // 如果 dataTransOpts.tableS.patient_register.id 为空(未增加)，则不做处理
+      let id = this.dataTransOpts.tableS.patient_register.id
+      if (!id) {
+        id = this.tableDataCurrentRow.id
+      }
+      if (!id) return
+      this.dataTransOpts.tableS.patient_register.id = id
+
+      let res = await postapi('/api/app/patientregister/getlistinfilter', { patientRegisterNo: this.dataTransOpts.tableS.patient_register.patientRegisterNo })
+      if (res.code != 1) return
+      let currentRow = res.data.items[0]
+
+      // this.tableData.forEach(e => {
+      //   e.choosed = false
+      // });      
+      let lfind = arrayExistObj(this.tableData, 'id', this.dataTransOpts.tableS.patient_register.id)
+      if (lfind > -1) {
+        objCopy(currentRow, this.tableData[lfind])
+      } else {
+        lfind = this.tableData.length
+        currentRow.index = lfind
+        currentRow.choosed = true
+        this.tableData.push(currentRow)
+      }
+
+      // 刷新 register_check_asbitem 表记录
+      if (lfind > -1) {
+        this.dataTransOpts.refresh.register_check_asbitem.M++
+      }
+    },
+
+    //拍照
+    openCamera() {
+      if (!this.patientRegister.patientRegisterId) {
+        this.$message.warning({ showClose: true, message: "请选择要操作的记录" });
+        return;
+      }
+      this.patientRegister.cameraVisble = true;
+    },
+
+    //删除（可批量删除）
+    // /api/app/patient-register/many?PatientRegisterIds=3a0c2cac-f44c-f407-9504-c1fc5e80a159&PatientRegisterIds=3a0c2cb3-d10c-ed70-db6a-b835e75ce641
+    btnDel() {
+
+      //选中（取消勾选）start -------------------------
+      // this.multipleSelection = []
+      // this.tableData.forEach(e => {
+      //   if (e.choosed) {
+      //     this.multipleSelection.push(deepCopy(e))
+      //   }
+      // })
+      //选中（取消勾选） end  -------------------------
+
+      if (this.multipleSelection.length < 1) {
+        this.$message.warning({ showClose: true, message: "请先勾选要操作的记录" });
+        return;
+      }
+
+      let patientRegisterIds = [];
+      for (let i = 0; i < this.multipleSelection.length; i++) {
+        patientRegisterIds.push(this.multipleSelection[i]["id"]);
+      }
+
+      this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
+        confirmButtonText: "是",
+        cancelButtonText: "否",
+        type: "warning",
+      })
+        .then(() => {
+          //// console.log('{patientRegisterIds}',{patientRegisterIds})
+          return postapi('/api/app/patient-register/delete-many', {
+            patientRegisterIds,
+          });
+        })
+        .then((res) => {
+          if (res.code != -1) {
+            // console.log("操作成功");
+            this.dataTransOpts.tableS.patient_register.id = ''
+            setTimeout(() => {
+              this.dataTransOpts.refresh.register_check_asbitem.M++
+            }, 10);
+            arrayReduce(this.tableData, this.multipleSelection, 'id=id') //清除列表记录
+            // this.setForm(this.patientRegister.patientRegisterRdInit)
+            // this.getPatientRegisterAbs();
+          }
+        })
+        .catch((err) => {
+          if (err == "cancel") {
+            this.$message.info({ showClose: true, message: "已取消操作" });
+          }
+        });
+    },
+
+
+    //查询
+    async Query() {
+      // 查询时，清掉明细数据 （滚动时不清）
+      this.dataTransOpts.tableS.patient_register.id = ''
+      this.tableDataCurrentRow = {} // 清除选择
+      this.tableData = []
+
+      setTimeout(() => {
+        this.dataTransOpts.refresh.register_check_asbitem.M++ //触发所选组合项目刷新  
+      }, 10);
+
+      this.loadOpts = Object.assign(this.loadOpts, this.loadOptsInit)
+      await this.getPrList()
+    },
+
+    //数据量多时，滚动加载
+    async load() {
+      this.loadOpts.skipCount++
+      await this.getPrList()
+    },
+
+    // 获取列表数据
+    async getPrList() {
+
+      if (this.loadOpts.skipCount != 0 && this.loadOpts.skipCount * this.loadOpts.maxResultCount >= this.loadOpts.totalCount) return
+      // console.log('getPrList', this.loadOpts)
+
+      let body = {
+        skipCount: this.loadOpts.skipCount,
+        maxResultCount: this.loadOpts.maxResultCount
+      };
+
+      // console.log(`this.patientRegister.query`, this.patientRegister.query);
+      if (this.patientRegister.query.customerOrgFlag) {
+        // if (this.patientRegister.query.CustomerOrgParentId) {
+        //   body.customerOrgId = this.patientRegister.query.CustomerOrgParentId;
+        // } else {
+        //   if (this.patientRegister.query.customerOrgId)
+        //     body.customerOrgId = this.patientRegister.query.customerOrgId;
+        // }
+        if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId;
+        if (this.patientRegister.query.customerOrgId
+          && this.patientRegister.query.customerOrgId != this.dict.personOrgId
+          && this.patientRegister.query.customerOrgRegister.id) {
+          body.customerOrgRegisterId = this.patientRegister.query.customerOrgRegister.id
+        }
+
+      }
+
+      if (this.patientRegister.query.sex)
+        body.sexId = this.patientRegister.query.sex;
+
+      if (this.patientRegister.query.patientName)
+        body.patientName = this.patientRegister.query.patientName;
+
+      if (this.patientRegister.query.medicalTypeIds && this.patientRegister.query.medicalTypeIds.length > 0)
+        body.medicalTypeIds = this.patientRegister.query.medicalTypeIds;
+
+      if (this.patientRegister.query.completeFlags && this.patientRegister.query.completeFlags.length > 0)
+        body.completeFlags = this.patientRegister.query.completeFlags;
+
+      //StartDate EndDate
+      if (
+        this.patientRegister.query.startDate &&
+        this.patientRegister.query.endDate
+      ) {
+        body.dateType = this.patientRegister.query.dateType
+        body.startDate = moment(this.patientRegister.query.startDate).format(
+          "yyyy-MM-DD"
+        );
+        body.endDate = moment(this.patientRegister.query.endDate).format(
+          "yyyy-MM-DD"
+        );
+        if (body.startDate > body.endDate) {
+          this.$message.warning({ showClose: true, message: "起始日期不能大于截止日期，数据校验不通过！" });
+          return;
+        }
+      }
+
+      if (this.patientRegister.query.phone)
+        body.phone = this.patientRegister.query.phone;
+
+      if (this.patientRegister.query.idCardNo)
+        body = {
+          idNo: this.patientRegister.query.idCardNo,
+          skipCount: this.loadOpts.skipCount,
+          maxResultCount: this.loadOpts.maxResultCount
+        };
+
+      if (this.patientRegister.query.patientNo)
+        body = {
+          patientNo: this.patientRegister.query.patientNo,
+          skipCount: this.loadOpts.skipCount,
+          maxResultCount: this.loadOpts.maxResultCount
+        };
+
+      if (this.patientRegister.query.patientRegisterNo)
+        body = {
+          patientRegisterNo: this.patientRegister.query.patientRegisterNo,
+          skipCount: this.loadOpts.skipCount,
+          maxResultCount: this.loadOpts.maxResultCount
+        };
+
+      // console.log("/api/app/patientregister/getlistinfilter", body);
+
+      postapi("/api/app/patientregister/getlistinfilter", body)
+        .then(res => {
+          if (res.code > -1) {
+            // 刷新最大记录数
+            this.loadOpts.totalCount = res.data.totalCount
+            let curLoad = res.data.items
+            // let oldCount = 0
+            // 处理分组/套餐 排序混乱的问题
+            curLoad.forEach(e => {
+              if (e.customerOrgId == this.dict.personOrgId) {
+                e.groupPack = e.medicalPackageId
+              } else {
+                e.groupPack = e.customerOrgGroupId
+              }
+            });
+
+            if (body.skipCount == 0) {  //查询
+              this.tableData = [];
+            }
+
+            this.tableData = this.tableData.concat(curLoad)
+            // else {
+            //   // 懒加载 ,原数据集不用清空
+            //   oldCount = this.tableData.length
+            // }
+            // curLoad.forEach((e, index) => {
+            //   this.tableData.push(Object.assign({ index: Number(oldCount) + Number(index), choosed: false }, e))
+            // })
+
+            //如果 有选中 记录，则刷新其对应的组合项目
+            if (this.dataTransOpts.tableS.patient_register.id) {
+              this.dataTransOpts.refresh.register_check_asbitem.M++
+            }
+          }
+        })
+    },
+
+    //滚动加载数据 
+    scrollFull() {
+      this.dom = this.$refs['info'].bodyWrapper
+      // console.log('this.dom', this.dom)
+
+      this.dom.addEventListener('scroll', async () => {
+        // // console.log('scrollTop',this.dom.scrollTop,'clientHeight',this.dom.clientHeight,'scrollHeight',this.dom.scrollHeight);
+        if (this.dom.scrollTop + this.dom.clientHeight + 20 > this.dom.scrollHeight && !this.lazyLoading) {
+          // 获取到的不是全部数据 当滚动到底部 
+          // console.log('scrollTop', this.dom.scrollTop, 'clientHeight', this.dom.clientHeight, 'scrollHeight', this.dom.scrollHeight);
+          if ((Number(this.loadOpts.skipCount) + 1) * Number(this.loadOpts.maxResultCount) >= Number(this.loadOpts.totalCount)) {
+            this.lazyLoading = false
+          } else {
+            this.lazyLoading = true
+            await this.load()
+            this.lazyLoading = false
+            // this.dom.scrollTop = this.dom.scrollTop - 100
+          }
+        }
+      })
+    },
+
+
+    close_dialogWin_upBaseInfo() {
+      this.upBaseInfo.visble = false
+      this.close_dialogWin_PatientRegisterEdit()
+    },
+    btnUpBaseInfo() {
+      let body = {
+        patientRegisterId: this.upBaseInfo.patientRegisterId,
+        // "patientName": "string",
+        // "mobileTelephone": "string",
+        // "idNo": "string"
+      }
+      body[this.upBaseInfo.colName] = this.upBaseInfo.value
+
+      postapi('/api/app/PatientRegister/UpdatePatientRegisterBaseInfoByPatientRegisterId', body).then(res => {
+        if (res.code > -1) {
+          this.close_dialogWin_upBaseInfo()
+        }
+      })
+    },
+    // 修改基本信息
+    fnUpBaseInfo(row, baseInfoType) {
+      this.dataTransOpts.tableS.patient_register.id = row.id
+      this.upBaseInfo.visble = true
+      this.upBaseInfo.patientRegisterId = row.id
+      this.upBaseInfo.colName = baseInfoType
+      switch (baseInfoType) {
+        case "idNo":
+          this.upBaseInfo.label = "新身份证号"
+          break;
+        case "mobileTelephone":
+          this.upBaseInfo.label = "新手机号"
+          break;
+        default:
+          this.upBaseInfo.label = "新姓名"
+          break;
+      }
+      this.upBaseInfo.value = row[baseInfoType]
+
+    },
+
+    // 分诊排队
+    fnQueue(row) {
+      this.queueParams = {
+        patientRegisterId: row.id
+      }
+      this.dialogWin.queue = true
+      this.dataTransOpts.plus.queue++
+    },
+
+    //右击菜单
+    onCellRightClick(row, column) {
+      this.rClickRow = { ...row }; //右击的行记录
+      this.rClickColumn = { ...column }; //右击的列（预留）
+      // console.log(row, column.property);
+    },
+    onContextmenu(event) {
+      //// console.log('onContextmenu',event);
+      if (!this.rClickRow) return false;
+      let row = { ...this.rClickRow };
+      let items = [] //菜单项
+
+      if (checkPagePriv(this.pagePriv.privs, '修改姓名') && row.completeFlag != '0')
+        items.push({
+          label: "修改姓名",
+          onClick: () => {
+            this.fnUpBaseInfo(row, 'patientName');
+          },
+        })
+      if (checkPagePriv(this.pagePriv.privs, '修改手机号') && row.completeFlag != '0')
+        items.push({
+          label: "修改手机号",
+          onClick: () => {
+            this.fnUpBaseInfo(row, 'mobileTelephone');
+          },
+        })
+      if (checkPagePriv(this.pagePriv.privs, '修改身份证号') && row.completeFlag != '0')
+        items.push({
+          label: "修改身份证号",
+          onClick: () => {
+            this.fnUpBaseInfo(row, 'idNo');
+          },
+        })
+      if (checkPagePriv(this.pagePriv.privs, '分诊排队') && row.completeFlag != '0')
+        items.push({
+          label: "分诊排队",
+          onClick: () => {
+            this.fnQueue(row);
+          },
+        })
+      if (checkPagePriv(this.pagePriv.privs, '发送检验申请') && row.completeFlag != '0')
+        items.push({
+          label: "发送检验申请",
+          onClick: () => {
+            this.lisRequest(row);
+          },
+        })
+      if (checkPagePriv(this.pagePriv.privs, '预览人员条码') && row.completeFlag != '0')
+        items.push({
+          label: "预览人员条码",
+          onClick: () => {
+            this.guidePrintPromise("0008", true, row);
+          },
+        })
+      if (checkPagePriv(this.pagePriv.privs, '预览检验条码') && row.completeFlag != '0')
+        items.push({
+          label: "预览检验条码",
+          onClick: () => {
+            this.lisPrint(row, "0002", true);
+          },
+        })
+      if (checkPagePriv(this.pagePriv.privs, '打印检验条码') && row.completeFlag != '0')
+        items.push({
+          label: "打印检验条码",
+          onClick: () => {
+            this.lisPrint(row, "0002", false);
+          },
+        })
+      if (checkPagePriv(this.pagePriv.privs, '预览Pacs条码') && row.completeFlag != '0')
+        items.push({
+          label: "预览Pacs条码",
+          onClick: () => {
+            this.pacsPrint(row, "0004", true);
+          },
+        })
+      if (checkPagePriv(this.pagePriv.privs, '打印Pacs条码') && row.completeFlag != '0')
+        items.push({
+          label: "打印Pacs条码",
+          onClick: () => {
+            this.pacsPrint(row, "0004", false);
+          },
+        })
+      if (checkPagePriv(this.pagePriv.privs, '导入检查结果') && row.completeFlag != '0')
+        items.push({
+          label: "导入检查结果",
+          onClick: () => {
+            this.importResult('pacs', row);
+          },
+        })
+      if (checkPagePriv(this.pagePriv.privs, '导入检验结果') && row.completeFlag != '0')
+        items.push({
+          label: "导入检验结果",
+          onClick: () => {
+            this.importResult('lis', row);
+          },
+        })
+      if (checkPagePriv(this.pagePriv.privs, '批量更新组合项目明细') && this.multipleSelection.length > 0)
+        items.push({
+          label: "批量更新组合项目明细",
+          onClick: () => {
+            this.btnItemBatch();
+          },
+        })
+      if (checkPagePriv(this.pagePriv.privs, '调整检查项目医生') && this.multipleSelection.length > 0)
+        items.push({
+          label: "调整检查项目医生",
+          onClick: () => {
+            this.dataTransOpts.plus.PatientRegisterEditDoctorBatch++  //如果放在弹窗显示后面，在首次加载子组件时，会触发两次数据处理 
+            this.dialogWin.PatientRegisterEditDoctorBatch = true;
+          },
+        })
+      items.push({ label: "----------------", })
+      this.$contextmenu({
+        items,
+        event,
+        //x: event.clientX,
+        //y: event.clientY,
+        customClass: "custom-class",
+        zIndex: 3,
+        minWidth: 80,
+      });
+
+      this.rClickRow = null;
+      return false;
+    },
+
+    //批量更新分组按钮
+    btnGroupBatch() {
+      let customerOrgId = this.patientRegister.query.customerOrgId;
+      if (!customerOrgId) {
+        this.$message.warning({ showClose: true, message: "请选择单位" });
+        return;
+      }
+      //取消勾选，换成选择的方式  start
+      // this.multipleSelection = [];
+      // this.tableData.forEach((e) => {
+      //   if (e.choosed) this.multipleSelection.push(e);
+      // });
+      //取消勾选，换成选择的方式  end
+
+      if (this.multipleSelection.length < 1) {
+        this.$message.info({ showClose: true, message: "请选择要操作的记录！" });
+        return;
+      }
+      this.dataTransOpts.plus.PatientRegisterEditGroupBatch++
+      this.dialogWin.PatientRegisterEditGroupBatch = true;
+
+    },
+
+    //批量更新组合项目
+    btnAsbBatch() {
+      let customerOrgId = this.patientRegister.query.customerOrgId;
+      if (!customerOrgId) {
+        this.$message.warning({ showClose: true, message: "请选择单位" });
+        return;
+      }
+      //取消勾选，换成选择的方式  start
+      // this.multipleSelection = [];
+      // this.tableData.forEach((e) => {
+      //   if (e.choosed) this.multipleSelection.push(e);
+      // });
+      //取消勾选，换成选择的方式  end
+
+      if (this.multipleSelection.length < 1) {
+        this.$message.warning({ showClose: true, message: "请选择要操作的记录" })
+        return
+      }
+
+      this.dataTransOpts.plus.PatientRegisterEditItemBatch++  //如果放在弹窗显示后面，在首次加载子组件时，会触发两次数据处理 
+      this.dialogWin.PatientRegisterEditItemBatch = true;
+
+    },
+
+    //批量更新组合项目
+    async btnItemBatch() {
+      if (this.multipleSelection.length < 1) {
+        this.$message.warning({ showClose: true, message: "请选择要操作的记录" })
+        return
+      }
+
+      this.elProgress.display = true;
+      this.elProgress.percentage = 0;
+
+      for (let i = 0; i < this.multipleSelection.length; i++) {
+        let patientRegisterId = this.multipleSelection[i].id
+        try {
+          await postapi('/api/app/RegisterCheckItem/SyncRegisterCheckItem', { patientRegisterId })
+        } catch (error) {
+          console.log('printPromise', error)
+        }
+
+        this.elProgress.percentage = Math.floor(
+          ((i + 1) * 100) / this.multipleSelection.length
+        );
+      }
+      this.elProgress.display = false;
+
+
+
+    },
+
+    //检验申请
+    async lisRequest(row) {
+      let isPrintLisRequest = false;
+      let res = null;
+      if (row.completeFlag == '0') {
+        this.$message.info({ showClose: true, message: "预登记人员，不可执行此操作！" });
+        return;
+      }
+
+      try {
+        res = await postapi(`/api/app/lisrequest/setlisrequest?PatientRegisterId=${row.id}`);
+        // console.log(`/ api / app / lisrequest / setlisrequest ? PatientRegisterId = ${ prId }`,res);
+      } catch (error) {
+        return;
+      }
+      if (res.code > -1) {
+        isPrintLisRequest = true;
+      }
+
+      //重复申请，重打
+      if (res.code == -1 && res.message.indexOf("已申请") > -1) {
+        isPrintLisRequest = true;
+      }
+
+      if (!isPrintLisRequest) return;
+
+      try {
+        await this.$confirm("是否打印检验申请单?", "提示", {
+          confirmButtonText: "是",
+          cancelButtonText: "否",
+          type: "info",
+          showClose: false,
+          closeOnClickModal: false,
+          closeOnPressEscape: false,
+        });
+      } catch (error) {
+        return;
+      }
+      //打印检验申请单
+      this.lisPrint(row, "0003", false);
+    },
+
+    //检验条码打印 改造成 promise
+    lisPrint(row, ReportCode, isPreview) {
+      return new Promise((resolve, reject) => {
+        if (!this.$peisAPI) reject("此功能，需要在壳客户端才可运行！");
+        if (!row.completeFlag || row.completeFlag == '0') reject("预登记人员，不可执行此操作！")
+
+
+
+        let token = window.sessionStorage.getItem("token");
+        let user = window.sessionStorage.getItem("user");
+        let toOutShell = {
+          ReportCode,
+          token,
+          IsMoreLabel: 'Y',
+          isBuildImage: 'N',
+          IsUploadPdf: 'N',
+          preViewCanPrint: "N",
+          Parameters: [
+            { Name: "printer", Value: user },
+            { Name: "hisLog", Value: "pic/hisLog.jpg" },
+          ],
+          BusinessCode: row.id
+        };
+        console.log('this.$peisAPI.toOutShell', toOutShell)
+        if (isPreview) {
+          this.$peisAPI.printPre(JSON.stringify(toOutShell))
+            .then(res => {
+              console.log('this.$peisAPI.printPre', res)
+              let lres = JSON.parse(res)
+              if (lres.code > -1) {
+                resolve(lres)
+              } else {
+                reject(lres.message);
+              }
+            })
+            .catch((err) => {
+              reject(err);
+            });
+        } else {
+          this.$peisAPI.print(JSON.stringify(toOutShell))
+            .then(res => {
+              console.log('this.$peisAPI.print', res)
+              let lres = JSON.parse(res)
+              if (lres.code < 0) {
+                reject(lres.message);
+              } else {
+                return postapi("/api/app/lisrequest/updatelisrequestisprint", {
+                  operateType: 1,
+                  patientRegisterId: row.id,
+                });
+              }
+            })
+            .then(res => {
+              if (res && res.code < 0) {
+                reject(res.message);
+              } else {
+                resolve(res)
+              }
+            })
+            .catch((err) => {
+              reject(err);
+            });
+        }
+      })
+    },
+
+    //pacs条码打印
+    pacsPrint(row, ReportCode, isPreview) {
+      return new Promise((resolve, reject) => {
+        if (!this.$peisAPI) reject("此功能，需要在壳客户端才可运行！");
+        if (!row.completeFlag || row.completeFlag == '0') reject("预登记人员，不可执行此操作！")
+
+        let token = window.sessionStorage.getItem("token");
+        let user = window.sessionStorage.getItem("user");
+        let toOutShell = {
+          ReportCode,
+          token,
+          IsMoreLabel: 'Y',
+          isBuildImage: 'N',
+          IsUploadPdf: 'N',
+          preViewCanPrint: "N",
+          Parameters: [
+            { Name: "printer", Value: user },
+            { Name: "hisLog", Value: "pic/hisLog.jpg" },
+          ],
+          BusinessCode: row.id
+        };
+        console.log('this.$peisAPI.print', toOutShell)
+        if (isPreview) {
+          this.$peisAPI.printPre(JSON.stringify(toOutShell))
+            .then(res => {
+              console.log('this.$peisAPI.printPre', res)
+              let lres = JSON.parse(res)
+              if (lres.code > -1) {
+                resolve(lres)
+              } else {
+                reject(lres.message);
+              }
+            })
+            .catch((err) => {
+              reject(err);
+            });
+        } else {
+          this.$peisAPI.print(JSON.stringify(toOutShell))
+            .then(res => {
+              console.log('this.$peisAPI.print', res)
+              let lres = JSON.parse(res)
+              if (lres.code > -1) {
+                resolve(lres)
+              } else {
+                reject(lres.message);
+              }
+            })
+            .catch((err) => {
+              reject(err);
+            });
+        }
+      })
+    },
+
+    // 导入检查检验结果
+    importResult(checkType, row) {
+      let url = '/api/app/ImportLisResult/ImportResultByPatientRegisterId'
+      switch (checkType) {
+        case 'pacs':
+          url = '/api/app/ImportPacsResult/ImportResultByPatientRegisterId'
+          postapi(url, { patientRegisterId: row.id })
+            .then(res => {
+              if (res.code > -1) {
+                return postapi('/api/app/ImportElectrocardiogramResult/ImportElectrocardiogramResultByPatientRegisterId', { patientRegisterId: row.id })
+              }
+            })
+            .then(res => {
+              if (res && res.code > -1) {
+                this.$message.success({ showClose: true, message: '导入成功！' })
+                this.rowClick(row)
+              }
+            })
+          break;
+        default:
+          postapi(url, { patientRegisterId: row.id }).then(res => {
+            if (res.code > -1) {
+              this.$message.success({ showClose: true, message: '导入成功！' })
+              this.rowClick(row)
+            }
+          })
+          break;
+      }
+    },
+
+    //通用导出
+    btnExport(elId) {
+      // 获取HTML元素（表格）
+      // let table = document.getElementById(elId); //.cloneNode(true)
+      this.$nextTick(() => {
+        // let refsTable = this.$refs[elId]  //.cloneNode(true) true
+        let table = document.getElementById(elId)
+        // console.log('table,refsTable', table, refsTable)
+
+        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元素转换为画布
+        // let cloneTable = table.cloneNode(true) //[elId]
+        /*
+        html2canvas(table).then(canvas => {
+
+          // 创建一个a元素用于下载
+          const link = document.createElement('a');
+          link.href = canvas.toDataURL('image/jpeg');
+          link.download = fileName + '.jpg';
+          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');
+
+        });
+        */
+      })
+    },
+
+    btnDragColDesign() {
+      this.dragColDesign = deepCopy(this.dragCol)
+      this.dialogColSort = true
+      this.rowDrag()
+    },
+
+    btnDragColDesignOk() {
+      this.dragCol = deepCopy(this.dragColDesign)
+      this.dialogColSort = false
+    },
+    //拖拽
+    rowDrag() {
+      this.$nextTick(() => {
+        const el = document.querySelector("#elTable_dragCol tbody");
+        // console.log('el0', el)
+        const that = this;
+        Sortable.create(el, {
+          animation: 150, // ms, number 单位：ms，定义排序动画的时间
+          //拖拽结束
+          onEnd({ newIndex, oldIndex }) {
+            that.isshow = false;
+            const currRow = that.dragColDesign.splice(oldIndex, 1)[0];
+            that.dragColDesign.splice(newIndex, 0, currRow);
+            // console.log('el', el)
+          },
+        });
+      });
+    },
+
+  },
+
+  //监听事件
+  watch: {
+    "patientRegister.query.customerOrgId": {
+      // immediate: true, // 立即执行
+      // deep: true, // 深度监听复杂类型内变化
+      handler(newVal, oldVal) {
+        //// console.log('watch:patientRegister.query.customerOrgId:',newVal,oldVal)
+        // 单位变化时，清除当前列表信息
+        if (newVal && newVal != oldVal) {
+          this.tableData = []
+          this.dataTransOpts.tableM.register_check_asbitem = []
+        }
+      }
+    },
+
+    //触发查询事件
+    "patientRegister.query.times"(newVal, oldVal) {
+      if (newVal != oldVal) {
+        //alert('触发查询事件')
+        this.Query();
+      }
+    },
+
+    //新增后，触发赋值
+    // "patientRegister.patientRegisterRd.id"(newVal, oldVal) {
+    //   if (newVal != oldVal) {
+    //     //// console.log('patientRegister.patientRegisterRd.customerOrgId',this.patientRegister.patientRegisterRd.customerOrgId)
+    //     objCopy(this.patientRegister.patientRegisterRd, this.form);
+    //   }
+    // },
+  },
+};
+</script>
+<style scoped>
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global.css";
+
+
+.box {
+  display: flex;
+}
+
+.listBtn {
+  margin-top: 5px;
+  text-align: center;
+}
+
+.btnClass {
+  width: 100px;
+}
+</style>
diff --git a/src/components/occDisease/occReport.vue b/src/components/occDisease/occReport.vue
index bbb0c4a..7cb73da 100644
--- a/src/components/occDisease/occReport.vue
+++ b/src/components/occDisease/occReport.vue
@@ -378,7 +378,7 @@ export default {
       //暂时未区分格式
       // if (this.format == 0)
 
-      let ReportCode = '0009';
+      let ReportCode = this.format == 0 ? '0009':'0010';
       let token = window.sessionStorage.getItem('token');
       let user = window.sessionStorage.getItem('user');
 
@@ -393,6 +393,7 @@ export default {
           { Name: "printer", Value: user },
           { Name: "hisLog", Value: "pic/hisLog.jpg" },
           { Name: 'pageFooter', Value: 'pic/peisQrCode.jpg' },
+          { Name: "picExtOne", Value: "pic/occGrant.jpg" },
         ],
         BusinessCode:JSON.stringify(customerOrgs)
       };
diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue
index 0ec55ed..83f0ba0 100644
--- a/src/components/report/PatientRegisterListNobtn.vue
+++ b/src/components/report/PatientRegisterListNobtn.vue
@@ -2,8 +2,8 @@
   <div>
     <div>
       <el-table :data="patientRegister.prList" border ref="info" id="info"
-        :height="(window.pageHeight < 600) ? 230 : (window.pageHeight - 370)" highlight-current-row @row-click="rowClick"
-        size="small" @selection-change="handleSelectionChange">
+        :height="(window.pageHeight < 600) ? 230 : (window.pageHeight - 370)" highlight-current-row
+        @row-click="rowClick" size="small" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="40" align="center" />
         <el-table-column prop="completeFlag" label="体检进度" sortable>
           <template slot-scope="scope">
@@ -27,21 +27,21 @@
           <template slot-scope="scope">
             <div style="font-family: 'Microsoft YaHei';">{{ scope.row.isUploadAppoint == "Y" ? "√" : "" }}</div>
           </template>
-        </el-table-column> 
+        </el-table-column>
         <el-table-column prop="isUpload" label="报告上传" align="center" sortable>
           <template slot-scope="scope">
             <div style="font-family: 'Microsoft YaHei';">{{ scope.row.isUpload == "Y" ? "√" : "" }}</div>
           </template>
-        </el-table-column> 
-        <el-table-column prop="customerOrgName" label="单位" width="180" sortable/>
-        <el-table-column prop="departmentName" label="部门" width="180" sortable/>
-        <el-table-column prop="patientName" label="姓名" align="center" sortable/>
-        <el-table-column prop="mobileTelephone" label="手机" width="130" sortable/>
-        <el-table-column prop="sexName" label="性别" align="center" sortable/>
-        <el-table-column prop="age" label="年龄" align="center" sortable/>
-        <el-table-column prop="patientRegisterNo" label="条码号" width="150" align="center" sortable/>
-        <el-table-column prop="patientNo" label="档案号" align="center" sortable/>
-        <el-table-column prop="medicalTimes" label="体检次数" align="center" sortable/>
+        </el-table-column>
+        <el-table-column prop="customerOrgName" label="单位" width="180" sortable />
+        <el-table-column prop="departmentName" label="部门" width="180" sortable />
+        <el-table-column prop="patientName" label="姓名" align="center" sortable />
+        <el-table-column prop="mobileTelephone" label="手机" width="130" sortable />
+        <el-table-column prop="sexName" label="性别" align="center" sortable />
+        <el-table-column prop="age" label="年龄" align="center" sortable />
+        <el-table-column prop="patientRegisterNo" label="条码号" width="150" align="center" sortable />
+        <el-table-column prop="patientNo" label="档案号" align="center" sortable />
+        <el-table-column prop="medicalTimes" label="体检次数" align="center" sortable />
         <el-table-column label="分组/套餐" width="150">
           <template slot-scope="scope">
             <div v-if="scope.row.medicalPackageName">
@@ -59,7 +59,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="idNo" label="身份证" width="150" align="center" sortable/>
+        <el-table-column prop="idNo" label="身份证" width="150" align="center" sortable />
         <el-table-column prop="birthDate" label="出生日期" width="100" align="center" sortable>
           <template slot-scope="scope">
             <div v-if="scope.row.birthDate">
@@ -67,32 +67,32 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="email" label="邮箱" width="180" sortable/>
-        <el-table-column prop="telephone" label="电话" width="130" sortable/>
-        <el-table-column prop="address" label="地址" width="400" sortable/>
-        <el-table-column prop="medicalCardNo" label="体检卡号" sortable/>
-        <el-table-column prop="jobCardNo" label="工卡号" sortable/>
-        <el-table-column prop="maritalStatusName" label="婚姻状况" align="center" sortable/>
-        <el-table-column prop="medicalTypeName" label="体检类别" min-width="100" align="center" sortable/>
-        <el-table-column prop="personnelTypeName" label="人员类别" min-width="100" align="center" sortable/>
-        <el-table-column prop="jobPost" label="职务" sortable/>
-        <el-table-column prop="jobTitle" label="职称" sortable/>
-        <el-table-column prop="salesman" label="介绍人" sortable/>
+        <el-table-column prop="email" label="邮箱" width="180" sortable />
+        <el-table-column prop="telephone" label="电话" width="130" sortable />
+        <el-table-column prop="address" label="地址" width="400" sortable />
+        <el-table-column prop="medicalCardNo" label="体检卡号" sortable />
+        <el-table-column prop="jobCardNo" label="工卡号" sortable />
+        <el-table-column prop="maritalStatusName" label="婚姻状况" align="center" sortable />
+        <el-table-column prop="medicalTypeName" label="体检类别" min-width="100" align="center" sortable />
+        <el-table-column prop="personnelTypeName" label="人员类别" min-width="100" align="center" sortable />
+        <el-table-column prop="jobPost" label="职务" sortable />
+        <el-table-column prop="jobTitle" label="职称" sortable />
+        <el-table-column prop="salesman" label="介绍人" sortable />
         <el-table-column prop="isVip" label="VIP" width="50" align="center" sortable>
           <template slot-scope="scope">
             <div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="summaryDoctorName" label="总检人" align="center" sortable/>
-        <el-table-column prop="summaryDate" label="总检时间" width="150" align="center" sortable/>
-        <el-table-column prop="registerName" label="登记人" align="center" sortable/>
-        <el-table-column prop="registerDate" label="登记时间" width="150" align="center" sortable/>
+        <el-table-column prop="summaryDoctorName" label="总检人" align="center" sortable />
+        <el-table-column prop="summaryDate" label="总检时间" width="150" align="center" sortable />
+        <el-table-column prop="registerName" label="登记人" align="center" sortable />
+        <el-table-column prop="registerDate" label="登记时间" width="150" align="center" sortable />
         <el-table-column prop="isLock" label="锁住" align="center" width="60" sortable>
           <template slot-scope="scope">
             <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
           </template>
         </el-table-column>
-        
+
         <!--
         "sexHormoneTermId": "00000000-0000-0000-0000-000000000000",
         "interposeMeasure": null,
@@ -127,7 +127,7 @@
             条。</span>
         </div>
       </div>
-    </div>    
+    </div>
   </div>
 </template>
 <script>
@@ -150,7 +150,7 @@ export default {
   props: ['fromType'],
   data() {
     return {
-      
+
       dialogVisible: false,
       dialogCamera: false,
       dialogGuide: false,
@@ -265,7 +265,7 @@ export default {
       this.patientRegister.prList = [];
       let body = {}
 
-      console.log(`this.patientRegister.query`, this.patientRegister.query)
+      // console.log(`this.patientRegister.query`, this.patientRegister.query)
 
       body = deepCopy(this.patientRegister.query)
       if (this.patientRegister.query.customerOrgFlag) {
@@ -276,7 +276,7 @@ export default {
         }
       }
 
-      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex      
+      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
 
       //StartDate EndDate
       if (this.patientRegister.query.dateRange) {
@@ -284,7 +284,7 @@ export default {
         body.endDate = moment(new Date(this.patientRegister.query.dateRange[1])).format("yyyy-MM-DD")
       }
 
-      console.log('body',body)
+      console.log('body', body)
 
       if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
 
@@ -359,25 +359,60 @@ export default {
 
       postapi('/api/app/peisreport/getpatientregisterreport', body).then(res => {
         if (res.code > -1) {
-          // 刷新最大记录数
-          this.loadOpts.totalCount = res.data.totalCount
 
-          if (body.skipCount == 0) {  //查询
-            this.patientRegister.prList = [];
-          }
-          this.patientRegister.prList = this.patientRegister.prList.concat(res.data.items)
-          if (body.skipCount == 0 && this.patientRegister.prList.length == 1) {
-            this.rowClick(this.patientRegister.prList[0])
-            this.$refs['info'].setCurrentRow(this.patientRegister.prList[0]);
+          if (this.patientRegister.query.isSeries == 'Y' && this.patientRegister.query.patientRegisterNo) {
+            if (this.dataTransOpts.tableM.patient_register.length == 0) {
+              this.patientRegister.prList = res.data.items
+              // this.dataTransOpts.tableM.patient_register = res.data.items
+            } else {
+              // console.log('isSeries',this.patientRegister.prList,res.data.items[0].patientRegisterId)
+              // console.log('isSeries',arrayExistObj(this.patientRegister.prList,'patientRegisterId',res.data.items[0].patientRegisterId))
+              if (res.data.items.length > 0 && arrayExistObj(this.patientRegister.prList, 'patientRegisterId', res.data.items[0].patientRegisterId) == -1) {
+                this.patientRegister.prList = this.patientRegister.prList.concat(res.data.items)
+                // this.dataTransOpts.tableM.patient_register.push(res.data.items[0])
+              }
+            }
+
+            if (this.patientRegister.prList.length > 0 && res.data.items.length > 0) {
+              let lfind = arrayExistObj(this.patientRegister.prList, 'patientRegisterId', res.data.items[0].patientRegisterId)
+              if (lfind > -1) {
+                // this.$refs['info'].setCurrentRow();
+                this.$refs['info'].setCurrentRow(this.patientRegister.prList[lfind]);
+                this.rowClick(this.patientRegister.prList[lfind])
+              }
+            }
+
+            // 选中
+            this.$nextTick(function () {
+              this.patientRegister.prList.forEach(row => {
+                if(arrayExistObj(this.dataTransOpts.tableM.patient_register, 'patientRegisterId', row.patientRegisterId) == -1) this.$refs['info'].toggleRowSelection(row)
+              })
+            });
+
           } else {
-            this.$refs['info'].setCurrentRow();
-            this.dataTransOpts.tableS.patient_register = { id: '' }
-            // 刷新个人资料
-            this.dataTransOpts.refresh.patient_register.S++
-            // 刷新总检状态
-            this.dataTransOpts.refresh.sumDoctor.M++
-            // 刷新检查项目
-            this.dataTransOpts.refresh.register_check.M++
+            // 刷新最大记录数
+            this.loadOpts.totalCount = res.data.totalCount
+
+            if (body.skipCount == 0) {  //查询
+              this.patientRegister.prList = [];
+            }
+            this.patientRegister.prList = this.patientRegister.prList.concat(res.data.items)
+
+            if (body.skipCount == 0 && this.patientRegister.prList.length > 0) {
+              this.rowClick(this.patientRegister.prList[0])
+              this.$refs['info'].setCurrentRow();
+              this.$refs['info'].setCurrentRow(this.patientRegister.prList[0]);
+            } else {
+              this.$refs['info'].setCurrentRow();
+
+              this.dataTransOpts.tableS.patient_register = { id: '' }
+              // 刷新个人资料
+              this.dataTransOpts.refresh.patient_register.S++
+              // 刷新总检状态
+              this.dataTransOpts.refresh.sumDoctor.M++
+              // 刷新检查项目
+              this.dataTransOpts.refresh.register_check.M++
+            }
           }
         }
       })
diff --git a/src/components/report/PatientRegisterQueryNobtn.vue b/src/components/report/PatientRegisterQueryNobtn.vue
index 2ad8276..122aeb2 100644
--- a/src/components/report/PatientRegisterQueryNobtn.vue
+++ b/src/components/report/PatientRegisterQueryNobtn.vue
@@ -10,6 +10,10 @@
               style="font-size: 20px;"></el-button>
           </el-input>
         </div>
+        <div class="query">
+          <span class="spanClass">连续扫码</span>
+          <el-checkbox v-model="patientRegister.query.isSeries" size="small" true-label="Y" false-label="N" />
+        </div>
         <div class="query">
           <span class="spanClass">条码号</span>
           <el-input placeholder="条码号" v-model="patientRegister.query.patientRegisterNo" size="small" clearable
diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index 2ff6898..fa899a2 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -255,6 +255,44 @@ export default {
                     break
                 }
             }
+
+            if (!message) {
+                let male_disable_keywords = ['子宫', '宫颈', '卵巢', '白带', '阴道']
+                let female_disable_keywords = ['睾丸', '阴茎']
+                let disable_keywords = []
+
+
+                switch (this.dataTransOpts.tableS.patient_register.sexId) {
+                    case 'M':
+                    case 'F':
+                        disable_keywords = this.dataTransOpts.tableS.patient_register.sexId == 'M' ? male_disable_keywords : female_disable_keywords
+
+                        disable_keywords.forEach(key => {
+                            this.sumDoctorCheck.summaryList.forEach(e => {
+                                if (e.summaryTitle && e.summaryTitle.indexOf(key) > -1) message = `当前患者性别为：${this.dataTransOpts.tableS.patient_register.sexName} 报告不应出现 ${key} 字眼`
+                                if (e.details) {
+                                    e.details.forEach(d => {
+                                        if (d.summaryContent && d.summaryContent.indexOf(key) > -1) message = `当前患者性别为：${this.dataTransOpts.tableS.patient_register.sexName} 报告不应出现 ${key} 字眼`
+                                    });
+                                }
+                            });
+
+                            this.sumDoctorCheck.suggestionList.forEach(e => {
+                                if (e.suggestionTitle && e.suggestionTitle.indexOf(key) > -1) message = `当前患者性别为：${this.dataTransOpts.tableS.patient_register.sexName} 报告不应出现 ${key} 字眼`
+                                if (e.diagnosisNames) {
+                                    e.diagnosisNames.forEach(d => {
+                                        if (d && d.indexOf(key) > -1) message = `当前患者性别为：${this.dataTransOpts.tableS.patient_register.sexName} 报告不应出现 ${key} 字眼`
+                                    });
+                                }
+                            });
+                        });
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+
             if (message) {
                 this.$message.error({ showClose: true, message })
                 return
diff --git a/src/components/sumDoctorCheck/CheckDetails.vue b/src/components/sumDoctorCheck/CheckDetails.vue
index 2ebc8af..5fcf98f 100644
--- a/src/components/sumDoctorCheck/CheckDetails.vue
+++ b/src/components/sumDoctorCheck/CheckDetails.vue
@@ -51,7 +51,7 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { arrayExistObj, getColorStr } from '@/utlis/proFunc';
 export default {
   components: {},
-  props: ["patientRegisterId","tabChoosed"],
+  props: ["patientRegisterId","tabChoosed","refParams"],
   data() {
     return {
       tableData: [],
@@ -69,8 +69,15 @@ export default {
     ...mapState(['window', 'dict', 'dataTransOpts', 'doctorCheck', 'sumDoctorCheck']),
 
     divHeight() {
-      let tempHeight = this.window.pageHeight < 600 ? 600 : this.window.pageHeight
-      return tempHeight - 195
+      let tableHeight = 465
+      switch (this.refParams.place) {
+        case 'summary': //总检处
+          tableHeight = (this.window.pageHeight < 600 ? 600 : this.window.pageHeight) - 195
+          break;      
+        default:
+          break;
+      }
+      return tableHeight
     },
   },
 
diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue
index ad7954b..5b92cbd 100644
--- a/src/components/sumDoctorCheck/SumSug.vue
+++ b/src/components/sumDoctorCheck/SumSug.vue
@@ -469,7 +469,7 @@ export default {
     //选择诊断
     btnChooseDiagnosis(index) {
       this.suggestionCurRow = index
-      this.choosedDiagnosisIds = this.sumDoctorCheck.suggestionList[index].diagnosisIds
+      this.choosedDiagnosisIds = this.sumDoctorCheck.suggestionList[index].diagnosisIds||[]
 
       this.disabledDiagnosisIds = []
       this.sumDoctorCheck.suggestionList.forEach((e, i) => {
@@ -482,8 +482,10 @@ export default {
       this.diagnosisesChoosed = []
 
       this.diagnosises.forEach(e => {
-        if (this.disabledDiagnosisIds.indexOf(e.id) == -1) {
+        if (e.id && this.disabledDiagnosisIds.indexOf(e.id) == -1) {
+          console.log('this.disabledDiagnosisIds',e.id,this.disabledDiagnosisIds,this.choosedDiagnosisIds)
           if (this.choosedDiagnosisIds.indexOf(e.id) == -1) {
+            console.log('this.diagnosisesFilter',e.id,this.diagnosisesFilter)
             if (this.diagnosisesFilter.length < 20) this.diagnosisesFilter.push(e)
           } else {
             this.diagnosisesChoosed.push(e)
diff --git a/src/store/index.js b/src/store/index.js
index 531c088..7ce952d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -142,6 +142,7 @@ export default new Vuex.Store({
                 patientName: '', //姓名
                 sex: '', //性别
                 idCardNo: '', //身份证号
+                isSeries: 'N',
             }, //查询条件
             customerOrgGroup: [], //分组（针对单位）
             patientRegisterAbs: [], //人员已选组合项目
@@ -461,6 +462,7 @@ export default new Vuex.Store({
             ImportOrgData: false, // 导入企业（青藏公司）数据
             RoomEdit:false, //房间
             queue:false, // 排队信息
+            FollowCriticalCheck:false, // 危急值
         }
 
     },
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index cba7faa..ecc04e0 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -58,6 +58,14 @@
         </div>
       </div>
     </div>
+    <!--组件弹窗-->
+    <div>
+      <!-- 危急值 -->
+      <el-dialog title="危急值" :visible.sync="dialogWin.FollowCriticalCheck" width="800px"
+        :show-close="false" :close-on-click-modal="false" :append-to-body="true">
+        <FollowCriticalCheck />
+      </el-dialog>      
+    </div>
   </div>
 </template>
 <script>
@@ -74,7 +82,9 @@ import QueueCheckList from "../../components/doctorCheck/QueueCheckList.vue";
 import CheckItemList from "../../components/doctorCheck/CheckItemList.vue";
 import CheckSumSug from "../../components/doctorCheck/CheckSumSug.vue";
 import RegisterCheckEdit from "../../components/doctorCheck/RegisterCheckEdit.vue";
+import FollowCriticalCheck from "../../components/follow/FollowCriticalCheck.vue";
 import moment from 'moment';
+import Follow from "@/components/follow/follow.vue";
 
 export default {
   components: {
@@ -85,7 +95,8 @@ export default {
     CheckPicture,
     CheckItemList,
     CheckSumSug,
-    RegisterCheckEdit
+    RegisterCheckEdit,
+    FollowCriticalCheck,
   },
   data() {
     return {
@@ -164,7 +175,7 @@ export default {
   // },
 
   computed: {
-    ...mapState(["window", "dataTransOpts", "dict", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck"]),
+    ...mapState(["window", "dataTransOpts", "dict", "dialogWin","patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck"]),
   },
 
   methods: {
diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue
index 7b58d1f..6108942 100644
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@@ -35,7 +35,7 @@
               </el-tab-pane>
 
               <el-tab-pane label="明细结果" name="2">
-                <CheckDetails :patientRegisterId="dataTransOpts.tableS.patient_register.id" :tabChoosed="tabChoosed" />
+                <CheckDetails :patientRegisterId="dataTransOpts.tableS.patient_register.id" :tabChoosed="tabChoosed" :refParams="{ place: 'summary' }"/>
               </el-tab-pane>
               <!--
               <el-tab-pane label="危急值" name="3"> </el-tab-pane>              
@@ -47,10 +47,10 @@
                 <ImageTextReport :refParams="{ place: 'summary' }"/>
               </el-tab-pane>
               <el-tab-pane label="历次结果" name="5">
-                <SumItems :patientId="dataTransOpts.tableS.patient_register.patientId" :tabChoosed="tabChoosed" />
+                <SumItems :patientId="dataTransOpts.tableS.patient_register.patientId" :tabChoosed="tabChoosed" :refParams="{ place: 'summary' }"/>
               </el-tab-pane>
               <el-tab-pane label="历次综述" name="6">
-                <SumHistory :patientId="dataTransOpts.tableS.patient_register.patientId" :tabChoosed="tabChoosed" />
+                <SumHistory :patientId="dataTransOpts.tableS.patient_register.patientId" :tabChoosed="tabChoosed" :refParams="{ place: 'summary' }"/>
               </el-tab-pane>
               <!--
               <el-tab-pane label="职业病" name="7">