From 5f09392da108c97c0af1d1042b71ae30cae968fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=96=8C=E6=9D=B0?= <>
Date: Wed, 30 Oct 2024 09:27:25 +0800
Subject: [PATCH] ui

---
 ...�集团预约人员名单导入模板.xlsx |  Bin 0 -> 12847 bytes
 src/components/doctorCheck/CheckItemList.vue  |   13 +-
 src/components/doctorCheck/CheckPicture.vue   |   16 +
 src/components/doctorCheck/CheckSumSug.vue    |    1 +
 src/components/follow/FollowCriticalCheck.vue |  215 +++-
 src/components/follow/FollowList.vue          | 1083 ++++++++++-------
 src/components/follow/FollowQuery.vue         |  116 +-
 src/components/follow/PhoneFollowUp.vue       |  488 +++++++-
 src/components/follow/SmsSend.vue             |  253 +++-
 .../patientRegister/PatientRegisterEdit.vue   |    2 +-
 src/components/report/BtnReport.vue           |  113 ++
 src/router/index.js                           |    6 +
 src/store/index.js                            |  101 +-
 .../customerOrg/BusReservationImport.vue      | 1014 +++++++++++++++
 src/views/doctorCheck/doctorCheck.vue         |    2 +-
 15 files changed, 2699 insertions(+), 724 deletions(-)
 create mode 100644 public/files/公交集团预约人员名单导入模板.xlsx
 create mode 100644 src/views/customerOrg/BusReservationImport.vue

diff --git a/public/files/公交集团预约人员名单导入模板.xlsx b/public/files/公交集团预约人员名单导入模板.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..afa35870ec700142157bcdd84945cdae9bb2baf9
GIT binary patch
literal 12847
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
M0bus0e)9gm0Ia5uV*mgE

literal 0
HcmV?d00001

diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index 4888011..3b71e80 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -27,10 +27,11 @@
           <div>{{ dddw(resultStatus, 'id', scope.row.resultStatusId, 'dataInputPrompt') }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="criticalFlag" label="危急" width="40" align="center">
+      <el-table-column prop="criticalFlag" label="危急值" width="50" align="center">
         <template slot-scope="scope">
-          <el-checkbox v-model="scope.row.criticalFlag" size="small" true-label="Y" false-label="N"
-            @change="dialogWin.FollowCriticalCheck = true" />
+          <el-button style="min-width:23px;padding:6px 2px;"
+              @click="btnCritical(scope.row)"
+              size="small">W</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -365,7 +366,11 @@ export default {
     rowResultDisabled(row) {
       return row.isCalculationItem == 'Y' || this.doctorCheck.RegisterCheckEdit.completeFlag == '1' || this.doctorCheck.RegisterCheckEdit.completeFlag == '2'
     },
-
+    btnCritical(row){
+      this.dialogWin.FollowCriticalCheck=true
+      this.doctorCheck.combinationCriticalValue=false
+      this.doctorCheck.singleDetailedProject=row
+    },
     //项目列为计算函数
     computeFun(index) {
       // 有计算项的，才调用计算函数
diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue
index aa70540..ad25db3 100644
--- a/src/components/doctorCheck/CheckPicture.vue
+++ b/src/components/doctorCheck/CheckPicture.vue
@@ -23,6 +23,8 @@
             :disabled="doctorBtnDisabled('btnExpPic')">导入图片</el-dropdown-item>
           <el-dropdown-item v-show="checkPagePriv(pagePriv.privs, '裁图')" @click.native="btnCutPic"
             :disabled="doctorBtnDisabled('btnCutPic')">裁剪图片</el-dropdown-item>
+            <el-dropdown-item v-show="checkPagePriv(pagePriv.privs, '清理pacs结果')" @click.native="btnClean"
+            :disabled="doctorBtnDisabled('btnClean')">清理pacs结果</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
     </div>
@@ -496,6 +498,20 @@ export default {
       this.uploadSeq++;
       this.dialogCheckPictureUpload = true;
     },
+    btnClean(){
+      if (!this.doctorCheck.RegisterCheckId) {
+        this.$message.warning({ showClose: true, message: "未选中组合项目！" });
+        return;
+      }
+      postapi("/api/app/PacsBusiness/DeletePacsCheckDicomDataByRegisterCheckId", {
+        registerCheckId:this.doctorCheck.RegisterCheckId
+      })
+        .then((res) => {
+          if (res.code > -1) {
+            
+          }
+        });
+    },
 
     // 裁图/修图/
     btnCutPicBak() {
diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index 6c7e799..7c56a77 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -341,6 +341,7 @@ export default {
     // 危急值
     btnCritical() {
       this.dialogWin.FollowCriticalCheck = true
+       this.doctorCheck.combinationCriticalValue=true
     },
 
     //删除小结
diff --git a/src/components/follow/FollowCriticalCheck.vue b/src/components/follow/FollowCriticalCheck.vue
index 61b17b4..ea6367d 100644
--- a/src/components/follow/FollowCriticalCheck.vue
+++ b/src/components/follow/FollowCriticalCheck.vue
@@ -3,47 +3,111 @@
     <!--组件主体-->
     <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>
+        <el-form ref="form" :model="tableData" label-width="105px">
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="危急值范围">
+                <el-input
+                  v-model="tableData.criticalRangeValue"
+                  style="width: 100%"
+                  disabled
+                  size="small"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item label="危急值标志">
+                <el-checkbox
+                  v-model="tableData.isCriticalValue"
+                  true-label="Y"
+                  false-label="N"
+                ></el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item label="危急值审核">
+                <el-checkbox
+                  v-model="tableData.isCriticalValueAudit"
+                  true-label="Y"
+                  false-label="N"
+                ></el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item label="复查">
+                <el-checkbox
+                  v-model="tableData.isReview"
+                  true-label="Y"
+                  false-label="N"
+                ></el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item label="随访标志">
+                <el-checkbox
+                  v-model="tableData.isFollowUp"
+                  true-label="Y"
+                  false-label="N"
+                ></el-checkbox>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="危急值处理内容">
+                <!-- <el-input
+                    v-model="form.parmValue"
+                    size="small"
+                  ></el-input> -->
+                <el-input
+                  type="textarea"
+                  v-model="tableData.criticalValueContent"
+                  :autosize="{ minRows: 3, maxRows: 23 }"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-divider></el-divider>
+            <el-col :span="6">
+              <el-form-item label="危急值创建者">
+                <el-input
+                  v-model="tableData.criticalValueCreatorName"
+                  disabled
+                  size="small"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="危急值创建日期">
+                <el-input
+                  :value="tableData.criticalValueCreationTime"
+                  disabled
+                  size="small"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="随访创建者">
+                <el-input
+                  v-model="tableData.followUpCreatorName"
+                  disabled
+                  size="small"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="随访创建日期">
+                <el-input
+                  style="width: 85%"
+                  :value="tableData.followUpCreationTime"
+                  disabled
+                  size="small"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
       </div>
       <div style="margin-top: 10px; display: flex;justify-content: space-between;">
         <div></div>
@@ -94,20 +158,18 @@ export default {
       peisid: null,
       startPoint: -1, // 多选起点 -1 表示选择
       endPoint: -1, // 多选终点 -1 表示未选择
-
-      tableData: [
-        {
+      tableData: {
           criticalRangeValue: "", //危急值范围
           isCriticalValue: "Y", //危急值标志
           criticalValueContent: "", // 危急值
-          criticalValueCreatorId: "", // 登记人
-          criticalValueCreationTime: "", // 登记时间
-          isCriticalValueAudit: "N",  // 审核
-          isReview: 'N', // 复查
-          isCriticalValueSmsComplete: "N", // 短信
-          isCriticalValuePhoneComplete: "N",  // 电话随访
-        }
-      ], //表格数据
+          criticalValueCreatorName:"",
+          criticalValueCreationTime:"",
+          isCriticalValueAudit:"",
+          isReview:"N",
+          isFollowUp:"N",
+          followUpCreatorName:"",
+          followUpCreationTime:""
+        },
       tableDataCurrentRow: {}, // 当前被选中的行
 
       multipleSelection: [], //选中的数据列表
@@ -210,7 +272,16 @@ export default {
     this.loadOpts.maxResultCount = Number(this.LocalConfig.normal.maxResultCount || 100)
 
     this.loadOptsInit = Object.assign({}, this.loadOpts)
-
+    // this.tableData=this.doctorCheck.RegisterCheck
+    if(this.doctorCheck.combinationCriticalValue){
+        //   getapi(`/api/app/registercheck/getregistercheck?id=${this.doctorCheck.RegisterCheckId}`)
+        // .then(res => {
+        //   this.tableData=res.data
+        // })
+        this.tableData=this.doctorCheck.RegisterCheckEdit
+    }else{
+      this.tableData=this.doctorCheck.singleDetailedProject
+    }
   },
 
   //挂载完成
@@ -220,9 +291,9 @@ export default {
     this.peisid = window.sessionStorage.getItem('peisid');
 
 
-    this.$nextTick(() => {
-      this.scrollFull()
-    })
+    // this.$nextTick(() => {
+    //   this.scrollFull()
+    // })
 
 
   },
@@ -235,6 +306,7 @@ export default {
       "elProgress",
       "patientRegister",
       "customerOrg",
+      "doctorCheck"
     ]),
   },
   methods: {
@@ -590,11 +662,32 @@ export default {
 
     // 导入企业(青藏公司)数据
     btnImportOrgData() {
-
-      //
-      this.dataTransOpts.plus.ImportOrgData++
-      this.dialogWin.ImportOrgData = true
-
+      if(this.doctorCheck.combinationCriticalValue){
+        postapi('/api/app/RegisterCheck/UpdateRegisterCheckCritical',{
+        registerCheckId:this.doctorCheck.RegisterCheckId,
+        isCriticalValue:this.tableData.isCriticalValue,
+        isFollowUp:this.tableData.isFollowUp,
+        criticalValueContent:this.tableData.criticalValueContent,
+        isCriticalValueAudit:this.tableData.isCriticalValueAudit,
+        isReview:this.tableData.isReview
+      }).then(res => {
+          this.dialogWin.FollowCriticalCheck = false
+          this.tableData=this.$options.data.tableData
+        })
+      }else{
+        postapi('/api/app/RegisterCheckItem/UpdateRegisterCheckItemCritical',{
+        registerCheckId:this.tableData.registerCheckId,
+        isCriticalValue:this.tableData.isCriticalValue,
+        isFollowUp:this.tableData.isFollowUp,
+        criticalValueContent:this.tableData.criticalValueContent,
+        isCriticalValueAudit:this.tableData.isCriticalValueAudit,
+        isReview:this.tableData.isReview,
+        itemId:this.tableData.itemId
+      }).then(res => {
+          this.dialogWin.FollowCriticalCheck = false
+          this.tableData=this.$options.data.tableData
+        })
+      }
     },
 
     //体检次数 相关操作
diff --git a/src/components/follow/FollowList.vue b/src/components/follow/FollowList.vue
index a7214ae..9b6bc03 100644
--- a/src/components/follow/FollowList.vue
+++ b/src/components/follow/FollowList.vue
@@ -2,123 +2,85 @@
   <div>
     <!--组件主体-->
     <div>
-      <div :style="'width:' + (window.pageWidth - 10) + 'px;'" @contextmenu.prevent="onContextmenu">
+      <div
+        :style="'width:' + (window.pageWidth - 10) + 'px;'"
+        @contextmenu.prevent="onContextmenu"
+      >
         <div>
-          <el-table :data="tableData" border
-            :height="window.pageHeight < 600 ? 248 : Math.floor(((window.pageHeight - 250) * 2) / 3)"
-            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 type="selection" width="40" align="center"></el-table-column>
-            <el-table-column v-for="(item, index) in dragCol" :key="index" :type="dragCol[index].type"
-              :min-width="dragCol[index].minWidth" :align="dragCol[index].align" :label="item.label"
-              :prop="dragCol[index].prop" :sortable="dragCol[index].type || dragCol[index].prop == 'sn' ? false : true">
-              <template slot-scope="scope" v-if="!(dragCol[index].type)">
-                <div v-if="!dragCol[index].type">
-                  <div v-if="dragCol[index].prop == 'sn'">
-                    {{ scope.$index + 1 }}
-                  </div>
-                  <div v-else-if="dragCol[index].prop == 'completeFlag'"
-                    :style="`color: ${setPrStatusColor(scope.row.isAudit, scope.row.completeFlag)}`">
-                    {{ scope.row.isAudit == 'Y' ? "已审核" : dddw(dict.completeFlag, "id", scope.row.completeFlag,
-                      "displayName") }}
-                  </div>
-                  <div v-else-if="dragCol[index].prop == 'qztlType'">
-                    {{ dddw(dict.qztlType, "id", scope.row.qztlType, "displayName") }}
-                  </div>
-                  <div v-else-if="dragCol[index].prop == 'guidePrintTimes'">
-                    <i class="el-icon-printer" v-if="scope.row.guidePrintTimes > 0"
-                      style="font-size: 20px; color: green" />
-                  </div>
-                  <div v-else-if="dragCol[index].prop == 'isLock'">
-                    <i class="el-icon-lock" v-if="scope.row.isLock == 'Y'" style="font-size: 20px; color: red" />
-                  </div>
-                  <div v-else-if="dragCol[index].prop == 'isVip'
-                    || dragCol[index].prop == 'isUpload'
-                    || dragCol[index].prop == 'qztlIsMain'
-                    || dragCol[index].prop == 'qztlIsCy'
-                    || dragCol[index].prop == 'qztlIsCw'
-                    || dragCol[index].prop == 'qztlIsGt'
-                    || dragCol[index].prop == 'qztlIsWh'
-                    || dragCol[index].prop == 'qztlIsFj'
-                  ">
-                    {{ scope.row[dragCol[index].prop] == "Y" ? "是" : "否" }}
-                  </div>
-
-                  <div v-else-if="dragCol[index].prop == 'customerOrgParentName'">
-                    {{ scope.row.customerOrgParentName
-                      ? scope.row.customerOrgParentName
-                      : scope.row.customerOrgName }}
-                  </div>
-                  <div v-else-if="dragCol[index].prop == 'sexId'">
-                    {{ dddw(dict.sex, "id", scope.row[dragCol[index].prop], "displayName") }}
-                  </div>
-                  <div v-else-if="dragCol[index].prop == 'groupPack'">
-                    <div
-                      v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
-                      {{ dddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
-                    </div>
-                    <div
-                      v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
-                      {{ dddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
-                    </div>
-                  </div>
-                  <div v-else-if="dragCol[index].prop == 'nationId'">
-                    {{ dddw(dict.nation, "id", scope.row[dragCol[index].prop], "displayName") }}
-                  </div>
-                  <div v-else-if="dragCol[index].prop == 'birthDate'">
-                    {{ scope.row[dragCol[index].prop] ? moment(scope.row[dragCol[index].prop]).format('yyyy-MM-DD') : ''
-                    }}
-                  </div>
-                  <div v-else-if="dragCol[index].prop == 'maritalStatusId'">
-                    {{ dddw(dict.maritalStatus, "id", scope.row[dragCol[index].prop], "displayName") }}
-                  </div>
-                  <div v-else-if="dragCol[index].prop == 'medicalTypeId'">
-                    {{ dddw(dict.medicalType, "id", scope.row[dragCol[index].prop], "displayName") }}
-                  </div>
-                  <div v-else-if="dragCol[index].prop == 'personnelTypeId'">
-                    {{ dddw(dict.personnelType, "id", scope.row[dragCol[index].prop], "displayName") }}
-                  </div>
-                  <div v-else-if="dragCol[index].prop == 'idNo'">
-                    {{ scope.row[dragCol[index].prop] }}&#031;
-                  </div>
-                  <div v-else-if="dragCol[index].prop == 'customerOrgName'">
-                    {{ scope.row[dragCol[index].prop] == scope.row['customerOrgParentName'] ?
-                      '' : scope.row[dragCol[index].prop] }}
-                  </div>
-                  <div v-else>
-                    {{ scope.row[dragCol[index].prop] }}
-                  </div>
+          <el-table
+            :data="tableData"
+            border
+            :height="
+              window.pageHeight < 600
+                ? 248
+                : Math.floor(((window.pageHeight - 250) * 2) / 3)
+            "
+            highlight-current-row
+            @row-click="rowClick"
+            size="small"
+            row-key="id"
+            :row-class-name="handleRowClassName"
+            id="phoneFollowUp"
+          >
+            <el-table-column prop="patientName" label="姓名" width="90" align="center" />
+            <el-table-column prop="idNo" label="身份证" width="150" align="center" />
+            <el-table-column prop="patientRegisterNo" label="人员条码号" width="90" align="center" />
+            <el-table-column prop="medicalTimes" label="体检次数" width="90" align="center" />
+            <el-table-column prop="sexName" label="性别" width="50" align="center" />
+            <el-table-column prop="birthDate" label="出生日期" width="90" align="center" />
+            <el-table-column prop="age" label="年龄" width="50" align="center" />
+            <el-table-column prop="abnormalAsbitemDetail" label="组合项目异常" width="200">
+              <template slot-scope="scope">
+                <div v-for="(item,index) in scope.row.abnormalAsbitemDetail" :key="index">
+                  {{item.asbitemName+' '+item.isCriticalValue+' '+item.isReview}}
                 </div>
               </template>
             </el-table-column>
+            <el-table-column prop="abnormalItemDetail" label="项目异常" width="200">
+              <template slot-scope="scope">
+                <div v-for="(item,index) in scope.row.abnormalItemDetail" :key="index">
+                  {{item.itemName+' '+item.isCriticalValue+' '+item.isReview}}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="jobCardNo" label="工卡号" width="90" align="center" />
+            <el-table-column prop="medicalCardNo" label="体检卡号" width="90" align="center" />
+            <el-table-column prop="maritalStatusName" label="婚姻状况" width="90" align="center" />
+            <el-table-column prop="medicalTypeName" label="体检类别" align="center" />
+            <el-table-column prop="personnelTypeName" label="人员类型" width="90" align="center" />
+            <el-table-column prop="jobPost" label="职务" width="90" align="center" />
+            <el-table-column prop="jobTitle" label="职称" width="90" align="center" />
+            <el-table-column prop="isUpload" label="上传WEB" width="90" align="center" />
+            <el-table-column prop="completeFlag" label="状态" width="90" align="center">
+              <template slot-scope="scope">
+                <div>{{ dddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="isMedicalStart" label="开始标志" width="90" align="center" />
+            <el-table-column prop="medicalStartDate" label="开始日期" width="90" align="center" />
+            <el-table-column prop="patientNo" label="档案号" width="90" align="center" />
+            <el-table-column prop="telephone" label="电话" width="90" align="center" />
+            <el-table-column prop="mobileTelephone" label="手机号" />
+            <el-table-column prop="customerOrgName" label="单位" />
+            <el-table-column prop="customerOrgParentName" label="父级单位" />
           </el-table>
-          <div style="display: flex;justify-content:space-between;">
+          <div style="display: flex; justify-content: space-between">
             <div></div>
-            <div>
-              <span style="font-size:12px;">共：{{ loadOpts.totalCount }} 条记录，当前显示：{{ tableData.length }}
-                条。</span>
-            </div>
           </div>
         </div>
         <!-- 组合项目  基本信息  -->
-        <el-tabs v-model="tabChoosed" style="margin-top: -22px;">
-          <!-- 组合项目 -->
-          <el-tab-pane label="危急值" name="1">
-            <FollowCritical />
-          </el-tab-pane>
-          <el-tab-pane label="电话随访" name="2">
+        <el-tabs v-model="tabChoosed">
+          <el-tab-pane label="电话随访" name="1">
             <PhoneFollowUp />
           </el-tab-pane>
-          <el-tab-pane label="短信随访" name="3">
+          <el-tab-pane label="短信随访" name="2">
             <SmsSend />
           </el-tab-pane>
         </el-tabs>
       </div>
     </div>
     <!--组件弹窗-->
-    <div>
-    </div>
+    <div></div>
   </div>
 </template>
 <script>
@@ -126,16 +88,19 @@ 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 FileSaver from "file-saver";
+import html2canvas from "html2canvas";
+import { exportToExcel } from "../../utlis/Export2Excel";
 
 import {
-  getPagePriv, checkPagePriv,
+  getPagePriv,
+  checkPagePriv,
   dddw,
   objCopy,
   arrayReduce,
   arrayExistObj,
-  deepCopy, setPrStatusColor
+  deepCopy,
+  setPrStatusColor,
 } from "../../utlis/proFunc";
 
 import FollowCritical from "./FollowCritical.vue";
@@ -143,14 +108,16 @@ import PhoneFollowUp from "./PhoneFollowUp.vue";
 import SmsSend from "./SmsSend.vue";
 
 export default {
-  components: {    
-    FollowCritical,PhoneFollowUp, SmsSend 
+  components: {
+    FollowCritical,
+    PhoneFollowUp,
+    SmsSend,
   },
   data() {
     return {
       pagePriv: {
-        routeUrlorPageName: 'patientRegister', //当前页面归属路由或归属页面权限名称
-        privs: [] // 页面权限
+        routeUrlorPageName: "patientRegister", //当前页面归属路由或归属页面权限名称
+        privs: [], // 页面权限
       },
       peisid: null,
       startPoint: -1, // 多选起点 -1 表示选择
@@ -169,41 +136,111 @@ export default {
       rClickRow: null, //右击的行
       rClickColumn: null, //右击的列（预留）
 
-      dragColDesign: [],  // 待调整的排序的序
+      dragColDesign: [], // 待调整的排序的序
       //拖动列
       dragCol: [
-        { label: "序号", prop: "sn", minWidth: 40, align: "center" },       
+        { 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: "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: "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: "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: "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: "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: "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: "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: "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" },
@@ -215,8 +252,8 @@ export default {
       ],
       dialogColSort: false,
 
-      dom: null,   //用于滚动加载数据
-      lazyLoading: false,  //是否懒加载中
+      dom: null, //用于滚动加载数据
+      lazyLoading: false, //是否懒加载中
       loadOpts: {
         totalCount: 0,
         skipCount: 0,
@@ -229,13 +266,13 @@ export default {
         label: "姓名",
         value: "",
         colName: "patientName",
-        patientRegisterId: ""
+        patientRegisterId: "",
       },
 
       queueParams: {}, // 分诊排队参数
       LocalConfig: {
         normal: {
-          maxResultCount: 100, //分页时单页记录数          
+          maxResultCount: 100, //分页时单页记录数
         },
       },
       LocalConfigInit: {},
@@ -244,36 +281,41 @@ export default {
 
   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
+    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) || {})
+      this.LocalConfig = Object.assign(
+        {},
+        deepCopy(this.LocalConfigInit),
+        JSON.parse(LocalConfig) || {}
+      );
     } catch (error) {
-      console.log('window.localStorage.getItem("LocalConfig")', 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)
+    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()
-    })
-
+    this.peisid = window.sessionStorage.getItem("peisid");
 
+    // this.$nextTick(() => {
+    //   this.scrollFull();
+    // });
   },
   computed: {
     ...mapState([
@@ -284,11 +326,16 @@ export default {
       "elProgress",
       "patientRegister",
       "customerOrg",
+      "report",
     ]),
   },
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
-    moment, dddw, deepCopy, checkPagePriv, setPrStatusColor,
+    moment,
+    dddw,
+    deepCopy,
+    checkPagePriv,
+    setPrStatusColor,
 
     // 扩展定义表格行样式
     handleRowClassName({ row, rowIndex }) {
@@ -309,18 +356,17 @@ export default {
       });
     },
 
-
-
-
     refFuncSetData(item, v) {
-      setData(this, item, v)
+      setData(this, item, v);
     },
 
     // 打印指引单(isPreview)
     async guidePrint(ReportCode, isPreview) {
-
       if (!this.$peisAPI) {
-        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" });
+        this.$message.info({
+          showClose: true,
+          message: "此功能，需要在壳客户端才可运行！",
+        });
         return;
       }
       let token = window.sessionStorage.getItem("token");
@@ -328,13 +374,13 @@ export default {
       let toOutShell = {
         ReportCode,
         token,
-        isBuildImage: 'N',
-        IsUploadPdf: 'N',
+        isBuildImage: "N",
+        IsUploadPdf: "N",
         preViewCanPrint: "N",
         Parameters: [
           { Name: "printer", Value: user },
           { Name: "hisLog", Value: "pic/hisLog.jpg" },
-          { Name: 'pageFooter', Value: 'pic/peisQrCode.jpg' },
+          { Name: "pageFooter", Value: "pic/peisQrCode.jpg" },
         ],
       };
       let lfind = -1;
@@ -349,7 +395,10 @@ export default {
       //选中（取消勾选） end  -------------------------
 
       if (this.multipleSelection.length < 1) {
-        this.$message.info({ showClose: true, message: "请勾选要打印指引单的人员记录！" });
+        this.$message.info({
+          showClose: true,
+          message: "请勾选要打印指引单的人员记录！",
+        });
         return;
       }
 
@@ -380,50 +429,62 @@ export default {
             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
+        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 => {
+        this.$peisAPI
+          .printPre(JSON.stringify(toOutShell))
+          .then((res) => {
             if (JSON.parse(res).code < 0) {
-              this.$message.warning({ showClose: true, message: JSON.parse(res).message });
+              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
+            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
+            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;
+                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}` });
@@ -437,98 +498,103 @@ export default {
       }
     },
 
-    // 指引单新打印方式，promise 
+    // 指引单新打印方式，promise
     guidePrintPromise(ReportCode, isPreview, row) {
       return new Promise((resolve, reject) => {
-        if (!this.$peisAPI) 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',
+          isBuildImage: "N",
+          IsUploadPdf: "N",
           preViewCanPrint: "N",
           Parameters: [
             { Name: "printer", Value: user },
             { Name: "hisLog", Value: "pic/hisLog.jpg" },
-            { Name: 'pageFooter', Value: 'pic/peisQrCode.jpg' },
+            { Name: "pageFooter", Value: "pic/peisQrCode.jpg" },
           ],
         };
 
-        if (!row.completeFlag || row.completeFlag == '0') reject('预登记人员，不可执行此操作！')
-        toOutShell.BusinessCode = row.id
-        console.log(JSON.stringify(toOutShell))
+        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)
+          this.$peisAPI
+            .printPre(JSON.stringify(toOutShell))
+            .then((res) => {
+              let lres = JSON.parse(res);
               if (lres.code > -1) {
-                resolve(lres)
+                resolve(lres);
               } else {
-                reject(lres.message)
+                reject(lres.message);
               }
             })
             .catch((err) => {
-              reject(err)
+              reject(err);
             });
         } else {
-          this.$peisAPI.print(JSON.stringify(toOutShell))
-            .then(res => {
-              let lres = JSON.parse(res)
+          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]);
+                return postapi(
+                  "/api/app/patientregister/updatepatientregisterguideprinttimesmany",
+                  [row.id]
+                );
               } else {
-                reject(lres.message)
+                reject(lres.message);
               }
             })
-            .then(res => {
+            .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;
+                    this.tableData[lfind].guidePrintTimes =
+                      Number(this.tableData[lfind].guidePrintTimes) + 1;
                   } else {
                     this.tableData[lfind].guidePrintTimes = 1;
                   }
                 }
               }
-              resolve(res)
+              resolve(res);
             })
             .catch((err) => {
-              reject(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) => {
+            return this.lisPrint(row, "0002", false);
           })
-          .then(res => {
-            resolve(res)
+          .then((res) => {
+            return this.pacsPrint(row, "0004", false);
           })
-          .catch(err => {
-            reject(err)
+          .then((res) => {
+            resolve(res);
           })
-      })
+          .catch((err) => {
+            reject(err);
+          });
+      });
     },
 
-
     async printPromise() {
-
       if (this.multipleSelection.length < 1) {
-        this.$message.info({ showClose: true, message: "请勾选要打印人员检验检查条码的记录！" });
+        this.$message.info({
+          showClose: true,
+          message: "请勾选要打印人员检验检查条码的记录！",
+        });
         return;
       }
 
@@ -536,11 +602,11 @@ export default {
       this.elProgress.percentage = 0;
 
       for (let i = 0; i < this.multipleSelection.length; i++) {
-        let row = this.multipleSelection[i]
+        let row = this.multipleSelection[i];
         try {
-          await this.printGuideLisPacs(row)
+          await this.printGuideLisPacs(row);
         } catch (error) {
-          console.log('printPromise', error)
+          console.log("printPromise", error);
         }
 
         this.elProgress.percentage = Math.floor(
@@ -550,8 +616,6 @@ export default {
       this.elProgress.display = false;
     },
 
-
-
     handleSelectionChange(rows) {
       //this.multipleSelection = rows;
       //// console.log('this.multipleSelection',this.multipleSelection)
@@ -569,9 +633,10 @@ export default {
 
     //设置新增/编辑的form数据
     setForm(formData) {
-      this.patientRegister.patientRegisterRd = deepCopy(formData)
+      this.patientRegister.patientRegisterRd = deepCopy(formData);
       if (!this.patientRegister.patientRegisterRd.id) {
-        this.patientRegister.patientRegisterRd.customerOrgId = this.patientRegister.query.customerOrgId
+        this.patientRegister.patientRegisterRd.customerOrgId =
+          this.patientRegister.query.customerOrgId;
       }
     },
 
@@ -631,98 +696,90 @@ export default {
 
       // if (lfind > -1) {
       // 弹出编辑框，只有在编辑框显示时，才去触发获取数据
-      this.dataTransOpts.tableS.patient_register = deepCopy(row)
-      this.tableDataCurrentRow = deepCopy(row)
-      this.dataTransOpts.refresh.register_check_asbitem.M++ //触发所选组合项目刷新       
+      this.dataTransOpts.tableS.patient_register = deepCopy(row);
+      this.tableDataCurrentRow = deepCopy(row);
+      this.dataTransOpts.refresh.register_check_asbitem.M++; //触发所选组合项目刷新
       // }
     },
 
-   
-
-   
-
-  
-
-  
-
     //查询
     async Query() {
       // 查询时，清掉明细数据 （滚动时不清）
-      this.dataTransOpts.tableS.patient_register.id = ''
-      this.tableDataCurrentRow = {} // 清除选择
-      this.tableData = []
+      this.dataTransOpts.tableS.patient_register.followUpId = "";
+      this.tableDataCurrentRow = {}; // 清除选择
+      this.tableData = [];
 
-      setTimeout(() => {
-        this.dataTransOpts.refresh.register_check_asbitem.M++ //触发所选组合项目刷新  
-      }, 10);
+      // setTimeout(() => {
+      //   this.dataTransOpts.refresh.register_check_asbitem.M++; //触发所选组合项目刷新
+      // }, 10);
 
-      this.loadOpts = Object.assign(this.loadOpts, this.loadOptsInit)
-      await this.getPrList()
+      this.loadOpts = Object.assign(this.loadOpts, this.loadOptsInit);
+      await this.getPrList();
     },
 
     //数据量多时，滚动加载
     async load() {
-      this.loadOpts.skipCount++
-      await this.getPrList()
+      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
+          
+        },
+        customerOrgs = [];
+      if (this.report.dataCusOrgOCX.length > 0) {
+        if (this.report.dataCusOrgOCX.length > 1) {
+          return this.$message({
+          message: '只能选择一个单位',
+          type: 'warning'
+        });
+        } else {
+          this.report.dataCusOrgOCX.forEach((e) => {
+            
+            if (e.customerOrgId) {
+              body.customerOrgId = e.customerOrgId;
+              if (e.customerOrgId == this.dict.personOrgId) {
+                body.customerOrgRegisterId = null;
+                body.customerOrgGroupId = [];
+              } else {
+                body.customerOrgRegisterId = e.customerOrgRegister.id;
+                body.customerOrgGroupId = e.customerOrgGroupIds;
+              }
+            }
+              body.startDate=moment(e.startDate).format("yyyy-MM-DD"),
+              body.endDate= moment(e.endDate).format("yyyy-MM-DD"),
+              body.dateType=
+                e.dateType == "summaryDate"
+                  ? "3"
+                  : e.dateType == "medicalStartDate"
+                  ? "2"
+                  : "1"
+          });
         }
-
       }
 
+      body.customerOrgs = customerOrgs;
       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)
+      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;
-        }
-      }
+        this.patientRegister.query.completeFlags &&
+        this.patientRegister.query.completeFlags.length > 0
+      )
+        body.completeFlags = this.patientRegister.query.completeFlags;
 
       if (this.patientRegister.query.phone)
         body.phone = this.patientRegister.query.phone;
@@ -731,129 +788,138 @@ export default {
         body = {
           idNo: this.patientRegister.query.idCardNo,
           skipCount: this.loadOpts.skipCount,
-          maxResultCount: this.loadOpts.maxResultCount
+          maxResultCount: this.loadOpts.maxResultCount,
         };
 
       if (this.patientRegister.query.patientNo)
         body = {
           patientNo: this.patientRegister.query.patientNo,
           skipCount: this.loadOpts.skipCount,
-          maxResultCount: this.loadOpts.maxResultCount
+          maxResultCount: this.loadOpts.maxResultCount,
         };
 
       if (this.patientRegister.query.patientRegisterNo)
         body = {
           patientRegisterNo: this.patientRegister.query.patientRegisterNo,
           skipCount: this.loadOpts.skipCount,
-          maxResultCount: this.loadOpts.maxResultCount
+          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 = [];
-            }
+      postapi(
+        "/api/app/PhoneFollowUp/GetPatientRegisterCriticalList",
+        body
+      ).then((res) => {
+        if (res.code > -1) {
+          let curLoad = res.data;
+          // 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++
-            }
+          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
+      this.dom = this.$refs["info"].bodyWrapper;
       // console.log('this.dom', this.dom)
 
-      this.dom.addEventListener('scroll', async () => {
+      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) {
-          // 获取到的不是全部数据 当滚动到底部 
+        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
+          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.lazyLoading = true;
+            await this.load();
+            this.lazyLoading = false;
             // this.dom.scrollTop = this.dom.scrollTop - 100
           }
         }
-      })
+      });
     },
 
-
-   
     btnUpBaseInfo() {
       let body = {
         patientRegisterId: this.upBaseInfo.patientRegisterId,
         // "patientName": "string",
         // "mobileTelephone": "string",
         // "idNo": "string"
-      }
-      body[this.upBaseInfo.colName] = this.upBaseInfo.value
+      };
+      body[this.upBaseInfo.colName] = this.upBaseInfo.value;
 
-      postapi('/api/app/PatientRegister/UpdatePatientRegisterBaseInfoByPatientRegisterId', body).then(res => {
+      postapi(
+        "/api/app/PatientRegister/UpdatePatientRegisterBaseInfoByPatientRegisterId",
+        body
+      ).then((res) => {
         if (res.code > -1) {
-          this.close_dialogWin_upBaseInfo()
+          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
+      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 = "新身份证号"
+          this.upBaseInfo.label = "新身份证号";
           break;
         case "mobileTelephone":
-          this.upBaseInfo.label = "新手机号"
+          this.upBaseInfo.label = "新手机号";
           break;
         default:
-          this.upBaseInfo.label = "新姓名"
+          this.upBaseInfo.label = "新姓名";
           break;
       }
-      this.upBaseInfo.value = row[baseInfoType]
-
+      this.upBaseInfo.value = row[baseInfoType];
     },
 
     // 分诊排队
     fnQueue(row) {
       this.queueParams = {
-        patientRegisterId: row.id
-      }
-      this.dialogWin.queue = true
-      this.dataTransOpts.plus.queue++      
+        patientRegisterId: row.id,
+      };
+      this.dialogWin.queue = true;
+      this.dataTransOpts.plus.queue++;
     },
 
     //右击菜单
@@ -866,108 +932,150 @@ export default {
       //// console.log('onContextmenu',event);
       if (!this.rClickRow) return false;
       let row = { ...this.rClickRow };
-      let items = [] //菜单项
+      let items = []; //菜单项
 
-      if (checkPagePriv(this.pagePriv.privs, '修改姓名') && row.completeFlag != '0')
+      if (
+        checkPagePriv(this.pagePriv.privs, "修改姓名") &&
+        row.completeFlag != "0"
+      )
         items.push({
           label: "修改姓名",
           onClick: () => {
-            this.fnUpBaseInfo(row, 'patientName');
+            this.fnUpBaseInfo(row, "patientName");
           },
-        })
-      if (checkPagePriv(this.pagePriv.privs, '修改手机号') && row.completeFlag != '0')
+        });
+      if (
+        checkPagePriv(this.pagePriv.privs, "修改手机号") &&
+        row.completeFlag != "0"
+      )
         items.push({
           label: "修改手机号",
           onClick: () => {
-            this.fnUpBaseInfo(row, 'mobileTelephone');
+            this.fnUpBaseInfo(row, "mobileTelephone");
           },
-        })
-      if (checkPagePriv(this.pagePriv.privs, '修改身份证号') && row.completeFlag != '0')
+        });
+      if (
+        checkPagePriv(this.pagePriv.privs, "修改身份证号") &&
+        row.completeFlag != "0"
+      )
         items.push({
           label: "修改身份证号",
           onClick: () => {
-            this.fnUpBaseInfo(row, 'idNo');
+            this.fnUpBaseInfo(row, "idNo");
           },
-        })
-      if (checkPagePriv(this.pagePriv.privs, '分诊排队') && row.completeFlag != '0')
+        });
+      if (
+        checkPagePriv(this.pagePriv.privs, "分诊排队") &&
+        row.completeFlag != "0"
+      )
         items.push({
           label: "分诊排队",
           onClick: () => {
             this.fnQueue(row);
           },
-        })
-      if (checkPagePriv(this.pagePriv.privs, '发送检验申请') && row.completeFlag != '0')
+        });
+      if (
+        checkPagePriv(this.pagePriv.privs, "发送检验申请") &&
+        row.completeFlag != "0"
+      )
         items.push({
           label: "发送检验申请",
           onClick: () => {
             this.lisRequest(row);
           },
-        })
-      if (checkPagePriv(this.pagePriv.privs, '预览人员条码') && row.completeFlag != '0')
+        });
+      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')
+        });
+      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')
+        });
+      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')
+        });
+      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')
+        });
+      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')
+        });
+      if (
+        checkPagePriv(this.pagePriv.privs, "导入检查结果") &&
+        row.completeFlag != "0"
+      )
         items.push({
           label: "导入检查结果",
           onClick: () => {
-            this.importResult('pacs', row);
+            this.importResult("pacs", row);
           },
-        })
-      if (checkPagePriv(this.pagePriv.privs, '导入检验结果') && row.completeFlag != '0')
+        });
+      if (
+        checkPagePriv(this.pagePriv.privs, "导入检验结果") &&
+        row.completeFlag != "0"
+      )
         items.push({
           label: "导入检验结果",
           onClick: () => {
-            this.importResult('lis', row);
+            this.importResult("lis", row);
           },
-        })
-      if (checkPagePriv(this.pagePriv.privs, '批量更新组合项目明细') && this.multipleSelection.length > 0)
+        });
+      if (
+        checkPagePriv(this.pagePriv.privs, "批量更新组合项目明细") &&
+        this.multipleSelection.length > 0
+      )
         items.push({
           label: "批量更新组合项目明细",
           onClick: () => {
             this.btnItemBatch();
           },
-        })
-      if (checkPagePriv(this.pagePriv.privs, '调整检查项目医生') && this.multipleSelection.length > 0)
+        });
+      if (
+        checkPagePriv(this.pagePriv.privs, "调整检查项目医生") &&
+        this.multipleSelection.length > 0
+      )
         items.push({
           label: "调整检查项目医生",
           onClick: () => {
-            this.dataTransOpts.plus.PatientRegisterEditDoctorBatch++  //如果放在弹窗显示后面，在首次加载子组件时，会触发两次数据处理 
+            this.dataTransOpts.plus.PatientRegisterEditDoctorBatch++; //如果放在弹窗显示后面，在首次加载子组件时，会触发两次数据处理
             this.dialogWin.PatientRegisterEditDoctorBatch = true;
           },
-        })
-      items.push({ label: "----------------", })
+        });
+      items.push({ label: "----------------" });
       this.$contextmenu({
         items,
         event,
@@ -997,12 +1105,14 @@ export default {
       //取消勾选，换成选择的方式  end
 
       if (this.multipleSelection.length < 1) {
-        this.$message.info({ showClose: true, message: "请选择要操作的记录！" });
+        this.$message.info({
+          showClose: true,
+          message: "请选择要操作的记录！",
+        });
         return;
       }
-      this.dataTransOpts.plus.PatientRegisterEditGroupBatch++
+      this.dataTransOpts.plus.PatientRegisterEditGroupBatch++;
       this.dialogWin.PatientRegisterEditGroupBatch = true;
-
     },
 
     //批量更新组合项目
@@ -1020,31 +1130,38 @@ export default {
       //取消勾选，换成选择的方式  end
 
       if (this.multipleSelection.length < 1) {
-        this.$message.warning({ showClose: true, message: "请选择要操作的记录" })
-        return
+        this.$message.warning({
+          showClose: true,
+          message: "请选择要操作的记录",
+        });
+        return;
       }
 
-      this.dataTransOpts.plus.PatientRegisterEditItemBatch++  //如果放在弹窗显示后面，在首次加载子组件时，会触发两次数据处理 
+      this.dataTransOpts.plus.PatientRegisterEditItemBatch++; //如果放在弹窗显示后面，在首次加载子组件时，会触发两次数据处理
       this.dialogWin.PatientRegisterEditItemBatch = true;
-
     },
 
     //批量更新组合项目
     async btnItemBatch() {
       if (this.multipleSelection.length < 1) {
-        this.$message.warning({ showClose: true, message: "请选择要操作的记录" })
-        return
+        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
+        let patientRegisterId = this.multipleSelection[i].id;
         try {
-          await postapi('/api/app/RegisterCheckItem/SyncRegisterCheckItem', { patientRegisterId })
+          await postapi("/api/app/RegisterCheckItem/SyncRegisterCheckItem", {
+            patientRegisterId,
+          });
         } catch (error) {
-          console.log('printPromise', error)
+          console.log("printPromise", error);
         }
 
         this.elProgress.percentage = Math.floor(
@@ -1052,22 +1169,24 @@ export default {
         );
       }
       this.elProgress.display = false;
-
-
-
     },
 
     //检验申请
     async lisRequest(row) {
       let isPrintLisRequest = false;
       let res = null;
-      if (row.completeFlag == '0') {
-        this.$message.info({ showClose: true, message: "预登记人员，不可执行此操作！" });
+      if (row.completeFlag == "0") {
+        this.$message.info({
+          showClose: true,
+          message: "预登记人员，不可执行此操作！",
+        });
         return;
       }
 
       try {
-        res = await postapi(`/api/app/lisrequest/setlisrequest?PatientRegisterId=${row.id}`);
+        res = await postapi(
+          `/api/app/lisrequest/setlisrequest?PatientRegisterId=${row.id}`
+        );
         // console.log(`/ api / app / lisrequest / setlisrequest ? PatientRegisterId = ${ prId }`,res);
       } catch (error) {
         return;
@@ -1103,33 +1222,33 @@ export default {
     lisPrint(row, ReportCode, isPreview) {
       return new Promise((resolve, reject) => {
         if (!this.$peisAPI) reject("此功能，需要在壳客户端才可运行！");
-        if (!row.completeFlag || row.completeFlag == '0') 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',
+          IsMoreLabel: "Y",
+          isBuildImage: "N",
+          IsUploadPdf: "N",
           preViewCanPrint: "N",
           Parameters: [
             { Name: "printer", Value: user },
             { Name: "hisLog", Value: "pic/hisLog.jpg" },
           ],
-          BusinessCode: row.id
+          BusinessCode: row.id,
         };
-        console.log('this.$peisAPI.toOutShell', toOutShell)
+        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)
+          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)
+                resolve(lres);
               } else {
                 reject(lres.message);
               }
@@ -1138,10 +1257,11 @@ export default {
               reject(err);
             });
         } else {
-          this.$peisAPI.print(JSON.stringify(toOutShell))
-            .then(res => {
-              console.log('this.$peisAPI.print', res)
-              let lres = JSON.parse(res)
+          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 {
@@ -1151,49 +1271,51 @@ export default {
                 });
               }
             })
-            .then(res => {
+            .then((res) => {
               if (res && res.code < 0) {
                 reject(res.message);
               } else {
-                resolve(res)
+                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("预登记人员，不可执行此操作！")
+        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',
+          IsMoreLabel: "Y",
+          isBuildImage: "N",
+          IsUploadPdf: "N",
           preViewCanPrint: "N",
           Parameters: [
             { Name: "printer", Value: user },
             { Name: "hisLog", Value: "pic/hisLog.jpg" },
           ],
-          BusinessCode: row.id
+          BusinessCode: row.id,
         };
-        console.log('this.$peisAPI.print', toOutShell)
+        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)
+          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)
+                resolve(lres);
               } else {
                 reject(lres.message);
               }
@@ -1202,12 +1324,13 @@ export default {
               reject(err);
             });
         } else {
-          this.$peisAPI.print(JSON.stringify(toOutShell))
-            .then(res => {
-              console.log('this.$peisAPI.print', res)
-              let lres = JSON.parse(res)
+          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)
+                resolve(lres);
               } else {
                 reject(lres.message);
               }
@@ -1216,35 +1339,41 @@ export default {
               reject(err);
             });
         }
-      })
+      });
     },
 
     // 导入检查检验结果
     importResult(checkType, row) {
-      let url = '/api/app/ImportLisResult/ImportResultByPatientRegisterId'
+      let url = "/api/app/ImportLisResult/ImportResultByPatientRegisterId";
       switch (checkType) {
-        case 'pacs':
-          url = '/api/app/ImportPacsResult/ImportResultByPatientRegisterId'
+        case "pacs":
+          url = "/api/app/ImportPacsResult/ImportResultByPatientRegisterId";
           postapi(url, { patientRegisterId: row.id })
-            .then(res => {
+            .then((res) => {
               if (res.code > -1) {
-                return postapi('/api/app/ImportElectrocardiogramResult/ImportElectrocardiogramResultByPatientRegisterId', { patientRegisterId: row.id })
+                return postapi(
+                  "/api/app/ImportElectrocardiogramResult/ImportElectrocardiogramResultByPatientRegisterId",
+                  { patientRegisterId: row.id }
+                );
               }
             })
-            .then(res => {
+            .then((res) => {
               if (res && res.code > -1) {
-                this.$message.success({ showClose: true, message: '导入成功！' })
-                this.rowClick(row)
+                this.$message.success({
+                  showClose: true,
+                  message: "导入成功！",
+                });
+                this.rowClick(row);
               }
-            })
+            });
           break;
         default:
-          postapi(url, { patientRegisterId: row.id }).then(res => {
+          postapi(url, { patientRegisterId: row.id }).then((res) => {
             if (res.code > -1) {
-              this.$message.success({ showClose: true, message: '导入成功！' })
-              this.rowClick(row)
+              this.$message.success({ showClose: true, message: "导入成功！" });
+              this.rowClick(row);
             }
-          })
+          });
           break;
       }
     },
@@ -1255,17 +1384,17 @@ export default {
       // let table = document.getElementById(elId); //.cloneNode(true)
       this.$nextTick(() => {
         // let refsTable = this.$refs[elId]  //.cloneNode(true) true
-        let table = document.getElementById(elId)
+        let table = document.getElementById(elId);
         // console.log('table,refsTable', table, refsTable)
 
-        let tableData = table.innerHTML
-        let fileName = moment(new Date()).format('yyyyMMDDHHmmss')
+        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');
+        FileSaver.saveAs(blob, fileName + ".xls");
 
-        // 导出图片       
+        // 导出图片
         // 使用html2canvas将HTML元素转换为画布
         // let cloneTable = table.cloneNode(true) //[elId]
         /*
@@ -1288,18 +1417,18 @@ export default {
 
         });
         */
-      })
+      });
     },
 
     btnDragColDesign() {
-      this.dragColDesign = deepCopy(this.dragCol)
-      this.dialogColSort = true
-      this.rowDrag()
+      this.dragColDesign = deepCopy(this.dragCol);
+      this.dialogColSort = true;
+      this.rowDrag();
     },
 
     btnDragColDesignOk() {
-      this.dragCol = deepCopy(this.dragColDesign)
-      this.dialogColSort = false
+      this.dragCol = deepCopy(this.dragColDesign);
+      this.dialogColSort = false;
     },
     //拖拽
     rowDrag() {
@@ -1319,7 +1448,10 @@ export default {
         });
       });
     },
-
+    handleExport() {
+      exportToExcel("#phoneFollowUp", "随访列表", false);
+      this.window.export=false
+    },
   },
 
   //监听事件
@@ -1331,10 +1463,10 @@ export default {
         //// console.log('watch:patientRegister.query.customerOrgId:',newVal,oldVal)
         // 单位变化时，清除当前列表信息
         if (newVal && newVal != oldVal) {
-          this.tableData = []
-          this.dataTransOpts.tableM.register_check_asbitem = []
+          this.tableData = [];
+          this.dataTransOpts.tableM.register_check_asbitem = [];
         }
-      }
+      },
     },
 
     //触发查询事件
@@ -1344,6 +1476,14 @@ export default {
         this.Query();
       }
     },
+    "window.export": {
+      // immediate:true,
+      handler(newVal, oldVal) {
+        if (newVal){
+          this.handleExport();
+        }
+      },
+    }
 
     //新增后，触发赋值
     // "patientRegister.patientRegisterRd.id"(newVal, oldVal) {
@@ -1360,7 +1500,6 @@ export default {
 @import "../../assets/css/global_table.css";
 @import "../../assets/css/global.css";
 
-
 .box {
   display: flex;
 }
diff --git a/src/components/follow/FollowQuery.vue b/src/components/follow/FollowQuery.vue
index ea269e4..edaab9a 100644
--- a/src/components/follow/FollowQuery.vue
+++ b/src/components/follow/FollowQuery.vue
@@ -1,34 +1,26 @@
 <template>
   <div style="display: flex;">
     <div
-      :style="'display: flex;flex-wrap: wrap;height: 80px;background-color: #fff;border-radius: 8px;margin-bottom: 15px;align-items: center;padding: 10px;width:' + (window.pageWidth  - 145) + 'px;'">
+      :style="'display: flex;flex-wrap: wrap;height: 90px;background-color: #fff;border-radius: 8px;margin-bottom: 5px;align-items: center;padding: 10px;width:' + (window.pageWidth  - 145) + 'px;'">
       <div class="query">
-        <span class="spanClass">体检单位</span>
-        <el-cascader v-model="patientRegister.query.customerOrgId" :options="patientRegister.customerOrgTreeAll"
-          :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }" placeholder="请选择单位"
-          :show-all-levels="false" clearable :disabled="orgEnable == 'Y' ? false : true" size="small"
-          style="width:120px;">
-        </el-cascader>
-      </div>
+            <span>体检单位：</span>
+            <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width: 240px" size="small"
+              disabled>
+              <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"
+                style="font-size: 20px"></el-button>
+            </el-input>
+          </div>
       <div class="query">
-
-        <el-select v-model="patientRegister.query.dateType" placeholder="请选择" style="width: 80px" size="small">
-          <el-option label="登记日期" :value="'1'" />
-          <el-option label="体检日期" :value="'2'" />
-          <el-option label="登记或体检" :value="'3'" />
-        </el-select>
-        <!-- dateType  1 登记，2 体检，3 体检或登记-->
-
-        <el-date-picker v-model="patientRegister.query.startDate" type="date" placeholder="起始日期" size="small"
-          style="width:90px;" value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
-        <span class="spanClass">至</span>
-        <el-date-picker v-model="patientRegister.query.endDate" type="date" placeholder="截止日期" size="small"
-          style="width:90px;" value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
+        <span class="spanClass">姓名</span>
+        <el-input placeholder="姓名" v-model="patientRegister.query.patientName" size="small" clearable
+          style="width: 80px" />
       </div>
-      <div class="query">
-        <span class="spanClass">条码号</span>
-        <el-input placeholder="条码号" v-model="patientRegister.query.patientRegisterNo" size="small" clearable
-          style="width: 120px" />
+            <div class="query">
+        <span class="spanClass">性别</span>
+        <el-select v-model="patientRegister.query.sex" placeholder="性别" style="width: 70px" size="small">
+          <el-option v-for="item in dict.forSex" :key="item.id" :label="item.displayName" :value="item.id">
+          </el-option>
+        </el-select>
       </div>
       <div class="query">
         <span class="spanClass">档案号</span>
@@ -36,46 +28,21 @@
           style="width: 80px" />
       </div>
       <div class="query">
-        <span class="spanClass">姓名</span>
-        <el-input placeholder="姓名" v-model="patientRegister.query.patientName" size="small" clearable
-          style="width: 60px" />
-      </div>
-      <div class="query">
-        <span class="spanClass">检查条码</span>
-        <el-input placeholder="检查条码" v-model="patientRegister.query.pacsNo" size="small" clearable
-          style="width: 120px" />
-      </div>
-      <div class="query">
-        <span class="spanClass">检验条码</span>
-        <el-input placeholder="检验条码" v-model="patientRegister.query.lisNo" size="small" clearable
+        <span class="spanClass">条码号</span>
+        <el-input placeholder="条码号" v-model="patientRegister.query.patientRegisterNo" size="small" clearable
           style="width: 120px" />
       </div>
       <div class="query">
-        <span class="spanClass">性别</span>
-        <el-select v-model="patientRegister.query.sex" placeholder="性别" style="width: 50px" size="small">
-          <el-option v-for="item in dict.forSex" :key="item.id" :label="item.displayName" :value="item.id">
-          </el-option>
-        </el-select>
+        <span class="spanClass">身份证</span>
+        <el-input placeholder="身份证" v-model="patientRegister.query.idCardNo" size="small" clearable
+          style="width: 150px" />
       </div>
       <div class="query">
         <span class="spanClass">手机号</span>
         <el-input placeholder="手机号/电话" v-model="patientRegister.query.phone" size="small" clearable
           style="width: 100px" />
       </div>
-      <div class="query">
-        <span class="spanClass">身份证</span>
-        <el-input placeholder="身份证" v-model="patientRegister.query.idCardNo" size="small" clearable
-          style="width: 150px" />
-      </div>
       
-      <div class="query">
-        <span class="spanClass">次数</span>
-        <el-select v-model="patientRegister.query.customerOrgRegister" placeholder="次数"
-          @change="changeCustomerOrgRegister" style="width: 50px;" size="small" value-key="id">
-          <el-option v-for="item in customerOrgRegisterList" :key="item.id" :label="item.medicalTimes" :value="item">{{
-            item.medicalTimes + '次' }}</el-option>
-        </el-select>
-      </div>
       <div class="query">
         <span class="spanClass">体检类别</span>
         <el-select v-model="patientRegister.query.medicalTypeIds" placeholder="请选择" clearable filterable
@@ -85,15 +52,7 @@
       </div>
       <div class="query">
         <span class="spanClass">状态</span>
-        <el-select v-model="patientRegister.query.completeFlags" placeholder="请选择" clearable style="width: 100px"
-          size="small" multiple collapse-tags>
-          <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
-          </el-option>
-        </el-select>
-      </div>
-      <div class="query">
-        <span class="spanClass">随访状态</span>
-        <el-select v-model="patientRegister.query.completeFlags" placeholder="请选择" clearable style="width: 100px"
+        <el-select v-model="patientRegister.query.completeFlags" placeholder="请选择" clearable style="width: 150px"
           size="small" multiple collapse-tags>
           <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
           </el-option>
@@ -102,23 +61,34 @@
     </div>
 
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px;margin-top: 5px;">
-      <div v-show="checkPagePriv(pagePriv.privs, '查询')" class="listBtn">
+    <div style="margin-left: 10px;">
+      <div class="listBtn">
         <el-button class="commonbutton" @click="btnQuery">查询</el-button>
       </div>      
       <div class="listBtn">
         <el-button type="danger" class="commonbutton" @click="btnClear">清除条件</el-button>
       </div>
+      <div class="listBtn">
+        <el-button type="danger" class="commonbutton" @click="exportTable">导出excel</el-button>
+      </div>
     </div>
+    <!--通用选单位、体检次数、分组的控件-->
+    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX" :close-on-click-modal="false" width="880px"
+      height="600px">
+      <CusOrgOCX :useCustomerOrg="true" :initDateType="'creationTime'" :isUnit="true" />
+    </el-dialog>
   </div>
 </template>
 <script>
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { getPagePriv, checkPagePriv, parsIcCardtoLocal, deepCopy } from '../../utlis/proFunc'
+import CusOrgOCX from "../report/CusOrgOCX.vue"
 
 export default {
-  components: {},
+  components: {
+    CusOrgOCX
+  },
   props: ["orgEnable"],
   data() {
     return {
@@ -174,7 +144,7 @@ export default {
   },
 
   computed: {
-    ...mapState(["window", "dict", "dataTransOpts", "patientRegister", "customerOrg"]),
+    ...mapState(["window", "dict", "dataTransOpts", "patientRegister", "customerOrg","report"]),
   },
   methods: {
     checkPagePriv,
@@ -189,7 +159,9 @@ export default {
       this.patientRegister.query.phone = ''
       this.patientRegister.query.idCardNo = ''
     },
-
+    exportTable(){
+      this.window.export=true
+    },
     init(customerOrgId) {
       if (!customerOrgId || customerOrgId == this.dict.personOrgId) {
         this.patientRegister.query.customerOrgRegister = null
@@ -232,7 +204,6 @@ export default {
     //查询
     btnQuery() {
       this.patientRegister.query.times++;
-      console.log("this.patientRegister.query", this.patientRegister.query);
     },
 
     changeCustomerOrgRegister(v) {
@@ -381,7 +352,7 @@ export default {
 }
 
 .listBtn {
-  margin-top: 10px;
+  margin-top: 5px;
 
   text-align: center;
 }
@@ -397,4 +368,7 @@ export default {
   font-size: 14px;
   padding: 0 2px 0 0;
 }
+::v-deep .el-icon-search:before {
+  color: #00F;
+}
 </style>
diff --git a/src/components/follow/PhoneFollowUp.vue b/src/components/follow/PhoneFollowUp.vue
index 6156246..dabb14a 100644
--- a/src/components/follow/PhoneFollowUp.vue
+++ b/src/components/follow/PhoneFollowUp.vue
@@ -1,43 +1,279 @@
 <template>
-  <div style="display: flex;">
+  <div style="display: flex">
     <div :style="`width: ${window.pageWidth - 120}px;`">
-      <el-table :data="phoneFollowUp" border
-        :height="window.pageHeight < 600 ? 124 : Math.floor((window.pageHeight - 228) / 3)" size="small"
-        highlight-current-row show-summary ref="phoneFollowUp">
+      <el-table
+        :data="phoneFollowUp"
+        border
+        :height="
+          window.pageHeight < 600
+            ? 124
+            : Math.floor((window.pageHeight - 228) / 3)
+        "
+        size="small"
+        highlight-current-row
+        ref="phoneFollowUp"
+        @row-click="rowick"
+      >
         <el-table-column type="index" label="序号" width="50" align="center" />
-        <el-table-column prop="followUpContent" label="随访内容" min-width="250" />
-        <el-table-column prop="replyContent" label="客户回复" min-width="200" align="center" />
-        <el-table-column prop="isComplete" label="完成" min-width="40" align="center">
+        <el-table-column
+          prop="followUpContent"
+          label="随访内容"
+          min-width="250"
+        />
+        <el-table-column
+          prop="replyContent"
+          label="回复内容"
+          min-width="200"
+          align="center"
+        />
+        <el-table-column
+          prop="isComplete"
+          label="完成"
+          min-width="40"
+          align="center"
+        >
           <template slot-scope="scope">
-            <el-checkbox v-model="scope.row.isComplete" true-label="Y" false-label="N" disabled />
+            <el-checkbox
+              v-model="scope.row.isComplete"
+              true-label="Y"
+              false-label="N"
+              disabled
+            />
           </template>
         </el-table-column>
-        <el-table-column prop="lastModifierName" label="修改人" min-width="80" align="center" />
-        <el-table-column prop="lastModificationTime" label="修改日期" min-width="100" align="center">
+        <el-table-column
+          prop="planFollowDate"
+          label="随访日期"
+          min-width="100"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <div>
+              {{ moment(scope.row.planFollowDate).format("yyyy-MM-DD") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="lastModifierName"
+          label="修改人"
+          min-width="80"
+          align="center"
+        />
+        <el-table-column
+          prop="lastModificationTime"
+          label="修改日期"
+          min-width="100"
+          align="center"
+        >
           <template slot-scope="scope">
             <div>{{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="creatorName" label="登记人" min-width="80" align="center" />
-        <el-table-column prop="creationTime" label="登记日期" min-width="100" align="center">
+        <el-table-column
+          prop="creatorName"
+          label="登记人"
+          min-width="80"
+          align="center"
+        />
+        <el-table-column
+          prop="creationTime"
+          label="登记日期"
+          min-width="100"
+          align="center"
+        >
           <template slot-scope="scope">
             <div>{{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}</div>
           </template>
         </el-table-column>
       </el-table>
-
     </div>
-    <div style="width: 120px;margin-top: 50px">
+    <div style="width: 120px; margin-top: 50px">
       <div style="margin-left: 10px">
-        <el-button class="commonbutton" type="primary" @click="btnAdd" >新增随访</el-button>
+        <el-button class="commonbutton" type="primary" @click="btnAdd"
+          >新增随访</el-button
+        >
       </div>
-      <div style="margin: 10px;">
-        <el-button class="commonbutton" type="primary" @click="btnEdit">编辑随访</el-button>
+      <div style="margin: 10px">
+        <el-button class="commonbutton" type="primary" @click="btnEdit"
+          >编辑随访</el-button
+        >
       </div>
       <div style="margin-left: 10px">
-        <el-button class="commonbutton" type="primary" @click="btnDel" >删除随访</el-button>
-      </div>      
+        <el-button class="commonbutton" type="primary" @click="btnDel"
+          >删除随访</el-button
+        >
+      </div>
     </div>
+    <el-dialog
+      :title="title == 1 ? '新增' : '修改'"
+      :visible.sync="dialogVisible"
+      width="75%"
+      :close-on-click-modal="false"
+    >
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="编号">
+              <el-input
+                v-model="form.id"
+                style="width: 65%"
+                disabled
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+                   <el-col :span="4" v-if="title != 1">
+            <el-form-item label="是否完成">
+              <el-checkbox
+                v-model="form.isComplete"
+                true-label="Y"
+                false-label="N"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="title == 1">
+            <el-form-item label="生成模式">
+              <el-select v-model="mode" placeholder="生成模式" size="small">
+                <el-option
+                  v-for="item in modes"
+                  :key="item.id"
+                  :label="item.displayName"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="title == 1 && mode == 1">
+            <el-form-item label="随访模式">
+              <el-select
+                v-model="form.followUpMode"
+                placeholder="请选择"
+                size="small"
+              >
+                <el-option
+                  v-for="item in followUpMode"
+                  :key="item.id"
+                  :label="item.displayName"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" v-if="mode == 1 && form.followUpMode == 0">
+            <el-form-item label="截止时间">
+              <el-date-picker
+                type="datetime"
+                placeholder="选择日期时间"
+                size="small"
+                v-model="form.endDate"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                editable
+                style="width: 177px"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" v-if="mode == 0">
+            <el-form-item label="随访日期">
+              <el-date-picker
+                type="datetime"
+                placeholder="选择日期时间"
+                size="small"
+                v-model="form.planFollowDate"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd HH:mm:ss"
+                editable
+                style="width: 177px"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="mode == 1">
+          <el-col :span="24">
+            <el-form-item
+              :label="form.followUpMode == 0 ? 'corn表达式' : '生成天数'"
+            >
+              <!-- <el-input
+                    v-model="form.parmValue"
+                    size="small"
+                  ></el-input> -->
+              <el-input v-model="form.modeValue"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="随访内容">
+              <!-- <el-input
+                    v-model="form.parmValue"
+                    size="small"
+                  ></el-input> -->
+              <el-input v-model="form.followUpContent"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="回复内容">
+              <!-- <el-input
+                    v-model="form.parmValue"
+                    size="small"
+                  ></el-input> -->
+              <el-input v-model="form.replyContent"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-divider></el-divider>
+          <el-col :span="4" style="margin-left: 15px">
+            <el-form-item label="创建者">
+              <el-input
+                v-model="form.creatorName"
+                disabled
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input
+                :value="form.creationTime | dateFormat"
+                disabled
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="修改者">
+              <el-input
+                v-model="form.lastModifierName"
+                disabled
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="修改时间">
+              <el-input
+                style="width: 85%"
+                :value="form.lastModificationTime | dateFormat"
+                disabled
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false" class="difference"
+          >取 消</el-button
+        >
+        <el-button type="primary" @click="addoredit" class="commonbutton"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -51,73 +287,218 @@ export default {
   data() {
     return {
       phoneFollowUp: [], // 电话随访
+      dialogVisible: false,
+      curRow: {},
+      form: {
+        followUpMode: "",
+        modeValue: "",
+        endDate: "",
+        followUpContent: "",
+        replyContent: "",
+        planFollowDate: "",
+        isComplete:""
+      },
+      mode: "0",
+      modes: [
+        {
+          id: "0",
+          displayName: "生成单条",
+        },
+        {
+          id: "1",
+          displayName: "生成多条",
+        },
+      ],
+      followUpMode: [
+        {
+          id: "0",
+          displayName: "corn表达式",
+        },
+        {
+          id: "1",
+          displayName: "按天",
+        },
+        {
+          id: "2",
+          displayName: "按周",
+        },
+        {
+          id: "3",
+          displayName: "按月",
+        },
+        {
+          id: "4",
+          displayName: "按年",
+        },
+      ],
+      title: "",
     };
   },
 
-  created() {
-
-  },
+  created() {},
 
   updated() {
     this.$nextTick(() => {
-      this.$refs['phoneFollowUp'].doLayout()
-    })
+      this.$refs["phoneFollowUp"].doLayout();
+    });
   },
 
   //挂载完成
   mounted() {
-    this.dictInit()
-    
+    this.dictInit();
   },
 
   computed: {
     ...mapState(["window", "dataTransOpts", "dict", "patientRegister"]),
   },
   methods: {
-    dddw, moment,
+    dddw,
+    moment,
 
     // 初始化字典信息
     dictInit() {
       // 获取组合项目包含的明细
-      postapi('/api/app/Asbitem/GetSimpleAsbitemWithDetails')
-        .then(res => {
-          if (res.code > -1) this.asbItems = res.data
-        })
+      postapi("/api/app/Asbitem/GetSimpleAsbitemWithDetails").then((res) => {
+        if (res.code > -1) this.asbItems = res.data;
+      });
     },
-
-    // 设置颜色 
+    getLists() {
+      postapi("/api/app/PhoneFollowUp/GetList", {
+        followUpId: this.dataTransOpts.tableS.patient_register.followUpId,
+      }).then((res) => {
+        if (res.code > -1) this.phoneFollowUp = res.data;
+      });
+    },
+    addoredit() {
+      if (this.title == 1) {
+        if (this.mode == 1) {
+          if (this.form.followUpMode == "") {
+            this.$message.warning("请选择随访模式");
+          } else if (this.form.followUpMode == 0 && this.form.modeValue == "") {
+            this.$message.warning("请输入corn表达式");
+          } else if (this.form.followUpMode == 0 && this.form.endDate == "") {
+            this.$message.warning("请选择截止时间");
+          } else if (this.form.followUpMode != 0 && this.form.modeValue == "") {
+            this.$message.warning("请输入生成天数");
+          } else {
+            postapi("/api/app/PhoneFollowUp/AutoCreate", {
+              followUpId: this.dataTransOpts.tableS.patient_register.followUpId,
+              followUpMode: this.form.followUpMode,
+              modeValue: this.form.modeValue,
+              endDate: this.form.endDate,
+              followUpContent: this.form.followUpContent,
+              replyContent: this.form.replyContent,
+            }).then((res) => {
+              if (res.code > -1) {
+                this.getLists();
+                this.dialogVisible = false;
+                this.mode="0"
+              }
+            });
+          }
+        } else {
+          if (this.form.planFollowDate == "") {
+            this.$message.warning("请选择随访日期");
+          } else {
+            postapi("/api/app/PhoneFollowUp/Create", {
+              followUpId: this.dataTransOpts.tableS.patient_register.followUpId,
+              planFollowDate: this.form.planFollowDate,
+              followUpContent: this.form.followUpContent,
+              replyContent: this.form.replyContent,
+            }).then((res) => {
+              if (res.code > -1) {
+                this.getLists();
+                this.dialogVisible = false;
+                this.mode="0"
+              }
+            });
+          }
+        }
+      }else{
+        postapi("/api/app/PhoneFollowUp/Update", {
+              phoneFollowUpId: this.form.id,
+              planFollowDate: this.form.planFollowDate,
+              followUpContent: this.form.followUpContent,
+              replyContent: this.form.replyContent,
+              isComplete:this.form.isComplete
+            }).then((res) => {
+              if (res.code > -1) {
+                this.getLists();
+                this.dialogVisible = false;
+                this.mode="0"
+              }
+            });
+      }
+    },
+    rowick(row) {
+      this.curRow = { ...row };
+    },
+    // 设置颜色
     setColor(checkCompleteFlag) {
-      let color = "#52555F"
+      let color = "#52555F";
       switch (checkCompleteFlag) {
-        case '0':
-          color = "#FF5054"
+        case "0":
+          color = "#FF5054";
           break;
-        case '2':
-          color = "#396FFA"
+        case "2":
+          color = "#396FFA";
           break;
         default:
           break;
       }
-      return color
+      return color;
     },
 
     // 新增
-    btnAdd(){
-      
+    btnAdd() {
+      this.dialogVisible = true;
+      this.title = 1;
+      this.form = this.$options.data().form;
     },
 
     // 编辑
-    btnEdit(){
-      
+    btnEdit() {
+      if (this.curRow.id == undefined) {
+        this.$message.warning("请选择操作的数据");
+      } else {
+        this.title = 2;
+        this.dialogVisible = true;
+        postapi("/api/app/PhoneFollowUp/Get", {
+          phoneFollowUpId: this.curRow.id,
+        }).then((res) => {
+          if (res.code != -1) {
+            this.form = res.data;
+          }
+        });
+      }
     },
 
     // 删除
-    btnDel(){
-      
+    btnDel() {
+      if (this.curRow.id == undefined) {
+        this.$message.warning("请选择删除的数据");
+      } else {
+        this.$confirm("是否确认删除,是否继续", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+          cancelButtonClass: "difference",
+          confirmButtonClass: "commonbutton",
+        })
+          .then(() => {
+            postapi("/api/app/PhoneFollowUp/Delete",{
+                phoneFollowUpId:this.curRow.id
+            }).then((res) => {
+              if (res.code != -1) {
+                this.curRow=this.$options.data().curRow
+                this.getLists();
+                //this.$message.success("删除成功");
+              }
+            });
+          })
+          .catch(() => {});
+      }
     },
-
-   
-
   },
 
   //监听事件
@@ -126,11 +507,14 @@ export default {
     "dataTransOpts.refresh.register_check_asbitem.M": {
       // immediate:true,
       handler(newVal, oldVal) {
-        console.log(`watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);
-        // if (newVal != oldVal) 
-      }
+        console.log(
+          `watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`
+        );
+        // if (newVal != oldVal)
+        this.getLists();
+      },
     },
-  }
+  },
 };
 </script>
 <style scoped>
diff --git a/src/components/follow/SmsSend.vue b/src/components/follow/SmsSend.vue
index 65b26f9..1636fb7 100644
--- a/src/components/follow/SmsSend.vue
+++ b/src/components/follow/SmsSend.vue
@@ -3,21 +3,19 @@
     <div :style="`width: ${window.pageWidth - 120}px;`">
       <el-table :data="phoneFollowUp" border
         :height="window.pageHeight < 600 ? 124 : Math.floor((window.pageHeight - 228) / 3)" size="small"
-        highlight-current-row show-summary ref="phoneFollowUp">
+        highlight-current-row ref="phoneFollowUp" @row-click="rowick">
         <el-table-column type="index" label="序号" width="50" align="center" />
         <el-table-column prop="patientName" label="姓名" min-width="80" />
         <el-table-column prop="mobileTelephone" label="手机号" min-width="130" align="center" />
-        <el-table-column prop="smsTypeId" label="短信类别" min-width="80" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.smsTypeId }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="content" label="手机号" min-width="300" />
+        <!-- <el-table-column prop="SmsTypeName" label="短信类别" min-width="80" align="center">
+        </el-table-column> -->
+        <el-table-column prop="content" label="短信内容" min-width="300" />
         <el-table-column prop="isComplete" label="完成" min-width="40" align="center">
           <template slot-scope="scope">
             <el-checkbox v-model="scope.row.isComplete" true-label="Y" false-label="N" disabled />
           </template>
         </el-table-column>
+        <el-table-column prop="planSendDate" label="推送时间" min-width="300" />
         <el-table-column prop="lastModifierName" label="修改人" min-width="80" align="center" />
         <el-table-column prop="lastModificationTime" label="修改日期" min-width="100" align="center">
           <template slot-scope="scope">
@@ -36,13 +34,136 @@
       <div style="margin-left: 10px">
         <el-button class="commonbutton" type="primary" @click="btnAdd" >新增随访</el-button>
       </div>
-      <div style="margin: 10px;">
+      <!-- <div style="margin: 10px;">
         <el-button class="commonbutton" type="primary" @click="btnEdit">编辑随访</el-button>
-      </div>
-      <div style="margin-left: 10px">
+      </div> -->
+      <div style="margin: 10px;">
         <el-button class="commonbutton" type="primary" @click="btnDel" >删除随访</el-button>
       </div>      
     </div>
+    <el-dialog
+      :title="title == 1 ? '新增' : '修改'"
+      :visible.sync="dialogVisible"
+      width="75%"
+      :close-on-click-modal="false"
+    >
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="编号">
+              <el-input
+                v-model="form.id"
+                style="width: 65%"
+                disabled
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="随访模式">
+              <el-select
+                v-model="form.followUpMode"
+                placeholder="请选择"
+                size="small"
+              >
+                <el-option
+                  v-for="item in followUpMode"
+                  :key="item.id"
+                  :label="item.displayName"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="截止时间" v-if="form.followUpMode == 0">
+              <el-date-picker
+                type="datetime"
+                placeholder="选择日期时间"
+                size="small"
+                v-model="form.endDate"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                editable
+                style="width: 177px"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item
+              :label="form.followUpMode == 0 ? 'corn表达式' : '生成天数'"
+            >
+              <!-- <el-input
+                    v-model="form.parmValue"
+                    size="small"
+                  ></el-input> -->
+              <el-input v-model="form.modeValue"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="短信内容">
+              <!-- <el-input
+                    v-model="form.parmValue"
+                    size="small"
+                  ></el-input> -->
+              <el-input v-model="form.content"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-divider></el-divider>
+          <el-col :span="4" style="margin-left: 15px">
+            <el-form-item label="创建者">
+              <el-input
+                v-model="form.creatorName"
+                disabled
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input
+                :value="form.creationTime | dateFormat"
+                disabled
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="修改者">
+              <el-input
+                v-model="form.lastModifierName"
+                disabled
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="修改时间">
+              <el-input
+                style="width: 85%"
+                :value="form.lastModificationTime | dateFormat"
+                disabled
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false" class="difference"
+          >取 消</el-button
+        >
+        <el-button type="primary" @click="addoredit" class="commonbutton"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -56,6 +177,37 @@ export default {
   data() {
     return {
       phoneFollowUp: [], // 电话随访
+      curRow: {},
+      dialogVisible:false,
+      form: {
+        followUpMode:"",
+        modeValue:"",
+        content:"",
+        endDate:""
+      },
+      followUpMode: [
+        {
+          id: "0",
+          displayName: "corn表达式",
+        },
+        {
+          id: "1",
+          displayName: "按天",
+        },
+        {
+          id: "2",
+          displayName: "按周",
+        },
+        {
+          id: "3",
+          displayName: "按月",
+        },
+        {
+          id: "4",
+          displayName: "按年",
+        },
+      ],
+      title: "",
     };
   },
 
@@ -89,7 +241,57 @@ export default {
           if (res.code > -1) this.asbItems = res.data
         })
     },
-
+    getLists() {
+      postapi("/api/app/SmsSend/GetList", {
+        followUpId: this.dataTransOpts.tableS.patient_register.followUpId,
+      }).then((res) => {
+        if (res.code > -1) this.phoneFollowUp = res.data;
+      });
+    },
+    rowick(row) {
+      this.curRow = { ...row };
+    },
+    addoredit() {
+      if (this.title == 1) {
+          if (this.form.followUpMode == "") {
+            this.$message.warning("请选择随访模式");
+          } else if (this.form.followUpMode == 0 && this.form.modeValue == "") {
+            this.$message.warning("请输入corn表达式");
+          } else if (this.form.followUpMode == 0 && this.form.endDate == "") {
+            this.$message.warning("请选择截止时间");
+          } else if (this.form.followUpMode != 0 && this.form.modeValue == "") {
+            this.$message.warning("请输入生成天数");
+          }else if (this.form.content== "") {
+            this.$message.warning("请输入短信内容");
+          } else {
+            postapi("/api/app/SmsSend/AutoCreate", {
+              followUpId: this.dataTransOpts.tableS.patient_register.followUpId,
+              followUpMode: this.form.followUpMode,
+              modeValue: this.form.modeValue,
+              endDate: this.form.endDate,
+              content: this.form.content
+            }).then((res) => {
+              if (res.code > -1) {
+                this.getLists();
+                this.dialogVisible = false;
+              }
+            });
+          }
+      }else{
+        postapi("/api/app/PhoneFollowUp/Update", {
+              phoneFollowUpId: this.form.id,
+              planFollowDate: this.form.planFollowDate,
+              followUpContent: this.form.followUpContent,
+              replyContent: this.form.replyContent,
+              isComplete:this.form.isComplete
+            }).then((res) => {
+              if (res.code > -1) {
+                this.getLists();
+                this.dialogVisible = false;
+              }
+            });
+      }
+    },
     // 设置颜色 
     setColor(checkCompleteFlag) {
       let color = "#52555F"
@@ -108,7 +310,9 @@ export default {
 
     // 新增
     btnAdd(){
-      
+      this.dialogVisible = true;
+      this.title = 1;
+      this.form = this.$options.data().form;
     },
 
     // 编辑
@@ -118,7 +322,29 @@ export default {
 
     // 删除
     btnDel(){
-      
+      if (this.curRow.id == undefined) {
+        this.$message.warning("请选择删除的数据");
+      } else {
+        this.$confirm("是否确认删除,是否继续", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+          cancelButtonClass: "difference",
+          confirmButtonClass: "commonbutton",
+        })
+          .then(() => {
+            postapi("/api/app/SmsSend/Delete",{
+                smsSendId:this.curRow.id
+            }).then((res) => {
+              if (res.code != -1) {
+                this.curRow=this.$options.data().curRow
+                this.getLists();
+                //this.$message.success("删除成功");
+              }
+            });
+          })
+          .catch(() => {});
+      }
     },
 
    
@@ -133,6 +359,7 @@ export default {
       handler(newVal, oldVal) {
         console.log(`watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);
         // if (newVal != oldVal) 
+        this.getLists();
       }
     },
   }
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index e8bb7a9..6d9204d 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -2824,7 +2824,7 @@ export default {
       // console.log('this.dataTransOpts.tableM.appoint_register_asbitem',this.dataTransOpts.tableM.appoint_register_asbitem)
       // 没有选中网上预约记录，直接返回，不做任何处理
       let appoint_patient_register = this.dataTransOpts.tableS.appoint_patient_register
-      if (!appoint_patient_register.appointPatientRegisterId) return
+      if (!appoint_patient_register.thirdBookingId) return
 
       this.dataTransOpts.tableS.patient_register.id = ''
       // this.preCustomerOrgId = this.dict.personOrgId
diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue
index 8438899..fb6967b 100644
--- a/src/components/report/BtnReport.vue
+++ b/src/components/report/BtnReport.vue
@@ -25,6 +25,12 @@
             <div class="listBtn">
                 <el-button type="primary" class="commonbutton" @click="btnUpReport">上传Web</el-button>
             </div>
+            <div class="listBtn">
+                <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>
+            </div>
         </div>
         <div>
             <!-- 通用进度条 -->
@@ -70,7 +76,114 @@ export default {
         btnQuery() {
             this.patientRegister.query.times++
         },
+        exportJpg(){
+            if (!this.$peisAPI) {
+                this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" })
+                return
+            }
 
+            if (!(this.dataTransOpts.tableM.patient_register && this.dataTransOpts.tableM.patient_register.length > 0)) {
+                this.$message.warning({ showClose: true, message: "请勾选择记录！" })
+                return
+            }
+            this.$peisAPI.openDirectoryDialog()
+                .then(res => {
+                    let lres = JSON.parse(res)
+                    if (lres.code > -1 && lres.data) {
+                        this.report2Jpg(JSON.parse(lres.data).directory)
+                    }
+                    console.log('lres', lres)
+                })
+                .catch(err => {
+                    this.$message.error(err)
+                })
+        },
+        async report2Jpg(path){
+            this.elProgress.display = true;
+            this.elProgress.percentage = 0;
+
+            let token = window.sessionStorage.getItem('token');
+            let toOutShell = {
+                localPath:path, 
+                token,
+                patientRegisterId:""
+            };
+
+            for (let i = 0; i < this.dataTransOpts.tableM.patient_register.length; i++) {
+
+                let e = this.dataTransOpts.tableM.patient_register[i];
+                this.elProgress.percentage = Math.floor(((i + 1) * 100) / this.dataTransOpts.tableM.patient_register.length);
+
+                // 导出pdf
+                try {
+                        toOutShell.patientRegisterId = e.patientRegisterId
+                        let jsonToOutShell = JSON.stringify(toOutShell)
+                        console.log('toOutShell', jsonToOutShell)
+                        let res = await this.$peisAPI.exportDcmjpg(jsonToOutShell)
+                        if (JSON.parse(res).code < 0) {
+                            console.log('this.$peisAPI.exportDcmjpg err', res)
+                        }
+                } catch (error) {
+                    console.log('error', error)
+                    this.$message.warning({ showClose: true, message: error });
+                }
+            }
+            this.elProgress.display = false;
+        },
+        exportZip(){
+            if (!this.$peisAPI) {
+                this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" })
+                return
+            }
+
+            if (!(this.dataTransOpts.tableM.patient_register && this.dataTransOpts.tableM.patient_register.length > 0)) {
+                this.$message.warning({ showClose: true, message: "请勾选择记录！" })
+                return
+            }
+            this.$peisAPI.openDirectoryDialog()
+                .then(res => {
+                    let lres = JSON.parse(res)
+                    if (lres.code > -1 && lres.data) {
+                        this.report2Zip(JSON.parse(lres.data).directory)
+                    }
+                    console.log('lres', lres)
+                })
+                .catch(err => {
+                    this.$message.error(err)
+                })
+        },
+        async report2Zip(path){
+            this.elProgress.display = true;
+            this.elProgress.percentage = 0;
+
+            let token = window.sessionStorage.getItem('token');
+            let toOutShell = {
+                localPath:path, 
+                token,
+                patientRegisterId:""
+            };
+
+            for (let i = 0; i < this.dataTransOpts.tableM.patient_register.length; i++) {
+
+                let e = this.dataTransOpts.tableM.patient_register[i];
+                this.elProgress.percentage = Math.floor(((i + 1) * 100) / this.dataTransOpts.tableM.patient_register.length);
+
+                // 导出pdf
+                try {
+                        toOutShell.patientRegisterId = e.patientRegisterId
+                        let jsonToOutShell = JSON.stringify(toOutShell)
+                        console.log('toOutShell', jsonToOutShell)
+                        let res = await this.$peisAPI.exportDcmZip(jsonToOutShell)
+                        if (JSON.parse(res).code < 0) {
+                            console.log('this.$peisAPI.exportDcmZip err', res)
+                        }
+                } catch (error) {
+                    console.log('error', error)
+                    this.$message.warning({ showClose: true, message: error });
+                }
+            }
+            this.elProgress.display = false;
+        },
         // 导入结果
         btnImportResult(checkType) {
             if (!this.dataTransOpts.tableS.patient_register.id) {
diff --git a/src/router/index.js b/src/router/index.js
index 40df082..f996a8c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -445,6 +445,12 @@ const routes = [{
                 component: () =>
                     import ("../views/customerOrg/patientRegisterImport.vue"), //../views/doctorCheck/personnelBatch.vue
             },
+            {
+                path: "/busReservationImport",
+                name: "公交预约导入",
+                component: () =>
+                    import ("../views/customerOrg/BusReservationImport.vue"), //../views/doctorCheck/personnelBatch.vue
+            },
             {
                 path: "/patientRegisterRecover",
                 name: "体检表回收",
diff --git a/src/store/index.js b/src/store/index.js
index dc72e36..10bfac9 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -93,6 +93,7 @@ export default new Vuex.Store({
 
             shift: false, //是否按下 shift键
             ctrl: false, //是否按下 ctrl键
+            export: false //是否导出excel
         },
         elProgress: { //通用进度条相关参数
             display: false, //是否显示
@@ -245,6 +246,8 @@ export default new Vuex.Store({
             preResult: {}, // 上次结果
             checkSummaryList: [], //小结
             checkSuggestionList: [], //建议 
+            singleDetailedProject: {}, //单明细项目记录
+            combinationCriticalValue: true //是否组合项目危急弹窗
         },
 
         //总检医生
@@ -449,9 +452,9 @@ export default new Vuex.Store({
                 charge: { id: '' }, // 收费
                 menu_info: { id: '' }, // 菜单与页面
                 lis_request: { id: '' }, // 检验申请（条码）
-                patient_register: { id: '', patientRegisterNo: '' },   // 体检人员记录
-                register_check_asbitem: { id: '' },   // 体检人员登记的项目（合并前）
-                register_check: { id: '' },     // 体检人员登记的项目（合并后）
+                patient_register: { id: '', patientRegisterNo: '' }, // 体检人员记录
+                register_check_asbitem: { id: '' }, // 体检人员登记的项目（合并前）
+                register_check: { id: '' }, // 体检人员登记的项目（合并后）
                 register_check_item: { id: '' }, // 体检人员登记的明细项目
                 role_menu_info: { id: '' }, // 角色对应的菜单
                 sum_diagnosis: { id: '' }, // 总检诊断
@@ -459,15 +462,15 @@ export default new Vuex.Store({
                 patient_occupational_disease: { id: '', patientRegisterId: '' }, // 职业病基本信息
 
                 occModifiable: { //虚拟职业病允许修改表
-                    isPatientOccupationalDiseaseUpdate: "N",  //基本信息
-                    isPatientPoisonsUpdate: "N",  //接害因素
+                    isPatientOccupationalDiseaseUpdate: "N", //基本信息
+                    isPatientPoisonsUpdate: "N", //接害因素
                     isPatientPastMedicalHistorysUpdate: "N", // 既往病史
                     isPatientOccupationalMedicalHistorysUpdate: "N", // 职业病史
                     isPatientOccupationalHistorysUpdate: "N", // 职业史
                     isPatientSymptomsUpdate: "N", // 症状
                     isOccSummary: 'N', // 修改总检结论 
                 },
-                appoint_patient_register: {},  // 预约登记数据 
+                appoint_patient_register: {}, // 预约登记数据 
                 room: { id: '' }, // 房间
                 room_detail: { id: '' }, // 房间关联组合项目
                 common_table: { id: '' }, // 公共表
@@ -490,16 +493,16 @@ export default new Vuex.Store({
                 customer_org_group_detail: [], // 单位分组包含的组合项目明细
                 charge: [], // 收费
                 menu_info: [], // 菜单与页面
-                lis_request: [],  // 检验申请（条码）
-                patient_register: [],   // 体检人员记录
-                register_check_asbitem: [],   // 体检人员登记的项目（合并前）
-                register_check: [],     // 体检人员登记的项目（合并后）
+                lis_request: [], // 检验申请（条码）
+                patient_register: [], // 体检人员记录
+                register_check_asbitem: [], // 体检人员登记的项目（合并前）
+                register_check: [], // 体检人员登记的项目（合并后）
                 register_check_item: [], // 体检人员登记的明细项目
                 role_menu_info: [], // 角色对应的菜单
                 sum_diagnosis: [], // 总检诊断
 
                 patient_poison: [], // 病人毒害因素
-                patient_occupational_history: [],// 病人职业史
+                patient_occupational_history: [], // 病人职业史
                 patient_symptom: [], // 病人症状
                 patient_past_medical_history: [], // 既往病史
                 patient_occupational_medical_history: [], // 职业病史
@@ -509,15 +512,15 @@ export default new Vuex.Store({
                 common_table: [], // 公共表
             },
             plus: {
-                PatientRegisterEditQuery: 0,         // 更新查询条件        
-                clearPatientRegisterQuery: 0,       // 清空人员登记界面查询条件(重新赋值体检单位)
-                PatientRegisterEditGroupBatch: 0,   // 刷新批量调整分组窗口
-                PatientRegisterEditItemBatch: 0,    // 刷新批量调整项目窗口
-                PatientRegisterEditDoctorBatch: 0,   // 刷新批量调整项目检查医生窗口
-                PatientRegisterForChoose: 0,         // 体检人员查询窗口  
-                OccDisease: 0,  // 职业病
-                WebBooking: 0,  // 网上预约
-                WebBookingMzak: 0,  // 人寿预约
+                PatientRegisterEditQuery: 0, // 更新查询条件        
+                clearPatientRegisterQuery: 0, // 清空人员登记界面查询条件(重新赋值体检单位)
+                PatientRegisterEditGroupBatch: 0, // 刷新批量调整分组窗口
+                PatientRegisterEditItemBatch: 0, // 刷新批量调整项目窗口
+                PatientRegisterEditDoctorBatch: 0, // 刷新批量调整项目检查医生窗口
+                PatientRegisterForChoose: 0, // 体检人员查询窗口  
+                OccDisease: 0, // 职业病
+                WebBooking: 0, // 网上预约
+                WebBookingMzak: 0, // 人寿预约
                 ImportOrgData: 0, // 导入企业（青藏公司）数据
                 queue: 0, // 排队信息 
             }
@@ -529,9 +532,9 @@ export default new Vuex.Store({
             ContactPersonEdit: false, // 联系人
             CustomerOrgGroupEdit: false, // 单位分组 新增/编辑
             charge: false, // 收费窗口
-            PatientList: false,  // 体检人员档案列表
+            PatientList: false, // 体检人员档案列表
             PatientRegisterEdit: false, // 体检人员登记 新增/编辑            
-            PatientRegisterForChoose: false,  // 体检人员登记列表
+            PatientRegisterForChoose: false, // 体检人员登记列表
             PatientRegisterEditItemBatch: false, //批量调整项目
             PatientRegisterEditGroupBatch: false, //批量调整分组
             PatientRegisterEditDoctorBatch: false, // 批量调整检查项目医生
@@ -546,8 +549,8 @@ export default new Vuex.Store({
             RoomEdit: false, //房间
             queue: false, // 排队信息
             FollowCriticalCheck: false, // 危急值
-            CommonTableTypeEdit: false,  //公共表类别
-            CommonTableEdit: false,  //公共表
+            CommonTableTypeEdit: false, //公共表类别
+            CommonTableEdit: false, //公共表
             PacsTemplate: false, // pacs结果模版
             ThirdMedicalCenterEdit: false,
             BigtextResultTypeEdit: false,
@@ -582,35 +585,35 @@ export default new Vuex.Store({
 
         doctorCheckPrBaseInit(state) {
             state.doctorCheck.prBase = {
-                id: '', //体检登记ID
-                patientRegisterNo: '', //条码号
-                patientNo: '', //档案号
-                patientName: '', //姓名
-                sexId: '', //性别
-                medicalTimes: '', //体检次数
-                maritalStatusId: '', //婚姻
-                creationTime: '', //体检日期
-                customerOrgParentName: '', //单位
-                customerOrgName: '', //部门
-                medicalTypeId: '', //体检类别
-                personnelTypeId: '', //人员类别
-                nationId: '', //民族
-                mobileTelephone: '', //手机
-            } //人员体检登记显示基本信息
+                    id: '', //体检登记ID
+                    patientRegisterNo: '', //条码号
+                    patientNo: '', //档案号
+                    patientName: '', //姓名
+                    sexId: '', //性别
+                    medicalTimes: '', //体检次数
+                    maritalStatusId: '', //婚姻
+                    creationTime: '', //体检日期
+                    customerOrgParentName: '', //单位
+                    customerOrgName: '', //部门
+                    medicalTypeId: '', //体检类别
+                    personnelTypeId: '', //人员类别
+                    nationId: '', //民族
+                    mobileTelephone: '', //手机
+                } //人员体检登记显示基本信息
         },
 
         sumPREditInit(state) {
             state.dataTransOpts.tableS.patient_register = {
-                id: '', //体检登记ID
-                completeFlag: '', //完成状态
-                summaryDoctor: '', //总检医生
-                summaryDate: '', //总检日期
-                isAudit: '', //审核状态
-                auditDoctor: '', //审核医生
-                auditDate: '', //审核日期
-                isLock: '', //锁定状态
-                patientId: '', //人员档案ID
-            } //人员体检登记显示基本信息
+                    id: '', //体检登记ID
+                    completeFlag: '', //完成状态
+                    summaryDoctor: '', //总检医生
+                    summaryDate: '', //总检日期
+                    isAudit: '', //审核状态
+                    auditDoctor: '', //审核医生
+                    auditDate: '', //审核日期
+                    isLock: '', //锁定状态
+                    patientId: '', //人员档案ID
+                } //人员体检登记显示基本信息
         },
     },
 
diff --git a/src/views/customerOrg/BusReservationImport.vue b/src/views/customerOrg/BusReservationImport.vue
new file mode 100644
index 0000000..c50d366
--- /dev/null
+++ b/src/views/customerOrg/BusReservationImport.vue
@@ -0,0 +1,1014 @@
+<template>
+  <div>
+    <!--主体-->
+    <div>
+      <div class="middlebox">
+        <div class="contenttitle">
+          体检登记 /
+          <span class="contenttitleBold">公交预约导入</span>
+        </div>
+      </div>
+      <div
+        style="
+          margin-bottom: 15px;
+          display: flex;
+          justify-content: space-between;
+          background-color: #fff;
+          border-radius: 8px;
+          padding: 15px;
+          margin-top: 7px;
+        "
+      >
+        <div></div>
+        <div style="display: flex">
+          <div style="padding: 0 5px">
+            <a
+              :underline="false"
+              href="/files/公交集团预约人员名单导入模板.xlsx"
+              ><el-button class="commonbutton" size="small"
+                >下载导入模版</el-button
+              ></a
+            >
+          </div>
+          <div style="padding: 0 5px">
+            <el-button class="commonbutton" @click="binImpoet" size="small"
+              >导入</el-button
+            >
+          </div>
+          <div style="padding: 0 5px">
+            <el-button
+              class="commonbutton"
+              @click="btnExport('tableData')"
+              size="small"
+              style="width: 140px"
+              >导入后结果状态导出</el-button
+            >
+          </div>
+        </div>
+      </div>
+      <div
+        id="tableData"
+        style="padding: 15px; background-color: #fff; border-radius: 8px"
+      >
+        <el-table
+          :data="tableData"
+          v-if="mode == '10'"
+          :row-class-name="importRowClassName"
+          :height="window.pageHeight < 600 ? 440 : window.pageHeight - 210"
+          highlight-current-row
+          size="small"
+          :summary-method="getSummaries"
+          show-summary
+        >
+          <el-table-column
+            type="index"
+            label="序号"
+            width="40"
+            align="center"
+          />
+          <el-table-column
+            prop="importState"
+            label="导入状态"
+            min-width="80"
+            sortable
+          />
+          <el-table-column
+            prop="importDes"
+            label="导入描述"
+            min-width="180"
+            sortable
+          />
+          <el-table-column
+            v-for="(item, index) in importCols"
+            :key="`col${index}`"
+            :prop="item.dispLabel"
+            align="center"
+            :label="item.dataLabel || item.dispLabel"
+            min-width="100"
+          />
+        </el-table>
+        <el-table
+          :data="tableData"
+          border
+          v-if="mode == '20'"
+          :row-class-name="importRowClassName"
+          :height="window.pageHeight < 600 ? 440 : window.pageHeight - 210"
+          highlight-current-row
+          size="small"
+          :summary-method="getSummaries"
+          show-summary
+        >
+          <el-table-column
+            type="index"
+            label="序号"
+            width="40"
+            align="center"
+          />
+          <el-table-column
+            prop="importState"
+            label="导入状态"
+            min-width="80"
+            sortable
+          />
+          <el-table-column
+            prop="importDes"
+            label="导入描述"
+            min-width="180"
+            sortable
+          />
+          <el-table-column
+            prop="patientNo"
+            align="center"
+            label="档案号"
+            min-width="80"
+          />
+          <el-table-column
+            prop="medicalTimes"
+            align="center"
+            label="体检次数"
+            min-width="80"
+          />
+          <el-table-column
+            prop="patientName"
+            align="center"
+            label="姓名"
+            min-width="80"
+          />
+          <el-table-column
+            prop="sexId"
+            align="center"
+            label="性别"
+            min-width="40"
+          >
+            <template slot-scope="scope">
+              <div>
+                {{ dddw(dict.sex, "id", scope.row.sexId, "displayName") }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="age"
+            align="center"
+            label="年龄"
+            min-width="40"
+          />
+          <el-table-column
+            prop="customerOrgParentName"
+            align="center"
+            label="单位"
+            min-width="150"
+          />
+          <el-table-column
+            prop="customerOrgName"
+            align="center"
+            label="部门"
+            min-width="120"
+          />
+          <el-table-column
+            prop="telephone"
+            align="center"
+            label="电话"
+            min-width="100"
+          />
+          <el-table-column
+            prop="mobileTelephone"
+            align="center"
+            label="手机"
+            min-width="100"
+          />
+          <el-table-column
+            prop="creatorName"
+            align="center"
+            label="登记人员"
+            min-width="80"
+          />
+          <el-table-column
+            prop="creationTime"
+            align="center"
+            label="登记日期"
+            min-width="80"
+          >
+            <template slot-scope="scope">
+              <div>
+                {{
+                  scope.row.birthDate
+                    ? moment(new Date(scope.row.creationTime)).format(
+                        "yyyy-MM-DD"
+                      )
+                    : ""
+                }}
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <el-dialog
+      title="导入EXCEL注意事项"
+      :visible.sync="dialogGroup.fileReadme"
+      width="700px"
+      :show-close="false"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+    >
+      <div style="height: 400px; padding: 0 20px">
+        <br />导入Excel时，Excel的格式必须符合一定规范，该格式的模板文件可通过下载模板获取。
+        <br />注意事项如下:
+        <br />
+        <div style="margin-left: 25px">
+          1、姓名不能为空，其余数据可根据实际情况选择是否填写。
+          <br />2、部门、单位分组、性别、婚姻状况、人员类别、体检类别、民族必须与本软件系统中的名称完全一致。
+          <br />3、年龄和出生日期可以只填一栏，系统将自动对年龄和出生日期进行相互转换。
+          <br />4、Excel中标题列不能有单元格合并。
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          class="commonbutton"
+          type="primary"
+          @click="nextStep('fileReadme', 'fileChoose')"
+          >下一步</el-button
+        >
+        <el-button class="commonbutton" @click="dialogClose">关闭</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog
+      title="选择文件"
+      :visible.sync="dialogGroup.fileChoose"
+      width="700px"
+      :show-close="false"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+    >
+      <div style="height: 400px; padding: 0 50px">
+        <!-- webkitdirectory 选择文件属性， multiple 多选属性-->
+        <div>
+          <input
+            id="fileNames"
+            type="file"
+            accept=".xlsx,.xls"
+            @change="changeFileChoose"
+            @focus="fileGetFocus"
+          />
+        </div>
+        <div style="margin: 5px 70px; width: 240px">
+          <el-table
+            :data="sheetNames"
+            border
+            ref="sheetNames"
+            height="300"
+            row-click="chooseSheetName"
+            highlight-current-row
+            size="small"
+          >
+            <el-table-column
+              prop="sheetName"
+              label="Excel表单名"
+              min-width="200"
+              align="center"
+            />
+          </el-table>
+        </div>
+        <div style="display: flex; flex-wrap: wrap">
+          <span style="margin-top: 6px">标题行： 第</span>
+          <el-input
+            type="number"
+            v-model="readDataOpts.titleRow"
+            size="small"
+            style="width: 60px; margin: 0 5px"
+          />
+          <span style="margin-top: 6px">行</span>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          class="commonbutton"
+          type="primary"
+          @click="nextStep('fileChoose', 'fileReadme')"
+          >上一步</el-button
+        >
+        <el-button
+          class="commonbutton"
+          type="primary"
+          @click="nextStep('fileChoose', 'fileDataOpr')"
+          >下一步</el-button
+        >
+        <el-button class="commonbutton" @click="dialogClose">关闭</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+      title="选择待导入的客户信息"
+      :visible.sync="dialogGroup.fileDataOpr"
+      width="700px"
+      :show-close="false"
+      :close-on-click-modal="false"
+    >
+      <!--:append-to-body="true" -->
+      <div style="height: 400px">
+        <div style="margin-top: -10px">
+          <!-- 1、在标题列右击鼠标可设置列名，即：标题列有 √ 的，才参与数据导入；<br> -->
+          1、身份证号有值且合法时，将以身份证号为主自动换算性别、出生日期及年龄；<br />
+          2、按住 Ctr1 或 Shift 键可进行多选。<br />
+        </div>
+        <div style="margin: 5px 0px 0px" @contextmenu.prevent="">
+          <!-- -->
+          <el-table
+            :data="excelData"
+            border
+            ref="excelData"
+            height="340"
+            @row-click="chooseDataImport"
+            row-key="id"
+            highlight-current-row
+            size="small"
+            :row-class-name="handleRowClassName"
+          >
+            <el-table-column
+              type="index"
+              align="center"
+              label="序号"
+              min-width="40"
+            />
+            <!-- 
+            <el-table-column prop="choosed" align="center" label="选中" min-width="40"/>
+            -->
+            <el-table-column
+              v-for="(item, index) in excelCols"
+              :key="`col_${index}`"
+              :prop="item.dispLabel"
+              align="center"
+              :label="
+                (item.val ? '√ ' : '') + (item.dataLabel || item.dispLabel)
+              "
+              :min-width="100 + index"
+            />
+          </el-table>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <div style="display: flex; justify-content: space-between">
+          <div style="display: flex">
+            <el-button
+              class="commonbutton"
+              type="primary"
+              @click="btnChoose('excelData', 'all')"
+              >全选</el-button
+            >
+            <el-button
+              class="commonbutton"
+              type="primary"
+              @click="btnChoose('excelData')"
+              >取消全选</el-button
+            >
+          </div>
+          <div style="display: flex">
+            <el-button
+              class="commonbutton"
+              type="primary"
+              @click="nextStep('fileDataOpr', 'fileChoose')"
+              >上一步</el-button
+            >
+            <el-button
+              class="commonbutton"
+              type="primary"
+              @click="nextStep('fileDataOpr', 'fileDataOpts')"
+              >下一步</el-button
+            >
+            <el-button class="commonbutton" @click="dialogClose"
+              >关闭</el-button
+            >
+          </div>
+        </div>
+      </span>
+    </el-dialog>
+    <el-dialog
+      title="选择单位"
+      :visible.sync="dialogGroup.fileDataOpts"
+      width="700px"
+      :show-close="false"
+      :close-on-click-modal="false"
+    >
+      <!--:append-to-body="true" -->
+      <div style="display: flex; flex-wrap: wrap; margin-bottom: 40px">
+        <div style="display: flex; align-items: center">
+          <span>单位分组：</span>
+          <el-select
+            v-model="CustomerOrgGroup"
+            placeholder="单位分组"
+            style="width: 150px"
+            size="small"
+            value-key="id"
+          >
+            <el-option
+              v-for="item in CustomerOrgGroupList"
+              :key="item.id"
+              :label="item.displayName"
+              :value="item.id"
+            />
+          </el-select>
+        </div>
+        <div style="margin-left: 10px; display: flex; align-items: center">
+          <span>体检中心：</span>
+          <el-select
+            v-model="thirdMedicalCenter"
+            placeholder="体检中心"
+            style="width: 150px"
+            size="small"
+            value-key="id"
+            @change="changeThirdMedicalCenter"
+          >
+            <el-option
+              v-for="item in thirdMedicalCenterList"
+              :key="item.id"
+              :label="item.displayName"
+              :value="item.id"
+            />
+          </el-select>
+        </div>
+        <div style="margin-left: 10px; display: flex; align-items: center">
+          <span>预约日期：</span>
+          <el-select
+            v-model="ThirdMedicalCenterBookingDate"
+            placeholder="预约日期"
+            style="width: 150px"
+            size="small"
+            value-key="id"
+          >
+            <el-option
+              v-for="item in ThirdMedicalCenterBookingDateList"
+              :key="item.id"
+              :label="item.bookingDate"
+              :value="item.bookingDate"
+            />
+          </el-select>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          class="commonbutton"
+          type="primary"
+          @click="nextStep('fileDataOpts', 'fileDataOpr')"
+          >上一步</el-button
+        >
+        <el-button class="commonbutton" type="primary" @click="btnImport"
+          >确定导入</el-button
+        >
+        <el-button class="commonbutton" @click="dialogClose">关闭</el-button>
+      </span>
+    </el-dialog>
+    <!-- 通用进度条 -->
+    <el-dialog
+      title="数据处理中……"
+      :visible.sync="elProgress.display"
+      width="700px"
+      height="400"
+      :show-close="false"
+      :close-on-click-modal="false"
+      :append-to-body="true"
+    >
+      <ElProgressOCX />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import moment from "moment";
+import { mapState, mapActions } from "vuex";
+import { read, readFile, utils } from "xlsx";
+import FileSaver from "file-saver";
+
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import {
+  getPagePriv,
+  checkPagePriv,
+  deepCopy,
+  arrayExistObj,
+  arrayFilter,
+  dddw,
+  tcdate,
+} from "../../utlis/proFunc";
+import ElProgressOCX from "../../components/report/ElProgressOCX.vue";
+export default {
+  components: {
+    ElProgressOCX,
+  },
+  data() {
+    return {
+      tableData: [],
+      mode: "10",
+      importCols: [], //实际导入的列（即有设置与 dataCols 匹配的列）
+      dialogGroup: {
+        fileReadme: true, //导入EXCEL注意事项
+        fileChoose: false, //选择文件
+        fileDataOpr: false,
+        fileDataOpts: false,
+      },
+      sheetNames: [], //EXCEL 工作薄中的表单 {sheetName:}
+      readDataOpts: {
+        file: "", //选中的文件名
+        sheetNameChoosed: "", //当前选中的表格
+        titleRow: 1, //标题行
+      },
+      excelData: [], //excel表格数据
+      excelCols: [{ dispLabel: "", val: "", dataLabel: "" }], //excel数据列名 {dispLabel:'',val:'',dataLabel:''}
+      workBook: null, //EXCEL 工作薄
+      dataCols: [
+        { dispLabel: "姓名", val: "patientName" },
+        { dispLabel: "身份证号", val: "idNo" },
+        { dispLabel: "性别", val: "sexName" },
+        { dispLabel: "年龄", val: "age" },
+        { dispLabel: "电话", val: "telephone" },
+        { dispLabel: "分公司", val: "childCompanyName" },
+        { dispLabel: "部门", val: "departmentName" },
+        { dispLabel: "岗位", val: "positionName" },
+        { dispLabel: "在职", val: "empStatus" },
+        { dispLabel: "婚姻状况", val: "maritalStatus" },
+      ],
+      startPoint: -1, // 多选起点 -1 表示未选择
+      endPoint: -1, // 多选终点 -1 表示未选择
+      CustomerOrgGroupList: [],
+      thirdMedicalCenterList: [],
+      ThirdMedicalCenterBookingDateList: [],
+      CustomerOrgGroup: "",
+      thirdMedicalCenter: "",
+      ThirdMedicalCenterBookingDate: "",
+      readDataOptsInit:{},
+      dataImportOptsInit:{}
+    };
+  },
+  created(){
+    this.readDataOptsInit = Object.assign({}, this.readDataOpts)
+    this.dataImportOptsInit = Object.assign({}, this.dataImportOpts)
+  },
+  mounted() {
+    this.dictInit();
+  },
+
+  computed: {
+    ...mapState([
+      "window",
+      "dict",
+      "elProgress",
+      "patientRegister",
+      "customerOrg",
+    ]),
+  },
+  methods: {
+    dddw,
+    moment,
+    checkPagePriv,
+    dictInit() {
+      //获取单位分组列表
+      postapi("/api/app/ThirdMedicalCenter/GetCustomerOrgGroupList").then(
+        (res) => {
+          if (res.code == 1) {
+            this.CustomerOrgGroupList = res.data;
+          }
+        }
+      );
+      postapi("/api/app/ThirdMedicalCenter/GetList").then((res) => {
+        if (res.code == 1) {
+          this.thirdMedicalCenterList = res.data;
+        }
+      });
+    },
+    changeThirdMedicalCenter() {
+      postapi(
+        "/api/app/ThirdMedicalCenter/GetThirdMedicalCenterBookingDateList",
+        {
+          thirdMedicalCenterId: this.thirdMedicalCenter,
+        }
+      ).then((res) => {
+        if (res.code == 1) {
+          this.ThirdMedicalCenterBookingDateList = res.data;
+        }
+      });
+    },
+    //导入完后，导入状态显示
+    importRowClassName({ row, rowIndex }) {
+      if (row.importState == "导入失败") {
+        return "danger";
+      } else {
+        return "";
+      }
+    },
+    // 导入完后，状态统计
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sumCol = [2]; //需合计的列
+      const sums = [];
+      let success = 0,
+        fail = 0;
+
+      columns.forEach((column, index) => {
+        //显示合计列
+        if (index === 1) {
+          sums[index] = "导入合计";
+          return;
+        }
+
+        //不合计的列
+        if (sumCol.indexOf(index) == -1) {
+          sums[index] = "";
+          return;
+        }
+
+        data.forEach((item) => {
+          console.log("item,column.property", item, column.property);
+          if (item[column.property]) {
+            fail++;
+          } else {
+            success++;
+          }
+        });
+      });
+      sums[2] = `成功：${success} 条，失败：${fail} 条。`;
+
+      return sums;
+    },
+    // 获取选择的文件
+    changeFileChoose(e) {
+      if (e.target.files.length <= 0) return;
+      // console.log('file',e.target.files[0])
+      this.readDataOpts.file = e.target.files[0];
+      // 调用导入Excel文件的方法
+      // File {name: 'vulkan-1.dll',
+      // console.log('file',file,file.type)
+      let fileName = this.readDataOpts.file.name.split(".");
+      let fileNameExt = fileName[fileName.length - 1].toLowerCase();
+      if (fileNameExt != "xls" && fileNameExt != "xlsx") {
+        this.$message.warning("你选的文件可能不是标准的Excel文件！");
+      }
+      this.readFile(this.readDataOpts.file);
+    },
+    //清除所选文件
+    fileGetFocus(e) {
+      console.log("fileGetFocus(e)", e);
+      e.value = ""; //未起作用的
+      // e.target.files = []
+    },
+    nextStep(e, d) {
+      let ret = 1;
+      if (d == "fileDataOpr") {
+        ret = this.readData();
+      }
+      if(d=="fileDataOpts"){
+        let count = 0
+        this.excelData.forEach(e => {
+            if (e.choosed) count++
+          })
+        if(count==0){
+            this.$message.warning("未选中要导入的记录")
+            ret=0
+        }
+      }
+      if (ret > 0) {
+        this.$set(this.dialogGroup, e, false);
+        this.$set(this.dialogGroup, d, true);
+      }
+    },
+    dialogClose() {
+        let keys = Object.keys(this.dialogGroup)
+        keys.forEach(e => {
+            this.dialogGroup[e] = false
+          })
+      let elo = document.getElementById('fileNames')
+      if(elo) elo.value = ''; // 清空选择的文件
+
+      this.workBook = null //EXCEL 工作薄
+      this.sheetNames = [] //EXCEL 工作薄中的表单 {sheetName:}
+
+      this.readDataOpts = Object.assign({}, this.readDataOptsInit)
+      this.dataImportOpts = Object.assign({}, this.dataImportOptsInit)
+
+      this.CustomerOrgGroup = ""
+      this.thirdMedicalCenter = ""
+      this.ThirdMedicalCenterBookingDate =""
+
+      this.startPoint = -1 // 多选起点 -1 表示未选择
+      this.endPoint = -1 // 多选终点 -1 表示未选择
+    },
+    binImpoet() {
+      this.dialogGroup.fileReadme = true;
+    },
+    readFile(file) {
+      const reader = new FileReader();
+
+      // reader.readAsArrayBuffer(file);
+      // 定义读取文件
+      reader.onload = (e) => {
+        let data = e.target.result;
+        // let typedArray = new Uint8Array(data);
+        // var workBook = read(typedArray,{type:'array'})
+        // this.workBook = read(data,{type:'binary',cellDates:true})  //日期将转成 标准 日期格式，显示会 undefined
+        this.workBook = read(data, { type: "binary" });
+        // var workBook = readFile(file); //后端读法
+
+        this.sheetNames = [];
+        this.workBook.SheetNames.forEach((e) => {
+          this.sheetNames.push({ sheetName: e });
+        });
+
+        this.$nextTick(() => {
+          this.$refs["sheetNames"].setCurrentRow(this.sheetNames[0]);
+          this.chooseSheetName(this.sheetNames[0]);
+        });
+      };
+
+      // 错误处理
+      reader.onerror = function (event) {
+        // 读取失败时执行的代码
+        console.error("File could not be read!" + event.target.error);
+      };
+
+      reader.readAsBinaryString(file);
+    },
+    //选择要导入的Excel表单名
+    chooseSheetName(row) {
+      this.readDataOpts.sheetNameChoosed = row.sheetName;
+    },
+    //多选 颜色标记
+    handleRowClassName({ row, rowIndex }) {
+      if (row.choosed) {
+        return "current-row";
+      } else {
+        return "";
+      }
+    },
+    //选择要导入的数据
+    chooseDataImport(row) {
+      // console.log("this.excelData",this.excelData);
+
+      // 按住了shift键
+      if (this.window.shift) {
+        //清除所有选择
+        this.excelData.forEach((e, index) => {
+          e.choosed = false;
+          e.index = index;
+        });
+
+        if (this.startPoint == -1) {
+          this.excelData[row.index].choosed = true;
+          this.startPoint = row.index;
+        } else {
+          if (this.startPoint > row.index) {
+            for (let i = row.index; i <= this.startPoint; i++) {
+              this.excelData[i].choosed = true;
+            }
+          } else if (this.startPoint <= row.index) {
+            for (let i = this.startPoint; i <= row.index; i++) {
+              this.excelData[i].choosed = true;
+            }
+          }
+        }
+      } else if (this.window.ctrl) {
+        // 按住了ctrl 键
+        this.excelData[row.index].choosed = true;
+        if (this.startPoint == -1) {
+          this.startPoint = row.index;
+        }
+      } else {
+        // 未按住了ctrl 、shift 键
+        //清除所有选择
+        console.log("清除所有选择");
+        this.excelData.forEach((e, index) => {
+          e.choosed = false;
+          e.index = index;
+        });
+        // console.log(this.excelData,row.index);
+        // console.log(this.excelData[row.index].choosed);
+
+        this.excelData[row.index].choosed = true;
+        this.startPoint = row.index;
+      }
+    },
+    //读取数据
+    readData() {
+      let ret = 1;
+      if (
+        !this.readDataOpts.file ||
+        !this.workBook ||
+        !this.readDataOpts.sheetNameChoosed
+      ) {
+        this.$message.warning("请选择文件及要导入的表格");
+        return 0;
+      }
+
+      if (this.readDataOpts.titleRow <= 0) {
+        this.$message.warning("标题行不能小于1");
+        return 0;
+      }
+
+      let worksheet = this.workBook.Sheets[this.readDataOpts.sheetNameChoosed];
+
+      //分析标题信息
+      let head = utils.sheet_to_json(worksheet, { header: 1 });
+      console.log(head)
+      this.excelCols = [];
+      head[this.readDataOpts.titleRow - 1].forEach((e) => {
+        let lfind = arrayExistObj(this.dataCols, "dispTitle", e),
+          val = "",
+          dataLabel = "";
+        if (lfind > -1) {
+          val = this.dataCols[lfind].val;
+          dataLabel = this.dataCols[lfind].dataLabel;
+        }
+        this.excelCols.push({
+          dispLabel: e,
+          val,
+          dataLabel,
+        });
+      });
+      //console.log('head,',head,this.excelCols)
+
+      this.excelData = utils.sheet_to_json(worksheet, {
+        raw: false,
+        range: this.readDataOpts.titleRow - 1,
+      }); //raw:false,range:1 从第1行开始读取
+      this.excelData.forEach((e, index) => {
+        e.choosed = false;
+        e.index = index;
+        e.id = "excelData" + index;
+      });
+      //console.log('this.excelCols',this.excelCols)
+      // console.log('sheet_to_json excelData',this.excelData)
+
+      // 导入后，批量分析Excel列 与 数据字段 的匹配关系
+      this.parseExcelData();
+
+      return ret;
+    },
+    parseExcelData() {
+      let lfind = -1;
+      this.excelCols.forEach((e, i) => {
+        lfind = arrayExistObj(this.dataCols, "dispLabel", e.dispLabel);
+        if (lfind > -1) this.setColumn(i, this.dataCols[lfind]);
+      });
+    },
+    //设置真实数据字段列
+    setColumn(oldColNum, newColObj) {
+      this.excelCols[oldColNum].dataLabel = newColObj.dispLabel;
+      this.excelCols[oldColNum].val = newColObj.val;
+    },
+    // 全选（取消全选）
+    btnChoose(refName, type) {
+      let choosed = false;
+      if (type && type == "all") {
+        choosed = true;
+      }
+      this[refName].forEach((e) => {
+        e.choosed = choosed;
+        if (choosed) {
+          this.$refs[refName].setCurrentRow(e);
+        }
+      });
+
+      if (!choosed) {
+        this.$refs[refName].setCurrentRow();
+      }
+    },
+    // 确定导入数据库
+    btnImport() {
+      if (this.CustomerOrgGroup == "") {
+        this.$message.warning("请选择单位分组");
+        return;
+      }
+      if (this.thirdMedicalCenter == "") {
+        this.$message.warning("请选择体检中心");
+        return;
+      }
+      if (this.ThirdMedicalCenterBookingDate == "") {
+        this.$message.warning("请选择预约日期");
+        return;
+      }
+
+      this.elProgress.display = true;
+      this.elProgress.percentage = 0;
+
+      this.importCols = [];
+      this.excelCols.forEach((e) => {
+        if (e.val) {
+          this.importCols.push(e);
+        }
+      });
+      this.tableData = []; // 记录导入后结果状态
+      this.choosedData = []; //选中待导入的数据
+      this.excelData.forEach((e) => {
+        if (e.choosed) this.choosedData.push(e);
+      });
+
+      //导入进行中
+      this.importing();
+      // 开始导入时，清除选择的 文件
+      document.getElementById("fileNames").value = "";
+    },
+    importing() {
+      let body = {};
+      for (let i = 0; i < this.choosedData.length; i++) {
+        this.elProgress.percentage = Math.floor(
+          ((i + 1) * 100) / this.choosedData.length
+        );
+        body = this.excelDataToApiBody(this.choosedData[i]);
+        postapi("/api/app/ThirdBooking/CreateBookingMedicalByExcel",body).then(
+          (res) => {
+            if (res.code >= 0) {
+            this.tableData.push(Object.assign({ importState: '导入成功' }, this.choosedData[i]))
+          } else {
+            this.tableData.push(Object.assign({ importState: '导入失败', importDes: res.message }, this.choosedData[i]))
+          }
+          }
+        );
+        if (i == this.choosedData.length - 1) {
+          this.elProgress.display = false;
+          let keys = Object.keys(this.dialogGroup);
+          keys.forEach((e) => {
+            this.dialogGroup[e] = false;
+          });
+        }
+      }
+    },
+    excelDataToApiBody(ExcelData) {
+      let body = {
+        customerOrgGroupId: this.CustomerOrgGroup,
+        thirdMedicalCenterId: this.thirdMedicalCenter,
+        bookingDate: this.ThirdMedicalCenterBookingDate,
+      };
+
+      this.excelCols.forEach((e) => {
+        if (e.val) {
+          switch (e.val) {
+            case "age":
+              if (ExcelData[e.dispLabel])
+                body[e.val] = parseInt(ExcelData[e.dispLabel]);
+              break;
+            case "maritalStatus":
+              if (ExcelData[e.dispLabel])
+                body[e.val] =
+                  ExcelData[e.dispLabel] == "未婚"
+                    ? "0"
+                    : ExcelData[e.dispLabel] == "已婚"
+                    ? "1"
+                    : undefined;
+              break;
+            case "empStatus":
+              if (ExcelData[e.dispLabel])
+                body[e.val] =
+                  ExcelData[e.dispLabel] == "在职"
+                    ? "0"
+                    : ExcelData[e.dispLabel] == "退休"
+                    ? "1"
+                    : undefined;
+              break;
+            default:
+              body[e.val] = ExcelData[e.dispLabel];
+              break;
+          }
+        }
+      });
+      return body;
+    },
+    //通用导出
+    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);
+    },
+  },
+};
+</script>
+
+<style scoped>
+@import "../../assets/css/global_button.css";
+@import "../../assets/css/global_card.css";
+@import "../../assets/css/global_dialog.css";
+@import "../../assets/css/global_form.css";
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global_menu.css";
+@import "../../assets/css/global.css";
+
+.spanLeftClass {
+  margin-top: 6px;
+  width: 70px;
+}
+
+.spanMidClass {
+  text-align: center;
+  margin-top: 6px;
+  width: 50px;
+}
+
+/* type=number 显示微调按钮 */
+::v-deep input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  -webkit-appearance: button !important;
+  margin: 0 -12px 0 0 !important;
+}
+
+::v-deep .el-table__header th {
+  font-family: "Microsoft YaHei";
+}
+</style>
\ No newline at end of file
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index df07bd7..71a990f 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -60,7 +60,7 @@
       </div>
     </div>
     <!--组件弹窗-->
-    <div>
+    <div v-if="dialogWin.FollowCriticalCheck">
       <!-- 危急值 -->
       <el-dialog title="危急值" :visible.sync="dialogWin.FollowCriticalCheck" width="800px"
         :show-close="false" :close-on-click-modal="false" :append-to-body="true">